@elementor/editor-editing-panel 4.0.0-manual → 4.1.0-684

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elementor/editor-editing-panel",
-  "version": "4.0.0-manual",
+  "version": "4.1.0-684",
   "private": false,
   "author": "Elementor Team",
   "homepage": "https://elementor.com/",
@@ -39,28 +39,28 @@
     "dev": "tsup --config=../../tsup.dev.ts"
   },
   "dependencies": {
-    "@elementor/editor": "4.0.0-manual",
-    "@elementor/editor-canvas": "4.0.0-manual",
-    "@elementor/editor-controls": "4.0.0-manual",
-    "@elementor/editor-documents": "4.0.0-manual",
-    "@elementor/editor-elements": "4.0.0-manual",
-    "@elementor/editor-interactions": "4.0.0-manual",
-    "@elementor/editor-panels": "4.0.0-manual",
-    "@elementor/editor-props": "4.0.0-manual",
-    "@elementor/editor-responsive": "4.0.0-manual",
-    "@elementor/editor-styles": "4.0.0-manual",
-    "@elementor/editor-styles-repository": "4.0.0-manual",
-    "@elementor/editor-ui": "4.0.0-manual",
-    "@elementor/editor-v1-adapters": "4.0.0-manual",
+    "@elementor/editor": "4.1.0-684",
+    "@elementor/editor-canvas": "4.1.0-684",
+    "@elementor/editor-controls": "4.1.0-684",
+    "@elementor/editor-documents": "4.1.0-684",
+    "@elementor/editor-elements": "4.1.0-684",
+    "@elementor/editor-interactions": "4.1.0-684",
+    "@elementor/editor-panels": "4.1.0-684",
+    "@elementor/editor-props": "4.1.0-684",
+    "@elementor/editor-responsive": "4.1.0-684",
+    "@elementor/editor-styles": "4.1.0-684",
+    "@elementor/editor-styles-repository": "4.1.0-684",
+    "@elementor/editor-ui": "4.1.0-684",
+    "@elementor/editor-v1-adapters": "4.1.0-684",
     "@elementor/icons": "^1.68.0",
-    "@elementor/editor-variables": "4.0.0-manual",
-    "@elementor/locations": "4.0.0-manual",
-    "@elementor/menus": "4.0.0-manual",
-    "@elementor/schema": "4.0.0-manual",
-    "@elementor/session": "4.0.0-manual",
+    "@elementor/editor-variables": "4.1.0-684",
+    "@elementor/locations": "4.1.0-684",
+    "@elementor/menus": "4.1.0-684",
+    "@elementor/schema": "4.1.0-684",
+    "@elementor/session": "4.1.0-684",
     "@elementor/ui": "1.36.17",
-    "@elementor/utils": "4.0.0-manual",
-    "@elementor/wp-media": "4.0.0-manual",
+    "@elementor/utils": "4.1.0-684",
+    "@elementor/wp-media": "4.1.0-684",
     "@wordpress/i18n": "^5.13.0"
   },
   "peerDependencies": {

package/src/components/promotions/custom-css.tsx

@@ -5,6 +5,8 @@ import { __ } from '@wordpress/i18n';
 
 import { StyleTabSection } from '../style-tab-section';
 
+const TRACKING_DATA = { target_name: 'custom_css', location_l2: 'style' } as const;
+
 export const CustomCssSection = () => {
 	const triggerRef = useRef< PromotionTriggerRef >( null );
 
@@ -14,7 +16,9 @@ export const CustomCssSection = () => {
 				name: 'Custom CSS',
 				title: __( 'Custom CSS', 'elementor' ),
 				action: {
-					component: <PromotionTrigger ref={ triggerRef } promotionKey="customCss" />,
+					component: (
+						<PromotionTrigger ref={ triggerRef } promotionKey="customCss" trackingData={ TRACKING_DATA } />
+					),
 					onClick: () => triggerRef.current?.toggle(),
 				},
 			} }

package/src/controls-registry/settings-field.tsx

@@ -16,7 +16,12 @@ import { undoable } from '@elementor/editor-v1-adapters';
 import { __ } from '@wordpress/i18n';
 
 import { useElement } from '../contexts/element-context';
-import { extractOrderedDependencies, getUpdatedValues, type Values } from '../utils/prop-dependency-utils';
+import {
+	extractOrderedDependencies,
+	getElementSettingsWithDefaults,
+	getUpdatedValues,
+	type Values,
+} from '../utils/prop-dependency-utils';
 import { createTopLevelObjectType } from './create-top-level-object-type';
 
 type SettingsFieldProps = {
@@ -27,20 +32,8 @@ type SettingsFieldProps = {
 
 const HISTORY_DEBOUNCE_WAIT = 800;
 
-const getElementSettigsWithDefaults = ( propsSchema: PropsSchema, elementSettings?: Props ) => {
-	const elementSettingsWithDefaults = { ...elementSettings };
-	Object.keys( propsSchema ).forEach( ( key ) => {
-		if ( ! ( key in elementSettingsWithDefaults ) ) {
-			if ( propsSchema[ key ].default !== null ) {
-				elementSettingsWithDefaults[ key ] = propsSchema[ key ].default as Values[ keyof Values ];
-			}
-		}
-	} );
-	return elementSettingsWithDefaults;
-};
-
 const extractDependencyEffect = ( bind: string, propsSchema: PropsSchema, currentElementSettings: Props ) => {
-	const elementSettingsForDepCheck = getElementSettigsWithDefaults( propsSchema, currentElementSettings );
+	const elementSettingsForDepCheck = getElementSettingsWithDefaults( propsSchema, currentElementSettings );
 	const propType = propsSchema[ bind ];
 	const depCheck = isDependencyMet( propType?.dependencies, elementSettingsForDepCheck );
 	const isHidden =

package/src/dynamics/components/dynamic-selection.tsx

@@ -1,6 +1,6 @@
-import { Fragment, useState } from 'react';
 import * as React from 'react';
-import { useBoundProp } from '@elementor/editor-controls';
+import { Fragment, useEffect, useState } from 'react';
+import { trackUpgradePromotionClick, trackViewPromotion, useBoundProp } from '@elementor/editor-controls';
 import { CtaButton, PopoverHeader, PopoverMenuList, SearchField, SectionPopoverBody } from '@elementor/editor-ui';
 import { DatabaseIcon } from '@elementor/icons';
 import { Divider, Link, Stack, Typography, useTheme } from '@elementor/ui';
@@ -50,6 +50,14 @@ export const DynamicSelection = ( { close: closePopover, expired = false }: Dyna
 
 	const hasNoDynamicTags = ! options.length && ! searchValue.trim();
 
+	useEffect( () => {
+		if ( hasNoDynamicTags ) {
+			trackViewPromotion( { target_name: 'dynamic_tags' } );
+		} else if ( expired ) {
+			trackViewPromotion( { target_name: 'dynamic_tags' } );
+		}
+	}, [ hasNoDynamicTags, expired ] );
+
 	const handleSearch = ( value: string ) => {
 		setSearchValue( value );
 	};
@@ -170,7 +178,11 @@ const NoDynamicTags = () => (
 			<Typography align="center" variant="caption" width={ PROMO_TEXT_WIDTH }>
 				{ __( 'Upgrade now to display your content dynamically.', 'elementor' ) }
 			</Typography>
-			<CtaButton size="small" href={ PRO_DYNAMIC_TAGS_URL } />
+			<CtaButton
+				size="small"
+				href={ PRO_DYNAMIC_TAGS_URL }
+				onClick={ () => trackUpgradePromotionClick( { target_name: 'dynamic_tags' } ) }
+			/>
 		</Stack>
 	</>
 );
@@ -194,7 +206,12 @@ const ExpiredDynamicTags = () => (
 			<Typography align="center" variant="caption" width={ PROMO_TEXT_WIDTH }>
 				{ __( 'Dynamic tags need Elementor Pro. Renew now to keep them active.', 'elementor' ) }
 			</Typography>
-			<CtaButton size="small" href={ RENEW_DYNAMIC_TAGS_URL } children={ __( 'Renew Now', 'elementor' ) } />
+			<CtaButton
+				size="small"
+				href={ RENEW_DYNAMIC_TAGS_URL }
+				onClick={ () => trackUpgradePromotionClick( { target_name: 'dynamic_tags' } ) }
+				children={ __( 'Renew Now', 'elementor' ) }
+			/>
 		</Stack>
 	</>
 );

package/src/utils/prop-dependency-utils.ts

@@ -3,6 +3,7 @@ import {
 	type DependencyTerm,
 	extractValue,
 	isDependencyMet,
+	type Props,
 	type PropsSchema,
 	type PropType,
 	type TransformablePropValue,
@@ -13,6 +14,17 @@ type Value = TransformablePropValue< string > | null;
 
 export type Values = Record< string, Value >;
 
+export function getElementSettingsWithDefaults( propsSchema: PropsSchema, elementSettings?: Props ): Values {
+	const elementSettingsWithDefaults = { ...elementSettings };
+	Object.keys( propsSchema ).forEach( ( key ) => {
+		if ( elementSettingsWithDefaults[ key ] === null && propsSchema[ key ].default !== null ) {
+			elementSettingsWithDefaults[ key ] = propsSchema[ key ].default as Values[ keyof Values ];
+		}
+	} );
+
+	return elementSettingsWithDefaults as Values;
+}
+
 export function extractOrderedDependencies( dependenciesPerTargetMapping: Record< string, string[] > ): string[] {
 	return Object.values( dependenciesPerTargetMapping )
 		.flat()