@elementor/editor-controls 0.20.0 → 0.24.0

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": "0.20.0",
+  "version": "0.24.0",
   "private": false,
   "author": "Elementor Team",
   "homepage": "https://elementor.com/",
@@ -41,9 +41,9 @@
   },
   "dependencies": {
     "@elementor/editor-current-user": "0.3.0",
-    "@elementor/editor-elements": "0.7.0",
+    "@elementor/editor-elements": "0.8.0",
     "@elementor/editor-props": "0.11.1",
-    "@elementor/editor-ui": "0.5.0",
+    "@elementor/editor-ui": "0.7.0",
     "@elementor/env": "0.3.5",
     "@elementor/http": "0.1.4",
     "@elementor/icons": "1.37.0",

package/src/components/control-form-label.tsx

@@ -0,0 +1,6 @@
+import * as React from 'react';
+import { FormLabel } from '@elementor/ui';
+
+export const ControlFormLabel = ( { children }: { children: React.ReactNode } ) => {
+	return <FormLabel size="tiny">{ children }</FormLabel>;
+};

package/src/components/control-label.tsx

@@ -1,6 +1,15 @@
 import * as React from 'react';
-import { FormLabel } from '@elementor/ui';
+import { type PropsWithChildren } from 'react';
+import { Stack } from '@elementor/ui';
 
-export const ControlLabel = ( { children }: { children: React.ReactNode } ) => {
-	return <FormLabel size="tiny">{ children }</FormLabel>;
+import { ControlAdornments } from '../control-adornments/control-adornments';
+import { ControlFormLabel } from './control-form-label';
+
+export const ControlLabel = ( { children }: PropsWithChildren< object > ) => {
+	return (
+		<Stack direction="row" alignItems="center" justifyItems="start" gap={ 1 }>
+			<ControlFormLabel>{ children }</ControlFormLabel>
+			<ControlAdornments />
+		</Stack>
+	);
 };

package/src/components/repeater.tsx

@@ -17,6 +17,7 @@ import {
 } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
+import { ControlAdornments } from '../control-adornments/control-adornments';
 import { useSyncExternalState } from '../hooks/use-sync-external-state';
 import { SectionContent } from './section-content';
 import { SortableItem, SortableProvider } from './sortable';
@@ -47,6 +48,8 @@ type RepeaterProps< T > = {
 	};
 };
 
+const EMPTY_OPEN_ITEM = -1;
+
 export const Repeater = < T, >( {
 	label,
 	itemSettings,
@@ -55,7 +58,7 @@ export const Repeater = < T, >( {
 	values: repeaterValues = [],
 	setValues: setRepeaterValues,
 }: RepeaterProps< Item< T > > ) => {
-	const [ openItem, setOpenItem ] = useState( -1 );
+	const [ openItem, setOpenItem ] = useState( EMPTY_OPEN_ITEM );
 
 	const [ items, setItems ] = useSyncExternalState( {
 		external: repeaterValues,
@@ -139,11 +142,17 @@ export const Repeater = < T, >( {
 
 	return (
 		<SectionContent>
-			<Stack direction="row" justifyContent="space-between" alignItems="center">
+			<Stack direction="row" justifyContent="start" alignItems="center" gap={ 1 }>
 				<Typography component="label" variant="caption" color="text.secondary">
 					{ label }
 				</Typography>
-				<IconButton size={ SIZE } onClick={ addRepeaterItem } aria-label={ __( 'Add item', 'elementor' ) }>
+				<ControlAdornments />
+				<IconButton
+					sx={ { ml: 'auto' } }
+					size={ SIZE }
+					onClick={ addRepeaterItem }
+					aria-label={ __( 'Add item', 'elementor' ) }
+				>
 					<PlusIcon fontSize={ SIZE } />
 				</IconButton>
 			</Stack>
@@ -159,7 +168,6 @@ export const Repeater = < T, >( {
 						return (
 							<SortableItem id={ key } key={ `sortable-${ key }` }>
 								<RepeaterItem
-									bind={ String( index ) }
 									disabled={ value?.disabled }
 									label={ <itemSettings.Label value={ value } /> }
 									startIcon={ <itemSettings.Icon value={ value } /> }
@@ -167,6 +175,7 @@ export const Repeater = < T, >( {
 									duplicateItem={ () => duplicateRepeaterItem( index ) }
 									toggleDisableItem={ () => toggleDisableRepeaterItem( index ) }
 									openOnMount={ openOnAdd && openItem === key }
+									onOpen={ () => setOpenItem( EMPTY_OPEN_ITEM ) }
 								>
 									{ ( props ) => (
 										<itemSettings.Content { ...props } value={ value } bind={ String( index ) } />
@@ -183,7 +192,6 @@ export const Repeater = < T, >( {
 
 type RepeaterItemProps = {
 	label: React.ReactNode;
-	bind: string;
 	disabled?: boolean;
 	startIcon: UnstableTagProps[ 'startIcon' ];
 	removeItem: () => void;
@@ -191,6 +199,7 @@ type RepeaterItemProps = {
 	toggleDisableItem: () => void;
 	children: ( { anchorEl }: { anchorEl: AnchorEl } ) => React.ReactNode;
 	openOnMount: boolean;
+	onOpen: () => void;
 };
 
 const RepeaterItem = ( {
@@ -202,9 +211,10 @@ const RepeaterItem = ( {
 	duplicateItem,
 	toggleDisableItem,
 	openOnMount,
+	onOpen,
 }: RepeaterItemProps ) => {
 	const [ anchorEl, setAnchorEl ] = useState< AnchorEl >( null );
-	const { popoverState, popoverProps, ref, setRef } = usePopover( openOnMount );
+	const { popoverState, popoverProps, ref, setRef } = usePopover( openOnMount, onOpen );
 
 	const duplicateLabel = __( 'Duplicate', 'elementor' );
 	const toggleLabel = disabled ? __( 'Show', 'elementor' ) : __( 'Hide', 'elementor' );
@@ -240,7 +250,6 @@ const RepeaterItem = ( {
 						</Tooltip>
 					</>
 				}
-				sx={ { backgroundColor: 'background.paper' } }
 			/>
 			<Popover
 				disablePortal
@@ -260,7 +269,7 @@ const RepeaterItem = ( {
 	);
 };
 
-const usePopover = ( openOnMount: boolean ) => {
+const usePopover = ( openOnMount: boolean, onOpen: () => void ) => {
 	const [ ref, setRef ] = useState< HTMLElement | null >( null );
 
 	const popoverState = usePopupState( { variant: 'popover' } );
@@ -270,6 +279,7 @@ const usePopover = ( openOnMount: boolean ) => {
 	useEffect( () => {
 		if ( openOnMount && ref ) {
 			popoverState.open( ref );
+			onOpen?.();
 		}
 		// eslint-disable-next-line react-compiler/react-compiler
 		// eslint-disable-next-line react-hooks/exhaustive-deps

package/src/components/sortable.tsx

@@ -34,16 +34,11 @@ export const SortableItem = ( { id, children }: SortableItemProps ): React.React
 				triggerProps,
 				itemStyle,
 				triggerStyle,
-				isDragOverlay,
 				showDropIndication,
 				dropIndicationStyle,
 			}: UnstableSortableItemRenderProps ) => {
 				return (
-					<StyledListItem
-						{ ...itemProps }
-						style={ itemStyle }
-						sx={ { backgroundColor: isDragOverlay ? 'background.paper' : undefined } }
-					>
+					<StyledListItem { ...itemProps } style={ itemStyle }>
 						<SortableTrigger { ...triggerProps } style={ triggerStyle } />
 						{ children }
 						{ showDropIndication && <StyledDivider style={ dropIndicationStyle } /> }
@@ -72,6 +67,11 @@ const StyledListItem = styled( ListItem )`
 		transform: translate( -75%, -50% );
 	}
 
+	&[aria-describedby=''] > .MuiTag-root {
+		background-color: ${ ( { theme } ) => theme.palette.background.paper };
+		box-shadow: ${ ( { theme } ) => theme.shadows[ 3 ] };
+	}
+
 	&:hover {
 		& .class-item-sortable-trigger {
 			visibility: visible;

package/src/components/text-field-inner-selection.tsx

@@ -58,11 +58,11 @@ export const SelectionEndAdornment = < T extends string >( {
 		<InputAdornment position="end">
 			<Button
 				size="small"
-				color="inherit"
-				sx={ { font: 'inherit', minWidth: 'initial' } }
+				color="secondary"
+				sx={ { font: 'inherit', minWidth: 'initial', textTransform: 'uppercase' } }
 				{ ...bindTrigger( popupState ) }
 			>
-				{ value.toUpperCase() }
+				{ value }
 			</Button>
 
 			<Menu MenuListProps={ { dense: true } } { ...bindMenu( popupState ) }>

package/src/controls/background-control/background-control.tsx

@@ -4,7 +4,7 @@ import { Grid } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
 import { PropKeyProvider, PropProvider, useBoundProp } from '../../bound-prop-context';
-import { ControlLabel } from '../../components/control-label';
+import { ControlFormLabel } from '../../components/control-form-label';
 import { SectionContent } from '../../components/section-content';
 import { createControl } from '../../create-control';
 import { ColorControl } from '../color-control';
@@ -22,7 +22,7 @@ export const BackgroundControl = createControl( () => {
 				<PropKeyProvider bind="color">
 					<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap">
 						<Grid item xs={ 6 }>
-							<ControlLabel>{ __( 'Color', 'elementor' ) }</ControlLabel>
+							<ControlFormLabel>{ __( 'Color', 'elementor' ) }</ControlFormLabel>
 						</Grid>
 						<Grid item xs={ 6 }>
 							<ColorControl />

package/src/controls/background-control/background-overlay/background-image-overlay/background-image-overlay-attachment.tsx

@@ -3,7 +3,7 @@ import { PinIcon, PinnedOffIcon } from '@elementor/icons';
 import { Grid } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
-import { ControlLabel } from '../../../../components/control-label';
+import { ControlFormLabel } from '../../../../components/control-form-label';
 import { type ToggleButtonGroupItem } from '../../../../components/control-toggle-button-group';
 import { PopoverGridContainer } from '../../../../components/popover-grid-container';
 import { ToggleControl } from '../../../toggle-control';
@@ -29,7 +29,7 @@ export const BackgroundImageOverlayAttachment = () => {
 	return (
 		<PopoverGridContainer>
 			<Grid item xs={ 6 }>
-				<ControlLabel>{ __( 'Attachment', 'elementor' ) }</ControlLabel>
+				<ControlFormLabel>{ __( 'Attachment', 'elementor' ) }</ControlFormLabel>
 			</Grid>
 			<Grid item xs={ 6 } sx={ { display: 'flex', justifyContent: 'flex-end', overflow: 'hidden' } }>
 				<ToggleControl options={ attachmentControlOptions } />

package/src/controls/background-control/background-overlay/background-image-overlay/background-image-overlay-position.tsx

@@ -6,7 +6,7 @@ import { Grid, Select, type SelectChangeEvent } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
 import { PropKeyProvider, PropProvider, useBoundProp } from '../../../../bound-prop-context';
-import { ControlLabel } from '../../../../components/control-label';
+import { ControlFormLabel } from '../../../../components/control-form-label';
 import { PopoverGridContainer } from '../../../../components/popover-grid-container';
 import { SizeControl } from '../../../size-control';
 
@@ -56,7 +56,7 @@ export const BackgroundImageOverlayPosition = () => {
 			<Grid item xs={ 12 }>
 				<PopoverGridContainer>
 					<Grid item xs={ 6 }>
-						<ControlLabel>{ __( 'Position', 'elementor' ) }</ControlLabel>
+						<ControlFormLabel>{ __( 'Position', 'elementor' ) }</ControlFormLabel>
 					</Grid>
 					<Grid item xs={ 6 } sx={ { display: 'flex', justifyContent: 'flex-end', overflow: 'hidden' } }>
 						<Select

package/src/controls/background-control/background-overlay/background-image-overlay/background-image-overlay-repeat.tsx

@@ -3,7 +3,7 @@ import { DotsHorizontalIcon, DotsVerticalIcon, GridDotsIcon, XIcon } from '@elem
 import { Grid } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
-import { ControlLabel } from '../../../../components/control-label';
+import { ControlFormLabel } from '../../../../components/control-form-label';
 import { type ToggleButtonGroupItem } from '../../../../components/control-toggle-button-group';
 import { PopoverGridContainer } from '../../../../components/popover-grid-container';
 import { ToggleControl } from '../../../toggle-control';
@@ -41,7 +41,7 @@ export const BackgroundImageOverlayRepeat = () => {
 	return (
 		<PopoverGridContainer>
 			<Grid item xs={ 6 }>
-				<ControlLabel>{ __( 'Repeat', 'elementor' ) }</ControlLabel>
+				<ControlFormLabel>{ __( 'Repeat', 'elementor' ) }</ControlFormLabel>
 			</Grid>
 			<Grid item xs={ 6 } sx={ { display: 'flex', justifyContent: 'flex-end' } }>
 				<ToggleControl options={ repeatControlOptions } />

package/src/controls/background-control/background-overlay/background-image-overlay/background-image-overlay-size.tsx

@@ -12,7 +12,7 @@ import { Grid } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
 import { PropKeyProvider, PropProvider, useBoundProp } from '../../../../bound-prop-context';
-import { ControlLabel } from '../../../../components/control-label';
+import { ControlFormLabel } from '../../../../components/control-form-label';
 import {
 	ControlToggleButtonGroup,
 	type ToggleButtonGroupItem,
@@ -68,7 +68,7 @@ export const BackgroundImageOverlaySize = () => {
 			<Grid item xs={ 12 }>
 				<PopoverGridContainer>
 					<Grid item xs={ 6 }>
-						<ControlLabel>{ __( 'Size', 'elementor' ) }</ControlLabel>
+						<ControlFormLabel>{ __( 'Size', 'elementor' ) }</ControlFormLabel>
 					</Grid>
 					<Grid item xs={ 6 } sx={ { display: 'flex', justifyContent: 'flex-end' } }>
 						<ControlToggleButtonGroup

package/src/controls/background-control/background-overlay/background-overlay-repeater-control.tsx

@@ -7,7 +7,7 @@ import {
 	colorPropTypeUtil,
 	type PropKey,
 } from '@elementor/editor-props';
-import { Box, CardMedia, Grid, Tab, TabPanel, Tabs, UnstableColorIndicator } from '@elementor/ui';
+import { Box, CardMedia, Grid, styled, Tab, TabPanel, Tabs, type Theme, UnstableColorIndicator } from '@elementor/ui';
 import { useWpMediaAttachment } from '@elementor/wp-media';
 import { __ } from '@wordpress/i18n';
 
@@ -160,19 +160,29 @@ const extractColorFrom = ( prop: BackgroundOverlayItemPropValue ) => {
 
 const ItemIconColor = ( { value: prop }: { value: BackgroundOverlayItemPropValue } ) => {
 	const color = extractColorFrom( prop );
-	return <UnstableColorIndicator size="inherit" component="span" value={ color } />;
+	return <StyledUnstableColorIndicator size="inherit" component="span" value={ color } />;
 };
 
 const ItemIconImage = ( { value }: { value: BackgroundImageOverlay } ) => {
 	const { imageUrl } = useImage( value );
 
-	return <CardMedia image={ imageUrl } sx={ { height: 13, width: 13, borderRadius: '4px' } } />;
+	return (
+		<CardMedia
+			image={ imageUrl }
+			sx={ ( theme: Theme ) => ( {
+				height: '1em',
+				width: '1em',
+				borderRadius: `${ theme.shape.borderRadius / 2 }px`,
+				outline: `1px solid ${ theme.palette.action.disabled }`,
+			} ) }
+		/>
+	);
 };
 
 const ItemIconGradient = ( { value }: { value: BackgroundOverlayItemPropValue } ) => {
 	const gradient = getGradientValue( value );
 
-	return <UnstableColorIndicator size="inherit" component="span" value={ gradient } />;
+	return <StyledUnstableColorIndicator size="inherit" component="span" value={ gradient } />;
 };
 
 const ItemLabel = ( { value }: { value: BackgroundOverlayItemPropValue } ) => {
@@ -249,6 +259,10 @@ const ImageOverlayContent = () => {
 	);
 };
 
+const StyledUnstableColorIndicator = styled( UnstableColorIndicator )( ( { theme } ) => ( {
+	borderRadius: `${ theme.shape.borderRadius / 2 }px`,
+} ) );
+
 const useImage = ( image: BackgroundImageOverlay ) => {
 	let imageTitle,
 		imageUrl: string | null = null;
@@ -257,7 +271,7 @@ const useImage = ( image: BackgroundImageOverlay ) => {
 	const { data: attachment } = useWpMediaAttachment( imageSrc.id?.value || null );
 
 	if ( imageSrc.id ) {
-		const imageFileTypeExtension = attachment?.subtype ? `.${ attachment.subtype }` : '';
+		const imageFileTypeExtension = getFileExtensionFromFilename( attachment?.filename );
 		imageTitle = `${ attachment?.title }${ imageFileTypeExtension }` || null;
 		imageUrl = attachment?.url || null;
 	} else if ( imageSrc.url ) {
@@ -268,6 +282,17 @@ const useImage = ( image: BackgroundImageOverlay ) => {
 	return { imageTitle, imageUrl };
 };
 
+const getFileExtensionFromFilename = ( filename?: string ) => {
+	if ( ! filename ) {
+		return '';
+	}
+
+	// get the substring after the last . in the filename
+	const extension = filename.substring( filename.lastIndexOf( '.' ) + 1 );
+
+	return `.${ extension }`;
+};
+
 const getGradientValue = ( value: BackgroundOverlayItemPropValue ) => {
 	const gradient = value.value;
 

package/src/controls/color-control.tsx

@@ -14,7 +14,7 @@ export const ColorControl = createControl( ( { propTypeUtil = colorPropTypeUtil,
 	const { value, setValue } = useBoundProp( propTypeUtil );
 
 	const handleChange = ( selectedColor: string ) => {
-		setValue( selectedColor );
+		setValue( selectedColor || null );
 	};
 
 	return (

package/src/controls/equal-unequal-sizes-control.tsx

@@ -5,6 +5,7 @@ import { bindPopover, bindToggle, Grid, Popover, Stack, ToggleButton, Tooltip, u
 import { __ } from '@wordpress/i18n';
 
 import { PropKeyProvider, PropProvider, useBoundProp } from '../bound-prop-context';
+import { ControlFormLabel } from '../components/control-form-label';
 import { ControlLabel } from '../components/control-label';
 import { PopoverContent } from '../components/popover-content';
 import { PopoverGridContainer } from '../components/popover-grid-container';
@@ -160,7 +161,7 @@ const MultiSizeValueControl = ( { item }: { item: Item } ) => (
 		<Grid item xs={ 6 }>
 			<Grid container gap={ 0.75 } alignItems="center">
 				<Grid item xs={ 12 }>
-					<ControlLabel>{ item.label }</ControlLabel>
+					<ControlFormLabel>{ item.label }</ControlFormLabel>
 				</Grid>
 				<Grid item xs={ 12 }>
 					<SizeControl startIcon={ item.icon } />

package/src/controls/font-family-control/font-family-control.tsx

@@ -280,6 +280,8 @@ const StyledMenuList = styled( MenuList )( ( { theme } ) => ( {
 		top: 0,
 		left: 0,
 		width: '100%',
+		display: 'flex',
+		alignItems: 'center',
 	},
 	'& > [role="option"]': {
 		...theme.typography.caption,

package/src/controls/gap-control.tsx

@@ -5,6 +5,7 @@ import { Grid, Stack, ToggleButton, Tooltip } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
 import { PropKeyProvider, PropProvider, useBoundProp } from '../bound-prop-context';
+import { ControlFormLabel } from '../components/control-form-label';
 import { ControlLabel } from '../components/control-label';
 import { createControl } from '../create-control';
 import { SizeControl } from './size-control';
@@ -61,7 +62,7 @@ export const GapControl = createControl( ( { label }: { label: string } ) => {
 			<Stack direction="row" gap={ 2 } flexWrap="nowrap">
 				<Grid container gap={ 0.75 } alignItems="center">
 					<Grid item xs={ 12 }>
-						<ControlLabel>{ __( 'Column', 'elementor' ) }</ControlLabel>
+						<ControlFormLabel>{ __( 'Column', 'elementor' ) }</ControlFormLabel>
 					</Grid>
 					<Grid item xs={ 12 }>
 						<Control bind={ 'column' } isLinked={ isLinked } />
@@ -69,7 +70,7 @@ export const GapControl = createControl( ( { label }: { label: string } ) => {
 				</Grid>
 				<Grid container gap={ 0.75 } alignItems="center">
 					<Grid item xs={ 12 }>
-						<ControlLabel>{ __( 'Row', 'elementor' ) }</ControlLabel>
+						<ControlFormLabel>{ __( 'Row', 'elementor' ) }</ControlFormLabel>
 					</Grid>
 					<Grid item xs={ 12 }>
 						<Control bind={ 'row' } isLinked={ isLinked } />

package/src/controls/image-control.tsx

@@ -5,7 +5,7 @@ import { type MediaType } from '@elementor/wp-media';
 import { __ } from '@wordpress/i18n';
 
 import { PropKeyProvider, PropProvider, useBoundProp } from '../bound-prop-context';
-import { ControlLabel } from '../components/control-label';
+import { ControlFormLabel } from '../components/control-form-label';
 import { createControl } from '../create-control';
 import { useUnfilteredFilesUpload } from '../hooks/use-unfiltered-files-upload';
 import { ImageMediaControl } from './image-media-control';
@@ -27,13 +27,13 @@ export const ImageControl = createControl(
 			<PropProvider { ...propContext }>
 				<Stack gap={ 1.5 }>
 					<PropKeyProvider bind={ 'src' }>
-						<ControlLabel> { __( 'Image', 'elementor' ) } </ControlLabel>
+						<ControlFormLabel> { __( 'Image', 'elementor' ) } </ControlFormLabel>
 						<ImageMediaControl mediaTypes={ mediaTypes } />
 					</PropKeyProvider>
 					<PropKeyProvider bind={ 'size' }>
 						<Grid container gap={ 1.5 } alignItems="center" flexWrap="nowrap">
 							<Grid item xs={ 6 }>
-								<ControlLabel> { resolutionLabel } </ControlLabel>
+								<ControlFormLabel> { resolutionLabel } </ControlFormLabel>
 							</Grid>
 							<Grid item xs={ 6 } sx={ { overflow: 'hidden' } }>
 								<SelectControl options={ sizes } />