From 799eee913899db3fcf5891dbfc368e87225fc9ec Mon Sep 17 00:00:00 2001
From: etoledom <etoledom@icloud.com>
Date: Fri, 22 Mar 2019 11:18:08 +0100
Subject: [PATCH 01/11] Refactoring html-text-input to share more code between
 platform files

---
 .../html-text-input-ui.android.js             | 32 +++++------------
 .../html-text-input-ui.ios.js                 | 24 +++----------
 src/components/html-text-input.js             | 34 ++++++++++++++++---
 3 files changed, 41 insertions(+), 49 deletions(-)

diff --git a/src/components/html-text-input-ui/html-text-input-ui.android.js b/src/components/html-text-input-ui/html-text-input-ui.android.js
index 102315c1c7..82aa21f399 100644
--- a/src/components/html-text-input-ui/html-text-input-ui.android.js
+++ b/src/components/html-text-input-ui/html-text-input-ui.android.js
@@ -39,35 +39,19 @@ export default class HTMLInputViewUI extends React.Component<PropsType, StateTyp
 		};
 	}
 
+	onContentSizeChange = ( event ) => {
+		this.setState( { contentHeight: event.nativeEvent.contentSize.height } );
+	}
+
 	render() {
+		const style = { ...styles.htmlView, height: this.state.contentHeight + 16 }
 		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 } );
-						} }
-					/>
+					keyboardDismissMode="interactive"
+				>
+					{ this.props.content( false, style, this.onContentSizeChange) }
 				</ScrollView>
 			</KeyboardAvoidingView>
 		);
diff --git a/src/components/html-text-input-ui/html-text-input-ui.ios.js b/src/components/html-text-input-ui/html-text-input-ui.ios.js
index 640ae0b8a3..337cd53d15 100644
--- a/src/components/html-text-input-ui/html-text-input-ui.ios.js
+++ b/src/components/html-text-input-ui/html-text-input-ui.ios.js
@@ -54,26 +54,10 @@ export default class HTMLInputViewUI extends React.Component<PropsType, StateTyp
 			<KeyboardAvoidingView
 				style={ styles.container }
 				{ ...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.content( true, styles.htmlView, ()=>{} ) }
+
 			</KeyboardAvoidingView>
 		);
 	}
diff --git a/src/components/html-text-input.js b/src/components/html-text-input.js
index 4a38794e06..20b2d437f4 100644
--- a/src/components/html-text-input.js
+++ b/src/components/html-text-input.js
@@ -14,11 +14,13 @@ import { withInstanceId, compose } from '@wordpress/compose';
  * External dependencies
  */
 import React from 'react';
+import { View, TextInput } from 'react-native';
 
 /**
  * Internal dependencies
  */
 import HTMLInputViewUI 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,
@@ -81,14 +83,36 @@ 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…' ) }
+				content={ ( scrollEnabled, style, onContentSizeChange ) => {
+					return (
+						<View>
+							<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={ style }
+								value={ this.state.value }
+								onChangeText={ this.edit }
+								onBlur={ this.stopEditing }
+								placeholder={ __( 'Start writing…' ) }
+								scrollEnabled={ scrollEnabled }
+								onContentSizeChange={ onContentSizeChange }
+							/>
+						</View>
+					);
+				} }
 			/>
 		);
 	}

From 569fd81ea1d5542a5d9bd15ebeb273cfe8676e3e Mon Sep 17 00:00:00 2001
From: etoledom <etoledom@icloud.com>
Date: Mon, 25 Mar 2019 13:18:51 +0100
Subject: [PATCH 02/11] Fix flow issues

---
 .../html-text-input-ui/html-text-input-ui.android.js | 12 +++---------
 .../html-text-input-ui/html-text-input-ui.ios.js     | 10 ++--------
 .../html-text-input-ui/html-text-input-ui.ios.scss   |  2 +-
 src/components/html-text-input.js                    |  2 --
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/components/html-text-input-ui/html-text-input-ui.android.js b/src/components/html-text-input-ui/html-text-input-ui.android.js
index 82aa21f399..1a0ce2bd98 100644
--- a/src/components/html-text-input-ui/html-text-input-ui.android.js
+++ b/src/components/html-text-input-ui/html-text-input-ui.android.js
@@ -6,7 +6,7 @@
 /**
  * External dependencies
  */
