@elementor/editor-elements 3.33.0-272 → 3.33.0-273

package/src/sync/move-elements.ts

@@ -9,6 +9,8 @@ type MoveElementsParams = {
 	moves: MoveElementParams[];
 	title: string;
 	subtitle?: string;
+	onMoveElements?: () => void;
+	onRestoreElements?: () => void;
 };
 
 type OriginalPosition = {
@@ -34,6 +36,8 @@ export const moveElements = ( {
 	moves: movesToMake,
 	title,
 	subtitle = __( 'Elements moved', 'elementor' ),
+	onMoveElements,
+	onRestoreElements,
 }: MoveElementsParams ): MovedElementsResult => {
 	const undoableMove = undoable(
 		{
@@ -62,6 +66,9 @@ export const moveElements = ( {
 						options: { ...move.options, useHistory: false },
 					} );
 
+					// Call onMoveElements before moving element to avoid conflicts between commands
+					onMoveElements?.();
+
 					movedElements.push( {
 						elementId,
 						originalPosition,
@@ -76,6 +83,8 @@ export const moveElements = ( {
 				[ ...movedElements ].reverse().forEach( ( { originalPosition } ) => {
 					const { elementId, originalContainerId, originalIndex } = originalPosition;
 
+					onRestoreElements?.();
+
 					moveElement( {
 						elementId,
 						targetContainerId: originalContainerId,
@@ -98,6 +107,8 @@ export const moveElements = ( {
 						options: { ...move.options, useHistory: false },
 					} );
 
+					onMoveElements?.();
+
 					newMovedElements.push( {
 						elementId: move.elementId,
 						originalPosition,

package/src/sync/remove-elements.ts

@@ -58,21 +58,21 @@ export const removeElements = ( {
 					}
 				} );
 
-				const results = elementIdsParam.map( ( elementId ) => {
-					return deleteElement( {
+				// Call onRemoveElements before deleting elements to avoid conflicts between commands
+				onRemoveElements?.();
+
+				elementIdsParam.forEach( ( elementId ) => {
+					deleteElement( {
 						elementId,
 						options: { useHistory: false },
 					} );
 				} );
 
-				// Wait for all elements to be deleted to avoid conflicts between commands
-				Promise.all( results ).then( () => {
-					onRemoveElements?.();
-				} );
-
 				return { elementIds: elementIdsParam, removedElements };
 			},
 			undo: ( _: { elementIds: string[] }, { removedElements }: RemovedElementsResult ) => {
+				onRestoreElements?.();
+
 				// Restore elements in reverse order to maintain proper hierarchy
 				[ ...removedElements ].reverse().forEach( ( { model, parent, at } ) => {
 					if ( parent && model ) {
@@ -83,12 +83,13 @@ export const removeElements = ( {
 						} );
 					}
 				} );
-				onRestoreElements?.();
 			},
 			redo: (
 				_: { elementIds: string[] },
 				{ elementIds: originalElementIds, removedElements }: RemovedElementsResult
 			): RemovedElementsResult => {
+				onRemoveElements?.();
+
 				originalElementIds.forEach( ( elementId ) => {
 					deleteElement( {
 						elementId,
@@ -96,7 +97,6 @@ export const removeElements = ( {
 					} );
 				} );
 
-				onRemoveElements?.();
 				return { elementIds: originalElementIds, removedElements };
 			},
 		},