[Native mobile] Bring release v1.0.1 back to "mobile develop" (#14075)

* Don't allow placeholder to moves once we tap on it (#14066) * Use platform based SCSS vars for block minHeight (#14070)
WordPress · Feb 24, 2019 · 926ed3f · 926ed3f
1 parent 987a5a4
commit 926ed3f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 14 deletions.
diff --git a/packages/block-library/src/heading/edit.native.js b/packages/block-library/src/heading/edit.native.js
@@ -19,9 +19,7 @@ import { createBlock } from '@wordpress/blocks';
 /**
  * Internal dependencies
  */
-import './editor.scss';
-
-const minHeight = 24;
+import styles from './style.scss';
 
 class HeadingEdit extends Component {
 	constructor( props ) {
@@ -47,6 +45,9 @@ class HeadingEdit extends Component {
 		} = attributes;
 
 		const tagName = 'h' + level;
+
+		const minHeight = styles.blockText.minHeight;
+
 		return (
 			<View>
 				<BlockControls>

diff --git a/packages/block-library/src/heading/style.native.scss b/packages/block-library/src/heading/style.native.scss
@@ -0,0 +1,5 @@
+@import "variables.scss";
+
+.blockText {
+	min-height: $min-height-heading;
+}
diff --git a/packages/block-library/src/image/edit.native.js b/packages/block-library/src/image/edit.native.js
@@ -340,14 +340,6 @@ class ImageEdit extends React.Component {
 								imageHeightWithinContainer,
 							} = sizes;
 
-							if ( imageWidthWithinContainer === undefined ) {
-								return (
-									<View style={ styles.imageContainer } >
-										<Dashicon icon={ 'format-image' } size={ 300 } />
-									</View>
-								);
-							}
-
 							let finalHeight = imageHeightWithinContainer;
 							if ( height > 0 && height < imageHeightWithinContainer ) {
 								finalHeight = height;
@@ -362,6 +354,9 @@ class ImageEdit extends React.Component {
 								<View style={ { flex: 1 } } >
 									{ getInspectorControls() }
 									{ getMediaOptions() }
+									{ ! imageWidthWithinContainer && <View style={ styles.imageContainer } >
+										<Dashicon icon={ 'format-image' } size={ 300 } />
+									</View> }
 									<ImageBackground
 										style={ { width: finalWidth, height: finalHeight, opacity } }
 										resizeMethod="scale"

diff --git a/packages/block-library/src/paragraph/style.native.scss b/packages/block-library/src/paragraph/style.native.scss
@@ -1,3 +1,5 @@
+@import "variables.scss";
+
 .blockText {
-	min-height: 24;
+	min-height: $min-height-paragraph;
 }
diff --git a/packages/editor/src/components/post-title/index.native.js b/packages/editor/src/components/post-title/index.native.js
@@ -18,8 +18,6 @@ import { withInstanceId, compose } from '@wordpress/compose';
  */
 import styles from './style.scss';
 
-const minHeight = 30;
-
 class PostTitle extends Component {
 	constructor() {
 		super( ...arguments );
@@ -72,6 +70,8 @@ class PostTitle extends Component {
 		const decodedPlaceholder = decodeEntities( placeholder );
 		const borderColor = this.state.isSelected ? focusedBorderColor : 'transparent';
 
+		const minHeight = styles.blockText.minHeight;
+
 		return (
 			<View style={ [ styles.titleContainer, borderStyle, { borderColor } ] }>
 				<RichText

diff --git a/packages/editor/src/components/post-title/style.native.scss b/packages/editor/src/components/post-title/style.native.scss
@@ -1,6 +1,10 @@
 
 @import "variables.scss";
 
+.blockText {
+	min-height: $min-height-title;
+}
+
 .titleContainer {
 	padding-left: 16;
 	padding-right: 16;