@elementor/editor-variables 0.15.0 → 0.18.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elementor/editor-variables",
-  "version": "0.15.0",
+  "version": "0.18.0",
   "private": false,
   "author": "Elementor Team",
   "homepage": "https://elementor.com/",
@@ -39,18 +39,18 @@
     "dev": "tsup --config=../../tsup.dev.ts"
   },
   "dependencies": {
-    "@elementor/editor": "0.20.1",
-    "@elementor/editor-editing-panel": "1.47.0",
-    "@elementor/editor-canvas": "0.25.0",
-    "@elementor/editor-props": "0.15.0",
+    "@elementor/editor": "0.21.1",
+    "@elementor/editor-editing-panel": "1.50.0",
+    "@elementor/editor-canvas": "0.28.0",
+    "@elementor/editor-props": "0.18.0",
     "@elementor/schema": "0.1.2",
-    "@elementor/editor-controls": "1.2.0",
-    "@elementor/icons": "1.44.0",
+    "@elementor/editor-controls": "1.5.0",
+    "@elementor/icons": "1.46.0",
     "@wordpress/i18n": "^5.13.0",
-    "@elementor/ui": "1.35.5",
+    "@elementor/ui": "1.36.0",
     "@elementor/editor-v1-adapters": "0.12.1",
     "@elementor/http-client": "0.3.0",
-    "@elementor/editor-ui": "0.13.0"
+    "@elementor/editor-ui": "0.14.2"
   },
   "peerDependencies": {
     "react": "^18.3.1",

package/src/components/color-variable-creation.tsx

@@ -1,24 +1,16 @@
 import * as React from 'react';
-import { useRef, useState } from 'react';
+import { useState } from 'react';
 import { PopoverContent, useBoundProp } from '@elementor/editor-controls';
-import { PopoverScrollableContent } from '@elementor/editor-editing-panel';
+import { PopoverBody } from '@elementor/editor-editing-panel';
 import { PopoverHeader } from '@elementor/editor-ui';
 import { ArrowLeftIcon, BrushIcon } from '@elementor/icons';
-import {
-	Button,
-	CardActions,
-	Divider,
-	FormLabel,
-	Grid,
-	IconButton,
-	TextField,
-	UnstableColorField,
-} from '@elementor/ui';
+import { Button, CardActions, Divider, FormHelperText, IconButton } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
 import { createVariable } from '../hooks/use-prop-variables';
 import { colorVariablePropTypeUtil } from '../prop-types/color-variable-prop-type';
-import { usePopoverContentRef } from './variable-selection-popover.context';
+import { ColorField } from './fields/color-field';
+import { LabelField } from './fields/label-field';
 
 const SIZE = 'tiny';
 
@@ -32,13 +24,12 @@ export const ColorVariableCreation = ( { onGoBack, onClose }: Props ) => {
 
 	const [ color, setColor ] = useState( '' );
 	const [ label, setLabel ] = useState( '' );
-
-	const defaultRef = useRef< HTMLDivElement >( null );
-	const anchorRef = usePopoverContentRef() ?? defaultRef;
+	const [ errorMessage, setErrorMessage ] = useState( '' );
 
 	const resetFields = () => {
 		setColor( '' );
 		setLabel( '' );
+		setErrorMessage( '' );
 	};
 
 	const closePopover = () => {
@@ -51,18 +42,24 @@ export const ColorVariableCreation = ( { onGoBack, onClose }: Props ) => {
 			value: color,
 			label,
 			type: colorVariablePropTypeUtil.key,
-		} ).then( ( key ) => {
-			setVariable( key );
-			closePopover();
-		} );
+		} )
+			.then( ( key ) => {
+				setVariable( key );
+				closePopover();
+			} )
+			.catch( ( error ) => {
+				setErrorMessage( error.message );
+			} );
 	};
 
