@elementor/editor-editing-panel 1.45.0 → 1.47.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elementor/editor-editing-panel",
-  "version": "1.45.0",
+  "version": "1.47.0",
   "private": false,
   "author": "Elementor Team",
   "homepage": "https://elementor.com/",
@@ -39,31 +39,32 @@
     "dev": "tsup --config=../../tsup.dev.ts"
   },
   "dependencies": {
-    "@elementor/editor": "0.19.4",
-    "@elementor/editor-canvas": "0.23.0",
-    "@elementor/editor-controls": "1.0.0",
+    "@elementor/editor": "0.20.1",
+    "@elementor/editor-canvas": "0.25.0",
+    "@elementor/editor-controls": "1.2.0",
     "@elementor/editor-current-user": "0.5.0",
-    "@elementor/editor-documents": "0.13.6",
-    "@elementor/editor-elements": "0.8.5",
-    "@elementor/editor-panels": "0.15.4",
-    "@elementor/editor-props": "0.13.0",
-    "@elementor/editor-responsive": "0.13.5",
-    "@elementor/editor-styles": "0.6.9",
-    "@elementor/editor-styles-repository": "0.10.2",
-    "@elementor/editor-ui": "0.11.0",
-    "@elementor/editor-v1-adapters": "0.12.0",
+    "@elementor/editor-documents": "0.13.8",
+    "@elementor/editor-elements": "0.8.7",
+    "@elementor/editor-panels": "0.16.1",
+    "@elementor/editor-props": "0.15.0",
+    "@elementor/editor-responsive": "0.13.6",
+    "@elementor/editor-styles": "0.6.11",
+    "@elementor/editor-styles-repository": "0.10.4",
+    "@elementor/editor-ui": "0.13.0",
+    "@elementor/editor-v1-adapters": "0.12.1",
     "@elementor/icons": "1.44.0",
     "@elementor/locations": "0.8.0",
     "@elementor/menus": "0.1.5",
     "@elementor/schema": "0.1.2",
     "@elementor/session": "0.1.0",
-    "@elementor/ui": "1.34.5",
-    "@elementor/utils": "0.4.0",
-    "@elementor/wp-media": "0.6.0",
+    "@elementor/ui": "1.35.5",
+    "@elementor/utils": "0.5.0",
+    "@elementor/wp-media": "0.6.1",
     "@wordpress/i18n": "^5.13.0"
   },
   "peerDependencies": {
-    "react": "^18.3.1"
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "devDependencies": {
     "tsup": "^8.3.5"

package/src/components/css-classes/css-class-menu.tsx

@@ -1,16 +1,13 @@
 import * as React from 'react';
 import { type StyleDefinitionState } from '@elementor/editor-styles';
-import {
-	isElementsStylesProvider,
-	stylesRepository,
-	useUserStylesCapability,
-} from '@elementor/editor-styles-repository';
+import { stylesRepository, useUserStylesCapability } from '@elementor/editor-styles-repository';
 import { MenuItemInfotip, MenuListItem } from '@elementor/editor-ui';
 import { bindMenu, Divider, Menu, MenuSubheader, type PopupState, Stack } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
 import { useStyle } from '../../contexts/style-context';
 import { type StyleDefinitionStateWithNormal } from '../../styles-inheritance/types';
+import { getStylesProviderThemeColor } from '../../utils/get-styles-provider-color';
 import { StyleIndicator } from '../style-indicator';
 import { useCssClass } from './css-class-context';
 import { useUnapplyClass } from './use-apply-and-unapply-class';
@@ -135,8 +132,6 @@ function StateMenuItem( { state, closeMenu, ...props }: StateMenuItemProps ) {
 
 	const isUpdateAllowed = ! state || userCan( provider ?? '' ).updateProps;
 
-	const indicatorVariant = ! provider || isElementsStylesProvider( provider ) ? 'local' : 'global';
-
 	const isStyled = modifiedStates[ state ?? 'normal' ] ?? false;
 	const disabled = ! isUpdateAllowed && ! isStyled;
 	const isActive = styleId === activeId;
@@ -164,7 +159,10 @@ function StateMenuItem( { state, closeMenu, ...props }: StateMenuItemProps ) {
 			>
 				<Stack gap={ 0.75 } direction="row" alignItems="center">
 					{ isStyled && (
-						<StyleIndicator aria-label={ __( 'Has style', 'elementor' ) } variant={ indicatorVariant } />
+						<StyleIndicator
+							aria-label={ __( 'Has style', 'elementor' ) }
+							getColor={ getStylesProviderThemeColor( provider ?? '' ) }
+						/>
 					) }
 					{ state ?? 'normal' }
 				</Stack>

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

@@ -14,12 +14,22 @@ import {
 import { InfoAlert, WarningInfotip } from '@elementor/editor-ui';
 import { ColorSwatchIcon, MapPinIcon } from '@elementor/icons';
 import { createLocation } from '@elementor/locations';
-import { type AutocompleteChangeReason, Box, Chip, FormLabel, Link, Stack, Typography } from '@elementor/ui';
+import {
+	type AutocompleteChangeReason,
+	Box,
+	Chip,
+	type ChipOwnProps,
+	FormLabel,
+	Link,
+	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 { getStylesProviderColorName } from '../../utils/get-styles-provider-color';
 import {
 	CreatableAutocomplete,
 	type CreatableAutocompleteProps,
@@ -34,7 +44,7 @@ const ID = 'elementor-css-class-selector';
 const TAGS_LIMIT = 50;
 
 type StyleDefOption = Option & {
-	color: 'accent' | 'global';
+	color: ChipOwnProps[ 'color' ];
 	icon: ReactElement | null;
 	provider: string | null;
 };
@@ -141,13 +151,9 @@ export function CssClassSelector() {
 				/>
 			</WarningInfotip>
 			{ ! canEdit && (
-				<InfoAlert
-					content={ __(
-						'With your current role, you can use existing classes but can’t modify them.',
-						'elementor'
-					) }
-					sx={ { mt: 1 } }
-				/>
+				<InfoAlert sx={ { mt: 1 } }>
+					{ __( 'With your current role, you can use existing classes but can’t modify them.', 'elementor' ) }
+				</InfoAlert>
 			) }
 		</Stack>
 	);
@@ -205,7 +211,7 @@ function useOptions() {
 			const isElements = isElementsStylesProvider( provider.getKey() );
 			const styleDefs = provider.actions.all( { elementId: element.id } );
 
-			// Add empty local option for elements, as fallback.
+			// Add an empty local option for elements, as fallback.
 			if ( isElements && styleDefs.length === 0 ) {
 				return [ EMPTY_OPTION ];
 			}
@@ -215,7 +221,7 @@ function useOptions() {
 					label: styleDef.label,
 					value: styleDef.id,
 					fixed: isElements,
-					color: isElements ? 'accent' : 'global',
+					color: getStylesProviderColorName( provider.getKey() ),
 					icon: isElements ? <MapPinIcon /> : null,
 					provider: provider.getKey(),
 				};

package/src/components/popover-scrollable-content.tsx

@@ -0,0 +1,12 @@
+import * as React from 'react';
+import { PopoverScrollableContent as BasePopoverScrollableContent } from '@elementor/editor-ui';
+
+import { useSectionWidth } from '../contexts/section-context';
+
+type Props = React.ComponentProps< typeof BasePopoverScrollableContent >;
+
+export const PopoverScrollableContent = ( props: Props ) => {
+	const sectionWidth = useSectionWidth();
+
+	return <BasePopoverScrollableContent { ...props } width={ sectionWidth } />;
+};

package/src/components/section-content.tsx

@@ -1,11 +1,7 @@
-import { createContext, type FC, type PropsWithChildren, useContext, useRef } from 'react';
+import { type FC, type PropsWithChildren } from 'react';
 import * as React from 'react';
 import { Stack } from '@elementor/ui';
 
-const SectionContentRefContext = createContext< React.RefObject< HTMLElement > | null >( null );
-
-export const useSectionContentRef = () => useContext( SectionContentRefContext );
-
 type SectionContentProps = PropsWithChildren< {
 	gap?: number;
 	sx?: {
@@ -13,14 +9,8 @@ type SectionContentProps = PropsWithChildren< {
 	};
 } >;
 
-export const SectionContent: FC< SectionContentProps > = ( { gap = 2, sx, children } ) => {
-	const ref = useRef< HTMLElement >( null );
-
-	return (
-		<SectionContentRefContext.Provider value={ ref }>
-			<Stack gap={ gap } sx={ { ...sx } } ref={ ref }>
-				{ children }
-			</Stack>
-		</SectionContentRefContext.Provider>
-	);
-};
+export const SectionContent: FC< SectionContentProps > = ( { gap = 2, sx, children } ) => (
+	<Stack gap={ gap } sx={ { ...sx } }>
+		{ children }
+	</Stack>
+);

package/src/components/section.tsx

@@ -1,8 +1,9 @@
 import * as React from 'react';
-import { type PropsWithChildren, type ReactNode, useId } from 'react';
+import { type PropsWithChildren, type ReactNode, useId, useRef } from 'react';
 import { isExperimentActive } from '@elementor/editor-v1-adapters';
 import { Collapse, Divider, ListItemButton, ListItemText, Stack } from '@elementor/ui';
 
+import { SectionRefContext } from '../contexts/section-context';
 import { useStateByElement } from '../hooks/use-state-by-element';
 import { EXPERIMENTAL_FEATURES } from '../sync/experiments-flags';
 import { CollapseIcon } from './collapse-icon';
@@ -16,6 +17,7 @@ type Props = PropsWithChildren< {
 
 export function Section( { title, children, defaultExpanded = false, titleEnd }: Props ) {
 	const [ isOpen, setIsOpen ] = useStateByElement( title, !! defaultExpanded );
+	const ref = useRef< HTMLElement >( null );
 
 	const handleClick = () => {
 		setIsOpen( ! isOpen );
@@ -46,9 +48,11 @@ export function Section( { title, children, defaultExpanded = false, titleEnd }:
 				<CollapseIcon open={ isOpen } color="secondary" fontSize="tiny" />
 			</ListItemButton>
 			<Collapse id={ contentId } aria-labelledby={ labelId } in={ isOpen } timeout="auto" unmountOnExit>
-				<Stack gap={ 2.5 } p={ 2 }>
-					{ children }
-				</Stack>
+				<SectionRefContext.Provider value={ ref }>
+					<Stack ref={ ref } gap={ 2.5 } p={ 2 }>
+						{ children }
+					</Stack>
+				</SectionRefContext.Provider>
 			</Collapse>
 			<Divider />
 		</>

package/src/components/settings-tab.tsx

@@ -8,7 +8,12 @@ import { Divider } from '@elementor/ui';
 import { useElement } from '../contexts/element-context';
 import { Control as BaseControl } from '../controls-registry/control';
 import { ControlTypeContainer } from '../controls-registry/control-type-container';
-import { type ControlType, getControl, getDefaultLayout } from '../controls-registry/controls-registry';
+import {
+	type ControlType,
+	getControl,
+	getDefaultLayout,
+	getPropTypeUtil,
+} from '../controls-registry/controls-registry';
 import { SettingsField } from '../controls-registry/settings-field';
 import { useDefaultPanelSettings } from '../hooks/use-default-panel-settings';
 import { EXPERIMENTAL_FEATURES } from '../sync/experiments-flags';
@@ -64,14 +69,35 @@ const Control = ( { control }: { control: Control[ 'value' ] } ) => {
 	}
 
 	const layout = control.meta?.layout || getDefaultLayout( control.type as ControlType );
+	const controlProps = populateChildControlProps( control.props );
+	if ( layout === 'custom' ) {
+		controlProps.label = control.label;
+	}
 
 	return (
-		<SettingsField bind={ control.bind }>
+		<SettingsField bind={ control.bind } propDisplayName={ control.label || control.bind }>
 			{ control.meta?.topDivider && <Divider /> }
 			<ControlTypeContainer layout={ layout }>
-				{ control.label ? <ControlFormLabel>{ control.label }</ControlFormLabel> : null }
-				<BaseControl type={ control.type as ControlType } props={ control.props } />
+				{ control.label && layout !== 'custom' ? <ControlFormLabel>{ control.label }</ControlFormLabel> : null }
+				<BaseControl type={ control.type as ControlType } props={ controlProps } />
 			</ControlTypeContainer>
 		</SettingsField>
 	);
 };
+
+function populateChildControlProps( props: Record< string, unknown > ) {
+	if ( props.childControlType ) {
+		const childComponent = getControl( props.childControlType as ControlType );
+		const childPropType = getPropTypeUtil( props.childControlType as ControlType );
+		props = {
+			...props,
+			childControlConfig: {
+				component: childComponent,
+				props: props.childControlProps || {},
+				propTypeUtil: childPropType,
+			},
+		};
+	}
+
+	return props;
+}

package/src/components/style-indicator.tsx

@@ -1,23 +1,27 @@
-import { styled } from '@elementor/ui';
-
-type StyleIndicatorVariant = 'overridden' | 'local' | 'global';
+import { styled, type Theme } from '@elementor/ui';
 
 export const StyleIndicator = styled( 'div', {
-	shouldForwardProp: ( prop ) => prop !== 'variant',
-} )< { variant?: StyleIndicatorVariant } >`
+	shouldForwardProp: ( prop: string ) => ! [ 'isOverridden', 'getColor' ].includes( prop ),
+} )<
+	| {
+			isOverridden?: boolean;
+			getColor?: never;
+	  }
+	| {
+			isOverridden?: boolean;
+			getColor?: ( ( theme: Theme ) => string ) | null;
+	  }
+>`
 	width: 5px;
 	height: 5px;
 	border-radius: 50%;
-	background-color: ${ ( { theme, variant } ) => {
-		switch ( variant ) {
-			case 'overridden':
-				return theme.palette.warning.light;
-			case 'global':
-				return theme.palette.global.dark;
-			case 'local':
-				return theme.palette.accent.main;
-			default:
-				return theme.palette.text.disabled;
+	background-color: ${ ( { theme, isOverridden, getColor } ) => {
+		if ( isOverridden ) {
+			return theme.palette.warning.light;
 		}
+
+		const providerColor = getColor?.( theme );
+
+		return providerColor ?? theme.palette.text.disabled;
 	} };
 `;

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

@@ -1,13 +1,16 @@
 import * as React from 'react';
 import { BackgroundControl } from '@elementor/editor-controls';
+import { __ } from '@wordpress/i18n';
 
 import { StylesField } from '../../../controls-registry/styles-field';
 import { SectionContent } from '../../section-content';
 
+const BACKGROUND_LABEL = __( 'Background', 'elementor' );
+
 export const BackgroundSection = () => {
 	return (
 		<SectionContent>
-			<StylesField bind="background">
+			<StylesField bind="background" propDisplayName={ BACKGROUND_LABEL }>
 				<BackgroundControl />
 			</StylesField>
 		</SectionContent>

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

@@ -1,22 +1,16 @@
 import * as React from 'react';
 import { ColorControl } 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';
 
-export const BorderColorField = () => {
-	return (
-		<StylesField bind={ 'border-color' }>
-			<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap">
-				<Grid item xs={ 6 }>
-					<ControlLabel>{ __( 'Border color', 'elementor' ) }</ControlLabel>
-				</Grid>
-				<Grid item xs={ 6 }>
-					<ColorControl />
-				</Grid>
-			</Grid>
-		</StylesField>
-	);
-};
+const BORDER_COLOR_LABEL = __( 'Border color', 'elementor' );
+
+export const BorderColorField = () => (
+	<StylesField bind="border-color" propDisplayName={ BORDER_COLOR_LABEL }>
+		<StylesFieldLayout label={ BORDER_COLOR_LABEL }>
+			<ColorControl />
+		</StylesFieldLayout>
+	</StylesField>
+);

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

@@ -2,7 +2,6 @@ import * as React from 'react';
 import { ControlFormLabel } from '@elementor/editor-controls';
 import { __ } from '@wordpress/i18n';
 
-import { useStyle } from '../../../contexts/style-context';
 import { useStylesFields } from '../../../hooks/use-styles-fields';
 import { AddOrRemoveContent } from '../../add-or-remove-content';
 import { BorderColorField } from './border-color-field';
@@ -16,22 +15,21 @@ const initialBorder = {
 };
 
 export const BorderField = () => {
-	const { canEdit } = useStyle();
-	const [ border, setBorder ] = useStylesFields( Object.keys( initialBorder ) );
+	const { values, setValues, canEdit } = useStylesFields( Object.keys( initialBorder ) );
 
 	const addBorder = () => {
-		setBorder( initialBorder );
+		setValues( initialBorder );
 	};
 
 	const removeBorder = () => {
-		setBorder( {
+		setValues( {
 			'border-width': null,
 			'border-color': null,
 			'border-style': null,
 		} );
 	};
 
-	const hasBorder = Object.values( border ?? {} ).some( Boolean );
+	const hasBorder = Object.values( values ?? {} ).some( Boolean );
 
 	return (
 		<AddOrRemoveContent

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

@@ -15,6 +15,8 @@ import { StylesField } from '../../../controls-registry/styles-field';
 import { useDirection } from '../../../hooks/use-direction';
 import { UiProviders } from '../../../styles-inheritance/components/ui-providers';
 
+const BORDER_RADIUS_LABEL = __( 'Border radius', 'elementor' );
+
 const StartStartIcon = withDirection( RadiusTopLeftIcon );
 const StartEndIcon = withDirection( RadiusTopRightIcon );
 const EndStartIcon = withDirection( RadiusBottomLeftIcon );
@@ -57,10 +59,10 @@ export const BorderRadiusField = () => {
 
 	return (
 		<UiProviders>
-			<StylesField bind={ 'border-radius' }>
+			<StylesField bind={ 'border-radius' } propDisplayName={ BORDER_RADIUS_LABEL }>
 				<EqualUnequalSizesControl
 					items={ getCorners( isSiteRtl ) }
-					label={ __( 'Border radius', 'elementor' ) }
+					label={ BORDER_RADIUS_LABEL }
 					icon={ <BorderCornersIcon fontSize={ 'tiny' } /> }
 					tooltipLabel={ __( 'Adjust corners', 'elementor' ) }
 					multiSizePropTypeUtil={ borderRadiusPropTypeUtil }

package/src/components/style-sections/border-section/border-style-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 BORDER_TYPE_LABEL = __( 'Border type', 'elementor' );
 
 const borderStyles = [
 	{ value: 'none', label: __( 'None', 'elementor' ) },
@@ -17,17 +18,11 @@ const borderStyles = [
 	{ value: 'inset', label: __( 'Inset', 'elementor' ) },
 	{ value: 'outset', label: __( 'Outset', 'elementor' ) },
 ];
-export const BorderStyleField = () => {
-	return (
-		<StylesField bind={ 'border-style' }>
-			<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap">
-				<Grid item xs={ 6 }>
-					<ControlLabel>{ __( 'Border type', 'elementor' ) }</ControlLabel>
-				</Grid>
-				<Grid item xs={ 6 } sx={ { overflow: 'hidden' } }>
-					<SelectControl options={ borderStyles } />
-				</Grid>
-			</Grid>
-		</StylesField>
-	);
-};
+
+export const BorderStyleField = () => (
+	<StylesField bind="border-style" propDisplayName={ BORDER_TYPE_LABEL }>
+		<StylesFieldLayout label={ BORDER_TYPE_LABEL }>
+			<SelectControl options={ borderStyles } />
+		</StylesFieldLayout>
+	</StylesField>
+);

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

@@ -8,6 +8,8 @@ import { __ } from '@wordpress/i18n';
 import { StylesField } from '../../../controls-registry/styles-field';
 import { useDirection } from '../../../hooks/use-direction';
 
+const BORDER_WIDTH_LABEL = __( 'Border width', 'elementor' );
+
 const InlineStartIcon = withDirection( SideRightIcon );
 const InlineEndIcon = withDirection( SideLeftIcon );
 
@@ -38,10 +40,10 @@ export const BorderWidthField = () => {
 	const { isSiteRtl } = useDirection();
 
 	return (
-		<StylesField bind={ 'border-width' }>
+		<StylesField bind={ 'border-width' } propDisplayName={ BORDER_WIDTH_LABEL }>
 			<EqualUnequalSizesControl
 				items={ getEdges( isSiteRtl ) }
-				label={ __( 'Border width', 'elementor' ) }
+				label={ BORDER_WIDTH_LABEL }
 				icon={ <SideAllIcon fontSize={ 'tiny' } /> }
 				tooltipLabel={ __( 'Adjust borders', 'elementor' ) }
 				multiSizePropTypeUtil={ borderWidthPropTypeUtil }

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

@@ -1,15 +1,35 @@
 import * as React from 'react';
-import { BoxShadowRepeaterControl } from '@elementor/editor-controls';
+import { BoxShadowRepeaterControl, FilterRepeaterControl } from '@elementor/editor-controls';
+import { isExperimentActive } from '@elementor/editor-v1-adapters';
+import { __ } from '@wordpress/i18n';
 
 import { StylesField } from '../../../controls-registry/styles-field';
+import { EXPERIMENTAL_FEATURES } from '../../../sync/experiments-flags';
+import { PanelDivider } from '../../panel-divider';
 import { SectionContent } from '../../section-content';
+import { OpacityControlField } from '../layout-section/opacity-control-field';
+
+const BOX_SHADOW_LABEL = __( 'Box shadow', 'elementor' );
+const FILTER_LABEL = __( 'Filter', 'elementor' );
 
 export const EffectsSection = () => {
+	const isVersion331Active = isExperimentActive( EXPERIMENTAL_FEATURES.V_3_31 );
+
 	return (
 		<SectionContent>
-			<StylesField bind="box-shadow">
+			<OpacityControlField />
+			<PanelDivider />
+			<StylesField bind="box-shadow" propDisplayName={ BOX_SHADOW_LABEL }>
 				<BoxShadowRepeaterControl />
 			</StylesField>
+			{ isVersion331Active && (
+				<>
+					<PanelDivider />
+					<StylesField bind="filter" propDisplayName={ FILTER_LABEL }>
+						<FilterRepeaterControl />
+					</StylesField>
+				</>
+			) }
 		</SectionContent>
 	);
 };

package/src/components/style-sections/layout-section/align-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 AlignContent = 'start' | 'center' | 'end' | 'space-between' | 'space-around' | 'space-evenly';
 
+const ALIGN_CONTENT_LABEL = __( 'Align content', 'elementor' );
+
 const StartIcon = withDirection( JustifyTopIcon );
 const EndIcon = withDirection( JustifyBottomIcon );
 
@@ -66,15 +68,12 @@ const options: ToggleButtonGroupItem< AlignContent >[] = [
 	},
 ];
 
-export const AlignContentField = () => {
-	return (
+export const AlignContentField = () => (
+	<StylesField bind="align-content" propDisplayName={ ALIGN_CONTENT_LABEL }>
 		<UiProviders>
-			<StylesField bind="align-content">
-				<Stack gap={ 1 }>
-					<ControlLabel>{ __( 'Align content', 'elementor' ) }</ControlLabel>
-					<ToggleControl options={ options } fullWidth={ true } />
-				</Stack>
-			</StylesField>
+			<StylesFieldLayout label={ ALIGN_CONTENT_LABEL } direction="column">
+				<ToggleControl options={ options } fullWidth={ true } />
+			</StylesFieldLayout>
 		</UiProviders>
-	);
-};
+	</StylesField>
+);

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

@@ -6,16 +6,18 @@ import {
 	LayoutAlignRightIcon,
 	LayoutDistributeVerticalIcon as JustifyIcon,
 } from '@elementor/icons';
-import { Grid, 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 AlignItems = 'start' | 'center' | 'end' | 'stretch';
 
+const ALIGN_ITEMS_LABEL = __( 'Align items', 'elementor' );
+
 const StartIcon = withDirection( LayoutAlignLeftIcon );
 const EndIcon = withDirection( LayoutAlignRightIcon );
 
@@ -54,15 +56,10 @@ const options: ToggleButtonGroupItem< AlignItems >[] = [
 export const AlignItemsField = () => {
 	return (
 		<UiProviders>
-			<StylesField bind="align-items">
-				<Grid container gap={ 2 } alignItems="center" flexWrap="nowrap">
-					<Grid item xs={ 6 }>
-						<ControlLabel>{ __( 'Align items', 'elementor' ) }</ControlLabel>
-					</Grid>
-					<Grid item xs={ 6 } sx={ { display: 'flex', justifyContent: 'end' } }>
-						<ToggleControl options={ options } />
-					</Grid>
-				</Grid>
+			<StylesField bind="align-items" propDisplayName={ ALIGN_ITEMS_LABEL }>
+				<StylesFieldLayout label={ ALIGN_ITEMS_LABEL }>
+					<ToggleControl options={ options } />
+				</StylesFieldLayout>
 			</StylesField>
 		</UiProviders>
 	);