Rename variable after rebase

WordPress · Mar 2, 2022 · 49b645b · 49b645b
1 parent 2be3ac5
commit 49b645b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/packages/block-editor/src/components/line-height-control/index.native.js b/packages/block-editor/src/components/line-height-control/index.native.js
@@ -20,7 +20,9 @@ export default function LineHeightControl( { value: lineHeight, onChange } ) {
 			step={ STEP }
 			value={ value }
 			onChange={ onChange }
-			units={ [] }
+			// TODO: should be updated to avoid using `false`, in order to
+			// align with the web version of `UnitControl`
+			units={ false }
 		/>
 	);
 }
diff --git a/packages/components/src/unit-control/index.native.js b/packages/components/src/unit-control/index.native.js
@@ -116,13 +116,15 @@ function UnitControl( {
 	};
 
 	const renderUnitPicker = useCallback( () => {
-		if ( hasUnits( units ) ) {
+		// Keeping for legacy reasons, although `false` should not be a valid
+		// value for the `units` prop anymore.
+		if ( units === false ) {
 			return null;
 		}
 		return (
 			<View style={ styles.unitMenu } ref={ anchorNodeRef }>
 				{ renderUnitButton }
-				{ units?.length > 1 ? (
+				{ hasUnits( units ) && units?.length > 1 ? (
 					<Picker
 						ref={ pickerRef }
 						options={ units }

diff --git a/packages/components/src/unit-control/index.tsx b/packages/components/src/unit-control/index.tsx
@@ -81,8 +81,8 @@ function UnitControl(
 	);
 
 	useEffect( () => {
-		setUnit( initialUnit );
-	}, [ initialUnit ] );
+		setUnit( parsedUnit );
+	}, [ parsedUnit ] );
 
 	// Stores parsed value for hand-off in state reducer.
 	const refParsedQuantity = useRef< number | undefined >( undefined );