Merge branch 'develop' of github.com:wordpress-mobile/gutenberg-mobil…

…e into add/spt-templates-i18n

.circleci/config.yml

@@ -118,8 +118,8 @@ jobs:
         - dependencies-v3-{{ checksum "ios/Gemfile.lock" }}
         - dependencies-v3-
     - run:
-        name: Yarn preios (if needed)
-        command: test -e ios/build/gutenberg/Build/Products/Release-iphonesimulator/GutenbergDemo.app || yarn preios
+        name: Build (if needed)
+        command: test -e ios/build/gutenberg/Build/Products/Release-iphonesimulator/GutenbergDemo.app || SKIP_BUNDLING=true yarn test:e2e:build-app:ios
     - save_cache:
         name: Save Dependencies Cache
         key: dependencies-v3-{{ checksum "ios/Gemfile.lock" }}-{{ checksum "ios/Podfile.lock" }}-{{
@@ -129,9 +129,6 @@ jobs:
         - ~/Library/Caches/CocoaPods
         - ~/.cocoapods/repos/trunk
         - ios/vendor
-    - run:
-        name: Build (if needed)
-        command: test -e ios/build/gutenberg/Build/Products/Release-iphonesimulator/GutenbergDemo.app || yarn react-native run-ios --configuration Release --no-packager
     - run:
         name: Bundle iOS
         command: yarn test:e2e:bundle:ios

.eslintignore

@@ -4,4 +4,3 @@ symlinked-packages
 symlinked-packages-in-parent
 react-native-aztec
 bundle
-react-native-aztec-old-submodule

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "gutenberg"]
 	path = gutenberg
 	url = ../../WordPress/gutenberg.git
-[submodule "react-native-aztec"]
-	path = react-native-aztec-old-submodule
-	url = ../react-native-aztec.git

RELEASE-NOTES.txt

@@ -2,6 +2,11 @@
 ------
 * New block: Group
 * Add support for upload options in Gallery block
+* Add support for size options in the Image block
+* 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

__device-tests__/helpers/caps.js

@@ -1,15 +1,27 @@
-exports.ios = {
+const ios = {
 	browserName: '',
 	platformName: 'iOS',
-	platformVersion: '13.0',
-	deviceName: 'iPhone 11 Simulator',
+	platformVersion: '13.3',
+	deviceName: 'iPhone 11',
 	os: 'iOS',
 	deviceOrientation: 'portrait',
 	automationName: 'XCUITest',
 	appiumVersion: '1.15.0', // SauceLabs requires appiumVersion to be specified.
 	app: undefined, // will be set later, locally this is relative to root of project
 };
 
+exports.iosLocal = {
+	...ios,
+	platformVersion: '13.3',
+	deviceName: 'iPhone 11',
+};
+
+exports.iosServer = {
+	...ios,
+	platformVersion: '13.0',
+	deviceName: 'iPhone 11 Simulator',
+};
+
 exports.android8 = {
 	browserName: '',
 	platformName: 'Android',

__device-tests__/helpers/utils.js

@@ -15,7 +15,7 @@ import path from 'path';
  * Internal dependencies
  */
 import serverConfigs from './serverConfigs';
-import { ios, android8 } from './caps';
+import { iosServer, iosLocal, android8 } from './caps';
 import AppiumLocal from './appium-local';
 import _ from 'underscore';
 
@@ -92,13 +92,11 @@ const setupDriver = async () => {
 			desiredCaps.app = `sauce-storage:Gutenberg-${ safeBranchName }.apk`; // App should be preloaded to sauce storage, this can also be a URL
 		}
 	} else {
-		desiredCaps = _.clone( ios );
+		desiredCaps = _.clone( iosServer );
+		desiredCaps.app = `sauce-storage:Gutenberg-${ safeBranchName }.app.zip`; // App should be preloaded to sauce storage, this can also be a URL
 		if ( isLocalEnvironment() ) {
+			desiredCaps = _.clone( iosLocal );
 			desiredCaps.app = path.resolve( localIOSAppPath );
-			delete desiredCaps.platformVersion;
-			desiredCaps.deviceName = 'iPhone 11';
-		} else {
-			desiredCaps.app = `sauce-storage:Gutenberg-${ safeBranchName }.app.zip`; // App should be preloaded to sauce storage, this can also be a URL
 		}
 	}
 

bundle/android/raw/gutenberg_packages_blocklibrary_src_columns_block.json

@@ -10,12 +10,6 @@
 		},
 		"customBackgroundColor": {
 			"type": "string"
-		},
-		"customTextColor" : {
-			"type": "string"
-		},
-		"textColor": {
-			"type": "string"
 		}
 	}
 }

