Unify vertical/horizontal min sizes back into one variable

WordPress · Mar 21, 2022 · 6ae3da6 · 6ae3da6
1 parent e8000d4
commit 6ae3da6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 23 deletions.
diff --git a/packages/block-library/src/spacer/controls.js b/packages/block-library/src/spacer/controls.js
@@ -15,16 +15,9 @@ import { useInstanceId } from '@wordpress/compose';
 /**
  * Internal dependencies
  */
-import { MIN_SPACER_WIDTH, MIN_SPACER_HEIGHT } from './edit';
+import { MIN_SPACER_SIZE } from './edit';
 
-function DimensionInput( {
-	label,
-	onChange,
-	isResizing,
-	value = '',
-	min,
-	max,
-} ) {
+function DimensionInput( { label, onChange, isResizing, value = '' } ) {
 	const inputId = useInstanceId( UnitControl, 'block-spacer-height-input' );
 
 	// In most contexts the spacer size cannot meaningfully be set to a
@@ -63,8 +56,7 @@ function DimensionInput( {
 			<UnitControl
 				id={ inputId }
 				isResetValueOnUnitChange
-				min={ min }
-				max={ max }
+				min={ MIN_SPACER_SIZE }
 				onChange={ handleOnChange }
 				style={ { maxWidth: 80 } }
 				value={ computedValue }
@@ -92,7 +84,6 @@ export default function SpacerControls( {
 							setAttributes( { width: nextWidth } )
 						}
 						isResizing={ isResizing }
-						min={ MIN_SPACER_WIDTH }
 					/>
 				) }
 				{ orientation !== 'horizontal' && (
@@ -103,7 +94,6 @@ export default function SpacerControls( {
 							setAttributes( { height: nextHeight } )
 						}
 						isResizing={ isResizing }
-						min={ MIN_SPACER_HEIGHT }
 					/>
 				) }
 			</PanelBody>

diff --git a/packages/block-library/src/spacer/controls.native.js b/packages/block-library/src/spacer/controls.native.js
@@ -14,7 +14,7 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import { MIN_SPACER_WIDTH, MIN_SPACER_HEIGHT } from './edit';
+import { MIN_SPACER_SIZE } from './edit';
 import styles from './style.scss';
 
 const DEFAULT_VALUES = { px: 100, em: 10, rem: 10, vw: 10, vh: 25 };
@@ -67,11 +67,7 @@ function Controls( { attributes, context, setAttributes } ) {
 			<PanelBody title={ __( 'Dimensions' ) }>
 				<UnitControl
 					label={ label }
-					min={
-						orientation === 'horizontal'
-							? MIN_SPACER_WIDTH
-							: MIN_SPACER_HEIGHT
-					}
+					min={ MIN_SPACER_SIZE }
 					value={ value }
 					onChange={ handleChange }
 					onUnitChange={ handleUnitChange }

diff --git a/packages/block-library/src/spacer/edit.js b/packages/block-library/src/spacer/edit.js
@@ -16,8 +16,7 @@ import { View } from '@wordpress/primitives';
  */
 import SpacerControls from './controls';
 
-export const MIN_SPACER_WIDTH = 0;
-export const MIN_SPACER_HEIGHT = 0;
+export const MIN_SPACER_SIZE = 0;
 
 const ResizableSpacer = ( {
 	orientation,
@@ -119,7 +118,7 @@ const SpacerEdit = ( {
 		if ( blockOrientation === 'horizontal' ) {
 			return (
 				<ResizableSpacer
-					minWidth={ MIN_SPACER_WIDTH }
+					minWidth={ MIN_SPACER_SIZE }
 					enable={ {
 						top: false,
 						right: true,
@@ -144,7 +143,7 @@ const SpacerEdit = ( {
 		return (
 			<>
 				<ResizableSpacer
-					minHeight={ MIN_SPACER_HEIGHT }
+					minHeight={ MIN_SPACER_SIZE }
 					enable={ {
 						top: false,
 						right: false,