@elementor/editor-editing-panel 1.2.0 → 1.3.0

package/src/components/style-sections/layout-section/layout-section.tsx

@@ -1,23 +1,26 @@
 import * as React from 'react';
 import { ControlLabel } from '@elementor/editor-controls';
+import { type StringPropValue } from '@elementor/editor-props';
 import { Divider, Stack } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
 import { useStylesField } from '../../../hooks/use-styles-field';
 import { AlignItemsField } from './align-items-field';
+import { AlignSelfChild } from './align-self-child-field';
 import { DisplayField } from './display-field';
 import { FlexDirectionField } from './flex-direction-field';
 import { FlexOrderField } from './flex-order-field';
+import { FlexSizeField } from './flex-size-field';
 import { JustifyContentField } from './justify-content-field';
 import { WrapField } from './wrap-field';
 
 export const LayoutSection = () => {
-	const [ display ] = useStylesField( 'display' );
+	const [ display ] = useStylesField< StringPropValue >( 'display' );
 
 	return (
 		<Stack gap={ 2 }>
 			<DisplayField />
-			{ 'flex' === display && <FlexFields /> }
+			{ 'flex' === display?.value && <FlexFields /> }
 		</Stack>
 	);
 };
@@ -31,6 +34,8 @@ const FlexFields = () => (
 		<WrapField />
 		<Divider />
 		<ControlLabel>{ __( 'Flex child', 'elementor' ) }</ControlLabel>
+		<AlignSelfChild />
 		<FlexOrderField />
+		<FlexSizeField />
 	</>
 );

package/src/components/style-sections/layout-section/utils/rotated-icon.tsx

@@ -0,0 +1,52 @@
+import * as React from 'react';
+import { useRef } from 'react';
+import { type StringPropValue } from '@elementor/editor-props';
+import { type ToggleButtonProps, useTheme } from '@elementor/ui';
+
+import { useStylesField } from '../../../../hooks/use-styles-field';
+import type { FlexDirection } from '../flex-direction-field';
+
+type Props = {
+	icon: React.JSX.ElementType;
+	size: ToggleButtonProps[ 'size' ];
+	isClockwise?: boolean;
+	offset?: number;
+};
+
+const CLOCKWISE_ANGLES: Record< FlexDirection, number > = {
+	row: 0,
+	column: 90,
+	'row-reverse': 180,
+	'column-reverse': 270,
+};
+
+const COUNTER_CLOCKWISE_ANGLES: Record< FlexDirection, number > = {
+	row: 0,
+	column: -90,
+	'row-reverse': -180,
+	'column-reverse': -270,
+};
+
+export const RotatedIcon = ( { icon: Icon, size, isClockwise = true, offset = 0 }: Props ) => {
+	const rotate = useRef( useGetTargetAngle( isClockwise, offset ) );
+	rotate.current = useGetTargetAngle( isClockwise, offset, rotate );
+
+	return <Icon fontSize={ size } sx={ { transition: '.3s', rotate: `${ rotate.current }deg` } } />;
+};
+
+const useGetTargetAngle = ( isClockwise: boolean, offset: number, existingRef?: React.MutableRefObject< number > ) => {
+	const [ direction ] = useStylesField< StringPropValue >( 'flex-direction' );
+	const isRtl = 'rtl' === useTheme().direction;
+	const rotationMultiplier = isRtl ? -1 : 1;
+	const angleMap = isClockwise ? CLOCKWISE_ANGLES : COUNTER_CLOCKWISE_ANGLES;
+
+	const currentAngle = existingRef
+		? existingRef.current * rotationMultiplier // Multiply by rotationMultiplier to get the correct angle for RTL, as it will have returned multiplied by this
+		: angleMap[ ( direction?.value as FlexDirection ) || 'row' ] + offset;
+	const targetAngle = angleMap[ ( direction?.value as FlexDirection ) || 'row' ] + offset;
+
+	const diffToTargetAngle = ( targetAngle - currentAngle + 360 ) % 360; // Make sure the diff is between 0, 360;
+	const formattedDiff = ( ( diffToTargetAngle + 180 ) % 360 ) - 180; // Get the angle to rotate as a value between -180, 180
+
+	return ( currentAngle + formattedDiff ) * rotationMultiplier;
+};

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

@@ -24,7 +24,7 @@ const options: ToggleButtonGroupItem< FlexWrap >[] = [
 	},
 	{
 		value: 'wrap-reverse',
-		label: __( 'Wrap reverse', 'elementor' ),
+		label: __( 'Reversed wrap', 'elementor' ),
 		renderContent: ( { size } ) => <ArrowForwardIcon fontSize={ size } />,
 		showTooltip: true,
 	},