-	const isFormInvalid = () => {
-		return ! color?.trim() || ! label?.trim();
+	const hasEmptyValue = () => {
+		return '' === color.trim() || '' === label.trim();
 	};
 
+	const isSubmitDisabled = hasEmptyValue();
+
 	return (
-		<PopoverScrollableContent height="auto">
+		<PopoverBody height="auto">
 			<PopoverHeader
 				icon={
 					<>
@@ -81,47 +78,29 @@ export const ColorVariableCreation = ( { onGoBack, onClose }: Props ) => {
 			<Divider />
 
 			<PopoverContent p={ 2 }>
-				<Grid container gap={ 0.75 } alignItems="center">
-					<Grid item xs={ 12 }>
-						<FormLabel size="tiny">{ __( 'Name', 'elementor' ) }</FormLabel>
-					</Grid>
-					<Grid item xs={ 12 }>
-						<TextField
-							size="tiny"
-							fullWidth
-							value={ label }
-							onChange={ ( e: React.ChangeEvent< HTMLInputElement > ) => setLabel( e.target.value ) }
-						/>
-					</Grid>
-				</Grid>
+				<LabelField
+					value={ label }
+					onChange={ ( value ) => {
+						setLabel( value );
+						setErrorMessage( '' );
+					} }
+				/>
+				<ColorField
+					value={ color }
+					onChange={ ( value ) => {
+						setColor( value );
+						setErrorMessage( '' );
+					} }
+				/>
 
-				<Grid container gap={ 0.75 } alignItems="center">
-					<Grid item xs={ 12 }>
-						<FormLabel size="tiny">{ __( 'Value', 'elementor' ) }</FormLabel>
-					</Grid>
-					<Grid item xs={ 12 }>
-						<UnstableColorField
-							size="tiny"
-							fullWidth
-							value={ color }
-							onChange={ setColor }
-							slotProps={ {
-								colorPicker: {
-									anchorEl: anchorRef.current,
-									anchorOrigin: { vertical: 'top', horizontal: 'right' },
-									transformOrigin: { vertical: 'top', horizontal: -10 },
-								},
-							} }
-						/>
-					</Grid>
-				</Grid>
+				{ errorMessage && <FormHelperText error>{ errorMessage }</FormHelperText> }
 			</PopoverContent>
 
 			<CardActions sx={ { pt: 0.5, pb: 1 } }>
-				<Button size="small" variant="contained" disabled={ isFormInvalid() } onClick={ handleCreate }>
+				<Button size="small" variant="contained" disabled={ isSubmitDisabled } onClick={ handleCreate }>
 					{ __( 'Create', 'elementor' ) }
 				</Button>
 			</CardActions>
-		</PopoverScrollableContent>
+		</PopoverBody>
 	);
 };

package/src/components/color-variable-edit.tsx

@@ -1,22 +1,17 @@
 import * as React from 'react';
-import { useRef, useState } from 'react';
-import { PopoverContent } from '@elementor/editor-controls';
-import { PopoverHeader, PopoverScrollableContent } from '@elementor/editor-ui';
+import { useState } from 'react';
+import { PopoverContent, useBoundProp } from '@elementor/editor-controls';
+import { PopoverBody } from '@elementor/editor-editing-panel';
+import { PopoverHeader } from '@elementor/editor-ui';
 import { ArrowLeftIcon, BrushIcon, TrashIcon } from '@elementor/icons';
-import {
-	Button,
-	CardActions,
-	Divider,
-	FormLabel,
-	Grid,
-	IconButton,
-	TextField,
-	UnstableColorField,
-} from '@elementor/ui';
+import { Button, CardActions, Divider, FormHelperText, IconButton } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
 import { deleteVariable, updateVariable, useVariable } from '../hooks/use-prop-variables';
-import { usePopoverContentRef } from './variable-selection-popover.context';
+import { colorVariablePropTypeUtil } from '../prop-types/color-variable-prop-type';
+import { ColorField } from './fields/color-field';
+import { LabelField } from './fields/label-field';
+import { DeleteConfirmationDialog } from './ui/delete-confirmation-dialog';
 
 const SIZE = 'tiny';
 
@@ -28,14 +23,15 @@ type Props = {
 };
 
 export const ColorVariableEdit = ( { onClose, onGoBack, onSubmit, editId }: Props ) => {
+	const { setValue: notifyBoundPropChange, value: assignedValue } = useBoundProp( colorVariablePropTypeUtil );
+	const [ deleteConfirmation, setDeleteConfirmation ] = useState( false );
+	const [ errorMessage, setErrorMessage ] = useState( '' );
+
 	const variable = useVariable( editId );
 	if ( ! variable ) {
 		throw new Error( `Global color variable not found` );
 	}
 
-	const defaultRef = useRef< HTMLDivElement >( null );
-	const anchorRef = usePopoverContentRef() ?? defaultRef;
-
 	const [ color, setColor ] = useState( variable.value );
 	const [ label, setLabel ] = useState( variable.label );
 
@@ -43,91 +39,119 @@ export const ColorVariableEdit = ( { onClose, onGoBack, onSubmit, editId }: Prop
 		updateVariable( editId, {
 			value: color,
 			label,
-		} ).then( () => {
-			onSubmit?.();
-		} );
+		} )
+			.then( () => {
+				maybeTriggerBoundPropChange();
+				onSubmit?.();
+			} )
+			.catch( ( error ) => {
+				setErrorMessage( error.message );
+			} );
 	};
 
 	const handleDelete = () => {
 		deleteVariable( editId ).then( () => {
+			maybeTriggerBoundPropChange();
 			onSubmit?.();
 		} );
 	};
 
-	const noValueChanged = () => color === variable.value && label === variable.label;
-	const hasEmptyValue = () => '' === color.trim() || '' === label.trim();
-	const isSaveDisabled = () => noValueChanged() || hasEmptyValue();
+	const maybeTriggerBoundPropChange = () => {
+		if ( editId === assignedValue ) {
+			notifyBoundPropChange( editId );
+		}
+	};
+
+	const handleDeleteConfirmation = () => {
+		setDeleteConfirmation( true );
+	};
+
+	const closeDeleteDialog = () => () => {
+		setDeleteConfirmation( false );
+	};
 
 	const actions = [];
 
 	actions.push(
-		<IconButton key="delete" size={ SIZE } aria-label={ __( 'Delete', 'elementor' ) } onClick={ handleDelete }>
+		<IconButton
+			key="delete"
+			size={ SIZE }
+			aria-label={ __( 'Delete', 'elementor' ) }
+			onClick={ handleDeleteConfirmation }
+		>
 			<TrashIcon fontSize={ SIZE } />
 		</IconButton>
 	);
 
+	const hasEmptyValues = () => {
+		return ! color.trim() || ! label.trim();
+	};
+
+	const noValueChanged = () => {
+		return color === variable.value && label === variable.label;
+	};
+
+	const isSubmitDisabled = noValueChanged() || hasEmptyValues();
+
 	return (
-		<PopoverScrollableContent height="auto">
-			<PopoverHeader
-				title={ __( 'Edit variable', 'elementor' ) }
-				onClose={ onClose }
-				icon={
-					<>
-						{ onGoBack && (
-							<IconButton size={ SIZE } aria-label={ __( 'Go Back', 'elementor' ) } onClick={ onGoBack }>
-								<ArrowLeftIcon fontSize={ SIZE } />
-							</IconButton>
-						) }
-						<BrushIcon fontSize={ SIZE } />
-					</>
-				}
-				actions={ actions }
-			/>
-
-			<Divider />
-
-			<PopoverContent p={ 2 }>
-				<Grid container gap={ 0.75 } alignItems="center">
-					<Grid item xs={ 12 }>
-						<FormLabel size="tiny">{ __( 'Name', 'elementor' ) }</FormLabel>
-					</Grid>
-					<Grid item xs={ 12 }>
-						<TextField
-							size="tiny"
-							fullWidth
-							value={ label }
-							onChange={ ( e: React.ChangeEvent< HTMLInputElement > ) => setLabel( e.target.value ) }
-						/>
-					</Grid>
-				</Grid>
-
-				<Grid container gap={ 0.75 } alignItems="center">
-					<Grid item xs={ 12 }>
-						<FormLabel size="tiny">{ __( 'Value', 'elementor' ) }</FormLabel>
-					</Grid>
-					<Grid item xs={ 12 }>
-						<UnstableColorField
-							size="tiny"
-							fullWidth
-							value={ color }
-							onChange={ setColor }
-							slotProps={ {
-								colorPicker: {
-									anchorEl: anchorRef.current,
-									anchorOrigin: { vertical: 'top', horizontal: 'right' },
-									transformOrigin: { vertical: 'top', horizontal: -10 },
-								},
-							} }
-						/>
-					</Grid>
-				</Grid>
-			</PopoverContent>
-
-			<CardActions sx={ { pt: 0.5, pb: 1 } }>
-				<Button size="small" variant="contained" disabled={ isSaveDisabled() } onClick={ handleUpdate }>
-					{ __( 'Save', 'elementor' ) }
-				</Button>
-			</CardActions>
-		</PopoverScrollableContent>
+		<>
+			<PopoverBody height="auto">
+				<PopoverHeader
+					title={ __( 'Edit variable', 'elementor' ) }
+					onClose={ onClose }
+					icon={
+						<>
+							{ onGoBack && (
+								<IconButton
+									size={ SIZE }
+									aria-label={ __( 'Go Back', 'elementor' ) }
+									onClick={ onGoBack }
+								>
+									<ArrowLeftIcon fontSize={ SIZE } />
+								</IconButton>
+							) }
+							<BrushIcon fontSize={ SIZE } />
+						</>
+					}
+					actions={ actions }
+				/>
+
+				<Divider />
+
+				<PopoverContent p={ 2 }>
+					<LabelField
+						value={ label }
+						onChange={ ( value ) => {
+							setLabel( value );
+							setErrorMessage( '' );
+						} }
+					/>
+					<ColorField
+						value={ color }
+						onChange={ ( value ) => {
+							setColor( value );
+							setErrorMessage( '' );
+						} }
+					/>
+
+					{ errorMessage && <FormHelperText error>{ errorMessage }</FormHelperText> }
+				</PopoverContent>
+
+				<CardActions sx={ { pt: 0.5, pb: 1 } }>
+					<Button size="small" variant="contained" disabled={ isSubmitDisabled } onClick={ handleUpdate }>
+						{ __( 'Save', 'elementor' ) }
+					</Button>
+				</CardActions>
+			</PopoverBody>
+
+			{ deleteConfirmation && (
+				<DeleteConfirmationDialog
+					open
+					label={ label }
+					onConfirm={ handleDelete }
+					closeDialog={ closeDeleteDialog() }
+				/>
+			) }
+		</>
 	);
 };

