Merge remote-tracking branch 'origin/release/1.23.0' into fix/wp-ios-…

…accessibility

RELEASE-NOTES.txt

@@ -6,6 +6,7 @@
 * New block: Button
 * Add scroll support inside block picker and block settings
 * [Android] Fix issue preventing correct placeholder image from displaying during image upload
+* [iOS] Fix diplay of large numbers on ordered lists
 
 1.22.0
 ------

RNTAztecView.podspec

@@ -18,6 +18,6 @@ Pod::Spec.new do |s|
   s.xcconfig         = {'OTHER_LDFLAGS' => '-lxml2',
                         'HEADER_SEARCH_PATHS' => '/usr/include/libxml2'}
   s.dependency         'React-Core'
-  s.dependency         'WordPress-Aztec-iOS', '1.15.0'
+  s.dependency         'WordPress-Aztec-iOS', '1.16.0'
 
 end

bundle/android/raw/gutenberg_packages_blocklibrary_src_gallery_block.json

@@ -9,27 +9,32 @@
 			"selector": ".blocks-gallery-item",
 			"query": {
 				"url": {
+					"type": "string",
 					"source": "attribute",
 					"selector": "img",
 					"attribute": "src"
 				},
 				"fullUrl": {
+					"type": "string",
 					"source": "attribute",
 					"selector": "img",
 					"attribute": "data-full-url"
 				},
 				"link": {
+					"type": "string",
 					"source": "attribute",
 					"selector": "img",
 					"attribute": "data-link"
 				},
 				"alt": {
+					"type": "string",
 					"source": "attribute",
 					"selector": "img",
 					"attribute": "alt",
 					"default": ""
 				},
 				"id": {
+					"type": "string",
 					"source": "attribute",
 					"selector": "img",
 					"attribute": "data-id"

bundle/android/strings.xml

@@ -19,10 +19,10 @@
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again" tools:ignore="UnusedResources">An unknown error occurred. Please try again.</string>
     <string name="gutenberg_native_annotations_sidebar" tools:ignore="UnusedResources">Annotations Sidebar</string>
     <string name="gutenberg_native_border_settings" tools:ignore="UnusedResources">Border Settings</string>
-    <string name="gutenberg_native_button_url" tools:ignore="UnusedResources">Button URL</string>
+    <string name="gutenberg_native_button_color_settings_are_coming_soon" tools:ignore="UnusedResources">Button color settings are coming soon.</string>
+    <string name="gutenberg_native_button_link_url" tools:ignore="UnusedResources">Button Link URL</string>
     <string name="gutenberg_native_choose_from_device" tools:ignore="UnusedResources">Choose from device</string>
     <string name="gutenberg_native_clear_all_settings" tools:ignore="UnusedResources">Clear All Settings</string>
-    <string name="gutenberg_native_color_settings" tools:ignore="UnusedResources">Color Settings</string>
     <string name="gutenberg_native_content" tools:ignore="UnusedResources">Content…</string>
     <string name="gutenberg_native_current_value_is_s" tools:ignore="UnusedResources">Current value is %s</string>
     <string name="gutenberg_native_double_tap_and_hold_to_edit" tools:ignore="UnusedResources">Double tap and hold to edit</string>
@@ -69,7 +69,6 @@
     <string name="gutenberg_native_my_pre_publish_panel" tools:ignore="UnusedResources">My pre publish panel</string>
     <string name="gutenberg_native_navigate_up" tools:ignore="UnusedResources">Navigate Up</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows" tools:ignore="UnusedResources">No application can handle this request. Please install a Web browser.</string>
-    <string name="gutenberg_native_note_theme_colors_are_not_available_at_this_time" tools:ignore="UnusedResources">Note: Theme colors are not available at this time.</string>
     <string name="gutenberg_native_open_settings" tools:ignore="UnusedResources">Open Settings</string>
     <!-- translators: accessibility text. %s: Page break text. -->
     <string name="gutenberg_native_page_break_block_s" tools:ignore="UnusedResources">Page break block. %s</string>

bundle/ios/GutenbergNativeTranslations.swift

@@ -23,10 +23,10 @@ private func dummy() {
     _ = NSLocalizedString("An unknown error occurred. Please try again.", comment: "")
     _ = NSLocalizedString("Annotations Sidebar", comment: "")
     _ = NSLocalizedString("Border Settings", comment: "")
-    _ = NSLocalizedString("Button URL", comment: "")
+    _ = NSLocalizedString("Button color settings are coming soon.", comment: "")
+    _ = NSLocalizedString("Button Link URL", comment: "")
     _ = NSLocalizedString("Choose from device", comment: "")
     _ = NSLocalizedString("Clear All Settings", comment: "")
-    _ = NSLocalizedString("Color Settings", comment: "")
     _ = NSLocalizedString("Content…", comment: "")
     _ = NSLocalizedString("Current value is %s", comment: "")
     _ = NSLocalizedString("Double tap and hold to edit", comment: "")
@@ -66,7 +66,6 @@ private func dummy() {
     _ = NSLocalizedString("My pre publish panel", comment: "")
     _ = NSLocalizedString("Navigate Up", comment: "")
     _ = NSLocalizedString("No application can handle this request. Please install a Web browser.", comment: "")
-    _ = NSLocalizedString("Note: Theme colors are not available at this time.", comment: "")
     _ = NSLocalizedString("Open Settings", comment: "")
     _ = NSLocalizedString("Page break block. %s", comment: "translators: accessibility text. %s: Page break text.")
     _ = NSLocalizedString("Paste URL", comment: "")

bundle/ios/assets/gutenberg/packages/block-library/src/gallery/block.json

@@ -9,27 +9,32 @@
 			"selector": ".blocks-gallery-item",
 			"query": {
 				"url": {
+					"type": "string",
 					"source": "attribute",
 					"selector": "img",
 					"attribute": "src"
 				},
 				"fullUrl": {
+					"type": "string",
 					"source": "attribute",
 					"selector": "img",
 					"attribute": "data-full-url"
 				},
 				"link": {
+					"type": "string",
 					"source": "attribute",
 					"selector": "img",
 					"attribute": "data-link"
 				},
 				"alt": {
+					"type": "string",
 					"source": "attribute",
 					"selector": "img",
 					"attribute": "alt",
 					"default": ""
 				},
 				"id": {
+					"type": "string",
 					"source": "attribute",
 					"selector": "img",
 					"attribute": "data-id"

ios/Podfile.lock

@@ -241,8 +241,8 @@ PODS:
     - React
   - RNTAztecView (1.22.0):
     - React-Core
-    - WordPress-Aztec-iOS (= 1.15.0)
-  - WordPress-Aztec-iOS (1.15.0)
+    - WordPress-Aztec-iOS (= 1.16.0)
+  - WordPress-Aztec-iOS (1.16.0)
   - Yoga (1.14.0)
 
 DEPENDENCIES:
@@ -393,8 +393,8 @@ SPEC CHECKSUMS:
   ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd
   ReactNativeDarkMode: f61376360c5d983907e5c316e8e1c853a8c2f348
   RNSVG: 68a534a5db06dcbdaebfd5079349191598caef7b
-  RNTAztecView: 8f1559db67161d20d394291a8adca2e473ac365e
-  WordPress-Aztec-iOS: 004a458e7c4a7b0e6ed1f40695f4ce3b35ba040f
+  RNTAztecView: 19eb77f908e7d834e35b8f9b323b9069ace39e86
+  WordPress-Aztec-iOS: 64a2989d25befb5ce086fac440315f696026ffd5
   Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
 
 PODFILE CHECKSUM: 2ca635b0121a10753500623fbaee9edd0fe6ef92

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gutenberg-mobile",
-  "version": "1.22.0",
+  "version": "1.23.0",
   "private": true,
   "config": {
     "jsfiles": "./*.js src/*.js src/**/*.js src/**/**/*.js",

react-native-aztec/README.md

@@ -7,66 +7,3 @@ Wrapping Aztec Android and Aztec iOS in a React Native component
 # License
 
 GPL v2
-
-## Android: Run the example app
-
-Make sure to have an emulator running or an Android device connected, and then:
-
-```
-$ cd example/
-$ yarn clean:install
-$ yarn android
-```
-
-This will build the Android library (via `gradle`) and example app, then launch the main example activity on your connected device and run the Metro bundler at the same time.
-
-## iOS: Run the example app
-
-Before being able to run the Example App, you'll need to install [Carthage](https://github.com/Carthage/Carthage) and the dependencies for this project:
-```
-cd ios
-carthage bootstrap --platform iOS
-```
-
-Then go back to the root directory of the project and do:
-```
-$ cd example/
-$ yarn clean:install
-$ yarn ios
-```
-
-This will compile the example project, launch metro, run the simulator and run the app.
-
-## FAQ / Troubleshooting
-
-Q: The example app doesn't run
-
-A: Make sure you have yarn and babel installed (https://yarnpkg.com/lang/en/docs/install/)
-
-
-Q: The example app gets compiled but ReactNative cannot connect to Metro bundler (I'm on a real device attached through USB)
-
-A: To debug on the device through USB, remember to revert ports before launching metro:
-`adb reverse tcp:8081 tcp:8081`
-
-
-Q: The example app gets compiled but ReactNative shows an error 
-
-A: try running, from the root folder in the project
-```
-$ cd example/
-$ yarn start --reset-cache
-```
-
-Open a new shell window and run either of these depending on the platform:
-
-```
-$ yarn android
-```
-
-or
-
-```
-$ yarn ios
-```
-

react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java

@@ -7,6 +7,8 @@
 import androidx.annotation.Nullable;
 import androidx.core.graphics.ColorUtils;
 
+import android.os.Handler;
+import android.os.Looper;
 import android.text.Editable;
 import android.text.Layout;
 import android.text.TextUtils;
@@ -488,7 +490,13 @@ public Map<String, Integer> getCommandsMap() {
     public void receiveCommand(final ReactAztecText parent, int commandType, @Nullable ReadableArray args) {
         Assertions.assertNotNull(parent);
         if (commandType == mFocusTextInputCommandCode) {
-            parent.requestFocusFromJS();
+            // schedule a request to focus in the next layout, to fix https://github.com/wordpress-mobile/gutenberg-mobile/issues/1870
+            new Handler(Looper.getMainLooper()).post(new Runnable() {
+                @Override
+                public void run() {
+                    parent.requestFocusFromJS();
+                }
+            });
             return;
         } else if (commandType == mBlurTextInputCommandCode) {
             parent.clearFocusFromJS();