-import React from 'react';
+import * as React from 'react';
 import { TextInput, ScrollView } from 'react-native';
 
 /**
@@ -16,14 +16,8 @@ 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,
+	content: (scrollEnabled: boolean, style: mixed, onContentSizeChange: () => void) => React.Node,
 };
 
 type StateType = {
diff --git a/src/components/html-text-input-ui/html-text-input-ui.ios.js b/src/components/html-text-input-ui/html-text-input-ui.ios.js
index 337cd53d15..5788842b0e 100644
--- a/src/components/html-text-input-ui/html-text-input-ui.ios.js
+++ b/src/components/html-text-input-ui/html-text-input-ui.ios.js
@@ -6,7 +6,7 @@
 /**
  * External dependencies
  */
-import React from 'react';
+import * as React from 'react';
 import { TextInput, UIManager, PanResponder } from 'react-native';
 
 /**
@@ -16,14 +16,8 @@ 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,
+	content: (scrollEnabled: boolean, style: mixed, onContentSizeChange: () => void) => React.Node,
 };
 
 type StateType = {
diff --git a/src/components/html-text-input-ui/html-text-input-ui.ios.scss b/src/components/html-text-input-ui/html-text-input-ui.ios.scss
index 4fccba7d30..3d052b05c0 100644
--- a/src/components/html-text-input-ui/html-text-input-ui.ios.scss
+++ b/src/components/html-text-input-ui/html-text-input-ui.ios.scss
@@ -9,7 +9,7 @@ $title-height: 32;
 	background-color: $backgroundColor;
 	padding-left: $padding;
 	padding-right: $padding;
-	padding-bottom: $title-height + $padding;
+	padding-bottom: $title-height + $padding + 100;
 }
 
 .htmlViewTitle {
diff --git a/src/components/html-text-input.js b/src/components/html-text-input.js
index 20b2d437f4..43b24f4d6c 100644
--- a/src/components/html-text-input.js
+++ b/src/components/html-text-input.js
@@ -84,8 +84,6 @@ export class HTMLInputView extends React.Component<PropsType, StateType> {
 		return (
 			<HTMLInputViewUI
 				parentHeight={ this.props.parentHeight }
-				titlePlaceholder={ __( 'Add title' ) }
-				htmlPlaceholder={ __( 'Start writing…' ) }
 				content={ ( scrollEnabled, style, onContentSizeChange ) => {
 					return (
 						<View>

From 12a8ae8877a28d10bdfab512426abc6f7e9c938e Mon Sep 17 00:00:00 2001
From: etoledom <etoledom@icloud.com>
Date: Mon, 25 Mar 2019 13:20:35 +0100
Subject: [PATCH 03/11] Fix lint issues

---
 .../html-text-input-ui/html-text-input-ui.android.js   | 10 +++++-----
 .../html-text-input-ui/html-text-input-ui.ios.js       |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/html-text-input-ui/html-text-input-ui.android.js b/src/components/html-text-input-ui/html-text-input-ui.android.js
index 1a0ce2bd98..4395f52aa3 100644
--- a/src/components/html-text-input-ui/html-text-input-ui.android.js
+++ b/src/components/html-text-input-ui/html-text-input-ui.android.js
@@ -7,7 +7,7 @@
  * External dependencies
  */
 import * as React from 'react';
-import { TextInput, ScrollView } from 'react-native';
+import { ScrollView } from 'react-native';
 
 /**
  * Internal dependencies
@@ -17,11 +17,11 @@ import KeyboardAvoidingView from '../keyboard-avoiding-view';
 
 type PropsType = {
 	parentHeight: number,
-	content: (scrollEnabled: boolean, style: mixed, onContentSizeChange: () => void) => React.Node,
+	content: ( scrollEnabled: boolean, style: mixed, onContentSizeChange: () => void ) => React.Node,
 };
 
 type StateType = {
-    contentHeight: number,
+	contentHeight: number,
 };
 
 export default class HTMLInputViewUI extends React.Component<PropsType, StateType> {
@@ -38,14 +38,14 @@ export default class HTMLInputViewUI extends React.Component<PropsType, StateTyp
 	}
 
 	render() {
-		const style = { ...styles.htmlView, height: this.state.contentHeight + 16 }
+		const style = { ...styles.htmlView, height: this.state.contentHeight + 16 };
 		return (
 			<KeyboardAvoidingView style={ styles.container } parentHeight={ this.props.parentHeight }>
 				<ScrollView
 					style={ { flex: 1 } }
 					keyboardDismissMode="interactive"
 				>
-					{ this.props.content( false, style, this.onContentSizeChange) }
+					{ this.props.content( false, style, this.onContentSizeChange ) }
 				</ScrollView>
 			</KeyboardAvoidingView>
 		);
diff --git a/src/components/html-text-input-ui/html-text-input-ui.ios.js b/src/components/html-text-input-ui/html-text-input-ui.ios.js
index 5788842b0e..0d6b85c179 100644
--- a/src/components/html-text-input-ui/html-text-input-ui.ios.js
+++ b/src/components/html-text-input-ui/html-text-input-ui.ios.js
@@ -7,7 +7,7 @@
  * External dependencies
  */
 import * as React from 'react';
