@elementor/editor-editing-panel 1.2.0 → 1.4.0

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

@@ -0,0 +1,164 @@
+import * as React from 'react';
+import {
+	ControlLabel,
+	ControlToggleButtonGroup,
+	NumberControl,
+	SizeControl,
+	type ToggleButtonGroupItem,
+} from '@elementor/editor-controls';
+import type { NumberPropValue, SizePropValue } from '@elementor/editor-props';
+import { ExpandIcon, PencilIcon, ShrinkIcon } from '@elementor/icons';
+import { DirectionProvider, Grid, Stack, ThemeProvider } 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';
+
+type GroupItem = 'flex-grow' | 'flex-shrink' | 'custom';
+
+export const DEFAULT = 1;
+
+const items: ToggleButtonGroupItem< GroupItem >[] = [
+	{
+		value: 'flex-grow',
+		label: __( 'Grow', 'elementor' ),
+		renderContent: ( { size } ) => <ExpandIcon fontSize={ size } />,
+		showTooltip: true,
+	},
+	{
+		value: 'flex-shrink',
+		label: __( 'Shrink', 'elementor' ),
+		renderContent: ( { size } ) => <ShrinkIcon fontSize={ size } />,
+		showTooltip: true,
+	},
+	{
+		value: 'custom',
+		label: __( 'Custom', 'elementor' ),
+		renderContent: ( { size } ) => <PencilIcon fontSize={ size } />,
+		showTooltip: true,
+	},
+];
+
+export const FlexSizeField = () => {
+	const { isSiteRtl } = useDirection(),
+		[ growField, setGrowField ] = useStylesField< NumberPropValue | null >( 'flex-grow' ),
+		[ shrinkField, setShrinkField ] = useStylesField< NumberPropValue | null >( 'flex-shrink' ),
+		[ basisField, setBasisField ] = useStylesField< SizePropValue | null >( 'flex-basis' );
+
+	const grow = growField?.value || null,
+		shrink = shrinkField?.value || null,
+		basis = basisField?.value || null;
+
+	const currentGroup = React.useMemo( () => getActiveGroup( { grow, shrink, basis } ), [ grow, shrink, basis ] ),
+		[ activeGroup, setActiveGroup ] = React.useState( currentGroup );
+
+	const onChangeGroup = ( group: GroupItem | null = null ) => {
+		setActiveGroup( group );
+		setBasisField( null );
+
+		if ( ! group || group === 'custom' ) {
+			setGrowField( null );
+			setShrinkField( null );
+
+			return;
+		}
+
+		if ( group === 'flex-grow' ) {
+			setGrowField( { $$type: 'number', value: DEFAULT } );
+			setShrinkField( null );
+
+			return;
+		}
+
+		setGrowField( null );
+		setShrinkField( { $$type: 'number', value: DEFAULT } );
+	};
+
+	return (
+		<DirectionProvider rtl={ isSiteRtl }>
+			<ThemeProvider>
+				<Stack gap={ 2 }>
+					<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap">
+						<Grid item xs={ 6 }>
+							<ControlLabel>{ __( 'Size', 'elementor' ) }</ControlLabel>
+						</Grid>
+						<Grid item xs={ 6 } sx={ { display: 'flex', justifyContent: 'end' } }>
+							<ControlToggleButtonGroup
+								value={ activeGroup }
+								onChange={ onChangeGroup }
+								items={ items }
+								exclusive={ true }
+							/>
+						</Grid>
+					</Grid>
+
+					{ 'custom' === activeGroup && <FlexCustomField /> }
+				</Stack>
+			</ThemeProvider>
+		</DirectionProvider>
+	);
+};
+
+const FlexCustomField = () => (
+	<>
+		<StylesField bind={ 'flex-grow' }>
+			<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap">
+				<Grid item xs={ 6 }>
+					<ControlLabel>{ __( 'Grow', 'elementor' ) }</ControlLabel>
+				</Grid>
+				<Grid item xs={ 6 } sx={ { display: 'flex', justifyContent: 'end' } }>
+					<NumberControl min={ 0 } shouldForceInt={ true } />
+				</Grid>
+			</Grid>
+		</StylesField>
+		<StylesField bind={ 'flex-shrink' }>
+			<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap">
+				<Grid item xs={ 6 }>
+					<ControlLabel>{ __( 'Shrink', 'elementor' ) }</ControlLabel>
+				</Grid>
+				<Grid item xs={ 6 } sx={ { display: 'flex', justifyContent: 'end' } }>
+					<NumberControl min={ 0 } shouldForceInt={ true } />
+				</Grid>
+			</Grid>
+		</StylesField>
+		<StylesField bind={ 'flex-basis' }>
+			<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap">
+				<Grid item xs={ 6 }>
+					<ControlLabel>{ __( 'Basis', 'elementor' ) }</ControlLabel>
+				</Grid>
+				<Grid item xs={ 6 } sx={ { display: 'flex', justifyContent: 'end' } }>
+					<SizeControl />
+				</Grid>
+			</Grid>
+		</StylesField>
+	</>
+);
+
+const getActiveGroup = ( {
+	grow,
+	shrink,
+	basis,
+}: {
+	grow: NumberPropValue[ 'value' ] | null;
+	shrink: NumberPropValue[ 'value' ] | null;
+	basis: SizePropValue[ 'value' ] | null;
+} ): GroupItem | null => {
+	if ( null === grow && null === shrink && ! basis ) {
+		return null;
+	}
+
+	if ( ( shrink && grow ) || basis ) {
+		return 'custom';
+	}
+
+	if ( grow === DEFAULT ) {
+		return 'flex-grow';
+	}
+
+	if ( shrink === DEFAULT ) {
+		return 'flex-shrink';
+	}
+
+	return 'custom';
+};

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