package/src/components/style-sections/position-section/position-section.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { useCallback } from 'react';
-import type { PropValue } from '@elementor/editor-props';
+import type { PropValue, StringPropValue } from '@elementor/editor-props';
 import { Stack } from '@elementor/ui';
 
 import { useStylePropsHistory } from '../../../hooks/use-style-prop-history';
@@ -12,10 +12,10 @@ import { ZIndexField } from './z-index-field';
 const dimensionsPropKeys = [ 'top', 'bottom', 'left', 'right' ];
 
 export const PositionSection = () => {
-	const [ positionValue ] = useStylesField( 'position' );
+	const [ positionValue ] = useStylesField< StringPropValue >( 'position' );
 	usePositionChangeHandler();
 
-	const isNotStatic = positionValue && positionValue !== 'static';
+	const isNotStatic = positionValue && positionValue?.value !== 'static';
 
 	return (
 		<Stack gap={ 1.5 }>

package/src/components/style-sections/typography-section/line-height-field.tsx

@@ -0,0 +1,21 @@
+import * as React from 'react';
+import { ControlLabel, SizeControl } from '@elementor/editor-controls';
+import { Grid } from '@elementor/ui';
+import { __ } from '@wordpress/i18n';
+
+import { StylesField } from '../../../controls-registry/styles-field';
+
+export const LineHeightField = () => {
+	return (
+		<StylesField bind="line-height">
+			<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap">
+				<Grid item xs={ 6 }>
+					<ControlLabel>{ __( 'Line Height', 'elementor' ) }</ControlLabel>
+				</Grid>
+				<Grid item xs={ 6 }>
+					<SizeControl />
+				</Grid>
+			</Grid>
+		</StylesField>
+	);
+};

package/src/components/style-sections/typography-section/text-style-field.tsx

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import { ControlLabel } from '@elementor/editor-controls';
+import { type StringPropValue } from '@elementor/editor-props';
 import { ItalicIcon, StrikethroughIcon, UnderlineIcon } from '@elementor/icons';
 import { Grid, ToggleButton as ToggleButtonBase, ToggleButtonGroup, type ToggleButtonProps } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
@@ -9,10 +10,32 @@ import { useStylesField } from '../../../hooks/use-styles-field';
 const buttonSize = 'tiny';
 
 export const TextStyleField = () => {
-	const [ fontStyle, setFontStyle ] = useStylesField< string | null >( 'font-style' );
-	const [ textDecoration, setTextDecoration ] = useStylesField< string | null >( 'text-decoration' );
+	const [ fontStyle, setFontStyle ] = useStylesField< StringPropValue | null >( 'font-style' );
+	const [ textDecoration, setTextDecoration ] = useStylesField< StringPropValue | null >( 'text-decoration' );
 
-	const formats = [ fontStyle, ...( textDecoration || '' ).split( ' ' ) ];
+	const formats = [ fontStyle?.value, ...( textDecoration?.value || '' ).split( ' ' ) ];
+
+	const handleSetFontStyle = ( newValue: string | null ) => {
+		if ( newValue === null ) {
+			return setFontStyle( null );
+		}
+
+		setFontStyle( {
+			$$type: 'string',
+			value: newValue,
+		} );
+	};
+
+	const handleSetTextDecoration = ( newValue: string | null ) => {
+		if ( newValue === null ) {
+			return setTextDecoration( null );
+		}
+
+		setTextDecoration( {
+			$$type: 'string',
+			value: newValue,
+		} );
+	};
 
 	return (
 		<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap">
@@ -23,7 +46,7 @@ export const TextStyleField = () => {
 				<ToggleButtonGroup value={ formats }>
 					<ToggleButton
 						value="italic"
-						onChange={ ( v ) => setFontStyle( fontStyle === v ? null : v ) }
+						onChange={ ( v ) => handleSetFontStyle( fontStyle?.value === v ? null : v ) }
 						aria-label="italic"
 						sx={ { marginLeft: 'auto' } }
 					>
@@ -31,16 +54,16 @@ export const TextStyleField = () => {
 					</ToggleButton>
 					<ShorthandControl
 						value="line-through"
-						currentValues={ textDecoration || '' }
-						updateValues={ setTextDecoration }
+						currentValues={ textDecoration?.value || '' }
+						updateValues={ handleSetTextDecoration }
 						aria-label="line-through"
 					>
 						<StrikethroughIcon fontSize={ buttonSize } />
 					</ShorthandControl>
 					<ShorthandControl
 						value="underline"
-						currentValues={ textDecoration || '' }
-						updateValues={ setTextDecoration }
+						currentValues={ textDecoration?.value || '' }
+						updateValues={ handleSetTextDecoration }
 						aria-label="underline"
 					>
 						<UnderlineIcon fontSize={ buttonSize } />

package/src/components/style-sections/typography-section/typography-section.tsx

@@ -6,6 +6,7 @@ import { FontFamilyField } from './font-family-field';
 import { FontSizeField } from './font-size-field';
 import { FontWeightField } from './font-weight-field';
 import { LetterSpacingField } from './letter-spacing-field';
+import { LineHeightField } from './line-height-field';
 import { TextAlignmentField } from './text-alignment-field';
 import { TextColorField } from './text-color-field';
 import { TextDirectionField } from './text-direction-field';
@@ -21,13 +22,14 @@ export const TypographySection = () => {
 			<FontWeightField />
 			<FontSizeField />
 			<Divider />
+			<TextAlignmentField />
 			<TextColorField />
 			<CollapsibleContent>
 				<Stack gap={ 1.5 } sx={ { pt: 1.5 } }>
+					<LineHeightField />
 					<LetterSpacingField />
 					<WordSpacingField />
 					<Divider />
-					<TextAlignmentField />
 					<TextStyleField />
 					<TransformField />
 					<TextDirectionField />

package/src/controls-registry/controls-registry.tsx

@@ -1,10 +1,12 @@
 import {
 	type ControlComponent,
 	ImageControl,
+	LinkControl,
 	SelectControl,
 	SizeControl,
 	TextAreaControl,
 	TextControl,
+	UrlControl,
 } from '@elementor/editor-controls';
 
 export type ControlLayout = 'full' | 'two-columns';
@@ -17,6 +19,8 @@ const controlTypes = {
 	textarea: { component: TextAreaControl, layout: 'full' },
 	size: { component: SizeControl, layout: 'two-columns' },
 	select: { component: SelectControl, layout: 'two-columns' },
+	link: { component: LinkControl, layout: 'full' },
+	url: { component: UrlControl, layout: 'full' },
 } as const satisfies ControlRegistry;
 
 export type ControlType = keyof typeof controlTypes;

package/src/dynamics/components/dynamic-selection-control.tsx

@@ -27,15 +27,17 @@ import { type ControlType, getControlByType } from '../../controls-registry/cont
 import { usePropValueHistory } from '../../hooks/use-prop-value-history';
 import { DynamicControl } from '../dynamic-control';
 import { useDynamicTag } from '../hooks/use-dynamic-tag';
-import { type DynamicPropValue, type DynamicTag } from '../types';
+import { type DynamicTag } from '../types';
+import { dynamicPropTypeUtil } from '../utils';
 import { DynamicSelection } from './dynamic-selection';
 
 const SIZE = 'tiny';
 
 export const DynamicSelectionControl = () => {
-	const { bind, value, setValue } = useBoundProp< DynamicPropValue | null >();
+	const { setValue: setAnyValue } = useBoundProp();
+	const { bind, value } = useBoundProp( dynamicPropTypeUtil );
 	const { getPropValue: getPropValueFromHistory } = usePropValueHistory();
-	const { name: tagName = '' } = value?.value || {};
+	const { name: tagName = '' } = value;
 
 	const selectionPopoverId = useId();
 	const selectionPopoverState = usePopupState( { variant: 'popover', popupId: selectionPopoverId } );
@@ -43,8 +45,9 @@ export const DynamicSelectionControl = () => {
 	const dynamicTag = useDynamicTag( bind, tagName );
 
 	const removeDynamicTag = () => {
-		const propValue = getPropValueFromHistory< DynamicPropValue >( bind );
-		setValue( propValue ?? null );
+		const propValue = getPropValueFromHistory( bind );
+
+		setAnyValue( propValue ?? null );
 	};
 
 	if ( ! dynamicTag ) {

package/src/dynamics/components/dynamic-selection.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Fragment, useState } from 'react';
 import { useBoundProp } from '@elementor/editor-controls';
-import { type PropKey, type PropValue } from '@elementor/editor-props';
+import { type PropKey } from '@elementor/editor-props';
 import { PhotoIcon, SearchIcon } from '@elementor/icons';
 import {
 	Box,
@@ -20,8 +20,7 @@ import { __ } from '@wordpress/i18n';
 import { usePropValueHistory } from '../../hooks/use-prop-value-history';
 import { usePropDynamicTags } from '../hooks/use-prop-dynamic-tags';
 import { getAtomicDynamicTags } from '../sync/get-atomic-dynamic-tags';
-import { type DynamicPropValue } from '../types';
-import { isDynamicPropValue } from '../utils';
+import { dynamicPropTypeUtil } from '../utils';
 
 type Option = {
 	label: string;
@@ -39,10 +38,13 @@ export type DynamicSelectionProps = {
 export const DynamicSelection = ( { onSelect }: DynamicSelectionProps ) => {
 	const [ searchValue, setSearchValue ] = useState( '' );
 	const { groups: dynamicGroups } = getAtomicDynamicTags() || {};
-	const { bind, value: currentValue, setValue } = useBoundProp< DynamicPropValue | PropValue >();
+
+	const { value: anyValue } = useBoundProp();
+	const { bind, value: dynamicvalue, setValue } = useBoundProp( dynamicPropTypeUtil );
+
 	const { setPropValue: updatePropValueHistory } = usePropValueHistory();
 
-	const isCurrentValueDynamic = isDynamicPropValue( currentValue );
+	const isCurrentValueDynamic = !! dynamicvalue;
 
 	const options = useFilteredOptions( bind, searchValue );
 
@@ -52,10 +54,10 @@ export const DynamicSelection = ( { onSelect }: DynamicSelectionProps ) => {
 
 	const handleSetDynamicTag = ( value: string ) => {
 		if ( ! isCurrentValueDynamic ) {
-			updatePropValueHistory( bind, currentValue );
+			updatePropValueHistory( bind, anyValue );
 		}
 
-		setValue( { $$type: 'dynamic', value: { name: value, settings: {} } } );
+		setValue( { name: value, settings: {} } );
 
 		onSelect?.();
 	};
@@ -88,7 +90,7 @@ export const DynamicSelection = ( { onSelect }: DynamicSelectionProps ) => {
 									{ dynamicGroups?.[ category ]?.title || category }
 								</ListSubheader>
 								{ items.map( ( { value, label: tagLabel } ) => {
-									const isSelected = isCurrentValueDynamic && value === currentValue?.value?.name;
+									const isSelected = isCurrentValueDynamic && value === dynamicvalue?.name;
 
 									return (
 										<MenuItem

package/src/dynamics/dynamic-control.tsx

@@ -1,17 +1,17 @@
 import * as React from 'react';
 import { BoundPropProvider, useBoundProp } from '@elementor/editor-controls';
-import { type PropKey, type PropValue } from '@elementor/editor-props';
+import { isTransformable, type PropKey, type PropValue } from '@elementor/editor-props';
 
 import { useDynamicTag } from './hooks/use-dynamic-tag';
-import { type DynamicPropValue } from './types';
+import { dynamicPropTypeUtil } from './utils';
 
 export type DynamicControlProps = React.PropsWithChildren< {
 	bind: PropKey;
 } >;
 
 export const DynamicControl = ( { bind, children }: DynamicControlProps ) => {
-	const { value, setValue, bind: propName } = useBoundProp< DynamicPropValue >();
-	const { name = '', settings } = value?.value ?? {};
+	const { value, setValue, bind: propName } = useBoundProp( dynamicPropTypeUtil );
+	const { name = '', settings } = value ?? {};
 
 	const dynamicTag = useDynamicTag( propName, name );
 
@@ -24,13 +24,11 @@ export const DynamicControl = ( { bind, children }: DynamicControlProps ) => {
 
 	const setDynamicValue = ( newValue: PropValue ) => {
 		setValue( {
-			$$type: 'dynamic',
-			value: {
-				name,
-				settings: {
-					...settings,
-					[ bind ]: newValue,
-				},
+			name,
+			settings: {
+				...settings,
+				// The value inside the dynamic is not a transformable value, so we need to store the whole object.
+				[ bind ]: isTransformable( newValue ) ? newValue.value : newValue,
 			},
 		} );
 	};

package/src/dynamics/utils.ts

@@ -1,8 +1,15 @@
-import { isTransformable, type PropType, type PropValue, type TransformablePropType } from '@elementor/editor-props';
+import {
+	createPropUtils,
+	isTransformable,
+	type PropType,
+	type PropValue,
+	type TransformablePropType,
+} from '@elementor/editor-props';
+import { z } from '@elementor/schema';
 
-import { type DynamicPropType, type DynamicPropValue } from './types';
+import { type DynamicPropType } from './types';
 
-const DYNAMIC_PROP_TYPE_KEY = 'dynamic';
+export const DYNAMIC_PROP_TYPE_KEY = 'dynamic';
 
 export const isDynamicPropType = ( prop: TransformablePropType ): prop is DynamicPropType =>
 	prop.key === DYNAMIC_PROP_TYPE_KEY;
@@ -20,3 +27,13 @@ export const isDynamicPropValue = ( prop: PropValue ): prop is DynamicPropValue
 export const supportsDynamic = ( propType: PropType ): boolean => {
 	return !! getDynamicPropType( propType );
 };
+
+export const dynamicPropTypeUtil = createPropUtils(
+	DYNAMIC_PROP_TYPE_KEY,
+	z.strictObject( {
+		name: z.string(),
+		settings: z.record( z.any() ).optional(),
+	} )
+);
+
+export type DynamicPropValue = z.infer< typeof dynamicPropTypeUtil.schema >;