Merge pull request #1770 from wordpress-mobile/master-to-develop-post…

…-release-v1.20.0 Master to develop post release v1.20.0
wordpress-mobile · Jan 14, 2020 · 49f605f · 49f605f
2 parents 5d4ce57 + 3a71bb4
commit 49f605f
Show file tree

Hide file tree

Showing 14 changed files with 1,856 additions and 1,819 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,6 +1,9 @@
 1.20.0
 ------
 * Fix bug where image placeholders would sometimes not be shown
+* Fix crash on undo
+* Style fixes on the navigation UI
+* [iOS] Fix focus issue
 
 1.19.0
 ------

diff --git a/bin/po2android.js b/bin/po2android.js
@@ -14,15 +14,23 @@ const indent = '    ';
  * @return {string} Escaped string to be copied into the XML <string></string> node
  */
 function escapeResourceXML( unsafeXMLValue ) {
-	// Let's first replace XML special characters that JSON.stringify does not escape: <, > and &
-	// Then let's use JSON.stringify to handle pre and post spaces as well as escaping ", \, \t and \n
-	return JSON.stringify( unsafeXMLValue.replace( /[<>&]/g, function( character ) {
+	// See: https://tekeye.uk/android/examples/android-string-resources-gotchas
+	// Let's replace XML special characters  <, >, &, ", ', \, \t and \n
+	// Note that this does not support android:textstyle attributes (<b></b>...)
+	return unsafeXMLValue.replace( /(\r?\n|\r|\t|<|>|&|'|"|\\)/gm, function( character ) {
 		switch ( character ) {
 			case '<': return '&lt;';
 			case '>': return '&gt;';
 			case '&': return '&amp;';
+			case '\'': return '\\\'';
+			case '"': return '\\\"';
+			case '\r':
+			case '\n':
+			case '\r\n': return '\\n';
+			case '\t': return '\\t';
+			case '\\': return '\\\\';
 		}
-	} ) );
+	} );
 }
 
 /**

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/android/strings.xml b/bundle/android/strings.xml
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/bundle/ios/GutenbergNativeTranslations.swift b/bundle/ios/GutenbergNativeTranslations.swift
@@ -3,6 +3,7 @@ import Foundation
 private func dummy() {
     _ = NSLocalizedString("'%s' isn't yet supported on WordPress for Android", comment: "translators: %s: Name of the block")
     _ = NSLocalizedString("'%s' isn't yet supported on WordPress for iOS", comment: "")
+    _ = NSLocalizedString("%1$s. Current value is %2$s", comment: "translators: accessibility text. Inform about current value. %1$s: Control label %2$s: Current value.")
     _ = NSLocalizedString("%s Block", comment: "translators: accessibility text. %s: block name.")
     _ = NSLocalizedString("%s block. Empty", comment: "translators: accessibility text for the media block empty state. %s: media type")
     _ = NSLocalizedString("%s block. This block has invalid content", comment: "translators: accessibility text for blocks with invalid content. %d: localized block title")
@@ -81,6 +82,5 @@ private func dummy() {
     _ = NSLocalizedString("Title:", comment: "")
     _ = NSLocalizedString("Translate", comment: "")
     _ = NSLocalizedString("Ungroup", comment: "")
-    _ = NSLocalizedString("Unsupported", comment: "")
     _ = NSLocalizedString("We are working hard to add more blocks with each release. In the meantime, you can also edit this post on the web.", comment: "")
     _ = NSLocalizedString("WordPress Media Library", comment: "")
diff --git a/gutenberg b/gutenberg
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gutenberg-mobile",
-  "version": "1.19.0",
+  "version": "1.20.0",
   "private": true,
   "config": {
     "jsfiles": "./*.js src/*.js src/**/*.js src/**/**/*.js",
@@ -85,7 +85,9 @@
     "pregenstrings": "test -f gutenberg.pot || yarn makepot:gutenberg",
     "genstrings": "yarn genstrings:android && yarn genstrings:ios",
     "genstrings:android": "yarn makepot:android && ./bin/po2android.js gutenberg-android.pot bundle/android/strings.xml",
+    "genstrings:android:check": "xmllint --noout bundle/android/strings.xml",
     "genstrings:ios": "yarn makepot:ios && ./bin/po2swift.js gutenberg-ios.pot bundle/ios/GutenbergNativeTranslations.swift",
+    "postgenstrings:android": "yarn genstrings:android:check",
     "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",
@@ -167,7 +169,7 @@
     "react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#eadaa2f62d2f488d4dc80f9148e52b62047297ab",
     "react-native-safe-area": "^0.5.0",
     "react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#d466eb06a38e6f553f08666f0ca784d47fd6f724",
-    "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#6c75579a95a6ddb3762b6e11ef004c2cd0bed537",
+    "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#ad64098edc4ce1cd0ad783cb1843df634d997fdb",
     "react-redux": "^5.0.7",
     "redux": "^3.7.2",
     "redux-multi": "^0.1.12",

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.36'
+        aztecVersion = 'v1.3.37'
     }
 
     repositories {

diff --git a/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift b/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift
@@ -669,6 +669,7 @@ extension RCTAztecView: UITextViewDelegate {
     }
 
     func textViewDidEndEditing(_ textView: UITextView) {
-        onBlur?([:])
+        let text = packForRN(cleanHTML(), withName: "text")
+        onBlur?(text)
     }
 }
diff --git a/react-native-aztec/src/AztecView.js b/react-native-aztec/src/AztecView.js
@@ -141,7 +141,7 @@ class AztecView extends React.Component {
 
   _onPress = (event) => {
 	if ( ! this.isFocused() ) {
-		this.focus(event); // Call to move the focus in RN way (TextInputState)
+		this.focus(); // Call to move the focus in RN way (TextInputState)
 		this._onFocus(event); // Check if there are listeners set on the focus event
 	}
   }

diff --git a/yarn.lock b/yarn.lock
@@ -11016,9 +11016,9 @@ react-native-sass-transformer@^1.1.1:
   version "9.3.3-gb"
   resolved "git+https://github.com/wordpress-mobile/react-native-svg.git#d466eb06a38e6f553f08666f0ca784d47fd6f724"
 
-"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#6c75579a95a6ddb3762b6e11ef004c2cd0bed537":
+"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#ad64098edc4ce1cd0ad783cb1843df634d997fdb":
   version "4.4.1"
-  resolved "git+https://github.com/wordpress-mobile/react-native-video.git#6c75579a95a6ddb3762b6e11ef004c2cd0bed537"
+  resolved "git+https://github.com/wordpress-mobile/react-native-video.git#ad64098edc4ce1cd0ad783cb1843df634d997fdb"
   dependencies:
     keymirror "^0.1.1"
     prop-types "^15.5.10"
+2 −2		package-lock.json
+1 −1		packages/block-editor/src/components/writing-flow/focus-capture.js
+0 −1		packages/block-library/src/media-text/style.native.scss
+2 −2		packages/components/src/button/index.native.js
+15 −2		packages/rich-text/src/component/index.native.js