bundle/android/strings.xml

@@ -18,11 +18,8 @@
     <string name="gutenberg_native_alt_text" tools:ignore="UnusedResources">Alt Text</string>
     <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_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>
@@ -53,7 +50,6 @@
     <!-- translators: accessibility text. %s: image caption. -->
     <string name="gutenberg_native_image_caption_s" tools:ignore="UnusedResources">Image caption. %s</string>
     <string name="gutenberg_native_link_inserted" tools:ignore="UnusedResources">Link inserted</string>
-    <string name="gutenberg_native_link_settings" tools:ignore="UnusedResources">Link Settings</string>
     <string name="gutenberg_native_link_text" tools:ignore="UnusedResources">Link text</string>
     <string name="gutenberg_native_move_block_down" tools:ignore="UnusedResources">Move block down</string>
     <!-- translators: accessibility text. %1: current block position (number). %2: next block position (number) -->
@@ -69,7 +65,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

@@ -22,11 +22,8 @@ private func dummy() {
     _ = NSLocalizedString("Alt Text", comment: "")
     _ = NSLocalizedString("An unknown error occurred. Please try again.", comment: "")
     _ = NSLocalizedString("Annotations Sidebar", comment: "")
-    _ = NSLocalizedString("Border Settings", comment: "")
-    _ = NSLocalizedString("Button 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: "")
@@ -52,7 +49,6 @@ private func dummy() {
     _ = NSLocalizedString("Hide keyboard", comment: "")
     _ = NSLocalizedString("Image caption. %s", comment: "translators: accessibility text. %s: image caption.")
     _ = NSLocalizedString("Link inserted", comment: "")
-    _ = NSLocalizedString("Link Settings", comment: "")
     _ = NSLocalizedString("Link text", comment: "")
     _ = NSLocalizedString("Move block down", comment: "")
     _ = NSLocalizedString("Move block down from row %1$s to row %2$s", comment: "translators: accessibility text. %1: current block position (number). %2: next block position (number)")
@@ -66,7 +62,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/columns/block.json

@@ -10,12 +10,6 @@
 		},
 		"customBackgroundColor": {
 			"type": "string"
-		},
-		"customTextColor" : {
-			"type": "string"
-		},
-		"textColor": {
-			"type": "string"
 		}
 	}
 }

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

jest.config.js

@@ -33,10 +33,7 @@ module.exports = {
 		'/__device-tests__/',
 	],
 	testURL: 'http://localhost/',
