Merge branch 'develop' of https://github.com/wordpress-mobile/gutenbe…

…rg-mobile into issue/372-add-enter-key-detection-to-Title-block * 'develop' of https://github.com/wordpress-mobile/gutenberg-mobile: Update bundle bump aztec android to v1.3.18 (#498) Update GB hash [Android] - Make sure mContentChanged has the correct value when asking content from the React side. This was necessary since the call to retrieve content and title are separate on Android. The HTML editor background is now white. Make sure to use `setContent` when initializating the GlueCode Dock the keyboard hide button to the right side of the screen (#480) RNAztecView: Removing branch spec from podspec Moving RNTAztecView.podspec to the gutenberg-mobile root dir. Aztec iOS: Force send height information to JS after pasting text # Conflicts: # gutenberg
wordpress-mobile · Jan 25, 2019 · 33975e9 · 33975e9
2 parents 9291516 + e78eed0
commit 33975e9
Show file tree

Hide file tree

Showing 14 changed files with 757 additions and 801 deletions.
diff --git a/react-native-aztec/RNTAztecView.podspec → RNTAztecView.podspec b/react-native-aztec/RNTAztecView.podspec → RNTAztecView.podspec
diff --git a/bin/generate-podspecs.sh b/bin/generate-podspecs.sh
@@ -16,7 +16,6 @@ node_modules/react-native/ReactCommon/yoga/yoga.podspec
 node_modules/react-native/third-party-podspecs/Folly.podspec
 node_modules/react-native/third-party-podspecs/DoubleConversion.podspec
 node_modules/react-native/third-party-podspecs/glog.podspec
-react-native-aztec/RNTAztecView.podspec
 EOP
 )
 

diff --git a/bundle/android/App.js b/bundle/android/App.js
diff --git a/bundle/android/App.js.map b/bundle/android/App.js.map
diff --git a/bundle/ios/App.js b/bundle/ios/App.js
diff --git a/bundle/ios/App.js.map b/bundle/ios/App.js.map
diff --git a/react-native-aztec/android/build.gradle b/react-native-aztec/android/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         wordpressUtilsVersion = '1.22'
         espressoVersion = '3.0.1'
 
-        aztecVersion = 'v1.3.14'
+        aztecVersion = 'v1.3.18'
     }
 
     repositories {

diff --git a/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift b/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift
@@ -302,6 +302,8 @@ extension RCTAztecView: UITextViewDelegate {
         forceTypingAttributesIfNeeded()
         propagateFormatChanges()
         propagateContentChanges()
+        //Necessary to send height information to JS after pasting text.
+        textView.setNeedsLayout()
     }
 
     func textViewDidBeginEditing(_ textView: UITextView) {

diff --git a/...rg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java b/...rg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
@@ -72,7 +72,9 @@ protected List<ReactPackage> getPackages(final OnMediaLibraryButtonListener onMe
             public void responseHtml(String title, String html, boolean changed) {
                 mContentHtml = html;
                 mTitle = title;
-                mContentChanged = changed;
+                // This code is called twice. When getTitle and getContent are called.
+                // Make sure mContentChanged has the correct value (true) if one of the call returned with changes.
+                mContentChanged = mContentChanged || changed;
                 mGetContentCountDownLatch.countDown();
             }
 

diff --git a/react-native-gutenberg-bridge/third-party-podspecs/RNTAztecView.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/RNTAztecView.podspec.json
diff --git a/src/block-management/block-toolbar.js b/src/block-management/block-toolbar.js
@@ -10,7 +10,6 @@ import { compose } from '@wordpress/compose';
 import { Toolbar, ToolbarButton } from '@wordpress/components';
 import { BlockFormatControls, BlockControls } from '@wordpress/editor';
 import { __ } from '@wordpress/i18n';
-import KeyboardHideButton from '../components/keyboard-hide-button';
 
 import styles from './block-toolbar.scss';
 
@@ -65,14 +64,16 @@ export class BlockToolbar extends Component<PropsType> {
 							onClick={ redo }
 						/>
 					</Toolbar>
-					{ showKeyboardHideButton && ( <Toolbar>
-						<KeyboardHideButton
-							onPress={ this.onKeyboardHide }
-						/>
-					</Toolbar> ) }
 					<BlockControls.Slot />
 					<BlockFormatControls.Slot />
 				</ScrollView>
+				{ showKeyboardHideButton &&
+				( <Toolbar passedStyle={ styles.keyboardHideContainer }>
+					<ToolbarButton
+						icon="keyboard-hide"
+						onClick={ this.onKeyboardHide }
+					/>
+				</Toolbar> ) }
 			</View>
 		);
 	}

diff --git a/src/block-management/block-toolbar.scss b/src/block-management/block-toolbar.scss
@@ -5,3 +5,12 @@
     border-top-color: #e9eff3;
     border-top-width: 1;
 }
+
+.keyboardHideContainer {
+    padding-right: 0px;
+    padding-left: 0px;
+    padding-top: 4px;
+    width: 44;
+    justify-content: center;
+    align-items: center;
+}
diff --git a/src/components/html-text-input.scss b/src/components/html-text-input.scss
@@ -5,7 +5,7 @@
 .htmlView {
 	font-family: $default-monospace-font;
 	flex: 1;
-	background-color: #eee;
+	background-color: white;
 	padding-left: 8;
 	padding-right: 8;
 	padding-top: 8;

diff --git a/src/components/keyboard-hide-button.js b/src/components/keyboard-hide-button.js