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

package/src/index.ts

@@ -1,74 +1,74 @@
 // types
-export * from './types';
 export type {
 	V1Element,
+	V1ElementConfig,
 	V1ElementData,
 	V1ElementModelProps,
 	V1ElementSettingsProps,
-	V1ElementConfig,
 } from './sync/types';
+export * from './types';
 
 // hooks
-export { useElementSetting, useElementSettings } from './hooks/use-element-setting';
-export { useSelectedElement } from './hooks/use-selected-element';
-export { useParentElement } from './hooks/use-parent-element';
 export { useElementChildren, type ElementChildren, type ElementModel } from './hooks/use-element-children';
 export { useElementEditorSettings } from './hooks/use-element-editor-settings';
+export { useElementSetting, useElementSettings } from './hooks/use-element-setting';
+export { useParentElement } from './hooks/use-parent-element';
+export { useSelectedElement } from './hooks/use-selected-element';
 
 // utils
 export { createElement, type CreateElementParams } from './sync/create-element';
-export { updateElementEditorSettings } from './sync/update-element-editor-settings';
-export { moveElement, type MoveElementParams } from './sync/move-element';
-export {
-	moveElements,
-	type MoveElementsParams,
-	type MovedElement,
-	type MovedElementsResult,
-} from './sync/move-elements';
-export { duplicateElement, type DuplicateElementParams } from './sync/duplicate-element';
 export { createElements } from './sync/create-elements';
+export { deleteElement } from './sync/delete-element';
+export { dropElement, type DropElementParams } from './sync/drop-element';
+export { duplicateElement, type DuplicateElementParams } from './sync/duplicate-element';
 export {
 	duplicateElements,
-	type DuplicateElementsParams,
 	type DuplicatedElement,
 	type DuplicatedElementsResult,
+	type DuplicateElementsParams,
 } from './sync/duplicate-elements';
-export { deleteElement } from './sync/delete-element';
-export { removeElements } from './sync/remove-elements';
+export { generateElementId } from './sync/generate-element-id';
 export { getContainer, selectElement } from './sync/get-container';
-export { getElementType } from './sync/get-element-type';
-export { getElementSetting, getElementSettings } from './sync/get-element-setting';
+export { getCurrentDocumentContainer } from './sync/get-current-document-container';
+export { getCurrentDocumentId } from './sync/get-current-document-id';
 export { getElementEditorSettings } from './sync/get-element-editor-settings';
-export { getElementStyles } from './sync/get-element-styles';
 export { getElementLabel } from './sync/get-element-label';
+export { getElementSetting, getElementSettings } from './sync/get-element-setting';
+export { getElementStyles } from './sync/get-element-styles';
+export { getElementType } from './sync/get-element-type';
 export { getElements } from './sync/get-elements';
-export { getCurrentDocumentId } from './sync/get-current-document-id';
 export { getSelectedElements } from './sync/get-selected-elements';
 export { getWidgetsCache } from './sync/get-widgets-cache';
-export { updateElementSettings, type UpdateElementSettingsArgs } from './sync/update-element-settings';
-export { generateElementId } from './sync/generate-element-id';
+export { moveElement, type MoveElementParams } from './sync/move-element';
+export {
+	moveElements,
+	type MovedElement,
+	type MovedElementsResult,
+	type MoveElementsParams,
+} from './sync/move-elements';
+export { removeElements } from './sync/remove-elements';
 export { replaceElement } from './sync/replace-element';
-export { getCurrentDocumentContainer } from './sync/get-current-document-container';
-export { dropElement, type DropElementParams } from './sync/drop-element';
+export { updateElementEditorSettings } from './sync/update-element-editor-settings';
+export { updateElementSettings, type UpdateElementSettingsArgs } from './sync/update-element-settings';
 
+export {
+	getAnchoredAncestorId,
+	getAnchoredDescendantId,
+	getLinkInLinkRestriction,
+	isElementAnchored,
+	type LinkInLinkRestriction,
+} from './link-restriction';
 export { ELEMENT_STYLE_CHANGE_EVENT, styleRerenderEvents } from './styles/consts';
 export {
 	createElementStyle,
 	shouldCreateNewLocalStyle,
 	type CreateElementStyleArgs,
 } from './styles/create-element-style';
-export { updateElementStyle, type UpdateElementStyleArgs } from './styles/update-element-style';
 export { deleteElementStyle } from './styles/delete-element-style';
-export {
-	isElementAnchored,
-	getAnchoredDescendantId,
-	getAnchoredAncestorId,
-	getLinkInLinkRestriction,
-	type LinkInLinkRestriction,
-} from './link-restriction';
+export { updateElementStyle, type UpdateElementStyleArgs } from './styles/update-element-style';
 
-export { getElementInteractions } from './sync/get-element-interactions';
-export { updateElementInteractions, playElementInteractions } from './sync/update-element-interactions';
 export { useElementInteractions } from './hooks/use-element-interactions';
+export { getElementInteractions } from './sync/get-element-interactions';
+export { playElementInteractions, updateElementInteractions } from './sync/update-element-interactions';
 
 export { initMcp as initElementsMcp } from './mcp';

package/src/sync/get-widgets-cache.ts

@@ -1,7 +1,8 @@
-import { type ExtendedWindow } from './types';
+import { type ExtendedWindow, type V1ElementConfig } from '../sync/types.js';
+type WidgetsCache< T > = Record< string, T >;
 
-export function getWidgetsCache() {
+export function getWidgetsCache< T extends V1ElementConfig >(): WidgetsCache< T > | null {
 	const extendedWindow = window as unknown as ExtendedWindow;
 
-	return extendedWindow?.elementor?.widgetsCache || null;
+	return ( extendedWindow?.elementor?.widgetsCache as WidgetsCache< T > ) || null;
 }

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 };
 			},
 		},

package/src/sync/types.ts

@@ -66,7 +66,7 @@ export type V1ElementEditorSettingsProps = {
 
 export type V1ElementSettingsProps = Record< string, PropValue >;
 
-export type V1ElementConfig = {
+export type V1ElementConfig< T = object > = {
 	title: string;
 	controls: object;
 	atomic?: boolean;
@@ -78,7 +78,7 @@ export type V1ElementConfig = {
 	base_styles?: Record< string, StyleDefinition >;
 	base_styles_dictionary?: Record< string, string >;
 	atomic_style_states?: ClassState[];
-};
+} & T;
 
 type V1Model< T > = {
 	get: < K extends keyof T >( key: K ) => T[ K ];