-import { TextInput, UIManager, PanResponder } from 'react-native';
+import { UIManager, PanResponder } from 'react-native';
 
 /**
  * Internal dependencies
@@ -16,8 +16,8 @@ import styles from './html-text-input-ui.scss';
 import KeyboardAvoidingView from '../keyboard-avoiding-view';
 
 type PropsType = {
-    parentHeight: number,
-	content: (scrollEnabled: boolean, style: mixed, onContentSizeChange: () => void) => React.Node,
+	parentHeight: number,
+	content: ( scrollEnabled: boolean, style: mixed, onContentSizeChange: () => void ) => React.Node,
 };
 
 type StateType = {
@@ -50,7 +50,7 @@ export default class HTMLInputViewUI extends React.Component<PropsType, StateTyp
 				{ ...this.panResponder.panHandlers }
 				parentHeight={ this.props.parentHeight }
 			>
-				{ this.props.content( true, styles.htmlView, ()=>{} ) }
+				{ this.props.content( true, styles.htmlView, () => {} ) }
 
 			</KeyboardAvoidingView>
 		);

From 8102542a5e3d49951f258ed8cac4567a371b0924 Mon Sep 17 00:00:00 2001
From: etoledom <etoledom@icloud.com>
Date: Mon, 25 Mar 2019 15:11:34 +0100
Subject: [PATCH 04/11] HTMLView: Fixed content on Android.

---
 .../html-text-input-ui/html-text-input-ui-common.scss |  6 +++++-
 .../html-text-input-ui/html-text-input-ui.android.js  | 11 +++++++----
 .../html-text-input-ui/html-text-input-ui.ios.js      |  5 ++---
 src/components/html-text-input.js                     |  6 +++---
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/components/html-text-input-ui/html-text-input-ui-common.scss b/src/components/html-text-input-ui/html-text-input-ui-common.scss
index 265e94e4c6..7405af8d36 100644
--- a/src/components/html-text-input-ui/html-text-input-ui-common.scss
+++ b/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;
+}
diff --git a/src/components/html-text-input-ui/html-text-input-ui.android.js b/src/components/html-text-input-ui/html-text-input-ui.android.js
index 4395f52aa3..e39f521533 100644
--- a/src/components/html-text-input-ui/html-text-input-ui.android.js
+++ b/src/components/html-text-input-ui/html-text-input-ui.android.js
@@ -7,7 +7,7 @@
  * External dependencies
  */
 import * as React from 'react';
