Update: changelog and test for all tests need to pass

WordPress · Nov 19, 2024 · b0a9775 · b0a9775
1 parent 76da993
commit b0a9775
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Deprecations
 
 -   `Radio`: Deprecate 36px default size ([#66572](https://github.com/WordPress/gutenberg/pull/66572)).
+-   `FontSizePicker`: Deprecate 36px default size ([#66920](https://github.com/WordPress/gutenberg/pull/66920)).
 
 ### Enhancements
 
@@ -24,7 +25,6 @@
 
 -   `BorderBoxControl`: Deprecate 36px default size ([#65752](https://github.com/WordPress/gutenberg/pull/65752)).
 -   `BorderControl`: Deprecate 36px default size ([#65755](https://github.com/WordPress/gutenberg/pull/65755)).
--   `FontSizePicker`: Deprecate 36px default size ([#66920](https://github.com/WordPress/gutenberg/pull/66920)).
 
 ### Bug Fixes
 

diff --git a/packages/components/src/font-size-picker/index.tsx b/packages/components/src/font-size-picker/index.tsx
@@ -127,7 +127,7 @@ const UnforwardedFontSizePicker = (
 	maybeWarnDeprecated36pxSize( {
 		componentName: 'FontSizePicker',
 		__next40pxDefaultSize,
-		size: undefined,
+		size,
 	} );
 
 	return (

diff --git a/packages/components/src/font-size-picker/test/index.tsx b/packages/components/src/font-size-picker/test/index.tsx
@@ -8,13 +8,17 @@ import { render } from '@ariakit/test/react';
 /**
  * Internal dependencies
  */
-import FontSizePicker from '../';
+import _FontSizePicker from '../';
 import type { FontSize } from '../types';
 /**
  * WordPress dependencies
  */
 import { useState } from '@wordpress/element';
 
+const FontSizePicker = (
+	props: React.ComponentProps< typeof _FontSizePicker >
+) => <_FontSizePicker __next40pxDefaultSize { ...props } />;
+
 const ControlledFontSizePicker = ( {
 	onChange,
 	...props
@@ -46,11 +50,7 @@ describe( 'FontSizePicker', () => {
 			const user = userEvent.setup();
 			const onChange = jest.fn();
 			await render(
-				<FontSizePicker
-					__next40pxDefaultSize
-					value={ value }
-					onChange={ onChange }
-				/>
+				<FontSizePicker value={ value } onChange={ onChange } />
 			);
 			const input = screen.getByLabelText( 'Custom' );
 			await user.clear( input );