From df716e0faa2f215146c1f558f241b93898a8cbf6 Mon Sep 17 00:00:00 2001 From: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com> Date: Thu, 12 Jan 2023 15:20:46 +1000 Subject: [PATCH 01/11] Stabilize inspector controls SlotFill groups --- packages/block-editor/src/components/inspector-controls/fill.js | 2 +- .../src/components/inspector-controls/fill.native.js | 2 +- packages/block-editor/src/components/inspector-controls/slot.js | 2 +- .../src/components/inspector-controls/slot.native.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/block-editor/src/components/inspector-controls/fill.js b/packages/block-editor/src/components/inspector-controls/fill.js index af3478252de6d2..62a9df196b74cd 100644 --- a/packages/block-editor/src/components/inspector-controls/fill.js +++ b/packages/block-editor/src/components/inspector-controls/fill.js @@ -19,8 +19,8 @@ import useDisplayBlockControls from '../use-display-block-controls'; import groups from './groups'; export default function InspectorControlsFill( { - __experimentalGroup: group = 'default', children, + group = 'default', } ) { const isDisplayed = useDisplayBlockControls(); const Fill = groups[ group ]?.Fill; diff --git a/packages/block-editor/src/components/inspector-controls/fill.native.js b/packages/block-editor/src/components/inspector-controls/fill.native.js index 01d3fc9c104727..3ebdb628c7e91a 100644 --- a/packages/block-editor/src/components/inspector-controls/fill.native.js +++ b/packages/block-editor/src/components/inspector-controls/fill.native.js @@ -19,7 +19,7 @@ import { BlockSettingsButton } from '../block-settings'; export default function InspectorControlsFill( { children, - __experimentalGroup: group = 'default', + group = 'default', ...props } ) { const isDisplayed = useDisplayBlockControls(); diff --git a/packages/block-editor/src/components/inspector-controls/slot.js b/packages/block-editor/src/components/inspector-controls/slot.js index 010332c0a3112d..a4c0d7ddcde946 100644 --- a/packages/block-editor/src/components/inspector-controls/slot.js +++ b/packages/block-editor/src/components/inspector-controls/slot.js @@ -15,7 +15,7 @@ import BlockSupportSlotContainer from './block-support-slot-container'; import groups from './groups'; export default function InspectorControlsSlot( { - __experimentalGroup: group = 'default', + group = 'default', label, ...props } ) { diff --git a/packages/block-editor/src/components/inspector-controls/slot.native.js b/packages/block-editor/src/components/inspector-controls/slot.native.js index adf4da06965e42..90712932c864dc 100644 --- a/packages/block-editor/src/components/inspector-controls/slot.native.js +++ b/packages/block-editor/src/components/inspector-controls/slot.native.js @@ -9,7 +9,7 @@ import warning from '@wordpress/warning'; import groups from './groups'; export default function InspectorControlsSlot( { - __experimentalGroup: group = 'default', + group = 'default', ...props } ) { const Slot = groups[ group ]?.Slot; From a9e5464d4cc5ea2d7c892d59eaaaac413ee727bd Mon Sep 17 00:00:00 2001 From: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com> Date: Fri, 13 Jan 2023 15:16:55 +1000 Subject: [PATCH 02/11] Add deprecation for __experimentalGroup --- .../src/components/inspector-controls/fill.js | 13 +++++++++++++ .../components/inspector-controls/fill.native.js | 12 ++++++++++++ .../src/components/inspector-controls/slot.js | 12 ++++++++++++ .../components/inspector-controls/slot.native.js | 12 ++++++++++++ 4 files changed, 49 insertions(+) diff --git a/packages/block-editor/src/components/inspector-controls/fill.js b/packages/block-editor/src/components/inspector-controls/fill.js index 62a9df196b74cd..e710a24597ee9a 100644 --- a/packages/block-editor/src/components/inspector-controls/fill.js +++ b/packages/block-editor/src/components/inspector-controls/fill.js @@ -11,6 +11,7 @@ import { __experimentalToolsPanelContext as ToolsPanelContext, } from '@wordpress/components'; import warning from '@wordpress/warning'; +import deprecated from '@wordpress/deprecated'; /** * Internal dependencies @@ -21,7 +22,19 @@ import groups from './groups'; export default function InspectorControlsFill( { children, group = 'default', + __experimentalGroup, } ) { + if ( __experimentalGroup ) { + deprecated( + '`__experimentalGroup` property in `InspectorControlsFill`', + { + since: '6.2', + alternative: '`group`', + } + ); + group = __experimentalGroup; + } + const isDisplayed = useDisplayBlockControls(); const Fill = groups[ group ]?.Fill; if ( ! Fill ) { diff --git a/packages/block-editor/src/components/inspector-controls/fill.native.js b/packages/block-editor/src/components/inspector-controls/fill.native.js index 3ebdb628c7e91a..418a9229e81841 100644 --- a/packages/block-editor/src/components/inspector-controls/fill.native.js +++ b/packages/block-editor/src/components/inspector-controls/fill.native.js @@ -9,6 +9,7 @@ import { View } from 'react-native'; import { Children } from '@wordpress/element'; import { BottomSheetConsumer } from '@wordpress/components'; import warning from '@wordpress/warning'; +import deprecated from '@wordpress/deprecated'; /** * Internal dependencies @@ -20,8 +21,19 @@ import { BlockSettingsButton } from '../block-settings'; export default function InspectorControlsFill( { children, group = 'default', + __experimentalGroup, ...props } ) { + if ( __experimentalGroup ) { + deprecated( + '`__experimentalGroup` property in `InspectorControlsFill`', + { + since: '6.2', + alternative: '`group`', + } + ); + group = __experimentalGroup; + } const isDisplayed = useDisplayBlockControls(); const Fill = groups[ group ]?.Fill; diff --git a/packages/block-editor/src/components/inspector-controls/slot.js b/packages/block-editor/src/components/inspector-controls/slot.js index a4c0d7ddcde946..949742e735d0fb 100644 --- a/packages/block-editor/src/components/inspector-controls/slot.js +++ b/packages/block-editor/src/components/inspector-controls/slot.js @@ -6,6 +6,7 @@ import { __experimentalUseSlotFills as useSlotFills, } from '@wordpress/components'; import warning from '@wordpress/warning'; +import deprecated from '@wordpress/deprecated'; /** * Internal dependencies @@ -15,10 +16,21 @@ import BlockSupportSlotContainer from './block-support-slot-container'; import groups from './groups'; export default function InspectorControlsSlot( { + __experimentalGroup, group = 'default', label, ...props } ) { + if ( __experimentalGroup ) { + deprecated( + '`__experimentalGroup` property in `InspectorControlsSlot`', + { + since: '6.2', + alternative: '`group`', + } + ); + group = __experimentalGroup; + } const Slot = groups[ group ]?.Slot; const slot = useSlot( Slot?.__unstableName ); const fills = useSlotFills( Slot?.__unstableName ); diff --git a/packages/block-editor/src/components/inspector-controls/slot.native.js b/packages/block-editor/src/components/inspector-controls/slot.native.js index 90712932c864dc..ed3913563624d4 100644 --- a/packages/block-editor/src/components/inspector-controls/slot.native.js +++ b/packages/block-editor/src/components/inspector-controls/slot.native.js @@ -2,6 +2,7 @@ * WordPress dependencies */ import warning from '@wordpress/warning'; +import deprecated from '@wordpress/deprecated'; /** * Internal dependencies @@ -9,9 +10,20 @@ import warning from '@wordpress/warning'; import groups from './groups'; export default function InspectorControlsSlot( { + __experimentalGroup, group = 'default', ...props } ) { + if ( __experimentalGroup ) { + deprecated( + '`__experimentalGroup` property in `InspectorControlsSlot`', + { + since: '6.2', + alternative: '`group`', + } + ); + group = __experimentalGroup; + } const Slot = groups[ group ]?.Slot; if ( ! Slot ) { warning( `Unknown InspectorControl group "${ group }" provided.` ); From ae013cdba4a2f84889cc3d3a823e690803870016 Mon Sep 17 00:00:00 2001 From: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com> Date: Thu, 12 Jan 2023 15:21:17 +1000 Subject: [PATCH 03/11] Update AdvancedControls SlotFill --- .../src/components/inspector-controls/index.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/block-editor/src/components/inspector-controls/index.js b/packages/block-editor/src/components/inspector-controls/index.js index 4cb36cdc843994..f066f059235064 100644 --- a/packages/block-editor/src/components/inspector-controls/index.js +++ b/packages/block-editor/src/components/inspector-controls/index.js @@ -10,14 +10,10 @@ InspectorControls.Slot = InspectorControlsSlot; // This is just here for backward compatibility. export const InspectorAdvancedControls = ( props ) => { - return ( - - ); + return ; }; InspectorAdvancedControls.Slot = ( props ) => { - return ( - - ); + return ; }; InspectorAdvancedControls.slotName = 'InspectorAdvancedControls'; From 1721c3eb22a20ced58719577db05093eff7e239d Mon Sep 17 00:00:00 2001 From: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com> Date: Thu, 12 Jan 2023 15:21:38 +1000 Subject: [PATCH 04/11] Update non-tabs inspector controls use of slots --- .../src/components/block-inspector/index.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/block-editor/src/components/block-inspector/index.js b/packages/block-editor/src/components/block-inspector/index.js index e37f6fb09efff4..50c00416bab436 100644 --- a/packages/block-editor/src/components/block-inspector/index.js +++ b/packages/block-editor/src/components/block-inspector/index.js @@ -198,20 +198,20 @@ const BlockInspector = ( { showNoBlockSelectedMessage = true } ) => { <> @@ -356,20 +356,20 @@ const BlockInspectorSingleBlock = ( { clientId, blockName } ) => { ) } From 8867545ee893a5261b97d223e57c4595a993208e Mon Sep 17 00:00:00 2001 From: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com> Date: Thu, 12 Jan 2023 15:24:42 +1000 Subject: [PATCH 05/11] Stabilize groups use in Inspector Control tabs --- .../advanced-controls-panel.js | 2 +- .../src/components/inspector-controls-tabs/index.js | 4 +--- .../position-controls-panel.js | 2 +- .../components/inspector-controls-tabs/styles-tab.js | 11 ++++------- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/packages/block-editor/src/components/inspector-controls-tabs/advanced-controls-panel.js b/packages/block-editor/src/components/inspector-controls-tabs/advanced-controls-panel.js index 83027861e9d190..6807a776b0ee63 100644 --- a/packages/block-editor/src/components/inspector-controls-tabs/advanced-controls-panel.js +++ b/packages/block-editor/src/components/inspector-controls-tabs/advanced-controls-panel.js @@ -29,7 +29,7 @@ const AdvancedControls = () => { title={ __( 'Advanced' ) } initialOpen={ false } > - + ); }; diff --git a/packages/block-editor/src/components/inspector-controls-tabs/index.js b/packages/block-editor/src/components/inspector-controls-tabs/index.js index efdaed591b4fec..74f89754428cb3 100644 --- a/packages/block-editor/src/components/inspector-controls-tabs/index.js +++ b/packages/block-editor/src/components/inspector-controls-tabs/index.js @@ -52,9 +52,7 @@ export default function InspectorControlsTabs( { } if ( tab.name === TAB_LIST_VIEW.name ) { - return ( - - ); + return ; } } } diff --git a/packages/block-editor/src/components/inspector-controls-tabs/position-controls-panel.js b/packages/block-editor/src/components/inspector-controls-tabs/position-controls-panel.js index 5fc71fab5960f4..f145d961e1f303 100644 --- a/packages/block-editor/src/components/inspector-controls-tabs/position-controls-panel.js +++ b/packages/block-editor/src/components/inspector-controls-tabs/position-controls-panel.js @@ -29,7 +29,7 @@ const PositionControls = () => { title={ __( 'Position' ) } initialOpen={ false } > - + ); }; diff --git a/packages/block-editor/src/components/inspector-controls-tabs/styles-tab.js b/packages/block-editor/src/components/inspector-controls-tabs/styles-tab.js index f2eac99680b9aa..0643d47d26965f 100644 --- a/packages/block-editor/src/components/inspector-controls-tabs/styles-tab.js +++ b/packages/block-editor/src/components/inspector-controls-tabs/styles-tab.js @@ -28,22 +28,19 @@ const StylesTab = ( { blockName, clientId, hasBlockStyles } ) => { ) } - + ); }; From 3d3402507750ac8daae828b783b5ab1cf1f985a1 Mon Sep 17 00:00:00 2001 From: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com> Date: Thu, 12 Jan 2023 15:26:44 +1000 Subject: [PATCH 06/11] Stabilize groups used in block support hooks --- packages/block-editor/src/hooks/anchor.js | 2 +- packages/block-editor/src/hooks/border.js | 2 +- packages/block-editor/src/hooks/color-panel.js | 2 +- packages/block-editor/src/hooks/custom-class-name.js | 2 +- packages/block-editor/src/hooks/dimensions.js | 2 +- packages/block-editor/src/hooks/position.js | 2 +- packages/block-editor/src/hooks/typography.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/block-editor/src/hooks/anchor.js b/packages/block-editor/src/hooks/anchor.js index 027b17d0c243e7..65e227ab107ebf 100644 --- a/packages/block-editor/src/hooks/anchor.js +++ b/packages/block-editor/src/hooks/anchor.js @@ -105,7 +105,7 @@ export const withInspectorControl = createHigherOrderComponent( <> { isWeb && ( - + { textControl } ) } diff --git a/packages/block-editor/src/hooks/border.js b/packages/block-editor/src/hooks/border.js index 74e79ecec80488..d99416e6cd6651 100644 --- a/packages/block-editor/src/hooks/border.js +++ b/packages/block-editor/src/hooks/border.js @@ -255,7 +255,7 @@ export function BorderPanel( props ) { const hydratedBorder = getBorderObject( attributes, colors ); return ( - + { ( isWidthSupported || isColorSupported ) && ( hasBorderValue( props ) } diff --git a/packages/block-editor/src/hooks/color-panel.js b/packages/block-editor/src/hooks/color-panel.js index 6bf9ff036280d2..97113b5a060f0c 100644 --- a/packages/block-editor/src/hooks/color-panel.js +++ b/packages/block-editor/src/hooks/color-panel.js @@ -75,7 +75,7 @@ export default function ColorPanel( { const colorGradientSettings = useMultipleOriginColorsAndGradients(); return ( - + - + - + { ! isPaddingDisabled && ( 1 ? ( - + + { ! isFontFamilyDisabled && ( hasFontFamilyValue( props ) } From 5478054091c4c6bb411edee27e1c7c9a77dfe5e4 Mon Sep 17 00:00:00 2001 From: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com> Date: Thu, 12 Jan 2023 15:29:40 +1000 Subject: [PATCH 07/11] Stabilize block library uses of group --- packages/block-library/src/button/edit.js | 2 +- .../src/comments/edit/comments-inspector-controls.js | 2 +- packages/block-library/src/cover/edit/inspector-controls.js | 4 ++-- packages/block-library/src/group/edit.js | 2 +- packages/block-library/src/image/image.js | 2 +- packages/block-library/src/navigation/edit/index.js | 4 ++-- .../src/navigation/edit/menu-inspector-controls.js | 2 +- packages/block-library/src/paragraph/edit.js | 2 +- .../src/post-featured-image/dimension-controls.js | 2 +- packages/block-library/src/post-featured-image/overlay.js | 2 +- packages/block-library/src/post-terms/edit.js | 2 +- packages/block-library/src/query/edit/query-content.js | 2 +- packages/block-library/src/social-link/edit.js | 2 +- packages/block-library/src/social-links/edit.js | 2 +- .../block-library/src/template-part/edit/advanced-controls.js | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/block-library/src/button/edit.js b/packages/block-library/src/button/edit.js index d204dd921a9725..9eab35ff3c0076 100644 --- a/packages/block-library/src/button/edit.js +++ b/packages/block-library/src/button/edit.js @@ -260,7 +260,7 @@ function ButtonEdit( props ) { setAttributes={ setAttributes } /> - + - + ) } - + - + !! minHeight } label={ __( 'Minimum height' ) } diff --git a/packages/block-library/src/group/edit.js b/packages/block-library/src/group/edit.js index a2cd8bd8cbaf22..1604d429fc6d67 100644 --- a/packages/block-library/src/group/edit.js +++ b/packages/block-library/src/group/edit.js @@ -49,7 +49,7 @@ function GroupEditControls( { tagName, onSelectTagName } ) { ), }; return ( - + - + ) } - + { hasColorSettings && ( <> { stylingInspectorControls } { isEntityAvailable && ( - + { hasResolvedCanUserUpdateNavigationMenu && canUserUpdateNavigationMenu && ( diff --git a/packages/block-library/src/navigation/edit/menu-inspector-controls.js b/packages/block-library/src/navigation/edit/menu-inspector-controls.js index 96f47d19917ba0..16620a4811e80f 100644 --- a/packages/block-library/src/navigation/edit/menu-inspector-controls.js +++ b/packages/block-library/src/navigation/edit/menu-inspector-controls.js @@ -128,7 +128,7 @@ const DefaultControls = ( props ) => { const MenuInspectorControls = ( props ) => { // Show the OffCanvasEditor controls if we're in the Gutenberg plugin. Previously used isOffCanvasNavigationEditorEnabled. return ( - + diff --git a/packages/block-library/src/paragraph/edit.js b/packages/block-library/src/paragraph/edit.js index 5340eb5e4ea543..5cb465dc6da664 100644 --- a/packages/block-library/src/paragraph/edit.js +++ b/packages/block-library/src/paragraph/edit.js @@ -99,7 +99,7 @@ function ParagraphBlock( { /> { isDropCapFeatureEnabled && ( - + !! dropCap } label={ __( 'Drop cap' ) } diff --git a/packages/block-library/src/post-featured-image/dimension-controls.js b/packages/block-library/src/post-featured-image/dimension-controls.js index 76bc9787bd5874..171924ec5fb3df 100644 --- a/packages/block-library/src/post-featured-image/dimension-controls.js +++ b/packages/block-library/src/post-featured-image/dimension-controls.js @@ -71,7 +71,7 @@ const DimensionControls = ( { }; const scaleLabel = _x( 'Scale', 'Image scaling options' ); return ( - + !! height } diff --git a/packages/block-library/src/post-featured-image/overlay.js b/packages/block-library/src/post-featured-image/overlay.js index 4b523abfb49160..236038897439fa 100644 --- a/packages/block-library/src/post-featured-image/overlay.js +++ b/packages/block-library/src/post-featured-image/overlay.js @@ -64,7 +64,7 @@ const Overlay = ( { style={ overlayStyles } /> ) } - + - + - + - + - + { colorSettings.map( ( { onChange, label, value, resetAllFilter } ) => ( + { isEntityAvailable && ( <> Date: Thu, 19 Jan 2023 11:16:12 +0800 Subject: [PATCH 08/11] Add styles group to match default in settings tab --- packages/block-editor/src/components/block-inspector/index.js | 2 ++ .../src/components/inspector-controls-tabs/styles-tab.js | 1 + .../inspector-controls-tabs/use-inspector-controls-tabs.js | 2 ++ .../block-editor/src/components/inspector-controls/groups.js | 2 ++ 4 files changed, 7 insertions(+) diff --git a/packages/block-editor/src/components/block-inspector/index.js b/packages/block-editor/src/components/block-inspector/index.js index 50c00416bab436..e7a769f51cec75 100644 --- a/packages/block-editor/src/components/block-inspector/index.js +++ b/packages/block-editor/src/components/block-inspector/index.js @@ -214,6 +214,7 @@ const BlockInspector = ( { showNoBlockSelectedMessage = true } ) => { group="border" label={ __( 'Border' ) } /> + ) } @@ -372,6 +373,7 @@ const BlockInspectorSingleBlock = ( { clientId, blockName } ) => { group="border" label={ __( 'Border' ) } /> +
diff --git a/packages/block-editor/src/components/inspector-controls-tabs/styles-tab.js b/packages/block-editor/src/components/inspector-controls-tabs/styles-tab.js index 0643d47d26965f..3a7f625d10de26 100644 --- a/packages/block-editor/src/components/inspector-controls-tabs/styles-tab.js +++ b/packages/block-editor/src/components/inspector-controls-tabs/styles-tab.js @@ -41,6 +41,7 @@ const StylesTab = ( { blockName, clientId, hasBlockStyles } ) => { label={ __( 'Dimensions' ) } /> + ); }; diff --git a/packages/block-editor/src/components/inspector-controls-tabs/use-inspector-controls-tabs.js b/packages/block-editor/src/components/inspector-controls-tabs/use-inspector-controls-tabs.js index 65677506893034..8d09a076e087de 100644 --- a/packages/block-editor/src/components/inspector-controls-tabs/use-inspector-controls-tabs.js +++ b/packages/block-editor/src/components/inspector-controls-tabs/use-inspector-controls-tabs.js @@ -38,6 +38,7 @@ export default function useInspectorControlsTabs( blockName ) { dimensions: dimensionsGroup, list: listGroup, position: positionGroup, + styles: stylesGroup, typography: typographyGroup, } = InspectorControlsGroups; @@ -55,6 +56,7 @@ export default function useInspectorControlsTabs( blockName ) { ...( useSlotFills( borderGroup.Slot.__unstableName ) || [] ), ...( useSlotFills( colorGroup.Slot.__unstableName ) || [] ), ...( useSlotFills( dimensionsGroup.Slot.__unstableName ) || [] ), + ...( useSlotFills( stylesGroup.Slot.__unstableName ) || [] ), ...( useSlotFills( typographyGroup.Slot.__unstableName ) || [] ), ]; diff --git a/packages/block-editor/src/components/inspector-controls/groups.js b/packages/block-editor/src/components/inspector-controls/groups.js index 46fca564925aa6..e4c8a7e072dc12 100644 --- a/packages/block-editor/src/components/inspector-controls/groups.js +++ b/packages/block-editor/src/components/inspector-controls/groups.js @@ -15,6 +15,7 @@ const InspectorControlsTypography = createSlotFill( 'InspectorControlsTypography' ); const InspectorControlsListView = createSlotFill( 'InspectorControlsListView' ); +const InspectorControlsStyles = createSlotFill( 'InspectorControlsStyles' ); const groups = { default: InspectorControlsDefault, @@ -23,6 +24,7 @@ const groups = { color: InspectorControlsColor, dimensions: InspectorControlsDimensions, list: InspectorControlsListView, + styles: InspectorControlsStyles, typography: InspectorControlsTypography, position: InspectorControlsPosition, }; From 926f6dbfee8c92e701c4bd220ce93726639b1d88 Mon Sep 17 00:00:00 2001 From: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com> Date: Thu, 19 Jan 2023 11:23:34 +0800 Subject: [PATCH 09/11] Alias default inspector controls group as settings --- .../block-editor/src/components/inspector-controls/groups.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/block-editor/src/components/inspector-controls/groups.js b/packages/block-editor/src/components/inspector-controls/groups.js index e4c8a7e072dc12..f1adbb66252b5f 100644 --- a/packages/block-editor/src/components/inspector-controls/groups.js +++ b/packages/block-editor/src/components/inspector-controls/groups.js @@ -24,6 +24,7 @@ const groups = { color: InspectorControlsColor, dimensions: InspectorControlsDimensions, list: InspectorControlsListView, + settings: InspectorControlsDefault, // Alias for default. styles: InspectorControlsStyles, typography: InspectorControlsTypography, position: InspectorControlsPosition, From 0363671e96dcb2159cb90726d8d9649a83db7419 Mon Sep 17 00:00:00 2001 From: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com> Date: Wed, 25 Jan 2023 16:49:19 +1000 Subject: [PATCH 10/11] Update cover advanced controls after rebase --- packages/block-library/src/cover/edit/inspector-controls.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/block-library/src/cover/edit/inspector-controls.js b/packages/block-library/src/cover/edit/inspector-controls.js index 4b8dc3876da5ee..b07f257ebf903d 100644 --- a/packages/block-library/src/cover/edit/inspector-controls.js +++ b/packages/block-library/src/cover/edit/inspector-controls.js @@ -335,7 +335,7 @@ export default function CoverInspectorControls( { /> - + Date: Fri, 27 Jan 2023 12:02:55 +1000 Subject: [PATCH 11/11] Add version to deprecation messages --- packages/block-editor/src/components/inspector-controls/fill.js | 1 + .../src/components/inspector-controls/fill.native.js | 1 + packages/block-editor/src/components/inspector-controls/slot.js | 1 + .../src/components/inspector-controls/slot.native.js | 1 + 4 files changed, 4 insertions(+) diff --git a/packages/block-editor/src/components/inspector-controls/fill.js b/packages/block-editor/src/components/inspector-controls/fill.js index e710a24597ee9a..8b3e3f600bd846 100644 --- a/packages/block-editor/src/components/inspector-controls/fill.js +++ b/packages/block-editor/src/components/inspector-controls/fill.js @@ -29,6 +29,7 @@ export default function InspectorControlsFill( { '`__experimentalGroup` property in `InspectorControlsFill`', { since: '6.2', + version: '6.4', alternative: '`group`', } ); diff --git a/packages/block-editor/src/components/inspector-controls/fill.native.js b/packages/block-editor/src/components/inspector-controls/fill.native.js index 418a9229e81841..37c084806da689 100644 --- a/packages/block-editor/src/components/inspector-controls/fill.native.js +++ b/packages/block-editor/src/components/inspector-controls/fill.native.js @@ -29,6 +29,7 @@ export default function InspectorControlsFill( { '`__experimentalGroup` property in `InspectorControlsFill`', { since: '6.2', + version: '6.4', alternative: '`group`', } ); diff --git a/packages/block-editor/src/components/inspector-controls/slot.js b/packages/block-editor/src/components/inspector-controls/slot.js index 949742e735d0fb..883421cacec233 100644 --- a/packages/block-editor/src/components/inspector-controls/slot.js +++ b/packages/block-editor/src/components/inspector-controls/slot.js @@ -26,6 +26,7 @@ export default function InspectorControlsSlot( { '`__experimentalGroup` property in `InspectorControlsSlot`', { since: '6.2', + version: '6.4', alternative: '`group`', } ); diff --git a/packages/block-editor/src/components/inspector-controls/slot.native.js b/packages/block-editor/src/components/inspector-controls/slot.native.js index ed3913563624d4..4354e08165d914 100644 --- a/packages/block-editor/src/components/inspector-controls/slot.native.js +++ b/packages/block-editor/src/components/inspector-controls/slot.native.js @@ -19,6 +19,7 @@ export default function InspectorControlsSlot( { '`__experimentalGroup` property in `InspectorControlsSlot`', { since: '6.2', + version: '6.4', alternative: '`group`', } );