-import { ScrollView } from 'react-native';
+import { ScrollView, NativeSyntheticEvent, TextInputContentSizeChangeEventData } from 'react-native';
 
 /**
  * Internal dependencies
@@ -17,7 +17,10 @@ import KeyboardAvoidingView from '../keyboard-avoiding-view';
 
 type PropsType = {
 	parentHeight: number,
-	content: ( scrollEnabled: boolean, style: mixed, onContentSizeChange: () => void ) => React.Node,
+	content: (
+		scrollEnabled: boolean,
+		style: mixed,
+		onContentSizeChange: ( NativeSyntheticEvent<TextInputContentSizeChangeEventData> ) => void ) => React.Node,
 };
 
 type StateType = {
@@ -33,14 +36,14 @@ export default class HTMLInputViewUI extends React.Component<PropsType, StateTyp
 		};
 	}
 
-	onContentSizeChange = ( event ) => {
+	onContentSizeChange = ( event: NativeSyntheticEvent<TextInputContentSizeChangeEventData> ) => {
 		this.setState( { contentHeight: event.nativeEvent.contentSize.height } );
 	}
 
 	render() {
 		const style = { ...styles.htmlView, height: this.state.contentHeight + 16 };
 		return (
-			<KeyboardAvoidingView style={ styles.container } parentHeight={ this.props.parentHeight }>
+			<KeyboardAvoidingView style={ styles.keyboardAvoidingView } parentHeight={ this.props.parentHeight }>
 				<ScrollView
 					style={ { flex: 1 } }
 					keyboardDismissMode="interactive"
diff --git a/src/components/html-text-input-ui/html-text-input-ui.ios.js b/src/components/html-text-input-ui/html-text-input-ui.ios.js
index 0d6b85c179..d978cc7935 100644
--- a/src/components/html-text-input-ui/html-text-input-ui.ios.js
+++ b/src/components/html-text-input-ui/html-text-input-ui.ios.js
@@ -34,7 +34,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 );
@@ -46,12 +46,11 @@ 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 }
 			>
 				{ this.props.content( true, styles.htmlView, () => {} ) }
-
 			</KeyboardAvoidingView>
 		);
 	}
diff --git a/src/components/html-text-input.js b/src/components/html-text-input.js
index 43b24f4d6c..92ab7e7db2 100644
--- a/src/components/html-text-input.js
+++ b/src/components/html-text-input.js
@@ -84,9 +84,9 @@ export class HTMLInputView extends React.Component<PropsType, StateType> {
 		return (
 			<HTMLInputViewUI
 				parentHeight={ this.props.parentHeight }
-				content={ ( scrollEnabled, style, onContentSizeChange ) => {
+				content={ ( scrollEnabled, htmlStyle, onContentSizeChange ) => {
 					return (
-						<View>
+						<View style={ styles.container }>
 							<TextInput
 								autoCorrect={ false }
 								textAlignVertical="center"
@@ -100,7 +100,7 @@ export class HTMLInputView extends React.Component<PropsType, StateType> {
 								autoCorrect={ false }
 								textAlignVertical="top"
 								multiline
-								style={ style }
+								style={ htmlStyle }
 								value={ this.state.value }
 								onChangeText={ this.edit }
 								onBlur={ this.stopEditing }

From 284f84dd742d11c45c105fd193a317115d262747 Mon Sep 17 00:00:00 2001
From: etoledom <etoledom@icloud.com>
Date: Mon, 25 Mar 2019 15:11:56 +0100
Subject: [PATCH 05/11] HTMLView remove extra ios padding (added for testing)

---
 .../html-text-input-ui/html-text-input-ui.ios.scss           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/html-text-input-ui/html-text-input-ui.ios.scss b/src/components/html-text-input-ui/html-text-input-ui.ios.scss
index 3d052b05c0..cca0cef89b 100644
--- a/src/components/html-text-input-ui/html-text-input-ui.ios.scss
+++ b/src/components/html-text-input-ui/html-text-input-ui.ios.scss
@@ -9,7 +9,7 @@ $title-height: 32;
 	background-color: $backgroundColor;
 	padding-left: $padding;
 	padding-right: $padding;
-	padding-bottom: $title-height + $padding + 100;
+	padding-bottom: $title-height + $padding;
 }
 
 .htmlViewTitle {
@@ -20,5 +20,4 @@ $title-height: 32;
 	padding-top: $padding;
 	padding-bottom: $padding;
 	height: $title-height;
-	
-}
\ No newline at end of file
+}

From 7d27850d07de5c7adbf56ddfd63c16c5756d2221 Mon Sep 17 00:00:00 2001
From: etoledom <etoledom@icloud.com>
Date: Tue, 26 Mar 2019 14:00:59 +0100
Subject: [PATCH 06/11] HTMLTextInput: Simplified code share implementation

---
 .../html-text-input-ui.ios.js                 | 11 ++--
 src/components/html-text-input.js             | 54 ++++++++-----------
 2 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/src/components/html-text-input-ui/html-text-input-ui.ios.js b/src/components/html-text-input-ui/html-text-input-ui.ios.js
index d978cc7935..8bc1c2effa 100644
--- a/src/components/html-text-input-ui/html-text-input-ui.ios.js
+++ b/src/components/html-text-input-ui/html-text-input-ui.ios.js
@@ -17,13 +17,14 @@ import KeyboardAvoidingView from '../keyboard-avoiding-view';
 
 type PropsType = {
 	parentHeight: number,
-	content: ( scrollEnabled: boolean, style: mixed, onContentSizeChange: () => void ) => React.Node,
+	children: React.Node,
 };
 
 type StateType = {
 };
 
-export default class HTMLInputViewUI extends React.Component<PropsType, StateType> {
+class HTMLInputViewUI extends React.Component<PropsType, StateType> {
+	static scrollEnabled: boolean;
 	panResponder: PanResponder;
 
 	constructor() {
@@ -50,8 +51,12 @@ export default class HTMLInputViewUI extends React.Component<PropsType, StateTyp
 				{ ...this.panResponder.panHandlers }
 				parentHeight={ this.props.parentHeight }
 			>
-				{ this.props.content( true, styles.htmlView, () => {} ) }
+				{ this.props.children }
 			</KeyboardAvoidingView>
 		);
 	}
 }
+
+HTMLInputViewUI.scrollEnabled = true;
+
+export default HTMLInputViewUI;
diff --git a/src/components/html-text-input.js b/src/components/html-text-input.js
index 92ab7e7db2..927a8e7b3b 100644
--- a/src/components/html-text-input.js
+++ b/src/components/html-text-input.js
@@ -14,7 +14,7 @@ import { withInstanceId, compose } from '@wordpress/compose';
  * External dependencies
  */
 import React from 'react';
