Merge pull request #8872 from ckeditor/i/8870

Fix (engine): Fixed content not restored on undo when multiple blocks and widgets were removed. Closes #8870.
ckeditor · Feb 2, 2021 · 385234a · 385234a
2 parents b278fde + 4127a0c
commit 385234a
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 5 deletions.
diff --git a/packages/ckeditor5-engine/src/model/operation/splitoperation.js b/packages/ckeditor5-engine/src/model/operation/splitoperation.js
@@ -59,7 +59,6 @@ export default class SplitOperation extends Operation {
 		 * @member {module:engine/model/position~Position} module:engine/model/operation/splitoperation~SplitOperation#insertionPosition
 		 */
 		this.insertionPosition = SplitOperation.getInsertionPosition( splitPosition );
-		this.insertionPosition.stickiness = 'toNone';
 
 		/**
 		 * Position in the graveyard root before the element which should be used as a parent of the nodes after `position`.
@@ -230,7 +229,7 @@ export default class SplitOperation extends Operation {
 		const path = splitPosition.path.slice( 0, -1 );
 		path[ path.length - 1 ]++;
 
-		return new Position( splitPosition.root, path );
+		return new Position( splitPosition.root, path, 'toPrevious' );
 	}
 
 	/**

diff --git a/packages/ckeditor5-engine/src/model/operation/transform.js b/packages/ckeditor5-engine/src/model/operation/transform.js
@@ -1981,7 +1981,7 @@ setTransformation( SplitOperation, InsertOperation, ( a, b ) => {
 	}
 
 	a.splitPosition = a.splitPosition._getTransformedByInsertOperation( b );
-	a.insertionPosition = SplitOperation.getInsertionPosition( a.splitPosition );
+	a.insertionPosition = a.insertionPosition._getTransformedByInsertOperation( b );
 
 	return [ a ];
 } );

diff --git a/packages/ckeditor5-engine/tests/model/operation/transform/merge.js b/packages/ckeditor5-engine/tests/model/operation/transform/merge.js
@@ -78,7 +78,7 @@ describe( 'transform', () => {
 
 				john.undo();
 				syncClients();
-				expectClients( '<paragraph>Foo</paragraph><paragraph>Bar</paragraph><paragraph></paragraph>' );
+				expectClients( '<paragraph>Foo</paragraph><paragraph></paragraph><paragraph>Bar</paragraph>' );
 
 				kate.undo();
 				syncClients();

diff --git a/packages/ckeditor5-engine/tests/model/operation/transform/undo.js b/packages/ckeditor5-engine/tests/model/operation/transform/undo.js
@@ -686,4 +686,28 @@ describe( 'transform', () => {
 
 		expectClients( '<paragraph>AbFoo</paragraph><paragraph>Baryz</paragraph>' );
 	} );
+
+	// https://github.com/ckeditor/ckeditor5/issues/8870
+	it( 'object, p, p, p, remove, undo', () => {
+		john.setData( '<image></image><paragraph>A</paragraph><paragraph>B[]</paragraph>' );
+
+		// I couldn't use delete command because simply executing this command several times does not
+		// work correctly when selection reaches <image></image><p>[]</p>.
+		// At this point we have custom control for firing delete event on view and I didn't want to
+		// simulate that.
+		//
+		john.remove( [ 2, 0 ], [ 2, 1 ] );
+		john.merge( [ 2 ] );
+		john.remove( [ 1, 0 ], [ 1, 1 ] );
+		john.remove( [ 1 ], [ 2 ] );
+		john.remove( [ 0 ], [ 1 ] );
+
+		john.undo();
+		john.undo();
+		john.undo();
+		john.undo();
+		john.undo();
+
+		expectClients( '<image></image><paragraph>A</paragraph><paragraph>B</paragraph>' );
+	} );
 } );
diff --git a/packages/ckeditor5-engine/tests/model/operation/transform/utils.js b/packages/ckeditor5-engine/tests/model/operation/transform/utils.js
@@ -13,6 +13,7 @@ import UndoEditing from '@ckeditor/ckeditor5-undo/src/undoediting';
 import BlockQuoteEditing from '@ckeditor/ckeditor5-block-quote/src/blockquoteediting';
 import HeadingEditing from '@ckeditor/ckeditor5-heading/src/headingediting';
 import TableEditing from '@ckeditor/ckeditor5-table/src/tableediting';
+import ImageEditing from '@ckeditor/ckeditor5-image/src/image/imageediting';
 
 import { getData, parse } from '../../../../src/dev-utils/model';
 import { transformSets } from '../../../../src/model/operation/transform';
@@ -38,7 +39,9 @@ export class Client {
 			// UndoEditing is needed for undo command.
 			// Block plugins are needed for proper data serializing.
 			// BoldEditing is needed for bold command.
-			plugins: [ Typing, Paragraph, ListEditing, UndoEditing, BlockQuoteEditing, HeadingEditing, BoldEditing, TableEditing ]
+			plugins: [
+				Typing, Paragraph, ListEditing, UndoEditing, BlockQuoteEditing, HeadingEditing, BoldEditing, TableEditing, ImageEditing
+			]
 		} ).then( editor => {
 			this.editor = editor;
 			this.document = editor.model.document;