@elementor/editor-editing-panel 4.2.0-928 → 4.2.0-930

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elementor/editor-editing-panel",
-  "version": "4.2.0-928",
+  "version": "4.2.0-930",
   "private": false,
   "author": "Elementor Team",
   "homepage": "https://elementor.com/",
@@ -39,31 +39,31 @@
     "dev": "tsup --config=../../tsup.dev.ts"
   },
   "dependencies": {
-    "@elementor/editor": "4.2.0-928",
-    "@elementor/editor-canvas": "4.2.0-928",
-    "@elementor/editor-controls": "4.2.0-928",
-    "@elementor/editor-documents": "4.2.0-928",
-    "@elementor/editor-elements": "4.2.0-928",
-    "@elementor/editor-interactions": "4.2.0-928",
-    "@elementor/editor-notifications": "4.2.0-928",
-    "@elementor/editor-panels": "4.2.0-928",
-    "@elementor/editor-props": "4.2.0-928",
-    "@elementor/editor-responsive": "4.2.0-928",
-    "@elementor/editor-styles": "4.2.0-928",
-    "@elementor/editor-styles-repository": "4.2.0-928",
-    "@elementor/editor-ui": "4.2.0-928",
-    "@elementor/editor-v1-adapters": "4.2.0-928",
-    "@elementor/http-client": "4.2.0-928",
+    "@elementor/editor": "4.2.0-930",
+    "@elementor/editor-canvas": "4.2.0-930",
+    "@elementor/editor-controls": "4.2.0-930",
+    "@elementor/editor-documents": "4.2.0-930",
+    "@elementor/editor-elements": "4.2.0-930",
+    "@elementor/editor-interactions": "4.2.0-930",
+    "@elementor/editor-notifications": "4.2.0-930",
+    "@elementor/editor-panels": "4.2.0-930",
+    "@elementor/editor-props": "4.2.0-930",
+    "@elementor/editor-responsive": "4.2.0-930",
+    "@elementor/editor-styles": "4.2.0-930",
+    "@elementor/editor-styles-repository": "4.2.0-930",
+    "@elementor/editor-ui": "4.2.0-930",
+    "@elementor/editor-v1-adapters": "4.2.0-930",
+    "@elementor/http-client": "4.2.0-930",
     "@elementor/icons": "~1.75.1",
-    "@elementor/editor-variables": "4.2.0-928",
-    "@elementor/locations": "4.2.0-928",
-    "@elementor/menus": "4.2.0-928",
-    "@elementor/query": "4.2.0-928",
-    "@elementor/schema": "4.2.0-928",
-    "@elementor/session": "4.2.0-928",
+    "@elementor/editor-variables": "4.2.0-930",
+    "@elementor/locations": "4.2.0-930",
+    "@elementor/menus": "4.2.0-930",
+    "@elementor/query": "4.2.0-930",
+    "@elementor/schema": "4.2.0-930",
+    "@elementor/session": "4.2.0-930",
     "@elementor/ui": "1.37.5",
-    "@elementor/utils": "4.2.0-928",
-    "@elementor/wp-media": "4.2.0-928",
+    "@elementor/utils": "4.2.0-930",
+    "@elementor/wp-media": "4.2.0-930",
     "@wordpress/i18n": "^5.13.0"
   },
   "peerDependencies": {

package/src/components/editing-panel-sticky-promotion.tsx

@@ -0,0 +1,24 @@
+import * as React from 'react';
+
+function getStickyPromotion() {
+	return window.elementor?.config?.editingPanelStickyPromotion;
+}
+
+export const EditingPanelStickyPromotion = () => {
+	const promotion = getStickyPromotion();
+
+	if ( ! promotion ) {
+		return null;
+	}
+
+	return (
+		<div className="elementor-panel-editor-sticky-promotion">
+			<div className="elementor-get-pro-sticky-message">
+				{ promotion.message }{ ' ' }
+				<a target="_blank" rel="noreferrer" href={ promotion.url }>
+					{ promotion.button_text }
+				</a>
+			</div>
+		</div>
+	);
+};

package/src/components/editing-panel.tsx

@@ -17,6 +17,7 @@ import { __ } from '@wordpress/i18n';
 import { ElementProvider } from '../contexts/element-context';
 import { getEditingPanelReplacement } from '../editing-panel-replacement-registry';
 import { EditorPanelErrorFallback } from './editing-panel-error-fallback';
+import { EditingPanelStickyPromotion } from './editing-panel-sticky-promotion';
 import { EditingPanelTabs } from './editing-panel-tabs';
 
 export const { Slot: PanelHeaderTopSlot, inject: injectIntoPanelHeaderTop } = createLocation();
@@ -43,9 +44,10 @@ export const EditingPanel = () => {
 				<PanelHeaderTitle>{ panelTitle }</PanelHeaderTitle>
 				<AtomIcon fontSize="small" sx={ { color: 'text.tertiary' } } />
 			</PanelHeader>
-			<PanelBody>
+			<PanelBody sx={ { height: 'auto', flex: 1, minHeight: 0 } }>
 				<EditingPanelTabs />
 			</PanelBody>
+			<EditingPanelStickyPromotion />
 		</>
 	);
 

package/src/dynamics/dynamic-transformer.ts

@@ -9,12 +9,14 @@ type Dynamic = {
 	settings?: Props;
 };
 
-export const dynamicTransformer = createTransformer< Dynamic >( ( value, { propType } ) => {
+export const dynamicTransformer = createTransformer< Dynamic >( ( value, { propType, renderContext } ) => {
 	if ( ! value?.name || ! isDynamicTagSupported( value.name ) ) {
 		return propType?.default ?? null;
 	}
 
-	return getDynamicValue( value.name, simpleTransform( value?.settings ?? {} ) );
+	const renderPostId = ( renderContext as { currentPostId?: number } | undefined )?.currentPostId;
+
+	return getDynamicValue( value.name, simpleTransform( value?.settings ?? {} ), renderPostId );
 } );
 
 // Temporary naive transformation until we'll have a `backendTransformer` that
@@ -29,7 +31,7 @@ function simpleTransform( props: Props ) {
 	return Object.fromEntries( transformed );
 }
 
-function getDynamicValue( name: string, settings: Record< string, unknown > ) {
+function getDynamicValue( name: string, settings: Record< string, unknown >, renderPostId?: number ) {
 	const { dynamicTags } = window.elementor ?? {};
 
 	if ( ! dynamicTags ) {
@@ -43,6 +45,10 @@ function getDynamicValue( name: string, settings: Record< string, unknown > ) {
 			return null;
 		}
 
+		if ( renderPostId ) {
+			tag.editorRenderPostId = renderPostId;
+		}
+
 		return dynamicTags.loadTagDataFromCache( tag ) ?? null;
 	};
 
@@ -53,11 +59,8 @@ function getDynamicValue( name: string, settings: Record< string, unknown > ) {
 	}
 
 	return new Promise( ( resolve ) => {
-		dynamicTags.refreshCacheFromServer(
-			() => {
-				resolve( getTagValue() );
-			},
-			{ disableCache: true }
-		);
+		dynamicTags.refreshCacheFromServer( () => {
+			resolve( getTagValue() );
+		} );
 	} );
 }

package/src/dynamics/types.ts

@@ -28,14 +28,10 @@ export type DynamicPropValue = TransformablePropValue<
 	{ name: string; settings?: Record< string, unknown > }
 >;
 
-export type RefreshCacheFromServerOptions = {
-	disableCache?: boolean;
-};
-
 export type DynamicTagsManager = {
 	createTag: ( id: string, name: string, settings: Record< string, unknown > ) => TagInstance;
 	loadTagDataFromCache: ( tag: TagInstance ) => unknown;
-	refreshCacheFromServer: ( callback: () => void, options?: RefreshCacheFromServerOptions ) => void;
+	refreshCacheFromServer: ( callback: () => void ) => void;
 };
 
 export type TagInstance = {
@@ -46,4 +42,5 @@ export type TagInstance = {
 	model: {
 		toJSON: () => Record< string, unknown >;
 	};
+	editorRenderPostId?: number;
 };