-import { View, TextInput } from 'react-native';
+import { TextInput } from 'react-native';
 
 /**
  * Internal dependencies
@@ -82,36 +82,28 @@ export class HTMLInputView extends React.Component<PropsType, StateType> {
 
 	render() {
 		return (
-			<HTMLInputViewUI
-				parentHeight={ this.props.parentHeight }
-				content={ ( scrollEnabled, htmlStyle, onContentSizeChange ) => {
-					return (
-						<View style={ styles.container }>
-							<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={ htmlStyle }
-								value={ this.state.value }
-								onChangeText={ this.edit }
-								onBlur={ this.stopEditing }
-								placeholder={ __( 'Start writing…' ) }
-								scrollEnabled={ scrollEnabled }
-								onContentSizeChange={ onContentSizeChange }
-							/>
-						</View>
-					);
-				} }
-			/>
+			<HTMLInputViewUI 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={ HTMLInputViewUI.scrollEnabled }
+				/>
+			</HTMLInputViewUI>
 		);
 	}
 }

From 7d3a9c8c72746a1c0676ffa7e50b10ed411de5cf Mon Sep 17 00:00:00 2001
From: etoledom <etoledom@icloud.com>
Date: Tue, 26 Mar 2019 14:01:46 +0100
Subject: [PATCH 07/11] HTMLTextInput: Implement necessary changes on Android
 branch for code share

---
 .../html-text-input-ui.android.js             | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/components/html-text-input-ui/html-text-input-ui.android.js b/src/components/html-text-input-ui/html-text-input-ui.android.js
index e39f521533..50a5cd2225 100644
--- a/src/components/html-text-input-ui/html-text-input-ui.android.js
+++ b/src/components/html-text-input-ui/html-text-input-ui.android.js
@@ -7,7 +7,7 @@
  * External dependencies
  */
 import * as React from 'react';
