@elementor/editor-canvas 4.2.0-923 → 4.2.0-924

package/dist/index.js

@@ -3734,22 +3734,29 @@ function registerModelExtensions(type, extensions) {
 }
 function registerElementType(type, elementTypeGenerator) {
   elementsLegacyTypes[type] = elementTypeGenerator;
+  if ((0, import_editor_v1_adapters14.__privateIsReady)()) {
+    registerElementInLegacyManager(type, createDomRenderer());
+  }
 }
 function initLegacyViews() {
   (0, import_editor_v1_adapters14.__privateListenTo)((0, import_editor_v1_adapters14.v1ReadyEvent)(), () => {
     const widgetsCache = (0, import_editor_elements10.getWidgetsCache)() ?? {};
-    const legacyWindow = window;
     const renderer = createDomRenderer();
     registerProPromotionTypes(widgetsCache);
-    Object.entries(widgetsCache).forEach(([type, element]) => {
-      if (!element.atomic) {
-        return;
-      }
-      const ResolvedElementType = resolveElementType(type, renderer, element);
-      tryRegisterElement(legacyWindow, type, element, ResolvedElementType);
+    Object.keys(widgetsCache).forEach((type) => {
+      registerElementInLegacyManager(type, renderer);
     });
   });
 }
+function registerElementInLegacyManager(type, renderer) {
+  const element = ((0, import_editor_elements10.getWidgetsCache)() ?? {})[type];
+  if (!element?.atomic) {
+    return;
+  }
+  const legacyWindow = window;
+  const ResolvedElementType = resolveElementType(type, renderer, element);
+  tryRegisterElement(legacyWindow, type, element, ResolvedElementType);
+}
 function registerProPromotionTypes(widgetsCache) {
   Object.entries(widgetsCache).forEach(([type, element]) => {
     if (element.meta?.is_pro_promotion) {

package/dist/index.mjs

@@ -2397,7 +2397,7 @@ function initStyleTransformers() {
 
 // src/legacy/init-legacy-views.ts
 import { getWidgetsCache as getWidgetsCache3 } from "@elementor/editor-elements";
-import { __privateListenTo, v1ReadyEvent as v1ReadyEvent2 } from "@elementor/editor-v1-adapters";
+import { __privateIsReady as isV1Ready, __privateListenTo, v1ReadyEvent as v1ReadyEvent2 } from "@elementor/editor-v1-adapters";
 
 // src/renderers/create-dom-renderer.ts
 import { createArrayLoader, createEnvironment } from "@elementor/twing";
@@ -3698,22 +3698,29 @@ function registerModelExtensions(type, extensions) {
 }
 function registerElementType(type, elementTypeGenerator) {
   elementsLegacyTypes[type] = elementTypeGenerator;
+  if (isV1Ready()) {
+    registerElementInLegacyManager(type, createDomRenderer());
+  }
 }
 function initLegacyViews() {
   __privateListenTo(v1ReadyEvent2(), () => {
     const widgetsCache = getWidgetsCache3() ?? {};
-    const legacyWindow = window;
     const renderer = createDomRenderer();
     registerProPromotionTypes(widgetsCache);
-    Object.entries(widgetsCache).forEach(([type, element]) => {
-      if (!element.atomic) {
-        return;
-      }
-      const ResolvedElementType = resolveElementType(type, renderer, element);
-      tryRegisterElement(legacyWindow, type, element, ResolvedElementType);
+    Object.keys(widgetsCache).forEach((type) => {
+      registerElementInLegacyManager(type, renderer);
     });
   });
 }
+function registerElementInLegacyManager(type, renderer) {
+  const element = (getWidgetsCache3() ?? {})[type];
+  if (!element?.atomic) {
+    return;
+  }
+  const legacyWindow = window;
+  const ResolvedElementType = resolveElementType(type, renderer, element);
+  tryRegisterElement(legacyWindow, type, element, ResolvedElementType);
+}
 function registerProPromotionTypes(widgetsCache) {
   Object.entries(widgetsCache).forEach(([type, element]) => {
     if (element.meta?.is_pro_promotion) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@elementor/editor-canvas",
   "description": "Elementor Editor Canvas",
-  "version": "4.2.0-923",
+  "version": "4.2.0-924",
   "private": false,
   "author": "Elementor Team",
   "homepage": "https://elementor.com/",
@@ -37,25 +37,25 @@
     "react-dom": "^18.3.1"
   },
   "dependencies": {
-    "@elementor/editor": "4.2.0-923",
+    "@elementor/editor": "4.2.0-924",
     "dompurify": "^3.2.6",
-    "@elementor/editor-controls": "4.2.0-923",
-    "@elementor/editor-documents": "4.2.0-923",
-    "@elementor/editor-elements": "4.2.0-923",
-    "@elementor/editor-interactions": "4.2.0-923",
-    "@elementor/editor-mcp": "4.2.0-923",
-    "@elementor/editor-notifications": "4.2.0-923",
-    "@elementor/editor-props": "4.2.0-923",
-    "@elementor/editor-responsive": "4.2.0-923",
-    "@elementor/editor-styles": "4.2.0-923",
-    "@elementor/editor-styles-repository": "4.2.0-923",
-    "@elementor/editor-ui": "4.2.0-923",
-    "@elementor/editor-v1-adapters": "4.2.0-923",
-    "@elementor/schema": "4.2.0-923",
-    "@elementor/twing": "4.2.0-923",
+    "@elementor/editor-controls": "4.2.0-924",
+    "@elementor/editor-documents": "4.2.0-924",
+    "@elementor/editor-elements": "4.2.0-924",
+    "@elementor/editor-interactions": "4.2.0-924",
+    "@elementor/editor-mcp": "4.2.0-924",
+    "@elementor/editor-notifications": "4.2.0-924",
+    "@elementor/editor-props": "4.2.0-924",
+    "@elementor/editor-responsive": "4.2.0-924",
+    "@elementor/editor-styles": "4.2.0-924",
+    "@elementor/editor-styles-repository": "4.2.0-924",
+    "@elementor/editor-ui": "4.2.0-924",
+    "@elementor/editor-v1-adapters": "4.2.0-924",
+    "@elementor/schema": "4.2.0-924",
+    "@elementor/twing": "4.2.0-924",
     "@elementor/ui": "1.37.5",
-    "@elementor/utils": "4.2.0-923",
-    "@elementor/wp-media": "4.2.0-923",
+    "@elementor/utils": "4.2.0-924",
+    "@elementor/wp-media": "4.2.0-924",
     "@floating-ui/react": "^0.27.5",
     "@wordpress/i18n": "^5.13.0"
   },

package/src/legacy/__tests__/init-legacy-views.test.ts

@@ -0,0 +1,66 @@
+import { mockLegacyElementor } from 'test-utils';
+import { getWidgetsCache } from '@elementor/editor-elements';
+
+import { createTemplatedElementType } from '../create-templated-element-type';
+import { initLegacyViews, registerElementType } from '../init-legacy-views';
+import type { LegacyWindow } from '../types';
+
+jest.mock( '@elementor/editor-elements', () => ( {
+	getWidgetsCache: jest.fn(),
+} ) );
+
+jest.mock( '../../renderers/create-dom-renderer', () => ( {
+	createDomRenderer: jest.fn( () => ( {
+		register: jest.fn(),
+		render: jest.fn(),
+	} ) ),
+} ) );
+
+const MOCK_TYPE = 'test-loop-type';
+
+const createMockAtomicWidget = () => ( {
+	atomic: true,
+	controls: {},
+	title: MOCK_TYPE,
+	twig_templates: {},
+	twig_main_template: 'main',
+	atomic_props_schema: {},
+	base_styles_dictionary: {},
+} );
+
+const createMockElementsManager = () => ( {
+	getElementTypeClass: jest.fn().mockReturnValue( null ),
+	registerElementType: jest.fn(),
+	elementTypes: {} as Record< string, unknown >,
+} );
+
+const attachMockElementsManager = ( elementsManager: ReturnType< typeof createMockElementsManager > ) => {
+	const legacyWindow = window as unknown as LegacyWindow;
+	legacyWindow.elementor.elementsManager =
+		elementsManager as unknown as LegacyWindow[ 'elementor' ][ 'elementsManager' ];
+};
+
+describe( 'initLegacyViews', () => {
+	beforeEach( () => {
+		mockLegacyElementor();
+	} );
+
+	it( 'should register a late element type via the legacy manager without leaking state', () => {
+		// Arrange
+		const elementsManager = createMockElementsManager();
+		attachMockElementsManager( elementsManager );
+
+		jest.mocked( getWidgetsCache ).mockReturnValue( { [ MOCK_TYPE ]: createMockAtomicWidget() } );
+
+		initLegacyViews();
+		elementsManager.registerElementType.mockClear();
+
+		// Act
+		registerElementType( MOCK_TYPE, ( options ) => createTemplatedElementType( options ) );
+
+		// Assert
+		expect( elementsManager.registerElementType ).toHaveBeenCalledTimes( 1 );
+		const [ registeredInstance ] = elementsManager.registerElementType.mock.calls[ 0 ];
+		expect( registeredInstance.getType() ).toBe( MOCK_TYPE );
+	} );
+} );

package/src/legacy/init-legacy-views.ts

@@ -1,5 +1,5 @@
 import { getWidgetsCache, type V1ElementConfig } from '@elementor/editor-elements';
-import { __privateListenTo, v1ReadyEvent } from '@elementor/editor-v1-adapters';
+import { __privateIsReady as isV1Ready, __privateListenTo, v1ReadyEvent } from '@elementor/editor-v1-adapters';
 
 import { createDomRenderer, type DomRenderer } from '../renderers/create-dom-renderer';
 import { createElementType } from './create-element-type';
@@ -30,28 +30,38 @@ export function registerElementType(
 	elementTypeGenerator: ElementLegacyType[ keyof ElementLegacyType ]
 ) {
 	elementsLegacyTypes[ type ] = elementTypeGenerator;
+
+	if ( isV1Ready() ) {
+		registerElementInLegacyManager( type, createDomRenderer() );
+	}
 }
 
 export function initLegacyViews() {
 	__privateListenTo( v1ReadyEvent(), () => {
 		const widgetsCache = getWidgetsCache() ?? {};
-		const legacyWindow = window as unknown as LegacyWindow;
 		const renderer = createDomRenderer();
 
 		registerProPromotionTypes( widgetsCache );
 
-		Object.entries( widgetsCache ).forEach( ( [ type, element ] ) => {
-			if ( ! element.atomic ) {
-				return;
-			}
-
-			const ResolvedElementType = resolveElementType( type, renderer, element );
-
-			tryRegisterElement( legacyWindow, type, element, ResolvedElementType );
+		Object.keys( widgetsCache ).forEach( ( type ) => {
+			registerElementInLegacyManager( type, renderer );
 		} );
 	} );
 }
 
+function registerElementInLegacyManager( type: string, renderer: DomRenderer ) {
+	const element = ( getWidgetsCache() ?? {} )[ type ];
+
+	if ( ! element?.atomic ) {
+		return;
+	}
+
+	const legacyWindow = window as unknown as LegacyWindow;
+	const ResolvedElementType = resolveElementType( type, renderer, element );
+
+	tryRegisterElement( legacyWindow, type, element, ResolvedElementType );
+}
+
 function registerProPromotionTypes( widgetsCache: Record< string, V1ElementConfig > ) {
 	Object.entries( widgetsCache ).forEach( ( [ type, element ] ) => {
 		if ( element.meta?.is_pro_promotion ) {