Skip to content

Commit

Permalink
Rich Text: Remove restoreContentAndSplit (#7618)
Browse files Browse the repository at this point in the history
* Rich Text: Create range fragments by clone

Avoid destroying original content incurred by extractContents

* Rich Text: Remove restoreContentAndSplit

Call `onSplit` directly
  • Loading branch information
aduth authored Jul 19, 2018
1 parent 635fa82 commit b28a678
Showing 1 changed file with 4 additions and 17 deletions.
21 changes: 4 additions & 17 deletions editor/components/rich-text/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ export class RichText extends Component {
const before = domToFormat( beforeNodes, format, this.editor );
const after = domToFormat( afterNodes, format, this.editor );

this.restoreContentAndSplit( before, after );
this.props.onSplit( before, after );
} else {
event.preventDefault();

Expand Down Expand Up @@ -633,8 +633,8 @@ export class RichText extends Component {
afterRange.setStart( selectionRange.endContainer, selectionRange.endOffset );
afterRange.setEnd( rootNode, dom.nodeIndex( rootNode.lastChild ) + 1 );

const beforeFragment = beforeRange.extractContents();
const afterFragment = afterRange.extractContents();
const beforeFragment = beforeRange.cloneContents();
const afterFragment = afterRange.cloneContents();

const { format } = this.props;
before = domToFormat( filterEmptyNodes( beforeFragment.childNodes ), format, this.editor );
Expand Down Expand Up @@ -662,7 +662,7 @@ export class RichText extends Component {
after = this.isEmpty( after ) ? null : after;
}

this.restoreContentAndSplit( before, after, blocks );
onSplit( before, after, ...blocks );
}

onNodeChange( { parents } ) {
Expand Down Expand Up @@ -824,19 +824,6 @@ export class RichText extends Component {
} ) );
}

/**
* Calling onSplit means we need to abort the change done by TinyMCE.
* we need to call updateContent to restore the initial content before calling onSplit.
*
* @param {Array} before content before the split position
* @param {Array} after content after the split position
* @param {?Array} blocks blocks to insert at the split position
*/
restoreContentAndSplit( before, after, blocks = [] ) {
this.setContent( this.props.value );
this.props.onSplit( before, after, ...blocks );
}

render() {
const {
tagName: Tagname = 'div',
Expand Down

0 comments on commit b28a678

Please sign in to comment.