DimensionControl: Deprecate 36px default size

packages/components/CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Deprecations
 
 -   `Radio`: Deprecate 36px default size ([#66572](https://github.com/WordPress/gutenberg/pull/66572)).
+-   `DimensionControl`: Deprecate 36px default size ([#66705](https://github.com/WordPress/gutenberg/pull/66705)).
 
 ### Enhancements
 

packages/components/src/dimension-control/README.md

@@ -22,6 +22,7 @@ export default function MyCustomDimensionControl() {
 	return (
 		<DimensionControl
 			__nextHasNoMarginBottom
+			__next40pxDefaultSize
 			label={ 'Padding' }
 			icon={ 'desktop' }
 			onChange={ ( value ) => setPaddingSize( value ) }

packages/components/src/dimension-control/index.tsx

@@ -18,6 +18,7 @@ import type { DimensionControlProps, Size } from './types';
 import type { SelectControlSingleSelectionProps } from '../select-control/types';
 import { ContextSystemProvider } from '../context';
 import deprecated from '@wordpress/deprecated';
+import { maybeWarnDeprecated36pxSize } from '../utils/deprecated-36px-size';
 
 const CONTEXT_VALUE = {
 	BaseControl: {
@@ -41,6 +42,7 @@ const CONTEXT_VALUE = {
  *
  * 	return (
  * 		<DimensionControl
+ * 			__next40pxDefaultSize
  * 			__nextHasNoMarginBottom
  * 			label={ 'Padding' }
  * 			icon={ 'desktop' }
@@ -68,6 +70,12 @@ export function DimensionControl( props: DimensionControlProps ) {
 		version: '7.0',
 	} );
 
+	maybeWarnDeprecated36pxSize( {
+		componentName: 'DimensionControl',
+		__next40pxDefaultSize,
+		size: undefined,
+	} );
+
 	const onChangeSpacingSize: SelectControlSingleSelectionProps[ 'onChange' ] =
 		( val ) => {
 			const theSize = findSizeBySlug( sizes, val );

packages/components/src/dimension-control/stories/index.story.tsx

@@ -50,6 +50,7 @@ const Template: StoryFn< typeof DimensionControl > = ( args ) => (
 export const Default = Template.bind( {} );
 Default.args = {
 	__nextHasNoMarginBottom: true,
+	__next40pxDefaultSize: true,
 	label: 'Please select a size',
 	sizes,
 };

packages/components/src/dimension-control/test/index.test.js

@@ -15,7 +15,13 @@
 import { DimensionControl as _DimensionControl } from '../';
 
 const DimensionControl = ( props ) => {
-	return <_DimensionControl { ...props } __nextHasNoMarginBottom />;
+	return (
+		<_DimensionControl
+			{ ...props }
+			__next40pxDefaultSize
+			__nextHasNoMarginBottom
+		/>
+	);
 };
 
 describe( 'DimensionControl', () => {
@@ -32,7 +38,7 @@
 				<DimensionControl instanceId={ instanceId } label="Padding" />
 			);
 			expect( console ).toHaveWarned();
 			expect( container ).toMatchSnapshot();
 		} );
 
 		it( 'renders with icon and default icon label', () => {
@@ -43,7 +49,7 @@
 					icon={ plus }
 				/>
 			);
 			expect( container ).toMatchSnapshot();
 		} );
 
 		it( 'renders with icon and custom icon label', () => {
@@ -55,7 +61,7 @@
 					iconLabel="Tablet Devices"
 				/>
 			);
 			expect( container ).toMatchSnapshot();
 		} );
 
 		it( 'renders with custom sizes', () => {
@@ -84,7 +90,7 @@
 					sizes={ customSizes }
 				/>
 			);
 			expect( container ).toMatchSnapshot();
 		} );
 	} );