@elementor/editor-components 3.35.5 → 3.35.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@elementor/editor-components",
   "description": "Elementor editor components",
-  "version": "3.35.5",
+  "version": "3.35.6",
   "private": false,
   "author": "Elementor Team",
   "homepage": "https://elementor.com/",
@@ -40,30 +40,31 @@
     "dev": "tsup --config=../../tsup.dev.ts"
   },
   "dependencies": {
-    "@elementor/editor": "3.35.5",
-    "@elementor/editor-canvas": "3.35.5",
-    "@elementor/editor-controls": "3.35.5",
-    "@elementor/editor-documents": "3.35.5",
-    "@elementor/editor-editing-panel": "3.35.5",
-    "@elementor/editor-elements": "3.35.5",
-    "@elementor/editor-elements-panel": "3.35.5",
-    "@elementor/editor-mcp": "3.35.5",
-    "@elementor/editor-panels": "3.35.5",
-    "@elementor/editor-props": "3.35.5",
-    "@elementor/editor-styles-repository": "3.35.5",
-    "@elementor/editor-ui": "3.35.5",
-    "@elementor/editor-v1-adapters": "3.35.5",
-    "@elementor/http-client": "3.35.5",
+    "@elementor/editor": "3.35.6",
+    "@elementor/editor-canvas": "3.35.6",
+    "@elementor/editor-controls": "3.35.6",
+    "@elementor/editor-documents": "3.35.6",
+    "@elementor/editor-editing-panel": "3.35.6",
+    "@elementor/editor-elements": "3.35.6",
+    "@elementor/editor-elements-panel": "3.35.6",
+    "@elementor/editor-mcp": "3.35.6",
+    "@elementor/editor-panels": "3.35.6",
+    "@elementor/editor-props": "3.35.6",
+    "@elementor/editor-styles-repository": "3.35.6",
+    "@elementor/editor-templates": "3.35.6",
+    "@elementor/editor-ui": "3.35.6",
+    "@elementor/editor-v1-adapters": "3.35.6",
+    "@elementor/http-client": "3.35.6",
     "@elementor/icons": "^1.63.0",
-    "@elementor/events": "3.35.5",
-    "@elementor/query": "3.35.5",
-    "@elementor/schema": "3.35.5",
-    "@elementor/store": "3.35.5",
+    "@elementor/events": "3.35.6",
+    "@elementor/query": "3.35.6",
+    "@elementor/schema": "3.35.6",
+    "@elementor/store": "3.35.6",
     "@elementor/ui": "1.36.17",
-    "@elementor/utils": "3.35.5",
+    "@elementor/utils": "3.35.6",
     "@wordpress/i18n": "^5.13.0",
-    "@elementor/editor-notifications": "3.35.5",
-    "@elementor/editor-current-user": "3.35.5"
+    "@elementor/editor-notifications": "3.35.6",
+    "@elementor/editor-current-user": "3.35.6"
   },
   "peerDependencies": {
     "react": "^18.3.1",

package/src/components/load-template-components.tsx

@@ -0,0 +1,14 @@
+import { useEffect } from 'react';
+import { useLoadedTemplates } from '@elementor/editor-templates';
+
+import { loadComponentsAssets } from '../store/actions/load-components-assets';
+
+export const LoadTemplateComponents = () => {
+	const templates = useLoadedTemplates();
+
+	useEffect( () => {
+		loadComponentsAssets( templates.flatMap( ( elements ) => elements ?? [] ) );
+	}, [ templates ] );
+
+	return null;
+};

package/src/init.ts

@@ -31,6 +31,7 @@ import { CreateComponentForm } from './components/create-component-form/create-c
 import { EditComponent } from './components/edit-component/edit-component';
 import { openEditModeDialog } from './components/in-edit-mode';
 import { InstanceEditingPanel } from './components/instance-editing-panel/instance-editing-panel';
+import { LoadTemplateComponents } from './components/load-template-components';
 import { OverridablePropControl } from './components/overridable-props/overridable-prop-control';
 import { OverridablePropIndicator } from './components/overridable-props/overridable-prop-indicator';
 import { COMPONENT_WIDGET_TYPE, createComponentType } from './create-component-type';
@@ -110,6 +111,11 @@ export function init() {
 		await loadComponentsAssets( ( config?.elements as V1ElementData[] ) ?? [] );
 	} );
 
