@elementor/editor-variables 0.14.0 → 0.16.0

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

@@ -1,28 +1,16 @@
 import * as React from 'react';
-import { useRef, useState } from 'react';
-import { FontFamilySelector, useBoundProp } from '@elementor/editor-controls';
-import { useFontFamilies } from '@elementor/editor-editing-panel';
+import { useState } from 'react';
+import { PopoverContent, useBoundProp } from '@elementor/editor-controls';
+import { PopoverScrollableContent } from '@elementor/editor-editing-panel';
 import { PopoverHeader } from '@elementor/editor-ui';
-import { ArrowLeftIcon, ChevronDownIcon, TextIcon } from '@elementor/icons';
-import {
-	bindPopover,
-	bindTrigger,
-	Button,
-	CardActions,
-	Divider,
-	FormLabel,
-	Grid,
-	IconButton,
-	Popover,
-	Stack,
-	TextField,
-	UnstableTag,
-	usePopupState,
-} from '@elementor/ui';
+import { ArrowLeftIcon, TextIcon } from '@elementor/icons';
+import { Button, CardActions, Divider, IconButton } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
 import { createVariable } from '../hooks/use-prop-variables';
 import { fontVariablePropTypeUtil } from '../prop-types/font-variable-prop-type';
+import { FontField } from './fields/font-field';
+import { LabelField } from './fields/label-field';
 
 const SIZE = 'tiny';
 
@@ -32,15 +20,11 @@ type Props = {
 };
 
 export const FontVariableCreation = ( { onClose, onGoBack }: Props ) => {
-	const fontFamilies = useFontFamilies();
 	const { setValue: setVariable } = useBoundProp( fontVariablePropTypeUtil );
 
 	const [ fontFamily, setFontFamily ] = useState( '' );
 	const [ label, setLabel ] = useState( '' );
 
-	const anchorRef = useRef< HTMLDivElement >( null );
-	const fontPopoverState = usePopupState( { variant: 'popover' } );
-
 	const resetFields = () => {
 		setFontFamily( '' );
 		setLabel( '' );
@@ -62,12 +46,14 @@ export const FontVariableCreation = ( { onClose, onGoBack }: Props ) => {
 		} );
 	};
 