-	modulePathIgnorePatterns: [
-		'<rootDir>/gutenberg/gutenberg-mobile',
-		'react-native-aztec-old-submodule',
-	],
+	modulePathIgnorePatterns: [ '<rootDir>/gutenberg/gutenberg-mobile' ],
 	moduleDirectories: [ 'node_modules', 'symlinked-packages' ],
 	moduleNameMapper: {
 		// Mock the CSS modules. See https://facebook.github.io/jest/docs/en/webpack.html#handling-static-assets

jitpack.yml

@@ -1,5 +1,7 @@
 install:
    - export TMPDIR=`dirname $(mktemp)`
+   - echo "Removing react-native-aztec-old-submodule folder"
+   - rm -rf react-native-aztec-old-submodule
    - echo "Changing into the android folder of the Bridge module"
    - pushd react-native-gutenberg-bridge/android && ./gradlew --stacktrace clean -Pgroup=com.github.wordpress-mobile.gutenberg-mobile -Pversion=$VERSION install && popd
    - pushd react-native-aztec/android && ./gradlew --stacktrace clean -Pgroup=com.github.wordpress-mobile.gutenberg-mobile -Pversion=$VERSION install && popd

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gutenberg-mobile",
-  "version": "1.22.0",
+  "version": "1.22.1",
   "private": true,
   "config": {
     "jsfiles": "./*.js src/*.js src/**/*.js src/**/**/*.js",
@@ -95,7 +95,7 @@
     "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",
-    "preios": "cd ios && (bundle check --path=vendor/bundle > /dev/null || bundle install) && bundle exec pod repo update && bundle exec pod install",
+    "preios": "cd ios && (bundle check --path=vendor/bundle > /dev/null || bundle install) && bundle exec pod install --repo-update",
     "ios": "react-native run-ios",
     "ios:fast": "react-native run-ios",
     "test": "cross-env NODE_ENV=test jest --verbose --config jest.config.js",
@@ -110,13 +110,12 @@
     "test:e2e:ios": "TEST_RN_PLATFORM=ios yarn device-tests",
     "test:e2e:android:local": "yarn test:e2e:build-app:android && yarn test:e2e:install-app:android && TEST_RN_PLATFORM=android yarn device-tests:local",
     "test:e2e:android:local:debug": "yarn test:e2e:build-app:android && yarn test:e2e:install-app:android && yarn test:e2e:android:debug",
-    "test:e2e:ios:local": "yarn test:e2e:build-app:ios && yarn test:e2e:install-app:ios && TEST_RN_PLATFORM=ios yarn device-tests:local",
+    "test:e2e:ios:local": "yarn test:e2e:build-app:ios && TEST_RN_PLATFORM=ios yarn device-tests:local",
     "test:e2e:bundle:android": "mkdir -p android/app/src/main/assets && react-native bundle --reset-cache --platform android --dev false --minify false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res",
     "test:e2e:build-app:android": "yarn test:e2e:bundle:android && cd android && ./gradlew clean && ./gradlew assembleDebug",
     "test:e2e:install-app:android": "cd android && ./gradlew installDebug",
     "test:e2e:bundle:ios": "react-native bundle --reset-cache --platform=ios --dev=false --minify false --entry-file=index.js --bundle-output=./ios/build/gutenberg/Build/Products/Release-iphonesimulator/GutenbergDemo.app/main.jsbundle --assets-dest=./ios/build/gutenberg/Build/Products/Release-iphonesimulator/GutenbergDemo.app",
-    "test:e2e:build-app:ios": "react-native run-ios --configuration Release --no-packager --simulator=\"iPhone 11\" && yarn test:e2e:bundle:ios && WORK_DIR=$(pwd) && cd ./ios/build/gutenberg/Build/Products/Release-iphonesimulator && zip -r $WORK_DIR/ios/GutenbergDemo.app.zip GutenbergDemo.app",
-    "test:e2e:install-app:ios": "yarn test:e2e:build-app:ios",
+    "test:e2e:build-app:ios": "yarn ios --configuration Release --no-packager",
     "flow": "flow",
     "prettier": "prettier-eslint --write $npm_package_config_jsfiles $npm_package_config_scssfiles",
     "prettier:check": "prettier-eslint --list-different $npm_package_config_jsfiles $npm_package_config_scssfiles || { echo '\nERROR: `yarn prettier:check` found a formatting problem.\nNo files have been changed. Try running `yarn prettier` to fix any formatting issues.\n'; exit 1; }",

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();