QueryControls: Complete __next40pxDefaultSize cleanup (#79485)

* QueryControls: Hard deprecate 40px default size

* Add changelog

* Remove changelog entry

* Restore WP 6.7 deprecation version on QueryControls

* Fix up

Co-authored-by: mirka <0mirka00@git.wordpress.org>
Co-authored-by: ciampo <mciampini@git.wordpress.org>

Author: mirka

packages/components/src/query-controls/README.md

@@ -247,10 +247,3 @@ The selected category for the `categoriesList` prop.
 
 -   Required: No
 -   Platform: Web
-
-#### `__next40pxDefaultSize`: `boolean`
-
-Start opting into the larger default height that will become the default size in a future version.
-
-- Required: No
-- Default: `false`

packages/components/src/query-controls/author-select.tsx

@@ -6,7 +6,6 @@ import TreeSelect from '../tree-select';
 import type { AuthorSelectProps } from './types';
 
 export default function AuthorSelect( {
-	__next40pxDefaultSize,
 	label,
 	noOptionLabel,
 	authorList,
@@ -30,7 +29,7 @@ export default function AuthorSelect( {
 					? String( selectedAuthorId )
 					: undefined
 			}
-			__next40pxDefaultSize={ __next40pxDefaultSize }
+			__next40pxDefaultSize
 		/>
 	);
 }

packages/components/src/query-controls/category-select.tsx

@@ -4,7 +4,6 @@ import TreeSelect from '../tree-select';
 import type { CategorySelectProps } from './types';
 
 export default function CategorySelect( {
-	__next40pxDefaultSize,
 	label,
 	noOptionLabel,
 	categoriesList,
@@ -30,7 +29,7 @@ export default function CategorySelect( {
 					: undefined
 			}
 			{ ...props }
-			__next40pxDefaultSize={ __next40pxDefaultSize }
+			__next40pxDefaultSize
 		/>
 	);
 }

packages/components/src/query-controls/index.tsx

@@ -139,7 +139,6 @@ export function QueryControls( {
 					props.categoriesList &&
 					props.onCategoryChange && (
 						<CategorySelect
-							__next40pxDefaultSize
 							key="query-controls-category-select"
 							categoriesList={ props.categoriesList }
 							label={ __( 'Category' ) }
@@ -175,7 +174,6 @@ export function QueryControls( {
 					),
 				onAuthorChange && (
 					<AuthorSelect
-						__next40pxDefaultSize
 						key="query-controls-author-select"
 						authorList={ authorList }
 						label={ __( 'Author' ) }

packages/components/src/query-controls/types.ts

@@ -31,7 +31,6 @@ export type CategorySelectProps = Pick<
 	categoriesList: Category[];
 	onChange: ( newCategory: string ) => void;
 	selectedCategoryId?: Category[ 'id' ];
-	__next40pxDefaultSize: boolean;
 };
 
 export type AuthorSelectProps = Pick<
@@ -41,7 +40,6 @@ export type AuthorSelectProps = Pick<
 	authorList?: Author[];
 	onChange: ( newAuthor: string ) => void;
 	selectedAuthorId?: Author[ 'id' ];
-	__next40pxDefaultSize: boolean;
 };
 
 type Order = 'asc' | 'desc';

tools/eslint/config.mjs

@@ -173,6 +173,7 @@ const restrictedSyntax = [
 		'BorderBoxControl',
 		'BoxControl',
 		'FontSizePicker',
+		'QueryControls',
 		'TextControl',
 	].map( ( componentName ) => ( {
 		selector: `JSXElement[openingElement.name.name="${ componentName }"] JSXAttribute[name.name="__next40pxDefaultSize"]`,