Changes per review

WordPress · Dec 11, 2024 · 2b412cf · 2b412cf
1 parent a9e0c21
commit 2b412cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/packages/components/src/box-control/input-control.tsx b/packages/components/src/box-control/input-control.tsx
@@ -174,7 +174,6 @@ export default function BoxInputControl( {
 		! hasPresets ||
 			( ! hasPresetValue && ! isMixed && mergedValue !== undefined )
 	);
-	const showRangeControl = true;
 	const presetIndex = hasPresetValue
 		? getPresetIndexFromValue( mergedValue, presetKey, presets )
 		: undefined;
@@ -240,7 +239,7 @@ export default function BoxInputControl( {
 				</>
 			) }
 
-			{ hasPresets && ! showCustomValueControl && showRangeControl && (
+			{ hasPresets && ! showCustomValueControl && (
 				<FlexedRangeControl
 					__next40pxDefaultSize
 					className="spacing-sizes-control__range-control"
@@ -289,7 +288,6 @@ export default function BoxInputControl( {
 					} }
 					isPressed={ showCustomValueControl }
 					size="small"
-					className="spacing-sizes-control__custom-toggle"
 					iconSize={ 24 }
 				/>
 			) }

diff --git a/packages/components/src/box-control/utils.ts b/packages/components/src/box-control/utils.ts
@@ -298,14 +298,17 @@ export function getPresetIndexFromValue(
 	presetKey: string,
 	presets: Preset[]
 ) {
-	if ( ! isValuePreset( value, presetKey ) === undefined ) {
+	if ( ! isValuePreset( value, presetKey ) ) {
 		return undefined;
 	}
 
 	const match = value.match(
 		new RegExp( `^var:preset\\|${ presetKey }\\|(.+)$` )
 	);
-	const slug = match ? match[ 1 ] : undefined;
+	if ( ! match ) {
+		return undefined;
+	}
+	const slug = match[ 1 ];
 	const index = presets.findIndex( ( preset ) => {
 		return preset.slug === slug;
 	} );