-import { ScrollView, NativeSyntheticEvent, TextInputContentSizeChangeEventData } from 'react-native';
+import { ScrollView, View } from 'react-native';
 
 /**
  * Internal dependencies
@@ -17,17 +17,16 @@ import KeyboardAvoidingView from '../keyboard-avoiding-view';
 
 type PropsType = {
 	parentHeight: number,
-	content: (
-		scrollEnabled: boolean,
-		style: mixed,
-		onContentSizeChange: ( NativeSyntheticEvent<TextInputContentSizeChangeEventData> ) => void ) => React.Node,
+	children: React.Node,
 };
 
 type StateType = {
 	contentHeight: number,
 };
 
-export default class HTMLInputViewUI extends React.Component<PropsType, StateType> {
+class HTMLInputViewUI extends React.Component<PropsType, StateType> {
+	static scrollEnabled: boolean;
+
 	constructor() {
 		super( ...arguments );
 
@@ -41,16 +40,20 @@ export default class HTMLInputViewUI extends React.Component<PropsType, StateTyp
 	}
 
 	render() {
-		const style = { ...styles.htmlView, height: this.state.contentHeight + 16 };
 		return (
 			<KeyboardAvoidingView style={ styles.keyboardAvoidingView } parentHeight={ this.props.parentHeight }>
 				<ScrollView
 					style={ { flex: 1 } }
 					keyboardDismissMode="interactive"
 				>
-					{ this.props.content( false, style, this.onContentSizeChange ) }
+					{ this.props.children }
+					<View style={ { height: 16 } } />
 				</ScrollView>
 			</KeyboardAvoidingView>
 		);
 	}
 }
+
+HTMLInputViewUI.scrollEnabled = false;
+
+export default HTMLInputViewUI;

From 668fd641d656b2fb0d830c85ddb836163c099a35 Mon Sep 17 00:00:00 2001
From: etoledom <etoledom@icloud.com>
Date: Tue, 26 Mar 2019 14:04:57 +0100
Subject: [PATCH 08/11] Rename HTMLInputViewUI to HTMLInputContainer

---
 .../html-text-input-ui/html-text-input-ui.android.js      | 6 +++---
 .../html-text-input-ui/html-text-input-ui.ios.js          | 6 +++---
 src/components/html-text-input.js                         | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/html-text-input-ui/html-text-input-ui.android.js b/src/components/html-text-input-ui/html-text-input-ui.android.js
index 50a5cd2225..a902f80d88 100644
--- a/src/components/html-text-input-ui/html-text-input-ui.android.js
+++ b/src/components/html-text-input-ui/html-text-input-ui.android.js
@@ -24,7 +24,7 @@ type StateType = {
 	contentHeight: number,
 };
 
-class HTMLInputViewUI extends React.Component<PropsType, StateType> {
+class HTMLInputContainer extends React.Component<PropsType, StateType> {
 	static scrollEnabled: boolean;
 
 	constructor() {
@@ -54,6 +54,6 @@ class HTMLInputViewUI extends React.Component<PropsType, StateType> {
 	}
 }
 
-HTMLInputViewUI.scrollEnabled = false;
+HTMLInputContainer.scrollEnabled = false;
 
-export default HTMLInputViewUI;
+export default HTMLInputContainer;
diff --git a/src/components/html-text-input-ui/html-text-input-ui.ios.js b/src/components/html-text-input-ui/html-text-input-ui.ios.js
index 8bc1c2effa..93da41f74f 100644
--- a/src/components/html-text-input-ui/html-text-input-ui.ios.js
+++ b/src/components/html-text-input-ui/html-text-input-ui.ios.js
@@ -23,7 +23,7 @@ type PropsType = {
 type StateType = {
 };
 
-class HTMLInputViewUI extends React.Component<PropsType, StateType> {
+class HTMLInputContainer extends React.Component<PropsType, StateType> {
 	static scrollEnabled: boolean;
 	panResponder: PanResponder;
 
@@ -57,6 +57,6 @@ class HTMLInputViewUI extends React.Component<PropsType, StateType> {
 	}
 }
 
-HTMLInputViewUI.scrollEnabled = true;
+HTMLInputContainer.scrollEnabled = true;
 
-export default HTMLInputViewUI;
+export default HTMLInputContainer;
diff --git a/src/components/html-text-input.js b/src/components/html-text-input.js
index 927a8e7b3b..bf18e52c4a 100644
--- a/src/components/html-text-input.js
+++ b/src/components/html-text-input.js
@@ -19,7 +19,7 @@ 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 = {
@@ -82,7 +82,7 @@ export class HTMLInputView extends React.Component<PropsType, StateType> {
 
 	render() {
 		return (
-			<HTMLInputViewUI parentHeight={ this.props.parentHeight }>
+			<HTMLInputContainer parentHeight={ this.props.parentHeight }>
 				<TextInput
 					autoCorrect={ false }
 					textAlignVertical="center"
@@ -101,9 +101,9 @@ export class HTMLInputView extends React.Component<PropsType, StateType> {
 					onChangeText={ this.edit }
 					onBlur={ this.stopEditing }
 					placeholder={ __( 'Start writing…' ) }
-					scrollEnabled={ HTMLInputViewUI.scrollEnabled }
+					scrollEnabled={ HTMLInputContainer.scrollEnabled }
 				/>
-			</HTMLInputViewUI>
+			</HTMLInputContainer>
 		);
 	}
 }

From 64438d70d83c92a7c60d3beae20e3d41331ade74 Mon Sep 17 00:00:00 2001
From: etoledom <etoledom@icloud.com>
Date: Tue, 26 Mar 2019 14:10:17 +0100
Subject: [PATCH 09/11] HTMLTextInput: Replace bottom padding view with extra
 `pading-bottom` style.

---
 src/components/html-text-input-ui/html-text-input-ui.android.js | 1 -
 .../html-text-input-ui/html-text-input-ui.android.scss          | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/html-text-input-ui/html-text-input-ui.android.js b/src/components/html-text-input-ui/html-text-input-ui.android.js
index a902f80d88..940e4b7468 100644
--- a/src/components/html-text-input-ui/html-text-input-ui.android.js
+++ b/src/components/html-text-input-ui/html-text-input-ui.android.js
@@ -47,7 +47,6 @@ class HTMLInputContainer extends React.Component<PropsType, StateType> {
 					keyboardDismissMode="interactive"
 				>
 					{ this.props.children }
-					<View style={ { height: 16 } } />
 				</ScrollView>
 			</KeyboardAvoidingView>
 		);
diff --git a/src/components/html-text-input-ui/html-text-input-ui.android.scss b/src/components/html-text-input-ui/html-text-input-ui.android.scss
index b6b3aa2923..e82ee1b02a 100644
--- a/src/components/html-text-input-ui/html-text-input-ui.android.scss
+++ b/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 {

From 5139b51078d6ee8875bec6b37824664c6df3071a Mon Sep 17 00:00:00 2001
From: etoledom <etoledom@icloud.com>
Date: Tue, 26 Mar 2019 14:41:13 +0100
Subject: [PATCH 10/11] Fix lint issues

---
 src/components/html-text-input-ui/html-text-input-ui.android.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/html-text-input-ui/html-text-input-ui.android.js b/src/components/html-text-input-ui/html-text-input-ui.android.js
index 940e4b7468..96b9046542 100644
--- a/src/components/html-text-input-ui/html-text-input-ui.android.js
+++ b/src/components/html-text-input-ui/html-text-input-ui.android.js
@@ -7,7 +7,7 @@
  * External dependencies
  */
 import * as React from 'react';