@@ -0,0 +1,18 @@
+import * as React from 'react';
+import { GapControl } from '@elementor/editor-controls';
+import { Stack } from '@elementor/ui';
+import { __ } from '@wordpress/i18n';
+
+import { StylesField } from '../../../controls-registry/styles-field';
+
+export type Gap = 'column' | 'row';
+
+export const GapControlField = () => {
+	return (
+		<Stack gap={ 1 }>
+			<StylesField bind={ 'gap' }>
+				<GapControl label={ __( 'Gaps', 'elementor' ) } />
+			</StylesField>
+		</Stack>
+	);
+};

package/src/components/style-sections/layout-section/justify-content-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 {
 	JustifyBottomIcon,
@@ -9,33 +8,71 @@ import {
 	JustifySpaceBetweenVerticalIcon as BetweenIcon,
 	JustifyTopIcon,
 } from '@elementor/icons';
-import {
-	DirectionProvider,
-	Stack,
-	ThemeProvider,
-	type ToggleButtonProps,
-	useTheme,
-	withDirection,
-} from '@elementor/ui';
+import { DirectionProvider, Stack, 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 JustifyContent = 'start' | 'center' | 'end' | 'space-between' | 'space-around' | 'space-evenly';
 
+const StartIcon = withDirection( JustifyTopIcon );
+const EndIcon = withDirection( JustifyBottomIcon );
+
+const iconProps = {
+	isClockwise: true,
+	offset: -90,
+};
+
+const options: ToggleButtonGroupItem< JustifyContent >[] = [
+	{
+		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: 'space-between',
+		label: __( 'Space between', 'elementor' ),
+		renderContent: ( { size } ) => <RotatedIcon icon={ BetweenIcon } size={ size } { ...iconProps } />,
+		showTooltip: true,
+	},
+	{
+		value: 'space-around',
+		label: __( 'Space around', 'elementor' ),
+		renderContent: ( { size } ) => <RotatedIcon icon={ AroundIcon } size={ size } { ...iconProps } />,
+		showTooltip: true,
+	},
+	{
+		value: 'space-evenly',
+		label: __( 'Space evenly', 'elementor' ),
+		renderContent: ( { size } ) => <RotatedIcon icon={ EvenlyIcon } size={ size } { ...iconProps } />,
+		showTooltip: true,
+	},
+];
+
 export const JustifyContentField = () => {
-	const options = useOptions(),
-		{ isSiteRtl } = useDirection();
+	const { isSiteRtl } = useDirection();
 
 	return (
 		<DirectionProvider rtl={ isSiteRtl }>
 			<ThemeProvider>
 				<StylesField bind="justify-content">
 					<Stack gap={ 1 }>
-						<ControlLabel>{ __( 'Justify Content', 'elementor' ) }</ControlLabel>
+						<ControlLabel>{ __( 'Justify content', 'elementor' ) }</ControlLabel>
 						<ToggleControl options={ options } fullWidth={ true } />
 					</Stack>
 				</StylesField>
@@ -43,67 +80,3 @@ export const JustifyContentField = () => {
 		</DirectionProvider>
 	);
 };
-
-const useOptions = (): ToggleButtonGroupItem< JustifyContent >[] => {
-	const StartIcon = withDirection( JustifyTopIcon ),
-		EndIcon = withDirection( JustifyBottomIcon );
-
-	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: 'space-between',
-			label: __( 'Space between', 'elementor' ),
-			renderContent: ( { size } ) => <RotatedIcon icon={ BetweenIcon } size={ size } />,
-			showTooltip: true,
-		},
-		{
-			value: 'space-around',
-			label: __( 'Space around', 'elementor' ),
-			renderContent: ( { size } ) => <RotatedIcon icon={ AroundIcon } size={ size } />,
-			showTooltip: true,
-		},
-		{
-			value: 'space-evenly',
-			label: __( 'Space evenly', 'elementor' ),
-			renderContent: ( { size } ) => <RotatedIcon icon={ EvenlyIcon } 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/layout-section.tsx

@@ -1,23 +1,27 @@
 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 { GapControlField } from './gap-control-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>
 	);
 };
@@ -28,9 +32,12 @@ const FlexFields = () => (
 		<JustifyContentField />
 		<AlignItemsField />
 		<Divider />
+		<GapControlField />
 		<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/components/style-tab.tsx

@@ -3,7 +3,7 @@ import { useState } from 'react';
 import { useElementSetting, useElementStyles } from '@elementor/editor-elements';
 import { type ClassesPropValue, type PropKey } from '@elementor/editor-props';
 import { useActiveBreakpoint } from '@elementor/editor-responsive';
-import { generateId, type StyleDefinition } from '@elementor/editor-styles';
+import { type StyleDefinition } from '@elementor/editor-styles';
 import { Divider } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
@@ -70,9 +70,7 @@ function useActiveStyleDefId( currentClassesProp: PropKey ) {
 
 	const fallback = useFirstElementStyleDef( currentClassesProp );
 
-	const newId = useGeneratedId();
-
-	return [ activeStyledDefId || fallback?.id || newId, setActiveStyledDefId ] as const;
+	return [ activeStyledDefId || fallback?.id || null, setActiveStyledDefId ] as const;
 }
 
 function useFirstElementStyleDef( currentClassesProp: PropKey ) {
@@ -84,13 +82,6 @@ function useFirstElementStyleDef( currentClassesProp: PropKey ) {
 	return Object.values( stylesDefs ).find( ( styleDef ) => classesIds.includes( styleDef.id ) );
 }
 
-function useGeneratedId() {
-	const { element } = useElement();
-	const stylesDefs = useElementStyles( element.id );
-
-	return generateId( `e-${ element.id }-`, Object.keys( stylesDefs ) );
-}
-
 function useCurrentClassesProp(): string {
 	const { elementType } = useElement();
 

package/src/contexts/style-context.tsx

@@ -3,8 +3,8 @@ import { createContext, type Dispatch, type PropsWithChildren, useContext } from
 import { type StyleDefinition, type StyleVariant } from '@elementor/editor-styles';
 
 type ContextValue = {
-	id: StyleDefinition[ 'id' ];
-	setId: Dispatch< StyleDefinition[ 'id' ] >;
+	id: StyleDefinition[ 'id' ] | null;
+	setId: Dispatch< StyleDefinition[ 'id' ] | null >;
 	meta: StyleVariant[ 'meta' ];
 };
 

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;