-	const isFormInvalid = () => {
-		return ! fontFamily?.trim() || ! label?.trim();
+	const hasEmptyValue = () => {
+		return '' === fontFamily.trim() || '' === label.trim();
 	};
 
+	const isSubmitDisabled = hasEmptyValue();
+
 	return (
-		<>
+		<PopoverScrollableContent height="auto">
 			<PopoverHeader
 				icon={
 					<>
@@ -85,59 +71,16 @@ export const FontVariableCreation = ( { onClose, onGoBack }: Props ) => {
 
 			<Divider />
 
-			<Stack p={ 1.5 } gap={ 1.5 }>
-				<Grid container gap={ 0.75 } alignItems="center">
-					<Grid item xs={ 12 }>
-						<FormLabel size="small">{ __( '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="small">{ __( '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={ setFontFamily }
-									onClose={ fontPopoverState.close }
-								/>
-							</Popover>
-						</>
-					</Grid>
-				</Grid>
-			</Stack>
+			<PopoverContent p={ 2 }>
+				<LabelField value={ label } onChange={ setLabel } />
+				<FontField value={ fontFamily } onChange={ setFontFamily } />
+			</PopoverContent>
 
-			<CardActions>
-				<Button size="small" variant="contained" disabled={ isFormInvalid() } onClick={ handleCreate }>
+			<CardActions sx={ { pt: 0.5, pb: 1 } }>
+				<Button size="small" variant="contained" disabled={ isSubmitDisabled } onClick={ handleCreate }>
 					{ __( 'Create', 'elementor' ) }
 				</Button>
 			</CardActions>
-		</>
+		</PopoverScrollableContent>
 	);
 };

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

@@ -1,27 +1,17 @@
 import * as React from 'react';
-import { useId, useRef, useState } from 'react';
-import { FontFamilySelector } from '@elementor/editor-controls';
-import { useFontFamilies } from '@elementor/editor-editing-panel';
+import { useState } from 'react';
+import { PopoverContent, useBoundProp } from '@elementor/editor-controls';
+import { PopoverScrollableContent } from '@elementor/editor-editing-panel';
 import { PopoverHeader } from '@elementor/editor-ui';
-import { ArrowLeftIcon, ChevronDownIcon, TextIcon } from '@elementor/icons';
-import {
-	bindPopover,
-	bindTrigger,
-	Button,
-	CardActions,
-	Divider,
-	FormLabel,
-	Grid,
-	IconButton,
-	Popover,
-	Stack,
-	TextField,
-	UnstableTag,
-	usePopupState,
-} from '@elementor/ui';
+import { ArrowLeftIcon, TextIcon, TrashIcon } from '@elementor/icons';
+import { Button, CardActions, Divider, IconButton } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
-import { updateVariable, useVariable } from '../hooks/use-prop-variables';
+import { deleteVariable, updateVariable, useVariable } from '../hooks/use-prop-variables';
+import { fontVariablePropTypeUtil } from '../prop-types/font-variable-prop-type';
+import { FontField } from './fields/font-field';
+import { LabelField } from './fields/label-field';
+import { DeleteConfirmationDialog } from './ui/delete-confirmation-dialog';
 
 const SIZE = 'tiny';
 
@@ -33,8 +23,10 @@ type Props = {
 };
 
 export const FontVariableEdit = ( { onClose, onGoBack, onSubmit, editId }: Props ) => {
-	const variable = useVariable( editId );
+	const { setValue: notifyBoundPropChange, value: assignedValue } = useBoundProp( fontVariablePropTypeUtil );
+	const [ deleteConfirmation, setDeleteConfirmation ] = useState( false );
 
+	const variable = useVariable( editId );
 	if ( ! variable ) {
 		throw new Error( `Global font variable "${ editId }" not found` );
 	}
@@ -42,105 +34,105 @@ export const FontVariableEdit = ( { onClose, onGoBack, onSubmit, editId }: Props
 	const [ fontFamily, setFontFamily ] = useState( variable.value );
 	const [ label, setLabel ] = useState( variable.label );
 
-	const variableNameId = useId();
-	const variableValueId = useId();
-
-	const anchorRef = useRef< HTMLDivElement >( null );
-	const fontPopoverState = usePopupState( { variant: 'popover' } );
-
-	const fontFamilies = useFontFamilies();
-
 	const handleUpdate = () => {
 		updateVariable( editId, {
 			value: fontFamily,
 			label,
 		} ).then( () => {
+			maybeTriggerBoundPropChange();
 			onSubmit?.();
 		} );
 	};
 
-	const noValueChanged = () => fontFamily === variable.value && label === variable.label;
-	const hasEmptyValue = () => '' === fontFamily.trim() || '' === label.trim();
-	const isSaveDisabled = () => noValueChanged() || hasEmptyValue();
+	const handleDelete = () => {
+		deleteVariable( editId ).then( () => {
+			maybeTriggerBoundPropChange();
+			onSubmit?.();
+		} );
+	};
+
+	const maybeTriggerBoundPropChange = () => {
+		if ( editId === assignedValue ) {
+			notifyBoundPropChange( editId );
+		}
+	};
+
+	const handleDeleteConfirmation = () => {
+		setDeleteConfirmation( true );
+	};
+
+	const closeDeleteDialog = () => () => {
+		setDeleteConfirmation( false );
+	};
+
+	const hasEmptyValue = () => {
+		return ! fontFamily.trim() || ! label.trim();
+	};
+
+	const noValueChanged = () => {
+		return fontFamily === variable.value && label === variable.label;
+	};
+
+	const isSubmitDisabled = noValueChanged() || hasEmptyValue();
+
+	const actions = [];
+
+	actions.push(
+		<IconButton
+			key="delete"
+			size={ SIZE }
+			aria-label={ __( 'Delete', 'elementor' ) }
+			onClick={ handleDeleteConfirmation }
+		>
+			<TrashIcon fontSize={ SIZE } />
+		</IconButton>
+	);
 
 	return (
 		<>
-			<PopoverHeader
-				icon={
-					<>
-						{ onGoBack && (
-							<IconButton size={ SIZE } aria-label={ __( 'Go Back', 'elementor' ) } onClick={ onGoBack }>
-								<ArrowLeftIcon fontSize={ SIZE } />
-							</IconButton>
-						) }
-						<TextIcon fontSize={ SIZE } />
-					</>
-				}
-				title={ __( 'Edit variable', 'elementor' ) }
-				onClose={ onClose }
-			/>
-
-			<Divider />
-
-			<Stack p={ 1.5 } gap={ 1.5 }>
-				<Grid container gap={ 0.75 } alignItems="center">
-					<Grid item xs={ 12 }>
-						<FormLabel htmlFor={ variableNameId } size="small">
-							{ __( 'Name', 'elementor' ) }
-						</FormLabel>
-					</Grid>
-					<Grid item xs={ 12 }>
-						<TextField
-							id={ variableNameId }
-							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 htmlFor={ variableValueId } size="small">
-							{ __( 'Value', 'elementor' ) }
-						</FormLabel>
-					</Grid>
-					<Grid item xs={ 12 }>
+			<PopoverScrollableContent height="auto">
+				<PopoverHeader
+					icon={
 						<>
-							<UnstableTag
-								id={ variableValueId }
-								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={ setFontFamily }
-									onClose={ fontPopoverState.close }
-								/>
-							</Popover>
+							{ onGoBack && (
+								<IconButton
+									size={ SIZE }
+									aria-label={ __( 'Go Back', 'elementor' ) }
+									onClick={ onGoBack }
+								>
+									<ArrowLeftIcon fontSize={ SIZE } />
+								</IconButton>
+							) }
+							<TextIcon fontSize={ SIZE } />
 						</>
-					</Grid>
-				</Grid>
-			</Stack>
-
-			<CardActions>
-				<Button size="small" variant="contained" disabled={ isSaveDisabled() } onClick={ handleUpdate }>
-					{ __( 'Save', 'elementor' ) }
-				</Button>
-			</CardActions>
+					}
+					title={ __( 'Edit variable', 'elementor' ) }
+					onClose={ onClose }
+					actions={ actions }
+				/>
+
+				<Divider />
+
+				<PopoverContent p={ 2 }>
+					<LabelField value={ label } onChange={ setLabel } />
+					<FontField value={ fontFamily } onChange={ setFontFamily } />
+				</PopoverContent>
+
+				<CardActions sx={ { pt: 0.5, pb: 1 } }>
+					<Button size="small" variant="contained" disabled={ isSubmitDisabled } onClick={ handleUpdate }>
+						{ __( 'Save', 'elementor' ) }
+					</Button>
+				</CardActions>
+			</PopoverScrollableContent>
+
+			{ deleteConfirmation && (
+				<DeleteConfirmationDialog
+					open
+					label={ label }
+					onConfirm={ handleDelete }
+					closeDialog={ closeDeleteDialog() }
+				/>
+			) }
 		</>
 	);
 };

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

@@ -1,6 +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 { PopoverHeader, PopoverMenuList, PopoverSearch, type VirtualizedItem } from '@elementor/editor-ui';
 import { ColorFilterIcon, PlusIcon, SettingsIcon, TextIcon } from '@elementor/icons';
 import { Divider, IconButton } from '@elementor/ui';
@@ -60,7 +61,7 @@ export const FontVariablesSelection = ( { closePopover, onAdd, onEdit, onSetting
 		type: 'item' as const,
 		value: key,
 		label,
-		icon: <TextIcon />,
+		icon: <TextIcon fontSize={ SIZE } />,
 		secondaryText: value,
 		onEdit: () => onEdit?.( key ),
 	} ) );
@@ -92,25 +93,37 @@ export const FontVariablesSelection = ( { closePopover, onAdd, onEdit, onSetting
 
 			<Divider />
 
-			{ hasVariables && hasSearchResults && (
-				<PopoverMenuList
-					items={ items }
-					onSelect={ handleSetVariable }
-					onClose={ () => {} }
-					selectedValue={ variable }
-					data-testid="font-variables-list"
-					menuListTemplate={ VariablesStyledMenuList }
-					menuItemContentTemplate={ ( item: VirtualizedItem< 'item', string > ) => (
-						<MenuItemContent item={ item } />
-					) }
-				/>
-			) }
-
-			{ ! hasSearchResults && hasVariables && (
-				<NoSearchResults searchValue={ searchValue } onClear={ handleClearSearch } />
-			) }
-
-			{ ! hasVariables && <NoVariables icon={ <TextIcon fontSize="large" /> } onAdd={ onAdd } /> }
+			<PopoverScrollableContent>
+				{ hasVariables && hasSearchResults && (
+					<PopoverMenuList
+						items={ items }
+						onSelect={ handleSetVariable }
+						onClose={ () => {} }
+						selectedValue={ variable }
+						data-testid="font-variables-list"
+						menuListTemplate={ VariablesStyledMenuList }
+						menuItemContentTemplate={ ( item: VirtualizedItem< 'item', string > ) => (
+							<MenuItemContent item={ item } />
+						) }
+					/>
+				) }
+
+				{ ! hasSearchResults && hasVariables && (
+					<NoSearchResults
+						searchValue={ searchValue }
+						onClear={ handleClearSearch }
+						icon={ <TextIcon fontSize="large" /> }
+					/>
+				) }
+
+				{ ! hasVariables && (
+					<NoVariables
+						title={ __( 'Create your first font variable', 'elementor' ) }
+						icon={ <TextIcon fontSize="large" /> }
+						onAdd={ onAdd }
+					/>
+				) }
+			</PopoverScrollableContent>
 		</>
 	);
 };

package/src/components/ui/color-indicator.tsx

@@ -2,4 +2,5 @@ import { styled, UnstableColorIndicator } from '@elementor/ui';
 
 export const ColorIndicator = styled( UnstableColorIndicator )( ( { theme } ) => ( {
 	borderRadius: `${ theme.shape.borderRadius / 2 }px`,
+	marginRight: theme.spacing( 0.25 ),
 } ) );

package/src/components/ui/delete-confirmation-dialog.tsx

@@ -0,0 +1,55 @@
+import * as React from 'react';
+import { AlertOctagonFilledIcon } from '@elementor/icons';
+import {
+	Button,
+	Dialog,
+	DialogActions,
+	DialogContent,
+	DialogContentText,
+	DialogTitle,
+	Typography,
+} from '@elementor/ui';
+import { __ } from '@wordpress/i18n';
+
+const TITLE_ID = 'delete-variable-dialog';
+
+export const DeleteConfirmationDialog = ( {
+	open,
+	label,
+	closeDialog,
+	onConfirm,
+}: {
+	open: boolean;
+	label: string;
+	closeDialog: () => void;
+	onConfirm: () => void;
+} ) => {
+	return (
+		<Dialog open={ open } onClose={ closeDialog } aria-labelledby={ TITLE_ID } maxWidth="xs">
+			<DialogTitle id={ TITLE_ID } display="flex" alignItems="center" gap={ 1 } sx={ { lineHeight: 1 } }>
+				<AlertOctagonFilledIcon color="error" />
+				{ __( 'Delete Variable', 'elementor' ) }
+			</DialogTitle>
+			<DialogContent>
+				<DialogContentText variant="body2" color="textPrimary">
+					{ __( 'You are about to delete', 'elementor' ) }
+					<Typography variant="subtitle2" component="span">
+						&nbsp;{ label }&nbsp;
+					</Typography>
+					{ __(
+						'Variable. Note that its value is still being used anywhere on your site where it was connected to the variable.',
+						'elementor'
+					) }
+				</DialogContentText>
+			</DialogContent>
+			<DialogActions>
+				<Button color="secondary" onClick={ closeDialog }>
+					{ __( 'Cancel', 'elementor' ) }
+				</Button>
+				<Button variant="contained" color="error" onClick={ onConfirm }>
+					{ __( 'Delete', 'elementor' ) }
+				</Button>
+			</DialogActions>
+		</Dialog>
+	);
+};

package/src/components/ui/menu-item-content.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import type { VirtualizedItem } from '@elementor/editor-ui';
+import { EllipsisWithTooltip, type VirtualizedItem } from '@elementor/editor-ui';
 import { EditIcon } from '@elementor/icons';
-import { IconButton, ListItemIcon, ListItemText } from '@elementor/ui';
+import { Box, IconButton, ListItemIcon, Typography } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
 const SIZE = 'tiny';
@@ -12,28 +12,34 @@ export const MenuItemContent = < T, V extends string >( { item }: { item: Virtua
 	return (
 		<>
 			<ListItemIcon>{ item.icon }</ListItemIcon>
-			<ListItemText
-				primary={ item.label || item.value }
-				secondary={ item.secondaryText }
-				primaryTypographyProps={ {
-					variant: 'body2',
-					color: 'text.secondary',
-					style: {
-						lineHeight: 2,
-						display: 'inline-block',
-						overflow: 'hidden',
-						textOverflow: 'ellipsis',
-						whiteSpace: 'nowrap',
-						maxWidth: '81px',
-					},
+			<Box
+				sx={ {
+					flex: 1,
+					minWidth: 0,
+					display: 'flex',
+					alignItems: 'center',
+					gap: 1,
 				} }
-				secondaryTypographyProps={ {
-					variant: 'caption',
-					color: 'text.tertiary',
-					style: { marginTop: '1px', lineHeight: '1' },
-				} }
-				sx={ { display: 'flex', alignItems: 'center', gap: 1 } }
-			/>
+			>
+				<EllipsisWithTooltip
+					title={ item.label || item.value }
+					as={ Typography }
+					variant="caption"
+					color="text.primary"
+					sx={ { marginTop: '1px', lineHeight: '2' } }
+					maxWidth="50%"
+				/>
+				{ item.secondaryText && (
+					<EllipsisWithTooltip
+						title={ item.secondaryText }
+						as={ Typography }
+						variant="caption"
+						color="text.tertiary"
+						sx={ { marginTop: '1px', lineHeight: '1' } }
+						maxWidth="50%"
+					/>
+				) }
+			</Box>
 			{ !! onEdit && (
 				<IconButton
 					sx={ { mx: 1, opacity: '0' } }

package/src/components/ui/no-search-results.tsx

@@ -1,34 +1,32 @@
 import * as React from 'react';
-import { ColorFilterIcon } from '@elementor/icons';
 import { Link, Stack, Typography } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
 type Props = {
 	searchValue: string;
 	onClear?: () => void;
+	icon?: React.ReactNode;
 };
 
-export const NoSearchResults = ( { searchValue, onClear }: Props ) => {
+export const NoSearchResults = ( { searchValue, onClear, icon }: Props ) => {
 	return (
 		<Stack
 			gap={ 1 }
 			alignItems="center"
 			justifyContent="center"
 			height="100%"
+			p={ 2.5 }
 			color="text.secondary"
-			sx={ { p: 2.5, pb: 5.5 } }
+			sx={ { pb: 3.5 } }
 		>
-			<ColorFilterIcon fontSize="large" />
-
+			{ icon }
 			<Typography align="center" variant="subtitle2">
 				{ __( 'Sorry, nothing matched', 'elementor' ) }
 				<br />
 				&ldquo;{ searchValue }&rdquo;.
 			</Typography>
-
-			<Typography align="center" variant="caption">
+			<Typography align="center" variant="caption" sx={ { display: 'flex', flexDirection: 'column' } }>
 				{ __( 'Try something else.', 'elementor' ) }
-				<br />
 				<Link color="text.secondary" variant="caption" component="button" onClick={ onClear }>
 					{ __( 'Clear & try again', 'elementor' ) }
 				</Link>

package/src/components/ui/no-variables.tsx

@@ -4,10 +4,11 @@ import { __ } from '@wordpress/i18n';
 
 type Props = {
 	icon?: React.ReactNode;
+	title?: string;
 	onAdd?: () => void;
 };
 
-export const NoVariables = ( { icon, onAdd }: Props ) => (
+export const NoVariables = ( { icon, title, onAdd }: Props ) => (
 	<Stack
 		gap={ 1 }
 		alignItems="center"
@@ -19,7 +20,7 @@ export const NoVariables = ( { icon, onAdd }: Props ) => (
 		{ icon }
 
 		<Typography align="center" variant="subtitle2">
-			{ __( 'Create your first variable', 'elementor' ) }
+			{ title }
 		</Typography>
 
 		<Typography align="center" variant="caption" maxWidth="180px">