Skip to content

Blocks: Reselect the current block if we click again on it #556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowriad merged 3 commits into from
May 2, 2017
Merged

Blocks: Reselect the current block if we click again on it #556

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d95c03c
Blocks: Reselect the current block if we click again on it
youknowriad Apr 28, 2017
473563a
Editable: Avoid unnecessary updateContent calls
youknowriad May 1, 2017
b8f7505
Blocks: Fix tab navigation
youknowriad May 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Editable: Avoid unnecessary updateContent calls
  • Loading branch information
@youknowriad
youknowriad committed May 1, 2017
commit 473563af5185c741c68e962b36994db66f8970a3
11 changes: 8 additions & 3 deletions blocks/components/editable/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,9 @@ export default class Editable extends wp.element.Component {
return;
}

this.savedContent = this.getContent();
this.editor.save();
this.props.onChange( this.getContent() );
this.props.onChange( this.savedContent );
}

isStartOfEditor() {
Expand Down Expand Up @@ -216,7 +217,8 @@ export default class Editable extends wp.element.Component {

updateContent() {
const bookmark = this.editor.selection.getBookmark( 2, true );
this.setContent( this.props.value );
this.savedContent = this.props.value;
this.setContent( this.savedContent );
this.editor.selection.moveToBookmark( bookmark );
// Saving the editor on updates avoid unecessary onChanges calls
// These calls can make the focus jump
Expand Down Expand Up @@ -266,10 +268,13 @@ export default class Editable extends wp.element.Component {
this.focus();
}

// The savedContent var allows us to avoid updating the content right after an onChange call
Copy link
Member

@aduth aduth May 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I follow this. Why does the value of this.props.value differ from prevProps.value after the onChange? And if it does, why do we not want this to be reflected in the editable?

Copy link
Contributor Author

@youknowriad youknowriad May 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you make a change on the editable. Say the old value is a and the new one is ab, we don't want to trigger the updateContent even if the old value prop and the new one are different. That's what I'm trying to achieve here by caching the savedContent.

if (
this.props.tagName === prevProps.tagName &&
this.props.value !== prevProps.value &&
! isEqual( this.props.value, prevProps.value )
this.props.value !== this.savedContent &&
! isEqual( this.props.value, prevProps.value ) &&
! isEqual( this.props.value, this.savedContent )
) {
this.updateContent();
}
Expand Down