Skip to content

Rename inspector and toolbar style-states slots for consistency #84598

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

Merged
tellthemachines merged 2 commits into from
Oct 15, 2026
Merged

Rename inspector and toolbar style-states slots for consistency #84598

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
4d78108
Rename inspector and toolbar style-states slots for consistency
tellthemachines Oct 13, 2026
d7791ef
rename to style-state
tellthemachines Oct 15, 2026
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
6 changes: 3 additions & 3 deletions packages/block-editor/src/components/block-inspector/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { BlockInspectorPreTabsSlot } from './inspector-pre-tabs-slot-fill';
import { default as InspectorControlsTabs } from '../inspector-controls-tabs';
import { SectionStyleControls } from '../inspector-controls-tabs/styles-tab';
import useInspectorControlsTabs from '../inspector-controls-tabs/use-inspector-controls-tabs';
import { PrivateInspectorControlsStyleStatesAdvanced } from '../inspector-controls/groups';
import { PrivateInspectorControlsStyleStateAdvanced } from '../inspector-controls/groups';
import InspectorControlsLastItem from '../inspector-controls/last-item';
import AdvancedControls from '../inspector-controls-tabs/advanced-controls-panel';
import PositionControls from '../inspector-controls-tabs/position-controls-panel';
Expand Down Expand Up @@ -152,10 +152,10 @@ function StyleStateInspectorSlots( {
</>
) }
{ ! isDefaultBlockStyleState( selectedBlockStyleState ) && (
<InspectorControls.Slot group="styleStates" />
<InspectorControls.Slot group="style-state" />
) }
{ ! isDefaultBlockStyleState( selectedBlockStyleState ) && (
<PrivateInspectorControlsStyleStatesAdvanced.Slot />
<PrivateInspectorControlsStyleStateAdvanced.Slot />
) }
</>
);
Expand Down
10 changes: 5 additions & 5 deletions packages/block-editor/src/components/inspector-controls/groups.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ const InspectorControlsPosition = createSlotFill( 'InspectorControlsPosition' );
const InspectorControlsTypography = createSlotFill(
'InspectorControlsTypography'
);
const InspectorControlsStyleStates = createSlotFill(
'InspectorControlsStyleStates'
const InspectorControlsStyleState = createSlotFill(
'InspectorControlsStyleState'
);
const InspectorControlsListView = createSlotFill( 'InspectorControlsListView' );
const InspectorControlsStyles = createSlotFill( 'InspectorControlsStyles' );
Expand All @@ -44,7 +44,7 @@ const groups = {
settings: InspectorControlsDefault, // Alias for default.
styles: InspectorControlsStyles,
typography: InspectorControlsTypography,
styleStates: InspectorControlsStyleStates,
'style-state': InspectorControlsStyleState,
};

export default groups;
Expand All @@ -56,6 +56,6 @@ export const PrivateInspectorControlsAllowedBlocks = createSlotFill(

// Private slot for the "Advanced" panel shown while editing a style state, so
// it always renders after every other style state panel.
export const PrivateInspectorControlsStyleStatesAdvanced = createSlotFill(
Symbol( 'PrivateInspectorControlsStyleStatesAdvanced' )
export const PrivateInspectorControlsStyleStateAdvanced = createSlotFill(
Symbol( 'PrivateInspectorControlsStyleStateAdvanced' )
);
6 changes: 3 additions & 3 deletions packages/block-editor/src/hooks/custom-css.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
import { store as noticesStore } from '@wordpress/notices';
import { useBlockEditingMode } from '../components/block-editing-mode';
import InspectorControls from '../components/inspector-controls';
import { PrivateInspectorControlsStyleStatesAdvanced } from '../components/inspector-controls/groups';
import { PrivateInspectorControlsStyleStateAdvanced } from '../components/inspector-controls/groups';
import AdvancedPanel, {
validateCSS,
} from '../components/global-styles/advanced-panel';
Expand Down Expand Up @@ -181,9 +181,9 @@ function CustomCSSControl( {

if ( isStateSelected ) {
return (
<PrivateInspectorControlsStyleStatesAdvanced.Fill>
<PrivateInspectorControlsStyleStateAdvanced.Fill>
<PanelBody title={ __( 'Advanced' ) }>{ panel }</PanelBody>
</PrivateInspectorControlsStyleStatesAdvanced.Fill>
</PrivateInspectorControlsStyleStateAdvanced.Fill>
);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/block-library/src/gallery/edit.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,7 +917,7 @@ export default function GalleryEdit( props ) {
<InspectorControls
group={
isViewportStyleState && hasViewportSettings
? 'styleStates'
? 'style-state'
: 'default'
}
>
Expand Down
Loading