@elementor/editor-editing-panel 1.46.0 → 1.48.0

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

@@ -11,9 +11,12 @@ import { useStylesField } from '../../../hooks/use-styles-field';
 import { UiProviders } from '../../../styles-inheritance/components/ui-providers';
 import { ControlLabel } from '../../control-label';
 import { SectionContent } from '../../section-content';
+import { StylesFieldLayout } from '../../styles-field-layout';
 
 type GroupControlItemOption = 'first' | 'last' | 'custom';
 
+const ORDER_LABEL = __( 'Order', 'elementor' );
+
 export const FIRST_DEFAULT_VALUE = -99999;
 export const LAST_DEFAULT_VALUE = 99999;
 const FIRST = 'first';
@@ -47,7 +50,13 @@ const items: ToggleButtonGroupItem< GroupControlItemOption >[] = [
 ];
 
 export const FlexOrderField = () => {
-	const { value: order, setValue: setOrder, canEdit } = useStylesField< NumberPropValue | null >( 'order' );
+	const {
+		value: order,
+		setValue: setOrder,
+		canEdit,
+	} = useStylesField< NumberPropValue | null >( 'order', {
+		history: { propDisplayName: ORDER_LABEL },
+	} );
 
 	const [ groupControlValue, setGroupControlValue ] = useState( getGroupControlValue( order?.value || null ) );
 
@@ -64,24 +73,18 @@ export const FlexOrderField = () => {
 	};
 
 	return (
-		<UiProviders>
-			<StylesField bind={ 'order' }>
+		<StylesField bind="order" propDisplayName={ ORDER_LABEL }>
+			<UiProviders>
 				<SectionContent>
-					<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap">
-						<Grid item xs={ 6 }>
-							<ControlLabel>{ __( 'Order', 'elementor' ) }</ControlLabel>
-						</Grid>
-						<Grid item xs={ 6 } sx={ { display: 'flex', justifyContent: 'end' } }>
-							<ControlToggleButtonGroup
-								items={ items }
-								value={ groupControlValue }
-								onChange={ handleToggleButtonChange }
-								exclusive={ true }
-								disabled={ ! canEdit }
-							/>
-						</Grid>
-					</Grid>
-
+					<StylesFieldLayout label={ ORDER_LABEL }>
+						<ControlToggleButtonGroup
+							items={ items }
+							value={ groupControlValue }
+							onChange={ handleToggleButtonChange }
+							exclusive={ true }
+							disabled={ ! canEdit }
+						/>
+					</StylesFieldLayout>
 					{ CUSTOM === groupControlValue && (
 						<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap">
 							<Grid item xs={ 6 }>
@@ -97,8 +100,8 @@ export const FlexOrderField = () => {
 						</Grid>
 					) }
 				</SectionContent>
-			</StylesField>
-		</UiProviders>
+			</UiProviders>
+		</StylesField>
 	);
 };
 

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { type MutableRefObject, useMemo, useRef, useState } from 'react';
+import { useMemo, useRef, useState } from 'react';
 import {
 	ControlToggleButtonGroup,
 	NumberControl,
@@ -8,17 +8,18 @@ import {
 } from '@elementor/editor-controls';
 import { numberPropTypeUtil, type NumberPropValue, type SizePropValue } from '@elementor/editor-props';
 import { ExpandIcon, PencilIcon, ShrinkIcon } from '@elementor/icons';
-import { Grid } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
 import { StylesField } from '../../../controls-registry/styles-field';
 import { useStylesFields } from '../../../hooks/use-styles-fields';
 import { UiProviders } from '../../../styles-inheritance/components/ui-providers';
-import { ControlLabel } from '../../control-label';
 import { SectionContent } from '../../section-content';
+import { StylesFieldLayout } from '../../styles-field-layout';
 
 type GroupItem = 'flex-grow' | 'flex-shrink' | 'custom';
 
+const FLEX_SIZE_LABEL = __( 'Flex Size', 'elementor' );
+
 const DEFAULT = 1;
 
 const items: ToggleButtonGroupItem< GroupItem >[] = [
@@ -59,53 +60,45 @@ export const FlexSizeField = () => {
 	const onChangeGroup = ( group: GroupItem | null = null ) => {
 		setActiveGroup( group );
 
+		let props;
+
 		if ( ! group || group === 'custom' ) {
-			setValues( {
+			props = {
 				'flex-basis': null,
 				'flex-grow': null,
 				'flex-shrink': null,
-			} );
-
-			return;
-		}
-
-		if ( group === 'flex-grow' ) {
-			setValues( {
+			};
+		} else if ( group === 'flex-grow' ) {
+			props = {
 				'flex-basis': null,
 				'flex-grow': numberPropTypeUtil.create( DEFAULT ),
 				'flex-shrink': null,
-			} );
-
-			return;
+			};
+		} else {
+			props = {
+				'flex-basis': null,
+				'flex-grow': null,
+				'flex-shrink': numberPropTypeUtil.create( DEFAULT ),
+			};
 		}
 
-		setValues( {
-			'flex-basis': null,
-			'flex-grow': null,
-			'flex-shrink': numberPropTypeUtil.create( DEFAULT ),
-		} );
+		setValues( props, { history: { propDisplayName: FLEX_SIZE_LABEL } } );
 	};
 
 	return (
 		<UiProviders>
 			<SectionContent>
-				<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap">
-					<StylesField bind={ activeGroup ?? '' }>
-						<Grid item xs={ 6 }>
-							<ControlLabel>{ __( 'Size', 'elementor' ) }</ControlLabel>
-						</Grid>
-
-						<Grid item xs={ 6 } sx={ { display: 'flex', justifyContent: 'end' } }>
-							<ControlToggleButtonGroup
-								value={ activeGroup }
-								onChange={ onChangeGroup }
-								disabled={ ! canEdit }
-								items={ items }
-								exclusive={ true }
-							/>
-						</Grid>
-					</StylesField>
-				</Grid>
+				<StylesField bind={ activeGroup ?? '' } propDisplayName={ FLEX_SIZE_LABEL }>
+					<StylesFieldLayout label={ FLEX_SIZE_LABEL }>
+						<ControlToggleButtonGroup
+							value={ activeGroup }
+							onChange={ onChangeGroup }
+							disabled={ ! canEdit }
+							items={ items }
+							exclusive={ true }
+						/>
+					</StylesFieldLayout>
+				</StylesField>
 				{ 'custom' === activeGroup && <FlexCustomField /> }
 			</SectionContent>
 		</UiProviders>
@@ -113,39 +106,24 @@ export const FlexSizeField = () => {
 };
 
 const FlexCustomField = () => {
-	const flexBasisRowRef: MutableRefObject< HTMLElement | undefined > = useRef();
+	const flexBasisRowRef = useRef< HTMLDivElement >( null );
 
 	return (
 		<>
-			<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 bind="flex-grow" propDisplayName={ FLEX_SIZE_LABEL }>
+				<StylesFieldLayout label={ __( 'Grow', 'elementor' ) }>
+					<NumberControl min={ 0 } shouldForceInt={ true } />
+				</StylesFieldLayout>
 			</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 bind="flex-shrink" propDisplayName={ FLEX_SIZE_LABEL }>
+				<StylesFieldLayout label={ __( 'Shrink', 'elementor' ) }>
+					<NumberControl min={ 0 } shouldForceInt={ true } />
+				</StylesFieldLayout>
 			</StylesField>
-			<StylesField bind={ 'flex-basis' }>
-				<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap" ref={ flexBasisRowRef }>
-					<Grid item xs={ 6 }>
-						<ControlLabel>{ __( 'Basis', 'elementor' ) }</ControlLabel>
-					</Grid>
-					<Grid item xs={ 6 } sx={ { display: 'flex', justifyContent: 'end' } }>
-						<SizeControl extendedOptions={ [ 'auto' ] } anchorRef={ flexBasisRowRef } />
-					</Grid>
-				</Grid>
+			<StylesField bind="flex-basis" propDisplayName={ FLEX_SIZE_LABEL }>
+				<StylesFieldLayout label={ __( 'Basis', 'elementor' ) } ref={ flexBasisRowRef }>
+					<SizeControl extendedOptions={ [ 'auto' ] } anchorRef={ flexBasisRowRef } />
+				</StylesFieldLayout>
 			</StylesField>
 		</>
 	);

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

@@ -1,16 +1,15 @@
 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';
 
+const GAPS_LABEL = __( 'Gaps', 'elementor' );
+
 export const GapControlField = () => {
 	return (
-		<Stack gap={ 1 }>
-			<StylesField bind={ 'gap' }>
-				<GapControl label={ __( 'Gaps', 'elementor' ) } />
-			</StylesField>
-		</Stack>
+		<StylesField bind={ 'gap' } propDisplayName={ GAPS_LABEL }>
+			<GapControl label={ GAPS_LABEL } />
+		</StylesField>
 	);
 };

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

@@ -8,16 +8,18 @@ import {
 	JustifySpaceBetweenVerticalIcon as BetweenIcon,
 	JustifyTopIcon,
 } from '@elementor/icons';
-import { Stack, withDirection } from '@elementor/ui';
+import { withDirection } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
 import { StylesField } from '../../../controls-registry/styles-field';
 import { UiProviders } from '../../../styles-inheritance/components/ui-providers';
-import { ControlLabel } from '../../control-label';
+import { StylesFieldLayout } from '../../styles-field-layout';
 import { RotatedIcon } from './utils/rotated-icon';
 
 type JustifyContent = 'flex-start' | 'center' | 'flex-end' | 'space-between' | 'space-around' | 'space-evenly';
 
+const JUSTIFY_CONTENT_LABEL = __( 'Justify content', 'elementor' );
+
 const StartIcon = withDirection( JustifyTopIcon );
 const EndIcon = withDirection( JustifyBottomIcon );
 
@@ -65,15 +67,12 @@ const options: ToggleButtonGroupItem< JustifyContent >[] = [
 	},
 ];
 
-export const JustifyContentField = () => {
-	return (
+export const JustifyContentField = () => (
+	<StylesField bind="justify-content" propDisplayName={ JUSTIFY_CONTENT_LABEL }>
 		<UiProviders>
-			<StylesField bind="justify-content">
-				<Stack gap={ 0.75 }>
-					<ControlLabel>{ __( 'Justify content', 'elementor' ) }</ControlLabel>
-					<ToggleControl options={ options } fullWidth={ true } />
-				</Stack>
-			</StylesField>
+			<StylesFieldLayout label={ JUSTIFY_CONTENT_LABEL } direction="column">
+				<ToggleControl options={ options } fullWidth={ true } />
+			</StylesFieldLayout>
 		</UiProviders>
-	);
-};
+	</StylesField>
+);

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

@@ -20,8 +20,13 @@ import { GapControlField } from './gap-control-field';
 import { JustifyContentField } from './justify-content-field';
 import { WrapField } from './wrap-field';
 
+const DISPLAY_LABEL = __( 'Display', 'elementor' );
+const FLEX_WRAP_LABEL = __( 'Flex wrap', 'elementor' );
+
 export const LayoutSection = () => {
-	const { value: display } = useStylesField< StringPropValue >( 'display' );
+	const { value: display } = useStylesField< StringPropValue >( 'display', {
+		history: { propDisplayName: DISPLAY_LABEL },
+	} );
 	const displayPlaceholder = useDisplayPlaceholderValue();
 	const isDisplayFlex = shouldDisplayFlexFields( display, displayPlaceholder as StringPropValue );
 	const { element } = useElement();
@@ -39,7 +44,9 @@ export const LayoutSection = () => {
 };
 
 const FlexFields = () => {
-	const { value: flexWrap } = useStylesField< StringPropValue >( 'flex-wrap' );
+	const { value: flexWrap } = useStylesField< StringPropValue >( 'flex-wrap', {
+		history: { propDisplayName: FLEX_WRAP_LABEL },
+	} );
 
 	return (
 		<>

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

@@ -1,25 +1,21 @@
 import * as React from 'react';
-import { type MutableRefObject, useRef } from 'react';
+import { useRef } from 'react';
 import { SizeControl } from '@elementor/editor-controls';
-import { Grid } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
 import { StylesField } from '../../../controls-registry/styles-field';
-import { ControlLabel } from '../../control-label';
+import { StylesFieldLayout } from '../../styles-field-layout';
+
+const OPACITY_LABEL = __( 'Opacity', 'elementor' );
 
 export const OpacityControlField = () => {
-	const rowRef: MutableRefObject< HTMLElement | undefined > = useRef();
+	const rowRef = useRef< HTMLDivElement | null >( null );
 
 	return (
-		<StylesField bind={ 'opacity' }>
-			<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap" ref={ rowRef }>
-				<Grid item xs={ 6 }>
-					<ControlLabel>{ __( 'Opacity', 'elementor' ) }</ControlLabel>
-				</Grid>
-				<Grid item xs={ 6 }>
-					<SizeControl units={ [ '%' ] } anchorRef={ rowRef } defaultUnit="%" />
-				</Grid>
-			</Grid>
+		<StylesField bind={ 'opacity' } propDisplayName={ OPACITY_LABEL }>
+			<StylesFieldLayout ref={ rowRef } label={ OPACITY_LABEL }>
+				<SizeControl units={ [ '%' ] } anchorRef={ rowRef } defaultUnit="%" />
+			</StylesFieldLayout>
 		</StylesField>
 	);
 };

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

@@ -2,6 +2,7 @@ import * as React from 'react';
 import { useRef } from 'react';
 import { type StringPropValue } from '@elementor/editor-props';
 import { type ToggleButtonProps, useTheme } from '@elementor/ui';
+import { __ } from '@wordpress/i18n';
 
 import { useStylesField } from '../../../../hooks/use-styles-field';
 import type { FlexDirection } from '../flex-direction-field';
@@ -14,6 +15,8 @@ type Props = {
 	disableRotationForReversed?: boolean;
 };
 
+const FLEX_DIRECTION_LABEL = __( 'Flex direction', 'elementor' );
+
 const CLOCKWISE_ANGLES: Record< FlexDirection, number > = {
 	row: 0,
 	column: 90,
@@ -48,7 +51,9 @@ const useGetTargetAngle = (
 	disableRotationForReversed: boolean,
 	existingRef?: React.MutableRefObject< number >
 ) => {
-	const { value: direction } = useStylesField< StringPropValue >( 'flex-direction' );
+	const { value: direction } = useStylesField< StringPropValue >( 'flex-direction', {
+		history: { propDisplayName: FLEX_DIRECTION_LABEL },
+	} );
 	const isRtl = 'rtl' === useTheme().direction;
 	const rotationMultiplier = isRtl ? -1 : 1;
 	const angleMap = isClockwise ? CLOCKWISE_ANGLES : COUNTER_CLOCKWISE_ANGLES;

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

@@ -1,15 +1,16 @@
 import * as React from 'react';
 import { type ToggleButtonGroupItem, ToggleControl } from '@elementor/editor-controls';
 import { ArrowBackIcon, ArrowForwardIcon, ArrowRightIcon } from '@elementor/icons';
-import { Grid } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
 import { StylesField } from '../../../controls-registry/styles-field';
 import { UiProviders } from '../../../styles-inheritance/components/ui-providers';
-import { ControlLabel } from '../../control-label';
+import { StylesFieldLayout } from '../../styles-field-layout';
 
 type FlexWrap = 'nowrap' | 'wrap' | 'wrap-reverse';
 
+const FLEX_WRAP_LABEL = __( 'Wrap', 'elementor' );
+
 const options: ToggleButtonGroupItem< FlexWrap >[] = [
 	{
 		value: 'nowrap',
@@ -33,17 +34,12 @@ const options: ToggleButtonGroupItem< FlexWrap >[] = [
 
 export const WrapField = () => {
 	return (
-		<UiProviders>
-			<StylesField bind={ 'flex-wrap' }>
-				<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap">
-					<Grid item xs={ 6 }>
-						<ControlLabel>{ __( 'Wrap', 'elementor' ) }</ControlLabel>
-					</Grid>
-					<Grid item xs={ 6 } sx={ { display: 'flex', justifyContent: 'flex-end' } }>
-						<ToggleControl options={ options } />
-					</Grid>
-				</Grid>
-			</StylesField>
-		</UiProviders>
+		<StylesField bind="flex-wrap" propDisplayName={ FLEX_WRAP_LABEL }>
+			<UiProviders>
+				<StylesFieldLayout label={ FLEX_WRAP_LABEL }>
+					<ToggleControl options={ options } />
+				</StylesFieldLayout>
+			</UiProviders>
+		</StylesField>
 	);
 };

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { type MutableRefObject, useRef } from 'react';
+import { useRef } from 'react';
 import { SizeControl } from '@elementor/editor-controls';
 import { SideBottomIcon, SideLeftIcon, SideRightIcon, SideTopIcon } from '@elementor/icons';
 import { Grid, Stack, withDirection } from '@elementor/ui';
@@ -31,7 +31,7 @@ const getInlineEndLabel = ( isSiteRtl: boolean ) =>
 
 export const DimensionsField = () => {
 	const { isSiteRtl } = useDirection();
-	const rowRefs: MutableRefObject< HTMLElement | undefined >[] = [ useRef(), useRef() ];
+	const rowRefs = [ useRef< HTMLDivElement >( null ), useRef< HTMLDivElement >( null ) ];
 
 	return (
 		<UiProviders>
@@ -62,9 +62,9 @@ const DimensionField = ( {
 }: {
 	side: Side;
 	label: string;
-	rowRef: MutableRefObject< HTMLElement | undefined >;
+	rowRef: React.RefObject< HTMLDivElement >;
 } ) => (
-	<StylesField bind={ side }>
+	<StylesField bind={ side } propDisplayName={ label }>
 		<Grid container gap={ 0.75 } alignItems="center">
 			<Grid item xs={ 12 }>
 				<ControlLabel>{ label }</ControlLabel>

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

@@ -1,25 +1,23 @@
 import * as React from 'react';
-import { type MutableRefObject, useRef } from 'react';
-import { SizeControl } from '@elementor/editor-controls';
-import { Grid } from '@elementor/ui';
+import { useRef } from 'react';
+import { SizeControl, type Unit } from '@elementor/editor-controls';
 import { __ } from '@wordpress/i18n';
 
 import { StylesField } from '../../../controls-registry/styles-field';
-import { ControlLabel } from '../../control-label';
+import { StylesFieldLayout } from '../../styles-field-layout';
+
+const OFFSET_LABEL = __( 'Anchor offset', 'elementor' );
+
+const UNITS: Unit[] = [ 'px', 'em', 'rem', 'vw', 'vh' ];
 
 export const OffsetField = () => {
-	const rowRef: MutableRefObject< HTMLElement | undefined > = useRef();
+	const rowRef = useRef< HTMLDivElement >( null );
 
 	return (
-		<StylesField bind="scroll-margin-top">
-			<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap" ref={ rowRef }>
-				<Grid item xs={ 6 }>
-					<ControlLabel>{ __( 'Anchor offset', 'elementor' ) }</ControlLabel>
-				</Grid>
-				<Grid item xs={ 6 }>
-					<SizeControl units={ [ 'px', 'em', 'rem', 'vw', 'vh' ] } anchorRef={ rowRef } />
-				</Grid>
-			</Grid>
+		<StylesField bind="scroll-margin-top" propDisplayName={ OFFSET_LABEL }>
+			<StylesFieldLayout label={ OFFSET_LABEL } ref={ rowRef }>
+				<SizeControl units={ UNITS } anchorRef={ rowRef } />
+			</StylesFieldLayout>
 		</StylesField>
 	);
 };

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

@@ -1,10 +1,11 @@
 import * as React from 'react';
 import { SelectControl } from '@elementor/editor-controls';
-import { Grid } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
 import { StylesField } from '../../../controls-registry/styles-field';
-import { ControlLabel } from '../../control-label';
+import { StylesFieldLayout } from '../../styles-field-layout';
+
+const POSITION_LABEL = __( 'Position', 'elementor' );
 
 const positionOptions = [
 	{ label: __( 'Static', 'elementor' ), value: 'static' },
@@ -20,15 +21,10 @@ type Props = {
 
 export const PositionField = ( { onChange }: Props ) => {
 	return (
-		<StylesField bind="position">
-			<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap">
-				<Grid item xs={ 6 }>
-					<ControlLabel>{ __( 'Position', 'elementor' ) }</ControlLabel>
-				</Grid>
-				<Grid item xs={ 6 } sx={ { overflow: 'hidden' } }>
-					<SelectControl options={ positionOptions } onChange={ onChange } />
-				</Grid>
-			</Grid>
+		<StylesField bind="position" propDisplayName={ POSITION_LABEL }>
+			<StylesFieldLayout label={ POSITION_LABEL }>
+				<SelectControl options={ positionOptions } onChange={ onChange } />
+			</StylesFieldLayout>
 		</StylesField>
 	);
 };

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

@@ -2,6 +2,7 @@ import * as React from 'react';
 import { type StringPropValue } from '@elementor/editor-props';
 import { isExperimentActive } from '@elementor/editor-v1-adapters';
 import { useSessionStorage } from '@elementor/session';
+import { __ } from '@wordpress/i18n';
 
 import { useStyle } from '../../../contexts/style-context';
 import { useStylesField } from '../../../hooks/use-styles-field';
@@ -28,8 +29,13 @@ type DimensionsValues = {
 	'inset-inline-end': DimensionValue;
 };
 
+const POSITION_LABEL = __( 'Position', 'elementor' );
+const DIMENSIONS_LABEL = __( 'Dimensions', 'elementor' );
+
 export const PositionSection = () => {
-	const { value: positionValue } = useStylesField< StringPropValue >( 'position' );
+	const { value: positionValue } = useStylesField< StringPropValue >( 'position', {
+		history: { propDisplayName: POSITION_LABEL },
+	} );
 	const { values: dimensions, setValues: setDimensions } = useStylesFields< DimensionsValues >( [
 		'inset-block-start',
 		'inset-block-end',
@@ -41,19 +47,24 @@ export const PositionSection = () => {
 	const isCssIdFeatureActive = isExperimentActive( 'e_v_3_30' );
 
 	const onPositionChange = ( newPosition: string | null, previousPosition: string | null | undefined ) => {
+		const meta = { history: { propDisplayName: DIMENSIONS_LABEL } };
+
 		if ( newPosition === 'static' ) {
 			if ( dimensions ) {
 				updateDimensionsHistory( dimensions );
-				setDimensions( {
-					'inset-block-start': undefined,
-					'inset-block-end': undefined,
-					'inset-inline-start': undefined,
-					'inset-inline-end': undefined,
-				} );
+				setDimensions(
+					{
+						'inset-block-start': undefined,
+						'inset-block-end': undefined,
+						'inset-inline-start': undefined,
+						'inset-inline-end': undefined,
+					},
+					meta
+				);
 			}
 		} else if ( previousPosition === 'static' ) {
 			if ( dimensionsValuesFromHistory ) {
-				setDimensions( dimensionsValuesFromHistory );
+				setDimensions( dimensionsValuesFromHistory, meta );
 				clearDimensionsHistory();
 			}
 		}

package/src/components/style-sections/position-section/z-index-field.tsx

@@ -1,22 +1,18 @@
 import * as React from 'react';
 import { NumberControl } from '@elementor/editor-controls';
-import { Grid } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
 import { StylesField } from '../../../controls-registry/styles-field';
-import { ControlLabel } from '../../control-label';
+import { StylesFieldLayout } from '../../styles-field-layout';
+
+const Z_INDEX_LABEL = __( 'Z-index', 'elementor' );
 
 export const ZIndexField = () => {
 	return (
-		<StylesField bind="z-index">
-			<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap">
-				<Grid item xs={ 6 }>
-					<ControlLabel>{ __( 'Z-index', 'elementor' ) }</ControlLabel>
-				</Grid>
-				<Grid item xs={ 6 }>
-					<NumberControl />
-				</Grid>
-			</Grid>
+		<StylesField bind="z-index" propDisplayName={ Z_INDEX_LABEL }>
+			<StylesFieldLayout label={ Z_INDEX_LABEL }>
+				<NumberControl />
+			</StylesFieldLayout>
 		</StylesField>
 	);
 };