-import { ScrollView, View } from 'react-native';
+import { ScrollView } from 'react-native';
 
 /**
  * Internal dependencies

From d496c64add2fc8ee0d3c8ef1109a037a9f9fcb01 Mon Sep 17 00:00:00 2001
From: etoledom <etoledom@icloud.com>
Date: Tue, 26 Mar 2019 15:45:16 +0100
Subject: [PATCH 11/11] Remove unnecessary code from
 html-text-input-ui.android.js

---
 .../html-text-input-ui.android.js              | 18 +-----------------
 .../html-text-input-ui.android.scss            |  4 ++++
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/components/html-text-input-ui/html-text-input-ui.android.js b/src/components/html-text-input-ui/html-text-input-ui.android.js
index 96b9046542..888ffcf89f 100644
--- a/src/components/html-text-input-ui/html-text-input-ui.android.js
+++ b/src/components/html-text-input-ui/html-text-input-ui.android.js
@@ -21,31 +21,15 @@ type PropsType = {
 };
 
 type StateType = {
-	contentHeight: number,
 };
 
 class HTMLInputContainer extends React.Component<PropsType, StateType> {
 	static scrollEnabled: boolean;
 
-	constructor() {
-		super( ...arguments );
-
-		this.state = {
-			contentHeight: 0,
-		};
-	}
-
-	onContentSizeChange = ( event: NativeSyntheticEvent<TextInputContentSizeChangeEventData> ) => {
-		this.setState( { contentHeight: event.nativeEvent.contentSize.height } );
-	}
-
 	render() {
 		return (
 			<KeyboardAvoidingView style={ styles.keyboardAvoidingView } parentHeight={ this.props.parentHeight }>
-				<ScrollView
-					style={ { flex: 1 } }
-					keyboardDismissMode="interactive"
-				>
+				<ScrollView style={ styles.scrollView } >
 					{ this.props.children }
 				</ScrollView>
 			</KeyboardAvoidingView>
diff --git a/src/components/html-text-input-ui/html-text-input-ui.android.scss b/src/components/html-text-input-ui/html-text-input-ui.android.scss
index e82ee1b02a..93560154af 100644
--- a/src/components/html-text-input-ui/html-text-input-ui.android.scss
+++ b/src/components/html-text-input-ui/html-text-input-ui.android.scss
@@ -19,3 +19,7 @@
 	padding-top: $padding;
 	padding-bottom: $padding;
 }
+
+.scrollView {
+	flex: 1;
+}