Skip to content

Block Editor: replace denylisted layout components in the Duotone filter label #83061

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
mirka merged 7 commits into from
Sep 21, 2026
Merged

Block Editor: replace denylisted layout components in the Duotone filter label #83061

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6e7b732
Block Editor: remove experimental ZStack from the duotone filter label
mirka Sep 17, 2026
1d42911
Changelog: note the Filters panel ZStack removal
mirka Sep 17, 2026
c647035
Block Editor: replace HStack and Flex in the Duotone filter label
mirka Sep 18, 2026
a68551b
Block Editor: drop ellipsis CSS from the Duotone filter label
mirka Sep 18, 2026
e99c797
Block Editor: fold Duotone label min-width into the row rule
mirka Sep 18, 2026
063b3c2
Block Editor: keep the Duotone label class for min-width
mirka Sep 18, 2026
1a407a3
Merge trunk into remove/zstack-filters-panel.
mirka Sep 18, 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
1 change: 1 addition & 0 deletions packages/block-editor/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### Internal

- Replace experimental `ZStack`, `HStack`, `Flex`, and `FlexItem` around the Duotone labeled swatch in the Filters panel ([#83061](https://github.com/WordPress/gutenberg/pull/83061)).
- Remove the `crossorigin` MutationObserver. Under `Document-Isolation-Policy: isolate-and-credentialless` cross-origin resources load without the attribute, and adding it broke any resource served without CORS headers ([#82614](https://github.com/WordPress/gutenberg/pull/82614)).

### New Features
Expand Down
33 changes: 16 additions & 17 deletions packages/block-editor/src/components/global-styles/filters-panel.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
import clsx from 'clsx';
import {
__experimentalToolsPanel as ToolsPanel,
__experimentalHStack as HStack, // eslint-disable-line @wordpress/use-recommended-components
__experimentalZStack as ZStack, // eslint-disable-line @wordpress/use-recommended-components
__experimentalDropdownContentWrapper as DropdownContentWrapper,
MenuGroup,
ColorIndicator,
DuotonePicker,
DuotoneSwatch,
Dropdown,
Flex,
FlexItem,
Button,
} from '@wordpress/components';
import { Stack } from '@wordpress/ui';
import { __, _x } from '@wordpress/i18n';
import { useCallback, useMemo, useRef } from '@wordpress/element';
import { reset as resetIcon } from '@wordpress/icons';
Expand Down Expand Up @@ -101,23 +98,25 @@ const popoverProps = {
};

const LabeledColorIndicator = ( { indicator, label } ) => (
<HStack justify="flex-start">
<ZStack isLayered={ false } offset={ -8 }>

@mirka mirka Sep 18, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This ZStack wasn't doing anything, there's only one child.

<Flex expanded={ false }>
{ indicator === 'unset' || ! indicator ? (
<ColorIndicator className="block-editor-duotone-control__unset-indicator" />
) : (
<DuotoneSwatch values={ indicator } />
) }
</Flex>
</ZStack>
<FlexItem
<Stack
className="block-editor-panel-duotone-settings__label-row"
direction="row"
align="center"
justify="flex-start"
gap="sm"
>
{ indicator === 'unset' || ! indicator ? (
<ColorIndicator className="block-editor-duotone-control__unset-indicator" />
) : (
<DuotoneSwatch values={ indicator } />
) }
<span
className="block-editor-panel-duotone-settings__label"
title={ label }
>
{ label }
</FlexItem>
</HStack>
</span>
</Stack>
);

const renderToggle = ( duotone, resetConfig ) =>
Expand Down
9 changes: 9 additions & 0 deletions packages/block-editor/src/components/global-styles/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,15 @@
}
}

.block-editor-panel-duotone-settings__label-row {
width: 100%;
min-width: 0;
}

.block-editor-panel-duotone-settings__label {
min-width: 0;
}

.block-editor-global-styles__shadow-editor__remove-button {
position: absolute;
right: 0;
Expand Down
3 changes: 0 additions & 3 deletions tools/eslint/suppressions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1116,9 +1116,6 @@
}
},
"packages/block-editor/src/components/global-styles/filters-panel.jsx": {
"@wordpress/use-recommended-components": {
"count": 2
},
"react/jsx-filename-extension": {
"count": 1
}
Expand Down
Loading