Mobile: fix getPxFromCssUnit circular dependency (#57045)

WordPress · Dec 14, 2023 · 30b5e03 · 30b5e03
1 parent 829e69c
commit 30b5e03
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 14 deletions.
diff --git a/packages/block-editor/README.md b/packages/block-editor/README.md
@@ -539,16 +539,13 @@ _Returns_
 
 ### getPxFromCssUnit
 
-Returns the px value of a cssUnit. The memoized version of getPxFromCssUnit;
-
-_Parameters_
+> **Deprecated**
 
--   _cssUnit_ `string`:
--   _options_ `Object`:
+This function was accidentially exposed for mobile/native usage.
 
 _Returns_
 
--   `string`: returns the cssUnit value in a simple px format.
+-   `string`: Empty string.
 
 ### getSpacingPresetCssVar
 

diff --git a/packages/block-editor/src/components/plain-text/index.native.js b/packages/block-editor/src/components/plain-text/index.native.js
@@ -7,7 +7,12 @@ import { TextInput, Platform, Dimensions } from 'react-native';
  * WordPress dependencies
  */
 import { Component } from '@wordpress/element';
-import { RichText, getPxFromCssUnit } from '@wordpress/block-editor';
+import { getPxFromCssUnit } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import RichText from '../rich-text';
 
 /**
  * Internal dependencies

diff --git a/packages/block-editor/src/components/rich-text/native/index.native.js b/packages/block-editor/src/components/rich-text/native/index.native.js
@@ -15,7 +15,8 @@ import {
 	showUserSuggestions,
 	showXpostSuggestions,
 } from '@wordpress/react-native-bridge';
-import { BlockFormatControls, getPxFromCssUnit } from '@wordpress/block-editor';
+import { BlockFormatControls } from '@wordpress/block-editor';
+import { getPxFromCssUnit } from '@wordpress/components';
 import { Component } from '@wordpress/element';
 import {
 	compose,

diff --git a/packages/block-editor/src/utils/get-px-from-css-unit.js b/packages/block-editor/src/utils/get-px-from-css-unit.js
@@ -0,0 +1,8 @@
+/**
+ * This function was accidentially exposed for mobile/native usage.
+ *
+ * @deprecated
+ *
+ * @return {string} Empty string.
+ */
+export default () => '';
diff --git a/packages/block-editor/src/utils/index.js b/packages/block-editor/src/utils/index.js
@@ -1,3 +1,3 @@
 export { default as transformStyles } from './transform-styles';
 export * from './block-variation-transforms';
-export { default as getPxFromCssUnit } from './parse-css-unit-to-px';
+export { default as getPxFromCssUnit } from './get-px-from-css-unit';
diff --git a/packages/block-library/src/spacer/edit.native.js b/packages/block-library/src/spacer/edit.native.js
@@ -6,14 +6,16 @@ import { View, useWindowDimensions } from 'react-native';
 /**
  * WordPress dependencies
  */
-import { useConvertUnitToMobile } from '@wordpress/components';
+import {
+	useConvertUnitToMobile,
+	getPxFromCssUnit,
+} from '@wordpress/components';
 import { withPreferredColorScheme } from '@wordpress/compose';
 import {
 	InspectorControls,
 	isValueSpacingPreset,
 	useSettings,
 	getCustomValueFromPreset,
-	getPxFromCssUnit,
 } from '@wordpress/block-editor';
 import { useEffect } from '@wordpress/element';
 

diff --git a/packages/components/src/font-size-picker/index.native.js b/packages/components/src/font-size-picker/index.native.js
@@ -11,11 +11,11 @@ import { useState } from '@wordpress/element';
 import { Icon, chevronRight, check } from '@wordpress/icons';
 import { __, sprintf } from '@wordpress/i18n';
 import { BottomSheet } from '@wordpress/components';
-import { getPxFromCssUnit } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
  */
+import { default as getPxFromCssUnit } from '../mobile/utils/get-px-from-css-unit';
 import { default as UnitControl, useCustomUnits } from '../unit-control';
 import styles from './style.scss';
 

diff --git a/packages/components/src/index.native.js b/packages/components/src/index.native.js
@@ -121,6 +121,7 @@ export {
 	ALIGNMENT_BREAKPOINTS,
 	alignmentHelpers,
 } from './mobile/utils/alignments';
+export { default as getPxFromCssUnit } from './mobile/utils/get-px-from-css-unit';
 
 // Hooks.
 export {

diff --git a/packages/components/src/mobile/global-styles-context/utils.native.js b/packages/components/src/mobile/global-styles-context/utils.native.js
@@ -9,7 +9,6 @@ import { colord } from 'colord';
  * WordPress dependencies
  */
 import {
-	getPxFromCssUnit,
 	useSettings,
 	useMultipleOriginColorsAndGradients,
 	SETTINGS_DEFAULTS,
@@ -19,6 +18,7 @@ import { usePreferredColorSchemeStyle } from '@wordpress/compose';
 /**
  * Internal dependencies
  */
+import { default as getPxFromCssUnit } from '../utils/get-px-from-css-unit';
 import { useGlobalStyles } from './index.native';
 
 export const BLOCK_STYLE_ATTRIBUTES = [

diff --git a/...-editor/src/utils/parse-css-unit-to-px.js → ...bile/utils/get-px-from-css-unit.native.js b/...-editor/src/utils/parse-css-unit-to-px.js → ...bile/utils/get-px-from-css-unit.native.js
diff --git a/...or/src/utils/test/parse-css-unit-to-px.js → ...utils/test/get-px-from-css-unit.native.js b/...or/src/utils/test/parse-css-unit-to-px.js → ...utils/test/get-px-from-css-unit.native.js
@@ -4,7 +4,7 @@
 import {
 	default as memoizedGetPxFromCssUnit,
 	getPxFromCssUnit,
-} from '../parse-css-unit-to-px';
+} from '../get-px-from-css-unit';
 
 describe( 'getPxFromCssUnit', () => {
 	// Absolute units.