Rnmobile/fix font size breakage (#21527)

* Hide typography controls in mobile * Add hooks for font-size This allow that font size attributes are still read and saved properly in mobile.
WordPress · Apr 10, 2020 · 3130e85 · 3130e85
1 parent 528c871
commit 3130e85
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/packages/block-editor/src/hooks/index.native.js b/packages/block-editor/src/hooks/index.native.js
@@ -5,3 +5,4 @@ import './custom-class-name';
 import './generated-class-name';
 import './style';
 import './color';
+import './font-size';
diff --git a/packages/block-editor/src/hooks/line-height.js b/packages/block-editor/src/hooks/line-height.js
@@ -1,7 +1,6 @@
 /**
  * WordPress dependencies
  */
-import { Platform } from '@wordpress/element';
 import { hasBlockSupport } from '@wordpress/blocks';
 
 /**
@@ -41,13 +40,10 @@ export function LineHeightEdit( props ) {
  style: cleanEmptyObject( newStyle ),
  } );
  };
- return Platform.select( {
- web: (
- <LineHeightControl
- value={ style?.typography?.lineHeight }
- onChange={ onChange }
- />
- ),
- native: null,
- } );
+ return (
+ <LineHeightControl
+ value={ style?.typography?.lineHeight }
+ onChange={ onChange }
+ />
+ );
 }
diff --git a/packages/block-editor/src/hooks/style.js b/packages/block-editor/src/hooks/style.js
@@ -11,6 +11,7 @@ import { hasBlockSupport } from '@wordpress/blocks';
 import { createHigherOrderComponent } from '@wordpress/compose';
 import { PanelBody } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
+import { Platform } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -144,7 +145,7 @@ export const withBlockControls = createHigherOrderComponent(
  );
 
  return [
- hasTypographySupport && (
+ Platform.OS === 'web' && hasTypographySupport && (
  <InspectorControls key="typography">
  <PanelBody title={ __( 'Typography' ) }>
  <FontSizeEdit { ...props } />