@elementor/editor-controls 4.1.0-760 → 4.1.0-762

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@elementor/editor-controls",
   "description": "This package contains the controls model and utils for the Elementor editor",
-  "version": "4.1.0-760",
+  "version": "4.1.0-762",
   "private": false,
   "author": "Elementor Team",
   "homepage": "https://elementor.com/",
@@ -40,22 +40,22 @@
     "dev": "tsup --config=../../tsup.dev.ts"
   },
   "dependencies": {
-    "@elementor/editor-current-user": "4.1.0-760",
-    "@elementor/editor-elements": "4.1.0-760",
-    "@elementor/editor-props": "4.1.0-760",
-    "@elementor/editor-responsive": "4.1.0-760",
-    "@elementor/editor-ui": "4.1.0-760",
-    "@elementor/editor-v1-adapters": "4.1.0-760",
-    "@elementor/env": "4.1.0-760",
-    "@elementor/http-client": "4.1.0-760",
+    "@elementor/editor-current-user": "4.1.0-762",
+    "@elementor/editor-elements": "4.1.0-762",
+    "@elementor/editor-props": "4.1.0-762",
+    "@elementor/editor-responsive": "4.1.0-762",
+    "@elementor/editor-ui": "4.1.0-762",
+    "@elementor/editor-v1-adapters": "4.1.0-762",
+    "@elementor/env": "4.1.0-762",
+    "@elementor/http-client": "4.1.0-762",
     "@elementor/icons": "^1.68.0",
-    "@elementor/locations": "4.1.0-760",
-    "@elementor/events": "4.1.0-760",
-    "@elementor/query": "4.1.0-760",
-    "@elementor/session": "4.1.0-760",
+    "@elementor/locations": "4.1.0-762",
+    "@elementor/events": "4.1.0-762",
+    "@elementor/query": "4.1.0-762",
+    "@elementor/session": "4.1.0-762",
     "@elementor/ui": "1.36.17",
-    "@elementor/utils": "4.1.0-760",
-    "@elementor/wp-media": "4.1.0-760",
+    "@elementor/utils": "4.1.0-762",
+    "@elementor/wp-media": "4.1.0-762",
     "@wordpress/i18n": "^5.13.0",
     "@monaco-editor/react": "^4.7.0",
     "dayjs": "^1.11.18",

package/src/controls/email-form-action-control.tsx

@@ -26,12 +26,8 @@ const EmailField = ( { bind, label, placeholder }: { bind: string; label: string
 	</PropKeyProvider>
 );
 
-const SendToField = () => (
-	<EmailField
-		bind="to"
-		label={ __( 'Send to', 'elementor' ) }
-		placeholder={ __( 'Where should we send new submissions?', 'elementor' ) }
-	/>
+const SendToField = ( { placeholder }: { placeholder?: string } ) => (
+	<EmailField bind="to" label={ __( 'Send to', 'elementor' ) } placeholder={ placeholder } />
 );
 
 const SubjectField = () => (
@@ -133,14 +129,14 @@ const AdvancedSettings = () => (
 	</CollapsibleContent>
 );
 
-export const EmailFormActionControl = createControl( () => {
+export const EmailFormActionControl = createControl( ( { toPlaceholder }: { toPlaceholder?: string } ) => {
 	const { value, setValue, ...propContext } = useBoundProp( emailPropTypeUtil );
 
 	return (
 		<PropProvider { ...propContext } value={ value } setValue={ setValue }>
 			<Stack gap={ 2 }>
 				<ControlLabel>{ __( 'Email settings', 'elementor' ) }</ControlLabel>
-				<SendToField />
+				<SendToField placeholder={ toPlaceholder } />
 				<SubjectField />
 				<MessageField />
 				<FromEmailField />

package/src/controls/size-control/hooks/use-unit-sync.ts

@@ -1,11 +1,15 @@
 import { useEffect, useState } from 'react';
 
+import { EXTENDED_UNITS } from '../utils/resolve-size-value';
+
 type UseUnitSyncProps< U > = {
 	unit: U;
 	setUnit: ( unit: U ) => void;
 	persistWhen: () => boolean;
 };
 
+type ExtendedUnit = ( typeof EXTENDED_UNITS )[ keyof typeof EXTENDED_UNITS ];
+
 export const useUnitSync = < U >( { unit, setUnit, persistWhen }: UseUnitSyncProps< U > ) => {
 	const [ state, setState ] = useState( unit );
 
@@ -16,10 +20,14 @@ export const useUnitSync = < U >( { unit, setUnit, persistWhen }: UseUnitSyncPro
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [ unit ] );
 
+	const isExtendedUnit = ( value: U ): value is ExtendedUnit & U => {
+		return Object.values( EXTENDED_UNITS ).includes( value as ExtendedUnit );
+	};
+
 	const setInternalValue = ( newUnit: U ) => {
 		setState( newUnit );
 
-		if ( persistWhen() ) {
+		if ( isExtendedUnit( newUnit ) || persistWhen() ) {
 			setUnit( newUnit );
 		}
 	};

package/src/controls/size-control/utils/resolve-bound-prop-value.ts

@@ -19,10 +19,11 @@ export const resolveBoundPropValue = < T extends SizeValue >(
 	] );
 
 	const placeholderSource = propPlaceholder ?? boundPropPlaceholder;
+	const hasValue = Boolean( value );
 
 	return {
 		sizeValue,
-		placeholder: resolvePlaceholder( placeholderSource ),
+		placeholder: hasValue ? undefined : resolvePlaceholder( placeholderSource ),
 	};
 };