@elementor/editor-editing-panel 1.2.0 → 1.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elementor/editor-editing-panel",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "private": false,
   "author": "Elementor Team",
   "homepage": "https://elementor.com/",
@@ -39,18 +39,20 @@
     "dev": "tsup --config=../../tsup.dev.ts"
   },
   "dependencies": {
-    "@elementor/editor": "^0.17.1",
-    "@elementor/editor-controls": "^0.1.1",
-    "@elementor/editor-elements": "^0.3.1",
-    "@elementor/menus": "^0.1.1",
-    "@elementor/editor-props": "^0.3.0",
-    "@elementor/editor-panels": "^0.10.1",
-    "@elementor/editor-responsive": "^0.12.3",
-    "@elementor/editor-styles": "^0.3.0",
-    "@elementor/editor-v1-adapters": "^0.8.4",
+    "@elementor/editor": "0.17.2",
+    "@elementor/editor-controls": "0.3.0",
+    "@elementor/editor-elements": "0.3.3",
+    "@elementor/menus": "0.1.2",
+    "@elementor/editor-props": "0.5.0",
+    "@elementor/editor-panels": "0.10.2",
+    "@elementor/editor-responsive": "0.12.4",
+    "@elementor/editor-styles": "0.3.2",
+    "@elementor/editor-styles-repository": "0.2.0",
+    "@elementor/editor-v1-adapters": "0.8.5",
     "@elementor/icons": "^1.20.0",
+    "@elementor/schema": "0.1.2",
     "@elementor/ui": "^1.22.0",
-    "@elementor/utils": "^0.3.0",
+    "@elementor/utils": "0.3.0",
     "@wordpress/i18n": "^5.13.0"
   },
   "peerDependencies": {

package/src/components/conditional-tooltip-wrapper.tsx

@@ -0,0 +1,52 @@
+import { useEffect, useRef, useState } from 'react';
+import * as React from 'react';
+import { Box, Tooltip } from '@elementor/ui';
+
+type ConditionalTooltipWrapperProps = {
+	maxWidth: React.CSSProperties[ 'maxWidth' ];
+	title: string;
+};
+
+export const ConditionalTooltipWrapper = ( { maxWidth, title }: ConditionalTooltipWrapperProps ) => {
+	const elRef = useRef< HTMLElement >( null );
+	const [ isOverflown, setIsOverflown ] = useState( false );
+
+	useEffect( () => {
+		const onResize = () => {
+			const element = elRef.current;
+
+			if ( element ) {
+				setIsOverflown( element.scrollWidth > element.clientWidth );
+			}
+		};
+
+		onResize();
+
+		window.addEventListener( 'resize', onResize );
+
+		return () => {
+			window.removeEventListener( 'resize', onResize );
+		};
+	}, [] );
+
+	if ( isOverflown ) {
+		return (
+			<Tooltip title={ title } placement="top">
+				<Content maxWidth={ maxWidth } ref={ elRef } title={ title } />
+			</Tooltip>
+		);
+	}
+
+	return <Content maxWidth={ maxWidth } ref={ elRef } title={ title } />;
+};
+
+const Content = React.forwardRef( ( { maxWidth, title, ...rest }: ConditionalTooltipWrapperProps, ref ) => (
+	<Box
+		ref={ ref }
+		position="relative"
+		sx={ { overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', maxWidth } }
+		{ ...rest }
+	>
+		{ title }
+	</Box>
+) );

package/src/components/css-class-selector.tsx

@@ -1,32 +1,44 @@
 import * as React from 'react';
-import { updateSettings, useElementSetting, useElementStyles } from '@elementor/editor-elements';
+import { updateSettings, useElementSetting } from '@elementor/editor-elements';
 import { classesPropTypeUtil, type ClassesPropValue } from '@elementor/editor-props';
 import { type StyleDefinitionID } from '@elementor/editor-styles';
+import { ELEMENTS_STYLES_PROVIDER_KEY, useAllStylesByProvider } from '@elementor/editor-styles-repository';
 import { Chip, Stack, Typography } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
 import { useClassesProp } from '../contexts/classes-prop-context';
 import { useElement } from '../contexts/element-context';
 import { useStyle } from '../contexts/style-context';
+import { ConditionalTooltipWrapper } from './conditional-tooltip-wrapper';
 import { MultiCombobox, type Option } from './multi-combobox';
 
 const ID = 'elementor-css-class-selector';
 const TAGS_LIMIT = 8;
 
+const EMPTY_OPTION = {
+	label: __( 'local', 'elementor' ),
+	value: '',
+	fixed: true,
+	color: 'primary',
+	provider: ELEMENTS_STYLES_PROVIDER_KEY,
+} satisfies Option;
+
+/**
+ * Applied - Classes applied to an element.
+ * Active - Class that is currently on edit mode.
+ */
+
 export function CssClassSelector() {
 	const options = useOptions();
+	const [ appliedIds, setAppliedIds ] = useAppliedClassesIds();
 
 	const { id: activeId, setId: setActiveId } = useStyle();
-	const [ appliedIds ] = useAppliedClassesIds();
 
-	const handleApply = useHandleApply();
+	const handleApply = useHandleApply( appliedIds, setAppliedIds );
 	const handleActivate = ( { value }: Option ) => setActiveId( value );
 
-	const active = options.find( ( option ) => option.value === activeId ) || null;
-
-	const applied = appliedIds
-		.map( ( id ) => options.find( ( option ) => option.value === id ) )
-		.filter( ( option ) => !! option );
+	const applied = useAppliedOptions( options, appliedIds );
+	const active = applied.find( ( option ) => option.value === activeId ) ?? EMPTY_OPTION;
 
 	return (
 		<Stack gap={ 1 } p={ 2 }>
@@ -51,11 +63,12 @@ export function CssClassSelector() {
 								{ ...chipProps }
 								key={ chipProps.key }
 								size="small"
-								label={ value.label }
+								label={ <ConditionalTooltipWrapper maxWidth="10ch" title={ value.label } /> }
 								variant={ isActive ? 'filled' : 'standard' }
 								color={ isActive && value.color ? value.color : 'default' }
 								onClick={ () => handleActivate( value ) }
 								onDelete={ null }
+								aria-pressed={ isActive }
 							/>
 						);
 					} )
@@ -68,14 +81,40 @@ export function CssClassSelector() {
 function useOptions() {
 	const { element } = useElement();
 
-	const styleDefs = useElementStyles( element.id );
+	return useAllStylesByProvider( { elementId: element.id } ).flatMap< Option >( ( [ providerKey, styleDefs ] ) => {
+		const isElements = providerKey === ELEMENTS_STYLES_PROVIDER_KEY;
+
+		// Add empty local option for elements, as fallback.
+		if ( isElements && styleDefs.length === 0 ) {
+			return [ EMPTY_OPTION ];
+		}
+
+		return styleDefs.map( ( styleDef ) => {
+			return {
+				label: styleDef.label,
+				value: styleDef.id,
+				fixed: isElements,
+				color: isElements ? 'primary' : 'global',
+				provider: providerKey,
+			};
+		} );
+	} );
+}
+
+function useAppliedOptions( options: Option[], appliedIds: StyleDefinitionID[] ) {
+	const applied = appliedIds
+		.map( ( id ) => options.find( ( option ) => option.value === id ) )
+		.filter( ( option ) => !! option );
+
+	const hasElementsProviderStyleApplied = applied.some(
+		( option ) => option.provider === ELEMENTS_STYLES_PROVIDER_KEY
+	);
 
-	return Object.values( styleDefs ).map< Option >( ( styleDef ) => ( {
-		label: styleDef.label,
-		value: styleDef.id,
-		fixed: true,
-		color: 'primary',
-	} ) );
+	if ( ! hasElementsProviderStyleApplied ) {
+		applied.unshift( EMPTY_OPTION );
+	}
+
+	return applied;
 }
 
 function useAppliedClassesIds() {
@@ -96,12 +135,13 @@ function useAppliedClassesIds() {
 	return [ value, setValue ] as const;
 }
 
-function useHandleApply() {
+function useHandleApply( appliedIds: StyleDefinitionID[], setAppliedIds: ( ids: StyleDefinitionID[] ) => void ) {
 	const { id: activeId, setId: setActiveId } = useStyle();
-	const [ appliedIds, setAppliedIds ] = useAppliedClassesIds();
 
 	return ( selectedOptions: Option[] ) => {
-		const selectedValues = selectedOptions.map( ( { value } ) => value );
+		const selectedValues = selectedOptions
+			.map( ( { value } ) => value )
+			.filter( ( value ) => value !== EMPTY_OPTION.value );
 
 		const isSameClassesAlreadyApplied =
 			selectedValues.length === appliedIds.length &&

package/src/components/multi-combobox/types.ts

@@ -4,6 +4,7 @@ export type Option = {
 	fixed?: boolean;
 	// TODO: Should be remove from here or use some kind of `meta`
 	color?: 'primary' | 'global';
+	provider?: string;
 };
 
 export type Action = {

package/src/components/style-sections/border-section/border-radius-field.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { type EqualUnequalItems, EqualUnequalSizesControl } from '@elementor/editor-controls';
-import type { BorderRadiusPropValue } from '@elementor/editor-props';
+import { borderRadiusPropTypeUtil } from '@elementor/editor-props';
 import {
 	BorderCornersIcon,
 	RadiusBottomLeftIcon,
@@ -12,7 +12,7 @@ import { __ } from '@wordpress/i18n';
 
 import { StylesField } from '../../../controls-registry/styles-field';
 
-const corners: EqualUnequalItems< BorderRadiusPropValue[ '$$type' ], BorderRadiusPropValue > = [
+const corners: EqualUnequalItems = [
 	{
 		label: __( 'Top Left', 'elementor' ),
 		icon: <RadiusTopLeftIcon fontSize={ 'tiny' } />,
@@ -39,10 +39,10 @@ export const BorderRadiusField = () => {
 	return (
 		<StylesField bind={ 'border-radius' }>
 			<EqualUnequalSizesControl
+				items={ corners }
 				label={ __( 'Border Radius', 'elementor' ) }
 				icon={ <BorderCornersIcon fontSize={ 'tiny' } /> }
-				items={ corners }
-				multiSizeType={ 'border-radius' }
+				multiSizePropTypeUtil={ borderRadiusPropTypeUtil }
 			/>
 		</StylesField>
 	);

package/src/components/style-sections/border-section/border-width-field.tsx

@@ -1,12 +1,12 @@
 import * as React from 'react';
 import { type EqualUnequalItems, EqualUnequalSizesControl } from '@elementor/editor-controls';
-import { type BorderWidthPropValue } from '@elementor/editor-props';
+import { borderWidthPropTypeUtil } from '@elementor/editor-props';
 import { SideAllIcon, SideBottomIcon, SideLeftIcon, SideRightIcon, SideTopIcon } from '@elementor/icons';
 import { __ } from '@wordpress/i18n';
 
 import { StylesField } from '../../../controls-registry/styles-field';
 
-const edges: EqualUnequalItems< BorderWidthPropValue[ '$$type' ], BorderWidthPropValue > = [
+const edges: EqualUnequalItems = [
 	{
 		label: __( 'Top', 'elementor' ),
 		icon: <SideTopIcon fontSize={ 'tiny' } />,
@@ -33,10 +33,10 @@ export const BorderWidthField = () => {
 	return (
 		<StylesField bind={ 'border-width' }>
 			<EqualUnequalSizesControl
+				items={ edges }
 				label={ __( 'Border Width', 'elementor' ) }
 				icon={ <SideAllIcon fontSize={ 'tiny' } /> }
-				items={ edges }
-				multiSizeType={ 'border-width' }
+				multiSizePropTypeUtil={ borderWidthPropTypeUtil }
 			/>
 		</StylesField>
 	);

package/src/components/style-sections/layout-section/align-items-field.tsx

@@ -1,5 +1,4 @@
 import * as React from 'react';
-import type { JSX } from 'react';
 import { ControlLabel, type ToggleButtonGroupItem, ToggleControl } from '@elementor/editor-controls';
 import {
 	LayoutAlignCenterIcon as CenterIcon,
@@ -7,19 +6,52 @@ import {
 	LayoutAlignRightIcon,
 	LayoutDistributeVerticalIcon as JustifyIcon,
 } from '@elementor/icons';
-import { DirectionProvider, Grid, ThemeProvider, type ToggleButtonProps, useTheme, withDirection } from '@elementor/ui';
+import { DirectionProvider, Grid, ThemeProvider, withDirection } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
 import { StylesField } from '../../../controls-registry/styles-field';
 import { useDirection } from '../../../hooks/use-direction';
-import { useStylesField } from '../../../hooks/use-styles-field';
-import { type FlexDirection } from './flex-direction-field';
+import { RotatedIcon } from './utils/rotated-icon';
 
-type AlignItems = 'start' | 'center' | 'end' | 'justify';
+type AlignItems = 'start' | 'center' | 'end' | 'stretch';
+
+const StartIcon = withDirection( LayoutAlignLeftIcon );
+const EndIcon = withDirection( LayoutAlignRightIcon );
+
+const iconProps = {
+	isClockwise: false,
+	offset: 90,
+};
+
+const options: ToggleButtonGroupItem< AlignItems >[] = [
+	{
+		value: 'start',
+		label: __( 'Start', 'elementor' ),
+		renderContent: ( { size } ) => <RotatedIcon icon={ StartIcon } size={ size } { ...iconProps } />,
+		showTooltip: true,
+	},
+	{
+		value: 'center',
+		label: __( 'Center', 'elementor' ),
+		renderContent: ( { size } ) => <RotatedIcon icon={ CenterIcon } size={ size } { ...iconProps } />,
+		showTooltip: true,
+	},
+	{
+		value: 'end',
+		label: __( 'End', 'elementor' ),
+		renderContent: ( { size } ) => <RotatedIcon icon={ EndIcon } size={ size } { ...iconProps } />,
+		showTooltip: true,
+	},
+	{
+		value: 'stretch',
+		label: __( 'Stretch', 'elementor' ),
+		renderContent: ( { size } ) => <RotatedIcon icon={ JustifyIcon } size={ size } { ...iconProps } />,
+		showTooltip: true,
+	},
+];
 
 export const AlignItemsField = () => {
-	const options = useOptions(),
-		{ isSiteRtl } = useDirection();
+	const { isSiteRtl } = useDirection();
 
 	return (
 		<DirectionProvider rtl={ isSiteRtl }>
@@ -27,7 +59,7 @@ export const AlignItemsField = () => {
 				<StylesField bind="align-items">
 					<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap">
 						<Grid item xs={ 6 }>
-							<ControlLabel>{ __( 'Align Items', 'elementor' ) }</ControlLabel>
+							<ControlLabel>{ __( 'Align items', 'elementor' ) }</ControlLabel>
 						</Grid>
 						<Grid item xs={ 6 } sx={ { display: 'flex', justifyContent: 'end' } }>
 							<ToggleControl options={ options } />
@@ -38,55 +70,3 @@ export const AlignItemsField = () => {
 		</DirectionProvider>
 	);
 };
-
-const useOptions = (): ToggleButtonGroupItem< AlignItems >[] => {
-	const StartIcon = withDirection( LayoutAlignLeftIcon ),
-		EndIcon = withDirection( LayoutAlignRightIcon );
-
-	return [
-		{
-			value: 'start',
-			label: __( 'Start', 'elementor' ),
-			renderContent: ( { size } ) => <RotatedIcon icon={ StartIcon } size={ size } />,
-			showTooltip: true,
-		},
-		{
-			value: 'center',
-			label: __( 'Center', 'elementor' ),
-			renderContent: ( { size } ) => <RotatedIcon icon={ CenterIcon } size={ size } />,
-			showTooltip: true,
-		},
-		{
-			value: 'end',
-			label: __( 'End', 'elementor' ),
-			renderContent: ( { size } ) => <RotatedIcon icon={ EndIcon } size={ size } />,
-			showTooltip: true,
-		},
-		{
-			value: 'justify',
-			label: __( 'Justify', 'elementor' ),
-			renderContent: ( { size } ) => <RotatedIcon icon={ JustifyIcon } size={ size } />,
-			showTooltip: true,
-		},
-	];
-};
-
-const RotatedIcon = ( { icon: Icon, size }: { icon: JSX.ElementType; size: ToggleButtonProps[ 'size' ] } ) => {
-	const [ direction ] = useStylesField< FlexDirection >( 'flex-direction' ),
-		isRtl = 'rtl' === useTheme().direction,
-		rotationMultiplier = isRtl ? -1 : 1;
-
-	const rotationAngelMap: Record< FlexDirection, number > = {
-		row: 90,
-		column: 0,
-		'row-reverse': -90,
-		'column-reverse': -180,
-	};
-
-	return (
-		<Icon
-			fontSize={ size }
-			sx={ { transition: '.3s', rotate: `${ rotationAngelMap[ direction || 'row' ] * rotationMultiplier }deg` } }
-		/>
-	);
-};

package/src/components/style-sections/layout-section/align-self-child-field.tsx

@@ -0,0 +1,72 @@
+import * as React from 'react';
+import { ControlLabel, type ToggleButtonGroupItem, ToggleControl } from '@elementor/editor-controls';
+import {
+	LayoutAlignCenterIcon as CenterIcon,
+	LayoutAlignLeftIcon,
+	LayoutAlignRightIcon,
+	LayoutDistributeVerticalIcon as JustifyIcon,
+} from '@elementor/icons';
+import { DirectionProvider, Grid, ThemeProvider, withDirection } from '@elementor/ui';
+import { __ } from '@wordpress/i18n';
+
+import { StylesField } from '../../../controls-registry/styles-field';
+import { useDirection } from '../../../hooks/use-direction';
+import { RotatedIcon } from './utils/rotated-icon';
+
+type AlignItems = 'start' | 'center' | 'end' | 'stretch';
+
+const StartIcon = withDirection( LayoutAlignLeftIcon );
+const EndIcon = withDirection( LayoutAlignRightIcon );
+
+const iconProps = {
+	isClockwise: false,
+	offset: 90,
+};
+
+const options: ToggleButtonGroupItem< AlignItems >[] = [
+	{
+		value: 'start',
+		label: __( 'Start', 'elementor' ),
+		renderContent: ( { size } ) => <RotatedIcon icon={ StartIcon } size={ size } { ...iconProps } />,
+		showTooltip: true,
+	},
+	{
+		value: 'center',
+		label: __( 'Center', 'elementor' ),
+		renderContent: ( { size } ) => <RotatedIcon icon={ CenterIcon } size={ size } { ...iconProps } />,
+		showTooltip: true,
+	},
+	{
+		value: 'end',
+		label: __( 'End', 'elementor' ),
+		renderContent: ( { size } ) => <RotatedIcon icon={ EndIcon } size={ size } { ...iconProps } />,
+		showTooltip: true,
+	},
+	{
+		value: 'stretch',
+		label: __( 'Stretch', 'elementor' ),
+		renderContent: ( { size } ) => <RotatedIcon icon={ JustifyIcon } size={ size } { ...iconProps } />,
+		showTooltip: true,
+	},
+];
+
+export const AlignSelfChild = () => {
+	const { isSiteRtl } = useDirection();
+
+	return (
+		<DirectionProvider rtl={ isSiteRtl }>
+			<ThemeProvider>
+				<StylesField bind={ 'align-self' }>
+					<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap">
+						<Grid item xs={ 6 }>
+							<ControlLabel>{ __( 'Align self', 'elementor' ) }</ControlLabel>
+						</Grid>
+						<Grid item xs={ 6 } sx={ { display: 'flex', justifyContent: 'flex-end' } }>
+							<ToggleControl options={ options } />
+						</Grid>
+					</Grid>
+				</StylesField>
+			</ThemeProvider>
+		</DirectionProvider>
+	);
+};

package/src/components/style-sections/layout-section/flex-direction-field.tsx

@@ -27,7 +27,7 @@ const options: ToggleButtonGroupItem< FlexDirection >[] = [
 	},
 	{
 		value: 'row-reverse',
-		label: __( 'Row reverse', 'elementor' ),
+		label: __( 'Reversed row', 'elementor' ),
 		renderContent: ( { size } ) => {
 			const EndIcon = withDirection( ArrowLeftIcon );
 			return <EndIcon fontSize={ size } />;
@@ -36,7 +36,7 @@ const options: ToggleButtonGroupItem< FlexDirection >[] = [
 	},
 	{
 		value: 'column-reverse',
-		label: __( 'Column reverse', 'elementor' ),
+		label: __( 'Reversed column', 'elementor' ),
 		renderContent: ( { size } ) => <ArrowUpSmallIcon fontSize={ size } />,
 		showTooltip: true,
 	},

package/src/components/style-sections/layout-section/flex-order-field.tsx

@@ -6,6 +6,7 @@ import {
 	NumberControl,
 	type ToggleButtonGroupItem,
 } from '@elementor/editor-controls';
+import { type NumberPropValue } from '@elementor/editor-props';
 import { ArrowDownSmallIcon, ArrowUpSmallIcon, PencilIcon } from '@elementor/icons';
 import { DirectionProvider, Grid, Stack, ThemeProvider } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
@@ -22,6 +23,11 @@ export const FIRST_DEFAULT_VALUE = -99999,
 	LAST = 'last',
 	CUSTOM = 'custom';
 
+const orderValueMap = {
+	[ FIRST ]: FIRST_DEFAULT_VALUE,
+	[ LAST ]: LAST_DEFAULT_VALUE,
+};
+
 const items: ToggleButtonGroupItem< GroupControlItemOption >[] = [
 	{
 		value: FIRST,
@@ -45,20 +51,20 @@ const items: ToggleButtonGroupItem< GroupControlItemOption >[] = [
 
 export const FlexOrderField = () => {
 	const { isSiteRtl } = useDirection(),
-		[ order, setOrder ] = useStylesField< number | null >( 'order' );
+		[ order, setOrder ] = useStylesField< NumberPropValue | null >( 'order' );
 
-	const [ groupControlValue, setGroupControlValue ] = useState( getGroupControlValue( order ) );
+	const [ groupControlValue, setGroupControlValue ] = useState( getGroupControlValue( order?.value || null ) );
 
 	const handleToggleButtonChange = ( group: GroupControlItemOption | null ) => {
 		setGroupControlValue( group );
 
-		const orderValueMap = {
-			[ FIRST ]: FIRST_DEFAULT_VALUE,
-			[ LAST ]: LAST_DEFAULT_VALUE,
-			[ CUSTOM ]: null,
-		};
+		if ( ! group || group === CUSTOM ) {
+			setOrder( null );
+
+			return;
+		}
 
-		setOrder( group ? orderValueMap[ group ] : null );
+		setOrder( { $$type: 'number', value: orderValueMap[ group ] } );
 	};
 
 	return (