Font size picker: use Button API for keeping focus on reset (#57221)

WordPress · Dec 19, 2023 · a76800c · a76800c
1 parent e47ba1b
commit a76800c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Bug Fix
 
+-   `FontSizePicker`: Use Button API for keeping focus on reset ([#57221](https://github.com/WordPress/gutenberg/pull/57221)).
 -   `FontSizePicker`: Fix Reset button focus loss ([#57196](https://github.com/WordPress/gutenberg/pull/57196)).
 -   `PaletteEdit`: Consider digits when generating kebab-cased slug ([#56713](https://github.com/WordPress/gutenberg/pull/56713)).
 -   `Button`: Fix logic of `has-text` class addition ([#56949](https://github.com/WordPress/gutenberg/pull/56949)).

diff --git a/packages/components/src/font-size-picker/index.tsx b/packages/components/src/font-size-picker/index.tsx
@@ -277,14 +277,11 @@ const UnforwardedFontSizePicker = (
 						{ withReset && (
 							<FlexItem>
 								<Button
-									aria-disabled={ isDisabled }
-									onClick={
-										isDisabled
-											? undefined
-											: () => {
-													onChange?.( undefined );
-											  }
-									}
+									disabled={ isDisabled }
+									__experimentalIsFocusable
+									onClick={ () => {
+										onChange?.( undefined );
+									} }
 									variant="secondary"
 									__next40pxDefaultSize
 									size={