Skip to content

Block Editor: Remove expired __experimentalGroup deprecations and prop #56023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aaronrobertshaw wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

Block Editor: Remove expired __experimentalGroup deprecations and prop #56023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7550b89
Block Editor: Remove __experimentalGroup deprecation
aaronrobertshaw Nov 9, 2023
395b9f1
Fix recent use of deprecated prop and typo
aaronrobertshaw Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions packages/block-editor/src/components/inspector-controls/fill.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

/**
Expand All @@ -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 ) {
Expand Down
13 changes: 0 additions & 13 deletions packages/block-editor/src/components/inspector-controls/fill.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down
13 changes: 0 additions & 13 deletions packages/block-editor/src/components/inspector-controls/slot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 );

Expand Down
13 changes: 0 additions & 13 deletions packages/block-editor/src/components/inspector-controls/slot.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,16 @@
* WordPress dependencies
*/
import warning from '@wordpress/warning';
import deprecated from '@wordpress/deprecated';

/**
* Internal dependencies
*/
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.` );
Expand Down
4 changes: 2 additions & 2 deletions packages/block-library/src/form-input/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
</PanelBody>
</InspectorControls>
) }
<InspectorControls __experimentalGroup="advanced">
<InspectorControls group="advanced">
<TextControl
autoComplete="off"
label={ __( 'Name' ) }
Expand All @@ -70,7 +70,7 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
} );
} }
help={ __(
'Affects the "name" atribute of the input element, and is used as a name for the form submission results.'
'Affects the "name" attribute of the input element, and is used as a name for the form submission results.'
) }
/>
</InspectorControls>
Expand Down