Skip to content

Commit ff1f017

Browse files
authored
Merge f1d2ef3 into fb2f367
2 parents fb2f367 + f1d2ef3 commit ff1f017

5 files changed

Lines changed: 10 additions & 32 deletions

File tree

‎packages/global-styles-ui/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66

77
- Raise the minimum required Node.js version to `>=22.13.0`, for stable `require(esm)` support ([#84313](https://github.com/WordPress/gutenberg/pull/84313)).
88

9+
### Enhancements
10+
11+
- Remove the dot that marks blocks with user styles in the block list. The filter to show only those blocks stays ([#84657](https://github.com/WordPress/gutenberg/pull/84657)).
12+
913
## 1.24.0 (2026-10-07)
1014

1115
### Enhancements

‎packages/global-styles-ui/src/screen-block-list.tsx‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
__experimentalText as WCText,
99
} from '@wordpress/components';
1010
// eslint-disable-next-line @wordpress/use-recommended-components -- Intentional early adoption of the new Menu, pending WordPress/gutenberg#76135.
11-
import { Menu, VisuallyHidden } from '@wordpress/ui';
11+
import { Menu } from '@wordpress/ui';
1212
import { useSelect } from '@wordpress/data';
1313
import {
1414
useState,
@@ -141,10 +141,9 @@ export function useBlockHasGlobalStyles( blockName: string ) {
141141

142142
interface BlockMenuItemProps {
143143
block: any;
144-
isCustomized: boolean;
145144
}
146145

147-
function BlockMenuItem( { block, isCustomized }: BlockMenuItemProps ) {
146+
function BlockMenuItem( { block }: BlockMenuItemProps ) {
148147
const hasBlockMenuItem = useBlockHasGlobalStyles( block.name );
149148
if ( ! hasBlockMenuItem ) {
150149
return null;
@@ -160,17 +159,6 @@ function BlockMenuItem( { block, isCustomized }: BlockMenuItemProps ) {
160159
icon={ block.icon }
161160
/>
162161
<FlexItem>{ block.title }</FlexItem>
163-
{ isCustomized && (
164-
<>
165-
<VisuallyHidden>
166-
{ __( 'Has custom styles' ) }
167-
</VisuallyHidden>
168-
<span
169-
aria-hidden="true"
170-
className="global-styles-ui-block-types-item__indicator"
171-
/>
172-
</>
173-
) }
174162
</HStack>
175163
</NavigationButtonAsItem>
176164
);
@@ -286,7 +274,6 @@ function BlockList( { filterValue, styleFilter }: BlockListProps ) {
286274
filteredBlockTypes.map( ( block ) => (
287275
<BlockMenuItem
288276
block={ block }
289-
isCustomized={ customizedBlockNames.has( block.name ) }
290277
key={ 'menu-itemblock-' + block.name }
291278
/>
292279
) )

‎packages/global-styles-ui/src/style.scss‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,6 @@
6767
padding-top: variables.$grid-unit-20;
6868
}
6969

70-
.global-styles-ui-block-types-item__indicator {
71-
background: var(--wp-admin-theme-color);
72-
border-radius: 50%;
73-
flex: none;
74-
height: 6px;
75-
margin-left: auto;
76-
width: 6px;
77-
}
78-
7970
.global-styles-ui-screen-typography__font-variants-count {
8071
color: colors.$gray-700;
8172
}

‎test/e2e/specs/site-editor/global-styles-button-states.spec.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,8 @@ test.describe( 'Global Styles - Button States', () => {
3333
.getByRole( 'button', { name: 'Blocks' } )
3434
.click();
3535

36-
// The extensible site editor appends the "Has custom styles" badge to
37-
// the item's accessible name, so match both shapes without matching
38-
// the "Buttons" block.
3936
await page
40-
.getByRole( 'button', { name: /^Button(Has custom styles)?$/ } )
37+
.getByRole( 'button', { name: 'Button', exact: true } )
4138
.click();
4239

4340
const stateDropdown = page

‎test/e2e/specs/site-editor/push-to-global-styles.spec.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,9 @@ test.describe( 'Push to Global Styles button', () => {
124124
.getByRole( 'button', { name: 'Styles', exact: true } )
125125
.click();
126126
await page.getByRole( 'button', { name: 'Blocks' } ).click();
127-
// A customized block's row is marked as having custom styles, so the
128-
// accessible name is "Heading Has custom styles" rather than just
129-
// "Heading".
130-
await settingsPanel.getByRole( 'button', { name: /^Heading/ } ).click();
127+
await settingsPanel
128+
.getByRole( 'button', { name: 'Heading', exact: true } )
129+
.click();
131130

132131
// Headings should now have uppercase.
133132
await expect(

0 commit comments

Comments
 (0)