+	injectIntoLogic( {
+		id: 'templates',
+		component: LoadTemplateComponents,
+	} );
+
 	registerFieldIndicator( {
 		fieldType: FIELD_TYPE.SETTINGS,
 		id: 'component-overridable-prop',

package/src/store/actions/delete-overridable-prop.ts

@@ -1,6 +1,6 @@
 import { __dispatch as dispatch, __getState as getState } from '@elementor/store';
 
-import { type ComponentId } from '../../types';
+import { type ComponentId, type OverridableProp } from '../../types';
 import { revertElementOverridableSetting } from '../../utils/revert-overridable-settings';
 import { type Source, trackComponentEvent } from '../../utils/tracking';
 import { selectCurrentComponent, selectOverridableProps, slice } from '../store';
@@ -8,26 +8,38 @@ import { removePropFromAllGroups } from '../utils/groups-transformers';
 
 type DeletePropParams = {
 	componentId: ComponentId;
-	propKey: string;
+	propKey: string | string[];
 	source: Source;
 };
 
 export function deleteOverridableProp( { componentId, propKey, source }: DeletePropParams ): void {
 	const overridableProps = selectOverridableProps( getState(), componentId );
 
-	if ( ! overridableProps ) {
+	if ( ! overridableProps || Object.keys( overridableProps.props ).length === 0 ) {
 		return;
 	}
 
-	const prop = overridableProps.props[ propKey ];
+	const propKeysToDelete = Array.isArray( propKey ) ? propKey : [ propKey ];
+	const deletedProps: OverridableProp[] = [];
 
-	if ( ! prop ) {
-		return;
+	for ( const key of propKeysToDelete ) {
+		const prop = overridableProps.props[ key ];
+
+		if ( ! prop ) {
+			continue;
+		}
+
+		deletedProps.push( prop );
+		revertElementOverridableSetting( prop.elementId, prop.propKey, prop.originValue, key );
 	}
 
-	revertElementOverridableSetting( prop.elementId, prop.propKey, prop.originValue, propKey );
+	if ( deletedProps.length === 0 ) {
+		return;
+	}
 
-	const { [ propKey ]: removedProp, ...remainingProps } = overridableProps.props;
+	const remainingProps = Object.fromEntries(
+		Object.entries( overridableProps.props ).filter( ( [ key ] ) => ! propKeysToDelete.includes( key ) )
+	);
 
 	const updatedGroups = removePropFromAllGroups( overridableProps.groups, propKey );
 
@@ -44,13 +56,15 @@ export function deleteOverridableProp( { componentId, propKey, source }: DeleteP
 
 	const currentComponent = selectCurrentComponent( getState() );
 
-	trackComponentEvent( {
-		action: 'propertyRemoved',
-		source,
-		component_uid: currentComponent?.uid,
-		property_id: removedProp.overrideKey,
-		property_path: removedProp.propKey,
-		property_name: removedProp.label,
-		element_type: removedProp.widgetType ?? removedProp.elType,
-	} );
+	for ( const prop of deletedProps ) {
+		trackComponentEvent( {
+			action: 'propertyRemoved',
+			source,
+			component_uid: currentComponent?.uid,
+			property_id: prop.overrideKey,
+			property_path: prop.propKey,
+			property_name: prop.label,
+			element_type: prop.widgetType ?? prop.elType,
+		} );
+	}
 }

package/src/store/utils/groups-transformers.ts

@@ -5,7 +5,9 @@ import { type OverridableProp, type OverridableProps, type OverridablePropsGroup
 
 type Groups = OverridableProps[ 'groups' ];
 
-export function removePropFromAllGroups( groups: Groups, propKey: string ): Groups {
+export function removePropFromAllGroups( groups: Groups, propKey: string | string[] ): Groups {
+	const propKeys = Array.isArray( propKey ) ? propKey : [ propKey ];
+
 	return {
 		...groups,
 		items: Object.fromEntries(
@@ -13,7 +15,7 @@ export function removePropFromAllGroups( groups: Groups, propKey: string ): Grou
 				groupId,
 				{
 					...group,
-					props: group.props.filter( ( p ) => p !== propKey ),
+					props: group.props.filter( ( p ) => ! propKeys.includes( p ) ),
 				},
 			] )
 		),

package/src/sync/cleanup-overridable-props-on-delete.ts

@@ -1,9 +1,9 @@
 import { getAllDescendants, type V1Element } from '@elementor/editor-elements';
-import { registerDataHook } from '@elementor/editor-v1-adapters';
-import { __dispatch as dispatch, __getState as getState } from '@elementor/store';
+import { type HookOptions, registerDataHook } from '@elementor/editor-v1-adapters';
+import { __getState as getState } from '@elementor/store';
 
-import { type ComponentsSlice, selectCurrentComponentId, selectOverridableProps, slice } from '../store/store';
-import { removePropFromAllGroups } from '../store/utils/groups-transformers';
+import { deleteOverridableProp } from '../store/actions/delete-overridable-prop';
+import { type ComponentsSlice, selectCurrentComponentId, selectOverridableProps } from '../store/store';
 
 type DeleteCommandArgs = {
 	container?: V1Element;
@@ -11,7 +11,14 @@ type DeleteCommandArgs = {
 };
 
 export function initCleanupOverridablePropsOnDelete() {
-	registerDataHook( 'dependency', 'document/elements/delete', ( args: DeleteCommandArgs ) => {
+	// This hook is not a real dependency - it doesn't block the execution of the command in any case, only perform side effect.
+	// We use `dependency` and not `after` hook because the `after` hook doesn't include the children of a deleted container
+	// in the callback parameters (as they already were deleted).
+	registerDataHook( 'dependency', 'document/elements/delete', ( args: DeleteCommandArgs, options?: HookOptions ) => {
+		if ( isPartOfMoveCommand( options ) ) {
+			return true;
+		}
+
 		const state = getState() as ComponentsSlice | undefined;
 
 		if ( ! state ) {
@@ -50,25 +57,7 @@ export function initCleanupOverridablePropsOnDelete() {
 			return true;
 		}
 
-		const remainingProps = Object.fromEntries(
-			Object.entries( overridableProps.props ).filter( ( [ propKey ] ) => ! propKeysToDelete.includes( propKey ) )
-		);
-
-		let updatedGroups = overridableProps.groups;
-		for ( const propKey of propKeysToDelete ) {
-			updatedGroups = removePropFromAllGroups( updatedGroups, propKey );
-		}
-
-		dispatch(
-			slice.actions.setOverridableProps( {
-				componentId: currentComponentId,
-				overridableProps: {
-					...overridableProps,
-					props: remainingProps,
-					groups: updatedGroups,
-				},
-			} )
-		);
+		deleteOverridableProp( { componentId: currentComponentId, propKey: propKeysToDelete, source: 'system' } );
 
 		return true;
 	} );
@@ -83,3 +72,14 @@ function collectDeletedElementIds( containers: V1Element[] ): string[] {
 
 	return elementIds;
 }
+
+function isPartOfMoveCommand( options?: HookOptions ): boolean {
+	// Skip cleanup if this delete is part of a move command
+	// Move = delete + create, and we don't want to delete the overridable prop in this case.
+	// See assets/dev/js/editor/document/elements/commands/move.js
+	const isMoveCommandInTrace =
+		options?.commandsCurrentTrace?.includes( 'document/elements/move' ) ||
+		options?.commandsCurrentTrace?.includes( 'document/repeater/move' );
+
+	return Boolean( isMoveCommandInTrace );
+}

package/src/utils/tracking.ts

@@ -5,7 +5,7 @@ import { __getState as getState } from '@elementor/store';
 import { selectCreatedThisSession } from '../store/store';
 import { type ExtendedWindow } from '../types';
 
-export type Source = 'user' | 'mcp_tool';
+export type Source = 'user' | 'mcp_tool' | 'system';
 
 type ComponentEventData = Record< string, unknown > & {
 	action: