From 7550b89f3122c9438bc32c69fbf2ad23748ed8f0 Mon Sep 17 00:00:00 2001 From: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com> Date: Fri, 10 Nov 2023 09:16:11 +1000 Subject: [PATCH 1/2] Block Editor: Remove __experimentalGroup deprecation With the release of 6.4, the deprecated old __experimentalGroup prop can now be removed. --- .../src/components/inspector-controls/fill.js | 14 -------------- .../components/inspector-controls/fill.native.js | 13 ------------- .../src/components/inspector-controls/slot.js | 13 ------------- .../components/inspector-controls/slot.native.js | 13 ------------- 4 files changed, 53 deletions(-) diff --git a/packages/block-editor/src/components/inspector-controls/fill.js b/packages/block-editor/src/components/inspector-controls/fill.js index f0640a9d31ddc5..37453608674fa9 100644 --- a/packages/block-editor/src/components/inspector-controls/fill.js +++ b/packages/block-editor/src/components/inspector-controls/fill.js @@ -6,7 +6,6 @@ import { __experimentalToolsPanelContext as ToolsPanelContext, } from '@wordpress/components'; import warning from '@wordpress/warning'; -import deprecated from '@wordpress/deprecated'; import { useEffect, useContext } from '@wordpress/element'; /** @@ -18,21 +17,8 @@ import groups from './groups'; export default function InspectorControlsFill( { children, group = 'default', - __experimentalGroup, resetAllFilter, } ) { - if ( __experimentalGroup ) { - deprecated( - '`__experimentalGroup` property in `InspectorControlsFill`', - { - since: '6.2', - version: '6.4', - 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 d38d865cd15cc0..b5c9a39024440a 100644 --- a/packages/block-editor/src/components/inspector-controls/fill.native.js +++ b/packages/block-editor/src/components/inspector-controls/fill.native.js @@ -9,7 +9,6 @@ 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 @@ -21,20 +20,8 @@ import { BlockSettingsButton } from '../block-settings'; export default function InspectorControlsFill( { children, group = 'default', - __experimentalGroup, ...props } ) { - if ( __experimentalGroup ) { - deprecated( - '`__experimentalGroup` property in `InspectorControlsFill`', - { - since: '6.2', - version: '6.4', - 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 cc32b1c88480ed..f19fc60064354a 100644 --- a/packages/block-editor/src/components/inspector-controls/slot.js +++ b/packages/block-editor/src/components/inspector-controls/slot.js @@ -7,7 +7,6 @@ import { } from '@wordpress/components'; import { useContext, useMemo } from '@wordpress/element'; import warning from '@wordpress/warning'; -import deprecated from '@wordpress/deprecated'; /** * Internal dependencies @@ -17,23 +16,11 @@ import BlockSupportSlotContainer from './block-support-slot-container'; import groups from './groups'; export default function InspectorControlsSlot( { - __experimentalGroup, group = 'default', label, fillProps, ...props } ) { - if ( __experimentalGroup ) { - deprecated( - '`__experimentalGroup` property in `InspectorControlsSlot`', - { - since: '6.2', - version: '6.4', - alternative: '`group`', - } - ); - group = __experimentalGroup; - } const Slot = groups[ group ]?.Slot; 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 e8917a6003b47d..de74de0ae943ff 100644 --- a/packages/block-editor/src/components/inspector-controls/slot.native.js +++ b/packages/block-editor/src/components/inspector-controls/slot.native.js @@ -2,7 +2,6 @@ * WordPress dependencies */ import warning from '@wordpress/warning'; -import deprecated from '@wordpress/deprecated'; /** * Internal dependencies @@ -10,21 +9,9 @@ import deprecated from '@wordpress/deprecated'; import groups from './groups'; export default function InspectorControlsSlot( { - __experimentalGroup, group = 'default', ...props } ) { - if ( __experimentalGroup ) { - deprecated( - '`__experimentalGroup` property in `InspectorControlsSlot`', - { - since: '6.2', - version: '6.4', - alternative: '`group`', - } - ); - group = __experimentalGroup; - } const Slot = groups[ group ]?.Slot; if ( ! Slot ) { warning( `Unknown InspectorControls group "${ group }" provided.` ); From 395b9f1844af143f34e2114191ad1ec6a3356023 Mon Sep 17 00:00:00 2001 From: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com> Date: Fri, 10 Nov 2023 09:16:37 +1000 Subject: [PATCH 2/2] Fix recent use of deprecated prop and typo --- packages/block-library/src/form-input/edit.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/block-library/src/form-input/edit.js b/packages/block-library/src/form-input/edit.js index 0742c22c22f429..1e21a35add13fe 100644 --- a/packages/block-library/src/form-input/edit.js +++ b/packages/block-library/src/form-input/edit.js @@ -59,7 +59,7 @@ function InputFieldBlock( { attributes, setAttributes, className } ) { ) } - +