Merge branch 'develop' into issue/546-add-block-icon-color

.gitignore

@@ -95,3 +95,4 @@ buck-out/
 !.vscode/extensions.json
 
 *.pot
+bin/wp-cli.phar

package.json

@@ -56,7 +56,12 @@
     "bundle:ios": "mkdir -p bundle/ios && yarn react-native bundle --platform ios --dev false --entry-file index.js --assets-dest bundle/ios --bundle-output bundle/ios/App.js --sourcemap-output bundle/ios/App.js.map",
     "i18n-cache": "node i18n-cache/index.js",
     "postinstall": "yarn i18n-cache",
-    "makepot": "xgettext -f <( find . \\( -path './gutenberg/*/src/*.native.js' -or -path './src/*.js' \\) ! -path 'node_modules' -print ) --from-code=UTF-8 -k__ -k_n -k_x -k_nx -x ./gutenberg/languages/gutenberg.pot -o ./gutenberg-mobile.pot",
+    "install:wpcli": "(test -x bin/wp-cli.phar || curl -Ls https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -o bin/wp-cli.phar && chmod +x bin/wp-cli.phar) && bin/wp-cli.phar --info",
+    "prewp": "yarn install:wpcli",
+    "wp": "php -d memory_limit=512M bin/wp-cli.phar",
+    "premakepot": "( command -v xgettext >/dev/null 2>&1 || { echo \"ERROR: xgettext is required to parse our Flow code.\" >&2; exit 1; } ) && yarn makepot:gutenberg",
+    "makepot": "bash -c \"xgettext -f <( find . -path './src/*.js' ! -path 'node_modules' -print ) --from-code=UTF-8 -k__ -k_n -k_x -k_nx -x ./gutenberg.pot -o ./gutenberg-mobile.pot\"",
+    "makepot:gutenberg": "yarn clean:gutenberg && yarn wp i18n make-pot ./gutenberg --ignore-domain gutenberg.pot",
     "android": "react-native run-android",
     "prewpandroid": "rm -Rf $TMPDIR/gbmobile-wpandroidfakernroot && mkdir $TMPDIR/gbmobile-wpandroidfakernroot && ln -s $(cd \"$(dirname \"../../../\")\"; pwd) $TMPDIR/gbmobile-wpandroidfakernroot/android",
     "wpandroid": "yarn android --root $TMPDIR/gbmobile-wpandroidfakernroot --variant wasabiDebug --appIdSuffix beta --appFolder WordPress --main-activity=ui.WPLaunchActivity",
@@ -72,6 +77,7 @@
     "clean": "yarn clean:aztec; yarn cache clean; yarn clean:haste; yarn clean:jest; yarn clean:metro; yarn clean:react; yarn clean:watchman; yarn clean:node;",
     "clean:runtime": "yarn clean:haste; yarn clean:react; yarn clean:metro; yarn clean:jest; yarn clean:watchman; yarn clean:babel-cache",
     "clean:aztec": "cd react-native-aztec && yarn clean && cd example && yarn clean",
+    "clean:gutenberg": "cd gutenberg && npm run clean:packages && rm -rf build",
     "clean:haste": "rm -rf /tmp/haste-map-react-native-packager-*",
     "clean:install": "yarn clean; yarn",
     "clean:jest": "yarn jest --clearCache --config jest.config.js; rm -rf $TMPDIR/jest_*",

src/block-management/inline-toolbar/index.js

