Fix: Improved MoveOperation x MergeOperation transformation.

ckeditor · Aug 8, 2018 · fb4cf24 · fb4cf24
1 parent 98ab5b3
commit fb4cf24
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/model/operation/transform.js b/src/model/operation/transform.js
@@ -1344,7 +1344,14 @@ setTransformation( MoveOperation, MergeOperation, ( a, b, context ) => {
 			//			it would be a move operation that moves 0 nodes, so maybe it is better just to return no-op.
 			//
 			if ( a.howMany == 1 ) {
-				return getNoOp();
+				if ( !context.bWasUndone ) {
+					return getNoOp();
+				} else {
+					a.sourcePosition = Position.createFromPosition( b.graveyardPosition );
+					a.targetPosition = a.targetPosition._getTransformedByMergeOperation( b );
+
+					return [ a ];
+				}
 			}
 		}
 	}