@elementor/editor-editing-panel 1.46.0 → 1.47.0

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 >[] = [
@@ -89,23 +90,17 @@ export const FlexSizeField = () => {
 	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 +108,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/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/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/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>
 	);
 };

package/src/components/style-sections/size-section/object-fit-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 OBJECT_FIT_LABEL = __( 'Object fit', 'elementor' );
 
 const positionOptions = [
 	{ label: __( 'Fill', 'elementor' ), value: 'fill' },
@@ -16,15 +17,10 @@ const positionOptions = [
 
 export const ObjectFitField = () => {
 	return (
-		<StylesField bind="object-fit">
-			<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap">
-				<Grid item xs={ 6 }>
-					<ControlLabel>{ __( 'Object fit', 'elementor' ) }</ControlLabel>
-				</Grid>
-				<Grid item xs={ 6 } sx={ { overflow: 'hidden' } }>
-					<SelectControl options={ positionOptions } />
-				</Grid>
-			</Grid>
+		<StylesField bind="object-fit" propDisplayName={ OBJECT_FIT_LABEL }>
+			<StylesFieldLayout label={ OBJECT_FIT_LABEL }>
+				<SelectControl options={ positionOptions } />
+			</StylesFieldLayout>
 		</StylesField>
 	);
 };

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

@@ -1,11 +1,14 @@
 import * as React from 'react';
 import { PositionControl } from '@elementor/editor-controls';
+import { __ } from '@wordpress/i18n';
 
 import { StylesField } from '../../../controls-registry/styles-field';
 
+const OBJECT_POSITION_LABEL = __( 'Object position', 'elementor' );
+
 export const ObjectPositionField = () => {
 	return (
-		<StylesField bind="object-position">
+		<StylesField bind="object-position" propDisplayName={ OBJECT_POSITION_LABEL }>
 			<PositionControl />
 		</StylesField>
 	);

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

@@ -1,14 +1,15 @@
 import * as React from 'react';
 import { type ToggleButtonGroupItem, ToggleControl } from '@elementor/editor-controls';
 import { EyeIcon, EyeOffIcon, LetterAIcon } from '@elementor/icons';
-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';
 
 type Overflows = 'visible' | 'hidden' | 'auto';
 
+const OVERFLOW_LABEL = __( 'Overflow', 'elementor' );
+
 const options: ToggleButtonGroupItem< Overflows >[] = [
 	{
 		value: 'visible',
@@ -32,15 +33,10 @@ const options: ToggleButtonGroupItem< Overflows >[] = [
 
 export const OverflowField = () => {
 	return (
-		<StylesField bind={ 'overflow' }>
-			<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap">
-				<Grid item xs={ 6 }>
-					<ControlLabel>{ __( 'Overflow', 'elementor' ) }</ControlLabel>
-				</Grid>
-				<Grid item xs={ 6 } sx={ { display: 'flex', justifyContent: 'flex-end' } }>
-					<ToggleControl options={ options } />
-				</Grid>
-			</Grid>
+		<StylesField bind="overflow" propDisplayName={ OVERFLOW_LABEL }>
+			<StylesFieldLayout label={ OVERFLOW_LABEL }>
+				<ToggleControl options={ options } />
+			</StylesFieldLayout>
 		</StylesField>
 	);
 };

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { type MutableRefObject, useRef } from 'react';
+import { type RefObject, useRef } from 'react';
 import { AspectRatioControl, type ExtendedOption, SizeControl } from '@elementor/editor-controls';
 import type { StringPropValue } from '@elementor/editor-props';
 import { isExperimentActive } from '@elementor/editor-v1-adapters';
@@ -51,12 +51,14 @@ const CssSizeProps = [
 	],
 ];
 
+const ASPECT_RATIO_LABEL = __( 'Aspect Ratio', 'elementor' );
+
 export const SizeSection = () => {
 	const { value: fitValue } = useStylesField< StringPropValue >( 'object-fit' );
 
 	const isNotFill = fitValue && fitValue?.value !== 'fill';
 
-	const gridRowRefs: MutableRefObject< HTMLElement | undefined >[] = [ useRef(), useRef(), useRef() ];
+	const gridRowRefs: RefObject< HTMLDivElement >[] = [ useRef( null ), useRef( null ), useRef( null ) ];
 	const isVersion330Active = isExperimentActive( EXPERIMENT_ID );
 
 	return (
@@ -76,9 +78,9 @@ export const SizeSection = () => {
 			</Stack>
 			{ isVersion330Active && (
 				<StyleTabCollapsibleContent fields={ [ 'aspect-ratio', 'object-fit' ] }>
-					<Stack gap={ 2 }>
-						<StylesField bind={ 'aspect-ratio' }>
-							<AspectRatioControl label={ __( 'Aspect Ratio', 'elementor' ) } />
+					<Stack gap={ 2 } pt={ 2 }>
+						<StylesField bind="aspect-ratio" propDisplayName={ ASPECT_RATIO_LABEL }>
+							<AspectRatioControl label={ ASPECT_RATIO_LABEL } />
 						</StylesField>
 						<PanelDivider />
 						<ObjectFitField />
@@ -97,13 +99,13 @@ export const SizeSection = () => {
 type ControlProps = {
 	bind: StylesFieldProps[ 'bind' ];
 	label: string;
-	rowRef: MutableRefObject< HTMLElement | undefined >;
+	rowRef: React.RefObject< HTMLDivElement >;
 	extendedOptions?: ExtendedOption[];
 };
 
 const SizeField = ( { label, bind, rowRef, extendedOptions }: ControlProps ) => {
 	return (
-		<StylesField bind={ bind }>
+		<StylesField bind={ bind } propDisplayName={ label }>
 			<Grid container gap={ 0.75 } alignItems="center">
 				<Grid item xs={ 12 }>
 					<ControlLabel>{ label }</ControlLabel>

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

@@ -7,21 +7,24 @@ import { useDirection } from '../../../hooks/use-direction';
 import { PanelDivider } from '../../panel-divider';
 import { SectionContent } from '../../section-content';
 
+const MARGIN_LABEL = __( 'Margin', 'elementor' );
+const PADDING_LABEL = __( 'Padding', 'elementor' );
+
 export const SpacingSection = () => {
 	const { isSiteRtl } = useDirection();
 
 	return (
 		<SectionContent>
-			<StylesField bind={ 'margin' }>
+			<StylesField bind={ 'margin' } propDisplayName={ MARGIN_LABEL }>
 				<LinkedDimensionsControl
-					label={ __( 'Margin', 'elementor' ) }
+					label={ MARGIN_LABEL }
 					isSiteRtl={ isSiteRtl }
 					extendedOptions={ [ 'auto' ] }
 				/>
 			</StylesField>
 			<PanelDivider />
-			<StylesField bind={ 'padding' }>
-				<LinkedDimensionsControl label={ __( 'Padding', 'elementor' ) } isSiteRtl={ isSiteRtl } />
+			<StylesField bind={ 'padding' } propDisplayName={ PADDING_LABEL }>
+				<LinkedDimensionsControl label={ PADDING_LABEL } isSiteRtl={ isSiteRtl } />
 			</StylesField>
 		</SectionContent>
 	);

package/src/components/style-sections/typography-section/column-count-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 COLUMN_COUNT_LABEL = __( 'Columns', 'elementor' );
 
 export const ColumnCountField = () => {
 	return (
-		<StylesField bind="column-count">
-			<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap">
-				<Grid item xs={ 6 }>
-					<ControlLabel>{ __( 'Columns', 'elementor' ) }</ControlLabel>
-				</Grid>
-				<Grid item xs={ 6 }>
-					<NumberControl shouldForceInt min={ 0 } step={ 1 } />
-				</Grid>
-			</Grid>
+		<StylesField bind="column-count" propDisplayName={ COLUMN_COUNT_LABEL }>
+			<StylesFieldLayout label={ COLUMN_COUNT_LABEL }>
+				<NumberControl shouldForceInt min={ 0 } step={ 1 } />
+			</StylesFieldLayout>
 		</StylesField>
 	);
 };

package/src/components/style-sections/typography-section/column-gap-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 COLUMN_GAP_LABEL = __( 'Column gap', 'elementor' );
 
 export const ColumnGapField = () => {
-	const rowRef: MutableRefObject< HTMLElement | undefined > = useRef();
+	const rowRef = useRef< HTMLDivElement >( null );
 
 	return (
-		<StylesField bind="column-gap">
-			<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap" ref={ rowRef }>
-				<Grid item xs={ 6 }>
-					<ControlLabel>{ __( 'Column gap', 'elementor' ) }</ControlLabel>
-				</Grid>
-				<Grid item xs={ 6 }>
-					<SizeControl anchorRef={ rowRef } />
-				</Grid>
-			</Grid>
+		<StylesField bind="column-gap" propDisplayName={ COLUMN_GAP_LABEL }>
+			<StylesFieldLayout label={ COLUMN_GAP_LABEL } ref={ rowRef }>
+				<SizeControl anchorRef={ rowRef } />
+			</StylesFieldLayout>
 		</StylesField>
 	);
 };