[RNMobile] Merge release 1.33.1 to master (#24448)

* Release script: Update react-native-editor version to 1.33.0 * Update release notes. * Update version numbers for packages. * Revert "Reduce spacing between label and slider control (#23580)" (#24109) This reverts commit 2a67de0. * Release script: Update react-native-* versions to 1.33.1 * Release script: Update with changes from 'npm run core preios' * Allow @ char in posts in mobile editor (#24428) This fixes a bug with the @-mention feature on mobile that made entering the standalone @ character difficult because of the @-mention UI getting in the way. The fix here is to allow the @ character to be intercepted without being consumed by the @ key event logic. * Remove duplicate entry from changelog Co-authored-by: Sergio Estevao <[email protected]> Co-authored-by: Antonis Lilis <[email protected]> Co-authored-by: Ceyhun Ozugur <[email protected]> Co-authored-by: Paul Von Schrottky <[email protected]>
WordPress · Aug 7, 2020 · 65ac645 · 65ac645
1 parent e610824
commit 65ac645
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/packages/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift b/packages/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift
@@ -306,10 +306,12 @@ class RCTAztecView: Aztec.TextView {
     // MARK: - Edits
 
     open override func insertText(_ text: String) {
-        guard !interceptEnter(text), !interceptTriggersKeyCodes(text) else {
+        guard !interceptEnter(text) else {
             return
         }
 
+        interceptTriggersKeyCodes(text)
+
         super.insertText(text)
         updatePlaceholderVisibility()
     }
@@ -374,13 +376,13 @@ class RCTAztecView: Aztec.TextView {
         return true
     }
 
-    private func interceptTriggersKeyCodes(_ text: String) -> Bool {
+    private func interceptTriggersKeyCodes(_ text: String) {
         guard let keyCodes = triggerKeyCodes,
             keyCodes.count > 0,
             let onKeyDown = onKeyDown,
             text.count == 1
         else {
-            return false
+            return
         }
         for value in keyCodes {
             guard let keyString = value as? String,
@@ -393,9 +395,8 @@ class RCTAztecView: Aztec.TextView {
             var eventData = [AnyHashable:Any]()
             eventData = add(keyCode: keyCode, to: eventData)
             onKeyDown(eventData)
-            return true
+            return
         }
-        return false;
     }
 
     private func isNewLineBeforeSelectionAndNotEndOfContent() -> Bool {

diff --git a/packages/react-native-aztec/package.json b/packages/react-native-aztec/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wordpress/react-native-aztec",
-  "version": "1.33.0",
+  "version": "1.33.1",
   "description": "Aztec view for react-native.",
   "private": true,
   "author": "The WordPress Contributors",

diff --git a/packages/react-native-bridge/package.json b/packages/react-native-bridge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wordpress/react-native-bridge",
-  "version": "1.33.0",
+  "version": "1.33.1",
   "description": "Native bridge library used to integrate the block editor into a native App.",
   "private": true,
   "author": "The WordPress Contributors",

diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md
@@ -16,6 +16,10 @@ For each user feature we should also add a importance categorization label  to i
 * [***] Media editing support in Cover block.
 * [*] Fixed a bug on the Heading block, where a heading with a link and string formatting showed a white shadow in dark mode.
 
+## 1.33.1
+
+* Fixed a bug in the @-mentions feature where dismissing the @-mentions UI removed the @ character from the post.
+
 ## 1.33.0
 
 * [***] Media editing support in Media & Text block.

diff --git a/packages/react-native-editor/ios/Podfile.lock b/packages/react-native-editor/ios/Podfile.lock
@@ -21,7 +21,7 @@ PODS:
     - DoubleConversion
     - glog
   - glog (0.3.5)
-  - Gutenberg (1.33.0):
+  - Gutenberg (1.33.1):
     - React (= 0.61.5)
     - React-CoreModules (= 0.61.5)
     - React-RCTImage (= 0.61.5)
@@ -243,7 +243,7 @@ PODS:
     - React
   - RNSVG (9.13.6-gb):
     - React
-  - RNTAztecView (1.33.0):
+  - RNTAztecView (1.33.1):
     - React-Core
     - WordPress-Aztec-iOS (~> 1.19.3)
   - WordPress-Aztec-iOS (1.19.3)
@@ -377,7 +377,7 @@ SPEC CHECKSUMS:
   FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75
   Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
   glog: 1f3da668190260b06b429bb211bfbee5cd790c28
-  Gutenberg: 26f1ba13f6edd966506ebc5dbeee727ccaaa6a68
+  Gutenberg: e0d65478c96d0dae0060c3a3a9c858ea59896faa
   RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1
   RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320
   React: b6a59ef847b2b40bb6e0180a97d0ca716969ac78
@@ -405,7 +405,7 @@ SPEC CHECKSUMS:
   ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd
   ReactNativeDarkMode: f61376360c5d983907e5c316e8e1c853a8c2f348
   RNSVG: 68a534a5db06dcbdaebfd5079349191598caef7b
-  RNTAztecView: 8826fac3758dc309c31366d54ed819d177e7cbfa
+  RNTAztecView: 97c0e2193a96e8c451773a0a4596ccc021610997
   WordPress-Aztec-iOS: b7ac8b30f746992e85d9668453ac87c2cdcecf4f
   Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b