@@ -55,14 +55,14 @@ export default class InlineToolbar extends React.Component<PropsType> {
 		return (
 			<View style={ styles.toolbar }>
 				<ToolbarButton
-					label={ __( 'Move block up' ) }
+					label={ __( 'Move up' ) }
 					isDisabled={ ! this.props.canMoveUp }
 					onClick={ this.onUpPressed }
 					icon="arrow-up-alt"
 				/>
 
 				<ToolbarButton
-					label={ __( 'Move block down' ) }
+					label={ __( 'Move down' ) }
 					isDisabled={ ! this.props.canMoveDown }
 					onClick={ this.onDownPressed }
 					icon="arrow-down-alt"
@@ -73,7 +73,7 @@ export default class InlineToolbar extends React.Component<PropsType> {
 				<InspectorControls.Slot />
 
 				<ToolbarButton
-					label={ __( 'Remove content' ) }
+					label={ __( 'Remove' ) }
 					onClick={ this.onDeletePressed }
 					icon="trash"
 				/>

src/components/html-text-input-ui/html-text-input-ui-common.scss

@@ -4,10 +4,14 @@ $padding: 8;
 $backgroundColor:  white;
 $htmlFont: $default-monospace-font;
 
-.container {
+.keyboardAvoidingView {
 	position: absolute;
 	top: 0;
 	right: 0;
 	left: 0;
 	bottom: 0;
 }
+
+.container {
+	flex: 1;
+}

src/components/html-text-input-ui/html-text-input-ui.android.js

@@ -6,8 +6,8 @@
 /**
  * External dependencies
  */
-import React from 'react';
-import { TextInput, ScrollView } from 'react-native';
+import * as React from 'react';
+import { ScrollView } from 'react-native';
 
 /**
  * Internal dependencies
@@ -16,60 +16,27 @@ import styles from './html-text-input-ui.scss';
 import KeyboardAvoidingView from '../keyboard-avoiding-view';
 
 type PropsType = {
-    setTitleAction: string => void,
-	value: string,
-	title: string,
-    parentHeight: number,
-    onChangeHTMLText: string => mixed,
-    onBlurHTMLText: () => mixed,
-    titlePlaceholder: string,
-    htmlPlaceholder: string,
+	parentHeight: number,
+	children: React.Node,
 };
 
 type StateType = {
-    contentHeight: number,
 };
 
-export default class HTMLInputViewUI extends React.Component<PropsType, StateType> {
-	constructor() {
-		super( ...arguments );
-
-		this.state = {
-			contentHeight: 0,
-		};
-	}
+class HTMLInputContainer extends React.Component<PropsType, StateType> {
+	static scrollEnabled: boolean;
 
 	render() {
 		return (
-			<KeyboardAvoidingView style={ styles.container } parentHeight={ this.props.parentHeight }>
-				<ScrollView
-					style={ { flex: 1 } }
-					keyboardDismissMode="interactive" >
-					<TextInput
-						autoCorrect={ false }
-						textAlignVertical="center"
-						numberOfLines={ 1 }
-						style={ styles.htmlViewTitle }
-						value={ this.props.title }
-						placeholder={ this.props.titlePlaceholder }
-						onChangeText={ this.props.setTitleAction }
-					/>
-					<TextInput
-						autoCorrect={ false }
-						textAlignVertical="top"
-						multiline
-						style={ { ...styles.htmlView, height: this.state.contentHeight + 16 } }
-						value={ this.props.value }
-						onChangeText={ this.props.onChangeHTMLText }
-						onBlur={ this.props.onBlurHTMLText }
-						placeholder={ this.props.htmlPlaceholder }
-						scrollEnabled={ false }
-						onContentSizeChange={ ( event ) => {
-							this.setState( { contentHeight: event.nativeEvent.contentSize.height } );
-						} }
-					/>
+			<KeyboardAvoidingView style={ styles.keyboardAvoidingView } parentHeight={ this.props.parentHeight }>
+				<ScrollView style={ styles.scrollView } >
+					{ this.props.children }
 				</ScrollView>
 			</KeyboardAvoidingView>
 		);
 	}
 }
+
+HTMLInputContainer.scrollEnabled = false;
+
+export default HTMLInputContainer;

src/components/html-text-input-ui/html-text-input-ui.android.scss

@@ -8,7 +8,7 @@
 	padding-left: $padding;
 	padding-right: $padding;
 	padding-top: $padding;
-	padding-bottom: $padding;
+	padding-bottom: $padding + 16;
 }
 
 .htmlViewTitle {
@@ -19,3 +19,7 @@
 	padding-top: $padding;
 	padding-bottom: $padding;
 }
+
+.scrollView {
+	flex: 1;
+}

src/components/html-text-input-ui/html-text-input-ui.ios.js

@@ -6,8 +6,8 @@
 /**
  * External dependencies
  */
-import React from 'react';
-import { TextInput, UIManager, PanResponder } from 'react-native';
+import * as React from 'react';
+import { UIManager, PanResponder } from 'react-native';
 
 /**
  * Internal dependencies
@@ -16,20 +16,15 @@ import styles from './html-text-input-ui.scss';
 import KeyboardAvoidingView from '../keyboard-avoiding-view';
 
 type PropsType = {
-    setTitleAction: string => void,
-	value: string,
-	title: string,
-    parentHeight: number,
-    onChangeHTMLText: string => mixed,
-    onBlurHTMLText: () => mixed,
-    titlePlaceholder: string,
-    htmlPlaceholder: string,
+	parentHeight: number,
+	children: React.Node,
 };
 
 type StateType = {
 };
 
-export default class HTMLInputViewUI extends React.Component<PropsType, StateType> {
+class HTMLInputContainer extends React.Component<PropsType, StateType> {
+	static scrollEnabled: boolean;
 	panResponder: PanResponder;
 
 	constructor() {
@@ -40,7 +35,7 @@ export default class HTMLInputViewUI extends React.Component<PropsType, StateTyp
 
 			onPanResponderMove: ( e, gestureState ) => {
 				if ( gestureState.dy > 100 && gestureState.dy < 110 ) {
-					//Keyboard.dismiss() and this.textInput.blur() is not working here
+					//Keyboard.dismiss() and this.textInput.blur() are not working here
 					//They require to know the currentlyFocusedID under the hood but
 					//during this gesture there's no currentlyFocusedID
 					UIManager.blur( e.target );
@@ -52,29 +47,16 @@ export default class HTMLInputViewUI extends React.Component<PropsType, StateTyp
 	render() {
 		return (
 			<KeyboardAvoidingView
-				style={ styles.container }
+				style={ styles.keyboardAvoidingView }
 				{ ...this.panResponder.panHandlers }
-				parentHeight={ this.props.parentHeight }>
-				<TextInput
-					autoCorrect={ false }
-					textAlignVertical="center"
-					numberOfLines={ 1 }
-					style={ styles.htmlViewTitle }
-					value={ this.props.title }
-					placeholder={ this.props.titlePlaceholder }
-					onChangeText={ this.props.setTitleAction }
-				/>
-				<TextInput
-					autoCorrect={ false }
-					textAlignVertical="top"
-					multiline
-					style={ { ...styles.htmlView } }
-					value={ this.props.value }
-					onChangeText={ this.props.onChangeHTMLText }
-					onBlur={ this.props.onBlurHTMLText }
-					placeholder={ this.props.htmlPlaceholder }
-				/>
+				parentHeight={ this.props.parentHeight }
+			>
+				{ this.props.children }
 			</KeyboardAvoidingView>
 		);
 	}
 }
+
+HTMLInputContainer.scrollEnabled = true;
+
+export default HTMLInputContainer;

src/components/html-text-input-ui/html-text-input-ui.ios.scss

@@ -20,5 +20,4 @@ $title-height: 32;
 	padding-top: $padding;
 	padding-bottom: $padding;
 	height: $title-height;
-
-}
+}

src/components/html-text-input.js

@@ -14,11 +14,13 @@ import { withInstanceId, compose } from '@wordpress/compose';
  * External dependencies
  */
 import React from 'react';
+import { TextInput } from 'react-native';
 
 /**
  * Internal dependencies
  */
-import HTMLInputViewUI from './html-text-input-ui/html-text-input-ui';
+import HTMLInputContainer from './html-text-input-ui/html-text-input-ui';
+import styles from './html-text-input-ui/html-text-input-ui.scss';
 
 type PropsType = {
 	onChange: string => mixed,
@@ -80,16 +82,28 @@ export class HTMLInputView extends React.Component<PropsType, StateType> {
 
 	render() {
 		return (
-			<HTMLInputViewUI
-				setTitleAction={ this.props.setTitleAction }
-				value={ this.state.value }
-				title={ this.props.title }
-				parentHeight={ this.props.parentHeight }
-				onChangeHTMLText={ this.edit }
-				onBlurHTMLText={ this.stopEditing }
-				titlePlaceholder={ __( 'Add title' ) }
-				htmlPlaceholder={ __( 'Start writing…' ) }
-			/>
+			<HTMLInputContainer parentHeight={ this.props.parentHeight }>
+				<TextInput
+					autoCorrect={ false }
+					textAlignVertical="center"
+					numberOfLines={ 1 }
+					style={ styles.htmlViewTitle }
+					value={ this.props.title }
+					placeholder={ __( 'Add title' ) }
+					onChangeText={ this.props.setTitleAction }
+				/>
+				<TextInput
+					autoCorrect={ false }
+					textAlignVertical="top"
+					multiline
+					style={ styles.htmlView }
+					value={ this.state.value }
+					onChangeText={ this.edit }
+					onBlur={ this.stopEditing }
+					placeholder={ __( 'Start writing…' ) }
+					scrollEnabled={ HTMLInputContainer.scrollEnabled }
+				/>
+			</HTMLInputContainer>
 		);
 	}
 }