@elementor/editor-editing-panel 4.2.0-929 → 4.2.0-931

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elementor/editor-editing-panel",
-  "version": "4.2.0-929",
+  "version": "4.2.0-931",
   "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-929",
-    "@elementor/editor-canvas": "4.2.0-929",
-    "@elementor/editor-controls": "4.2.0-929",
-    "@elementor/editor-documents": "4.2.0-929",
-    "@elementor/editor-elements": "4.2.0-929",
-    "@elementor/editor-interactions": "4.2.0-929",
-    "@elementor/editor-notifications": "4.2.0-929",
-    "@elementor/editor-panels": "4.2.0-929",
-    "@elementor/editor-props": "4.2.0-929",
-    "@elementor/editor-responsive": "4.2.0-929",
-    "@elementor/editor-styles": "4.2.0-929",
-    "@elementor/editor-styles-repository": "4.2.0-929",
-    "@elementor/editor-ui": "4.2.0-929",
-    "@elementor/editor-v1-adapters": "4.2.0-929",
-    "@elementor/http-client": "4.2.0-929",
+    "@elementor/editor": "4.2.0-931",
+    "@elementor/editor-canvas": "4.2.0-931",
+    "@elementor/editor-controls": "4.2.0-931",
+    "@elementor/editor-documents": "4.2.0-931",
+    "@elementor/editor-elements": "4.2.0-931",
+    "@elementor/editor-interactions": "4.2.0-931",
+    "@elementor/editor-notifications": "4.2.0-931",
+    "@elementor/editor-panels": "4.2.0-931",
+    "@elementor/editor-props": "4.2.0-931",
+    "@elementor/editor-responsive": "4.2.0-931",
+    "@elementor/editor-styles": "4.2.0-931",
+    "@elementor/editor-styles-repository": "4.2.0-931",
+    "@elementor/editor-ui": "4.2.0-931",
+    "@elementor/editor-v1-adapters": "4.2.0-931",
+    "@elementor/http-client": "4.2.0-931",
     "@elementor/icons": "~1.75.1",
-    "@elementor/editor-variables": "4.2.0-929",
-    "@elementor/locations": "4.2.0-929",
-    "@elementor/menus": "4.2.0-929",
-    "@elementor/query": "4.2.0-929",
-    "@elementor/schema": "4.2.0-929",
-    "@elementor/session": "4.2.0-929",
+    "@elementor/editor-variables": "4.2.0-931",
+    "@elementor/locations": "4.2.0-931",
+    "@elementor/menus": "4.2.0-931",
+    "@elementor/query": "4.2.0-931",
+    "@elementor/schema": "4.2.0-931",
+    "@elementor/session": "4.2.0-931",
     "@elementor/ui": "1.37.5",
-    "@elementor/utils": "4.2.0-929",
-    "@elementor/wp-media": "4.2.0-929",
+    "@elementor/utils": "4.2.0-931",
+    "@elementor/wp-media": "4.2.0-931",
     "@wordpress/i18n": "^5.13.0"
   },
   "peerDependencies": {

package/src/components/style-sections/layout-section/display-field.tsx

@@ -1,7 +1,5 @@
 import * as React from 'react';
-import { useMemo } from 'react';
 import { type ToggleButtonGroupItem, ToggleControl } from '@elementor/editor-controls';
-import { isExperimentActive } from '@elementor/editor-v1-adapters';
 import { __ } from '@wordpress/i18n';
 
 import { useStylesInheritanceChain } from '../../../contexts/styles-inheritance-context';
@@ -53,16 +51,11 @@ const displayFieldItems: ToggleButtonGroupItem< Displays >[] = [
 
 export const DisplayField = () => {
 	const placeholder = useDisplayPlaceholderValue();
-	const isGridActive = isExperimentActive( 'e_css_grid' );
-	const items = useMemo(
-		() => ( isGridActive ? displayFieldItems : displayFieldItems.filter( ( item ) => item.value !== 'grid' ) ),
-		[ isGridActive ]
-	);
 
 	return (
 		<StylesField bind="display" propDisplayName={ DISPLAY_LABEL } placeholder={ placeholder }>
 			<StylesFieldLayout label={ DISPLAY_LABEL } direction="column">
-				<ToggleControl options={ items } maxItems={ 4 } fullWidth={ true } />
+				<ToggleControl options={ displayFieldItems } maxItems={ 4 } fullWidth={ true } />
 			</StylesFieldLayout>
 		</StylesField>
 	);

package/src/components/style-sections/layout-section/layout-section.tsx

@@ -2,7 +2,6 @@ import * as React from 'react';
 import { ControlFormLabel } from '@elementor/editor-controls';
 import { useParentElement } from '@elementor/editor-elements';
 import { type StringPropValue } from '@elementor/editor-props';
-import { isExperimentActive } from '@elementor/editor-v1-adapters';
 import { __ } from '@wordpress/i18n';
 
 import { useElement } from '../../../contexts/element-context';
@@ -38,7 +37,6 @@ export const LayoutSection = () => {
 		history: { propDisplayName: DISPLAY_LABEL },
 	} );
 	const displayPlaceholder = useDisplayPlaceholderValue();
-	const isGridExperimentActive = isExperimentActive( 'e_css_grid' );
 	const isDisplayFlex = shouldDisplayFlexFields( display, displayPlaceholder as StringPropValue );
 	const isDisplayGrid = 'grid' === ( display?.value ?? ( displayPlaceholder as StringPropValue )?.value );
 	const { element } = useElement();
@@ -64,8 +62,8 @@ export const LayoutSection = () => {
 			{ 'flex' === parentStyle?.display && (
 				<FlexChildFields parentStyleDirection={ getParentStyleDirection() } />
 			) }
-			{ isGridExperimentActive && isDisplayGrid && <GridFields /> }
-			{ isGridExperimentActive && 'grid' === parentStyle?.display && (
+			{ isDisplayGrid && <GridFields /> }
+			{ 'grid' === parentStyle?.display && (
 				<GridChildFields parentStyleDirection={ getParentStyleDirection() } />
 			) }
 		</SectionContent>

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