@elementor/editor-components 3.35.0-489 → 3.35.0-490

package/package.json

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

package/src/components/create-component-form/create-component-form.tsx

@@ -106,6 +106,7 @@ export function CreateComponentForm() {
 				message: errorMessage,
 				id: 'component-save-failed',
 			} );
+			resetAndClosePopup();
 		}
 	};
 

package/src/store/actions/create-unpublished-component.ts

@@ -1,11 +1,12 @@
-import { type V1ElementData } from '@elementor/editor-elements';
+import { createElements, deleteElement, getContainer, type V1ElementData } from '@elementor/editor-elements';
 import { __privateRunCommand as runCommand } from '@elementor/editor-v1-adapters';
 import { __dispatch as dispatch } from '@elementor/store';
 import { generateUniqueId } from '@elementor/utils';
+import { __ } from '@wordpress/i18n';
 
 import { type ComponentEventData } from '../../components/create-component-form/utils/get-component-event-data';
 import { replaceElementWithComponent } from '../../components/create-component-form/utils/replace-element-with-component';
-import { type OverridableProps } from '../../types';
+import { type OriginalElementData, type OverridableProps } from '../../types';
 import { revertAllOverridablesInElementData } from '../../utils/revert-overridable-settings';
 import { type Source, trackComponentEvent } from '../../utils/tracking';
 import { slice } from '../store';
@@ -31,6 +32,14 @@ export async function createUnpublishedComponent( {
 	const componentBase = { uid: generatedUid, name };
 	const elementDataWithOverridablesReverted = revertAllOverridablesInElementData( element );
 
+	const container = getContainer( element.id );
+	const modelFromContainer = container?.model?.toJSON?.() as V1ElementData | undefined;
+	const originalElement: OriginalElementData = {
+		model: modelFromContainer ?? element,
+		parentId: container?.parent?.id ?? '',
+		index: container?.view?._index ?? 0,
+	};
+
 	dispatch(
 		slice.actions.addUnpublished( {
 			...componentBase,
@@ -51,7 +60,33 @@ export async function createUnpublishedComponent( {
 		...eventData,
 	} );
 
-	await runCommand( 'document/save/auto' );
+	try {
+		await runCommand( 'document/save/auto' );
+	} catch ( error ) {
+		restoreOriginalElement( originalElement, componentInstance.id );
+
+		dispatch( slice.actions.removeUnpublished( generatedUid ) );
+		dispatch( slice.actions.removeCreatedThisSession( generatedUid ) );
+
+		throw error;
+	}
 
 	return { uid: generatedUid, instanceId: componentInstance.id };
 }
+
+function restoreOriginalElement( originalElement: OriginalElementData, componentInstanceId: string ): void {
+	deleteElement( { elementId: componentInstanceId, options: { useHistory: false } } );
+
+	const clonedModel = structuredClone( originalElement.model );
+
+	createElements( {
+		title: __( 'Restore Element', 'elementor' ),
+		elements: [
+			{
+				containerId: originalElement.parentId,
+				model: clonedModel as Parameters< typeof createElements >[ 0 ][ 'elements' ][ 0 ][ 'model' ],
+				options: { at: originalElement.index },
+			},
+		],
+	} );
+}

package/src/store/store.ts

@@ -72,6 +72,12 @@ export const slice = createSlice( {
 		addUnpublished: ( state, { payload }: PayloadAction< UnpublishedComponent > ) => {
 			state.unpublishedData.unshift( payload );
 		},
+		removeUnpublished: ( state, { payload }: PayloadAction< string | string[] > ) => {
+			const uidsToRemove = Array.isArray( payload ) ? payload : [ payload ];
+			state.unpublishedData = state.unpublishedData.filter(
+				( component ) => ! uidsToRemove.includes( component.uid )
+			);
+		},
 		resetUnpublished: ( state ) => {
 			state.unpublishedData = [];
 		},
@@ -86,6 +92,9 @@ export const slice = createSlice( {
 		addCreatedThisSession: ( state, { payload }: PayloadAction< string > ) => {
 			state.createdThisSession.push( payload );
 		},
+		removeCreatedThisSession: ( state, { payload }: PayloadAction< string > ) => {
+			state.createdThisSession = state.createdThisSession.filter( ( uid ) => uid !== payload );
+		},
 		archive: ( state, { payload }: PayloadAction< number > ) => {
 			const component = state.data.find( ( comp ) => comp.id === payload );
 

package/src/sync/create-components-before-save.ts

@@ -36,7 +36,10 @@ export async function createComponentsBeforeSave( {
 		);
 		dispatch( slice.actions.resetUnpublished() );
 	} catch ( error ) {
-		throw new Error( `Failed to publish components and update component instances: ${ error }` );
+		const failedUids = unpublishedComponents.map( ( component ) => component.uid );
+		dispatch( slice.actions.removeUnpublished( failedUids ) );
+
+		throw new Error( `Failed to publish components: ${ error }` );
 	}
 }
 

package/src/types.ts

@@ -18,6 +18,12 @@ export type PublishedComponent = BaseComponent & {
 	isArchived?: boolean;
 };
 
+export type OriginalElementData = {
+	model: V1ElementData;
+	parentId: string;
+	index: number;
+};
+
 export type UnpublishedComponent = BaseComponent & {
 	elements: V1ElementData[];
 };