package/src/components/color-variables-selection.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { useState } from 'react';
 import { useBoundProp } from '@elementor/editor-controls';
-import { PopoverScrollableContent } from '@elementor/editor-editing-panel';
+import { PopoverBody } from '@elementor/editor-editing-panel';
 import { PopoverHeader, PopoverMenuList, PopoverSearch, type VirtualizedItem } from '@elementor/editor-ui';
 import { BrushIcon, ColorFilterIcon, PlusIcon, SettingsIcon } from '@elementor/icons';
 import { Divider, IconButton } from '@elementor/ui';
@@ -76,7 +76,7 @@ export const ColorVariablesSelection = ( { closePopover, onAdd, onEdit, onSettin
 	};
 
 	return (
-		<>
+		<PopoverBody>
 			<PopoverHeader
 				title={ __( 'Variables', 'elementor' ) }
 				icon={ <ColorFilterIcon fontSize={ SIZE } /> }
@@ -94,37 +94,35 @@ export const ColorVariablesSelection = ( { closePopover, onAdd, onEdit, onSettin
 
 			<Divider />
 
-			<PopoverScrollableContent>
-				{ hasVariables && hasSearchResults && (
-					<PopoverMenuList
-						items={ items }
-						onSelect={ handleSetColorVariable }
-						onClose={ () => {} }
-						selectedValue={ variable }
-						data-testid="color-variables-list"
-						menuListTemplate={ VariablesStyledMenuList }
-						menuItemContentTemplate={ ( item: VirtualizedItem< 'item', string > ) => (
-							<MenuItemContent item={ item } />
-						) }
-					/>
-				) }
-
-				{ ! hasSearchResults && hasVariables && (
-					<NoSearchResults
-						searchValue={ searchValue }
-						onClear={ handleClearSearch }
-						icon={ <BrushIcon fontSize="large" /> }
-					/>
-				) }
-
-				{ ! hasVariables && (
-					<NoVariables
-						title={ __( 'Create your first color variable', 'elementor' ) }
-						icon={ <BrushIcon fontSize="large" /> }
-						onAdd={ onAdd }
-					/>
-				) }
-			</PopoverScrollableContent>
-		</>
+			{ hasVariables && hasSearchResults && (
+				<PopoverMenuList
+					items={ items }
+					onSelect={ handleSetColorVariable }
+					onClose={ () => {} }
+					selectedValue={ variable }
+					data-testid="color-variables-list"
+					menuListTemplate={ VariablesStyledMenuList }
+					menuItemContentTemplate={ ( item: VirtualizedItem< 'item', string > ) => (
+						<MenuItemContent item={ item } />
+					) }
+				/>
+			) }
+
+			{ ! hasSearchResults && hasVariables && (
+				<NoSearchResults
+					searchValue={ searchValue }
+					onClear={ handleClearSearch }
+					icon={ <BrushIcon fontSize="large" /> }
+				/>
+			) }
+
+			{ ! hasVariables && (
+				<NoVariables
+					title={ __( 'Create your first color variable', 'elementor' ) }
+					icon={ <BrushIcon fontSize="large" /> }
+					onAdd={ onAdd }
+				/>
+			) }
+		</PopoverBody>
 	);
 };

package/src/components/fields/color-field.tsx

@@ -0,0 +1,54 @@
+import * as React from 'react';
+import { useRef, useState } from 'react';
+import { FormHelperText, FormLabel, Grid, UnstableColorField } from '@elementor/ui';
+import { __ } from '@wordpress/i18n';
+
+import { validateValue } from '../../utils/validations';
+import { usePopoverContentRef } from '../variable-selection-popover.context';
+
+type ColorFieldProps = {
+	value: string;
+	onChange: ( value: string ) => void;
+};
+
+export const ColorField = ( { value, onChange }: ColorFieldProps ) => {
+	const [ color, setColor ] = useState( value );
+	const [ errorMessage, setErrorMessage ] = useState( '' );
+
+	const defaultRef = useRef< HTMLDivElement >( null );
+	const anchorRef = usePopoverContentRef() ?? defaultRef;
+
+	const handleChange = ( newValue: string ) => {
+		setColor( newValue );
+
+		const errorMsg = validateValue( newValue );
+		setErrorMessage( errorMsg );
+
+		onChange( errorMsg ? '' : newValue );
+	};
+
+	return (
+		<Grid container gap={ 0.75 } alignItems="center">
+			<Grid item xs={ 12 }>
+				<FormLabel size="tiny">{ __( 'Value', 'elementor' ) }</FormLabel>
+			</Grid>
+			<Grid item xs={ 12 }>
+				<UnstableColorField
+					size="tiny"
+					fullWidth
+					value={ color }
+					onChange={ handleChange }
+					error={ errorMessage ?? undefined }
+					slotProps={ {
+						colorPicker: {
+							anchorEl: anchorRef.current,
+							anchorOrigin: { vertical: 'top', horizontal: 'right' },
+							transformOrigin: { vertical: 'top', horizontal: -10 },
+						},
+					} }
+				/>
+				{ errorMessage && <FormHelperText error>{ errorMessage }</FormHelperText> }
+			</Grid>
+		</Grid>
+	);
+};

package/src/components/fields/font-field.tsx

@@ -0,0 +1,85 @@
+import * as React from 'react';
+import { useRef, useState } from 'react';
+import { FontFamilySelector } from '@elementor/editor-controls';
+import { useFontFamilies, useSectionWidth } from '@elementor/editor-editing-panel';
+import { ChevronDownIcon } from '@elementor/icons';
+import {
+	bindPopover,
+	bindTrigger,
+	FormHelperText,
+	FormLabel,
+	Grid,
+	Popover,
+	UnstableTag,
+	usePopupState,
+} from '@elementor/ui';
+import { __ } from '@wordpress/i18n';
+
+import { validateValue } from '../../utils/validations';
+import { usePopoverContentRef } from '../variable-selection-popover.context';
+
+type FontFieldProps = {
+	value: string;
+	onChange: ( value: string ) => void;
+};
+
+export const FontField = ( { value, onChange }: FontFieldProps ) => {
+	const [ fontFamily, setFontFamily ] = useState( value );
+	const [ errorMessage, setErrorMessage ] = useState( '' );
+
+	const defaultRef = useRef< HTMLDivElement >( null );
+	const anchorRef = usePopoverContentRef() ?? defaultRef;
+
+	const fontPopoverState = usePopupState( { variant: 'popover' } );
+
+	const fontFamilies = useFontFamilies();
+	const sectionWidth = useSectionWidth();
+
+	const handleChange = ( newValue: string ) => {
+		setFontFamily( newValue );
+
+		const errorMsg = validateValue( newValue );
+		setErrorMessage( errorMsg );
+
+		onChange( errorMsg ? '' : newValue );
+	};
+
+	const handleFontFamilyChange = ( newFontFamily: string ) => {
+		handleChange( newFontFamily );
+		fontPopoverState.close();
+	};
+
+	return (
+		<Grid container gap={ 0.75 } alignItems="center">
+			<Grid item xs={ 12 }>
+				<FormLabel size="tiny">{ __( 'Value', 'elementor' ) }</FormLabel>
+			</Grid>
+			<Grid item xs={ 12 }>
+				<UnstableTag
+					variant="outlined"
+					label={ fontFamily }
+					endIcon={ <ChevronDownIcon fontSize="tiny" /> }
+					{ ...bindTrigger( fontPopoverState ) }
+					fullWidth
+				/>
+				<Popover
+					disablePortal
+					disableScrollLock
+					anchorEl={ anchorRef.current }
+					anchorOrigin={ { vertical: 'top', horizontal: 'right' } }
+					transformOrigin={ { vertical: 'top', horizontal: -20 } }
+					{ ...bindPopover( fontPopoverState ) }
+				>
+					<FontFamilySelector
+						fontFamilies={ fontFamilies }
+						fontFamily={ fontFamily }
+						onFontFamilyChange={ handleFontFamilyChange }
+						onClose={ fontPopoverState.close }
+						sectionWidth={ sectionWidth }
+					/>
+				</Popover>
+				{ errorMessage && <FormHelperText error>{ errorMessage }</FormHelperText> }
+			</Grid>
+		</Grid>
+	);
+};