@elementor/editor-controls 4.2.0-beta2 → 4.3.0-1000

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.2.0-beta2",
+  "version": "4.3.0-1000",
   "private": false,
   "author": "Elementor Team",
   "homepage": "https://elementor.com/",
@@ -40,23 +40,23 @@
     "dev": "tsup --config=../../tsup.dev.ts"
   },
   "dependencies": {
-    "@elementor/editor-current-user": "4.2.0-beta2",
-    "@elementor/editor-elements": "4.2.0-beta2",
-    "@elementor/editor-props": "4.2.0-beta2",
-    "@elementor/editor-responsive": "4.2.0-beta2",
-    "@elementor/editor-ui": "4.2.0-beta2",
-    "@elementor/editor-v1-adapters": "4.2.0-beta2",
-    "@elementor/env": "4.2.0-beta2",
-    "@elementor/events": "4.2.0-beta2",
-    "@elementor/http-client": "4.2.0-beta2",
+    "@elementor/editor-current-user": "4.3.0-1000",
+    "@elementor/editor-elements": "4.3.0-1000",
+    "@elementor/editor-props": "4.3.0-1000",
+    "@elementor/editor-responsive": "4.3.0-1000",
+    "@elementor/editor-ui": "4.3.0-1000",
+    "@elementor/editor-v1-adapters": "4.3.0-1000",
+    "@elementor/env": "4.3.0-1000",
+    "@elementor/events": "4.3.0-1000",
+    "@elementor/http-client": "4.3.0-1000",
     "@elementor/icons": "~1.75.1",
-    "@elementor/locations": "4.2.0-beta2",
-    "@elementor/query": "4.2.0-beta2",
-    "@elementor/schema": "4.2.0-beta2",
-    "@elementor/session": "4.2.0-beta2",
+    "@elementor/locations": "4.3.0-1000",
+    "@elementor/query": "4.3.0-1000",
+    "@elementor/schema": "4.3.0-1000",
+    "@elementor/session": "4.3.0-1000",
     "@elementor/ui": "1.37.5",
-    "@elementor/utils": "4.2.0-beta2",
-    "@elementor/wp-media": "4.2.0-beta2",
+    "@elementor/utils": "4.3.0-1000",
+    "@elementor/wp-media": "4.3.0-1000",
     "@monaco-editor/react": "^4.7.0",
     "@tiptap/extension-bold": "^3.11.1",
     "@tiptap/extension-document": "^3.11.1",

package/src/components/repeater/repeater.tsx

@@ -88,37 +88,32 @@ type SortableItemSettings< T > = BaseItemSettings< T > & {
 	getId: ( { item, index }: { item: T; index: number } ) => string;
 };
 
-type RepeaterProps< T > =
-	| {
-			label: string;
-			values?: T[];
-			openOnAdd?: boolean;
-			setValues: ( newValue: T[], _: CreateOptions, meta?: SetRepeaterValuesMeta< T > ) => void;
-			disabled?: boolean;
-			disableAddItemButton?: boolean;
-			addButtonInfotipContent?: React.ReactNode;
-			showDuplicate?: boolean;
-			showToggle?: boolean;
-			showRemove?: boolean;
-			openItem?: number;
-			isSortable: false;
-			itemSettings: BaseItemSettings< T >;
-	  }
-	| {
-			label: string;
-			values?: T[];
-			openOnAdd?: boolean;
-			setValues: ( newValue: T[], _: CreateOptions, meta?: SetRepeaterValuesMeta< T > ) => void;
-			disabled?: boolean;
-			disableAddItemButton?: boolean;
-			addButtonInfotipContent?: React.ReactNode;
-			showDuplicate?: boolean;
-			showToggle?: boolean;
-			showRemove?: boolean;
-			openItem?: number;
-			isSortable?: true;
-			itemSettings: SortableItemSettings< T >;
-	  };
+type BaseProps< T > = {
+	label: string;
+	values?: T[];
+	openOnAdd?: boolean;
+	setValues: ( newValue: T[], _: CreateOptions, meta?: SetRepeaterValuesMeta< T > ) => void;
+	disabled?: boolean;
+	disableAddItemButton?: boolean;
+	addButtonInfotipContent?: React.ReactNode;
+	showDuplicate?: boolean;
+	showToggle?: boolean;
+	showRemove?: boolean;
+	openItem?: number;
+	adornment?: React.FC;
+};
+
+type SortableProps< T > = BaseProps< T > & {
+	isSortable?: true;
+	itemSettings: SortableItemSettings< T >;
+};
+
+type NonSortableProps< T > = BaseProps< T > & {
+	isSortable?: false;
+	itemSettings: BaseItemSettings< T >;
+};
+
+type RepeaterProps< T > = SortableProps< T > | NonSortableProps< T >;
 
 const EMPTY_OPEN_ITEM = -1;
 
@@ -136,6 +131,7 @@ export const Repeater = < T, >( {
 	addButtonInfotipContent,
 	openItem: initialOpenItem = EMPTY_OPEN_ITEM,
 	isSortable = true,
+	adornment = ControlAdornments,
 }: RepeaterProps< RepeaterItem< T > > ) => {
 	const [ openItem, setOpenItem ] = useState( initialOpenItem );
 
@@ -232,7 +228,7 @@ export const Repeater = < T, >( {
 
 	return (
 		<SectionContent gap={ 2 }>
-			<RepeaterHeader label={ label } adornment={ ControlAdornments }>
+			<RepeaterHeader label={ label } adornment={ adornment }>
 				{ shouldShowInfotip ? (
 					<Infotip
 						placement="right"

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

@@ -6,16 +6,15 @@ import { Autocomplete, Grid, TextField } from '@elementor/ui';
 import { useBoundProp } from '../../bound-prop-context';
 import { ChipsList } from '../../components/chips-list';
 import { ControlFormLabel } from '../../components/control-form-label';
+import ControlActions from '../../control-actions/control-actions';
+import { createControl } from '../../create-control';
 import { CHIP_TRIGGER_KEYS, isValidEmail } from './utils';
 
-// type EmailChip = { label: string; value: string };
-
-type EmailChipsFieldProps = {
-	fieldLabel: string;
+type EmailChipsControlProps = {
 	placeholder?: string;
 };
 
-export const EmailChipsField = ( { fieldLabel, placeholder }: EmailChipsFieldProps ) => {
+export const EmailChipsControl = createControl( ( { placeholder }: EmailChipsControlProps ) => {
 	const { value, setValue, disabled } = useBoundProp( stringArrayPropTypeUtil );
 	const [ inputValue, setInputValue ] = useState( '' );
 
@@ -68,37 +67,48 @@ export const EmailChipsField = ( { fieldLabel, placeholder }: EmailChipsFieldPro
 	};
 
 	return (
-		<Grid container direction="column" gap={ 0.5 }>
-			<Grid item>
-				<ControlFormLabel>{ fieldLabel }</ControlFormLabel>
-			</Grid>
-			<Grid item>
-				<Autocomplete
-					fullWidth
-					multiple
-					freeSolo
-					size="tiny"
-					disabled={ disabled }
-					inputValue={ inputValue }
-					onInputChange={ ( _, val, reason ) => {
-						if ( reason !== 'reset' ) {
-							setInputValue( val );
-						}
-					} }
-					value={ selectedValues }
-					onChange={ handleChange }
-					options={ [] }
-					onBlur={ handleBlur }
-					getOptionLabel={ ( option ) => option }
-					isOptionEqualToValue={ ( option, val ) => option === val }
-					renderInput={ ( params ) => (
-						<TextField { ...params } placeholder={ placeholder } onKeyDown={ handleKeyDown } />
-					) }
-					renderTags={ ( tagValues, getTagProps ) => (
-						<ChipsList getLabel={ ( option ) => option } getTagProps={ getTagProps } values={ tagValues } />
-					) }
-				/>
-			</Grid>
-		</Grid>
+		<ControlActions>
+			<Autocomplete
+				fullWidth
+				multiple
+				freeSolo
+				size="tiny"
+				disabled={ disabled }
+				inputValue={ inputValue }
+				onInputChange={ ( _, val, reason ) => {
+					if ( reason !== 'reset' ) {
+						setInputValue( val );
+					}
+				} }
+				value={ selectedValues }
+				onChange={ handleChange }
+				options={ [] }
+				onBlur={ handleBlur }
+				getOptionLabel={ ( option ) => option }
+				isOptionEqualToValue={ ( option, val ) => option === val }
+				renderInput={ ( params ) => (
+					<TextField { ...params } placeholder={ placeholder } onKeyDown={ handleKeyDown } />
+				) }
+				renderTags={ ( tagValues, getTagProps ) => (
+					<ChipsList getLabel={ ( option ) => option } getTagProps={ getTagProps } values={ tagValues } />
+				) }
+			/>
+		</ControlActions>
 	);
+} );
+
+type EmailChipsFieldProps = {
+	fieldLabel: string;
+	placeholder?: string;
 };
+
+export const EmailChipsField = ( { fieldLabel, placeholder }: EmailChipsFieldProps ) => (
+	<Grid container direction="column" gap={ 0.5 }>
+		<Grid item>
+			<ControlFormLabel>{ fieldLabel }</ControlFormLabel>
+		</Grid>
+		<Grid item>
+			<EmailChipsControl placeholder={ placeholder } />
+		</Grid>
+	</Grid>
+);

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

@@ -14,7 +14,9 @@ import { EmailField } from './email-field';
 import { shouldShowMentionsInfo } from './utils';
 
 export const SendToField = ( { placeholder }: { placeholder?: string } ) => (
-	<EmailChipsField fieldLabel={ __( 'Send to', 'elementor' ) } placeholder={ placeholder } />
+	<PropKeyProvider bind="to">
+		<EmailChipsField fieldLabel={ __( 'Send to', 'elementor' ) } placeholder={ placeholder } />
+	</PropKeyProvider>
 );
 
 export const SubjectField = () => (

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

@@ -4,7 +4,7 @@ import { CollapsibleContent } from '@elementor/editor-ui';
 import { Box, Divider, Stack } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
-import { PropKeyProvider, PropProvider, useBoundProp } from '../../bound-prop-context';
+import { PropProvider, useBoundProp } from '../../bound-prop-context';
 import { ControlLabel } from '../../components/control-label';
 import { createControl } from '../../create-control';
 import {
@@ -30,9 +30,7 @@ export const EmailFormActionControl = createControl(
 					<ControlLabel>
 						{ label ? label + ' ' + __( 'settings', 'elementor' ) : __( 'Email settings', 'elementor' ) }
 					</ControlLabel>
-					<PropKeyProvider bind="to">
-						<SendToField placeholder={ toPlaceholder } />
-					</PropKeyProvider>
+					<SendToField placeholder={ toPlaceholder } />
 					<SubjectField />
 					<MessageField />
 					<FromEmailField />

package/src/utils/tracking.ts

@@ -17,7 +17,6 @@ type PromotionEventOptions = {
 type MixpanelConfig = ReturnType< typeof getMixpanel >[ 'config' ];
 
 const getBaseEventProperties = ( data: PromotionTrackingData, config: MixpanelConfig ) => ( {
-	app_type: config?.appTypes?.editor ?? 'editor',
 	window_name: config?.appTypes?.editor ?? 'editor',
 	interaction_type: config?.triggers?.click ?? 'Click',
 	target_name: data.target_name,