Prepare release 1.2

.flowconfig

@@ -54,6 +54,7 @@
 <PROJECT_ROOT>/gutenberg/node_modules/cypress/.*
 <PROJECT_ROOT>/gutenberg/node_modules/config-chain/.*
 <PROJECT_ROOT>/gutenberg/node_modules/editions/es2015/.*
+<PROJECT_ROOT>/gutenberg/node_modules/@parcel/.*
 
 ; Mirror some ignores from Gutenberg tools
 <PROJECT_ROOT>/node_modules/config-chain/.*

.gitignore

@@ -95,3 +95,4 @@ buck-out/
 !.vscode/extensions.json
 
 *.pot
+bin/wp-cli.phar

__mocks__/styleMock.js

@@ -26,10 +26,19 @@ module.exports = {
 	'block-editor-plain-text': {
 		fontFamily: 'serif',
 	},
+	addBlockButton: {
+		color: '',
+	},
 	blockHolderFocused: {
 		borderColor: 'gray',
 	},
 	'wp-block-heading': {
 		minHeight: 60,
 	},
+	'editor-rich-text': {
+		minHeight: 50,
+	},
+	'editor-plain-text': {
+		fontFamily: 'serif',
+	},
 };

android/app/src/main/java/com/gutenberg/MainApplication.java

@@ -1,13 +1,13 @@
 package com.gutenberg;
 
 import android.app.Application;
+import android.util.Log;
 
 import com.facebook.react.ReactApplication;
 import com.horcrux.svg.SvgPackage;
+
 import org.wordpress.mobile.ReactNativeAztec.ReactAztecPackage;
 import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent;
-import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent.MediaSelectedCallback;
-import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent.MediaUploadCallback;
 import org.wordpress.mobile.ReactNativeGutenbergBridge.RNReactNativeGutenbergBridgePackage;
 import com.github.godness84.RNRecyclerViewList.RNRecyclerviewListPackage;
 import com.facebook.react.ReactNativeHost;
@@ -20,6 +20,8 @@
 
 public class MainApplication extends Application implements ReactApplication {
 
+  private static final String TAG = "MainApplication";
+
   private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
     @Override
     public boolean getUseDeveloperSupport() {
@@ -60,6 +62,24 @@ public void requestImageUploadCancel(int mediaId) {}
 
                 @Override
                 public void editorDidMount(boolean hasUnsupportedBlocks) {}
+
+                @Override
+                public void editorDidEmitLog(String message, LogLevel logLevel) {
+                    switch (logLevel) {
+                        case TRACE:
+                            Log.d(TAG, message);
+                            break;
+                        case INFO:
+                            Log.i(TAG, message);
+                            break;
+                        case WARN:
+                            Log.w(TAG, message);
+                            break;
+                        case ERROR:
+                            Log.e(TAG, message);
+                            break;
+                    }
+                }
             })
       );
     }

enzyme.config.js

@@ -0,0 +1,6 @@
+/**
+ * External dependencies
+ */
+import { configure } from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+configure( { adapter: new Adapter() } );

ios/gutenberg.xcodeproj/project.pbxproj

@@ -1530,7 +1530,7 @@
 				PRODUCT_NAME = gutenberg;
 				SWIFT_OBJC_BRIDGING_HEADER = "gutenberg-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@@ -1565,7 +1565,7 @@
 				);
 				PRODUCT_NAME = gutenberg;
 				SWIFT_OBJC_BRIDGING_HEADER = "gutenberg-Bridging-Header.h";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};

ios/gutenberg/AppDelegate.swift

@@ -6,7 +6,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
 
         window = UIWindow(frame: UIScreen.main.bounds)
 

ios/gutenberg/GutenbergViewController.swift

@@ -64,6 +64,11 @@ extension GutenbergViewController: GutenbergBridgeDelegate {
         }
     }
 
+    func gutenbergDidRequestImport(from url: URL, with callback: @escaping MediaPickerDidPickMediaCallback) {
+        let id = mediaUploadCoordinator.upload(url: url)
+        callback(id, url.absoluteString)
+    }
+
     func pickAndUpload(from source: UIImagePickerController.SourceType, callback: @escaping MediaPickerDidPickMediaCallback) {
         mediaPickCoordinator = MediaPickCoordinator(presenter: self, callback: { (url) in
             guard let url = url, let mediaID = self.mediaUploadCoordinator.upload(url: url) else {
@@ -122,6 +127,19 @@ extension GutenbergViewController: GutenbergBridgeDelegate {
         }
         progress.cancel()
     }
+
+    func gutenbergDidEmitLog(message: String, logLevel: LogLevel) {
+        switch logLevel {
+        case .trace:
+            print("Debug: \(message)")
+        case .info:
+            print("Info: \(message)")
+        case .warn:
+            print("Warn: \(message)")
+        case .error:
+            print("Error: \(message)")
+        }
+    }
 }
 
 extension GutenbergViewController: GutenbergBridgeDataSource {
@@ -176,7 +194,8 @@ extension GutenbergViewController {
 
     func showMoreSheet() {
         let alert = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
-
+        alert.popoverPresentationController?.barButtonItem = navigationItem.rightBarButtonItem
+
         let cancelAction = UIAlertAction(title: "Keep Editing", style: .cancel)
         alert.addAction(toggleHTMLModeAction)
         alert.addAction(updateHtmlAction)

ios/gutenberg/Info.plist

@@ -2,13 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>UIAppFonts</key>
-	<array>
-		<string>NotoSerif-BoldItalic.ttf</string>
-		<string>NotoSerif-Regular.ttf</string>
-		<string>NotoSerif-Italic.ttf</string>
-		<string>NotoSerif-Bold.ttf</string>
-	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -31,6 +24,36 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSExceptionDomains</key>
+		<dict>
+			<key>localhost</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+			</dict>
+		</dict>
+	</dict>
+	<key>NSCameraUsageDescription</key>
+	<string>To take photos or videos to use in your posts.</string>
+	<key>NSLocationUsageDescription</key>
+	<string>The app would like to add your location to posts on sites where you have enabled geotagging.</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>The app would like to add your location to posts on sites where you have enabled geotagging.</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>Enable microphone access to record sound in your videos.</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>To add photos or videos to your posts.</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>To add photos or videos to your posts.</string>
+	<key>UIAppFonts</key>
+	<array>
+		<string>NotoSerif-BoldItalic.ttf</string>
+		<string>NotoSerif-Regular.ttf</string>
+		<string>NotoSerif-Italic.ttf</string>
+		<string>NotoSerif-Bold.ttf</string>
+	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
@@ -43,30 +66,14 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>The app would like to add your location to posts on sites where you have enabled geotagging.</string>
-	<key>NSCameraUsageDescription</key>
-	<string>To take photos or videos to use in your posts.</string>
-	<key>NSLocationUsageDescription</key>
-	<string>The app would like to add your location to posts on sites where you have enabled geotagging.</string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>Enable microphone access to record sound in your videos.</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>To add photos or videos to your posts.</string>
-	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>To add photos or videos to your posts.</string>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSExceptionDomains</key>
-		<dict>
-			<key>localhost</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-			</dict>
-		</dict>
-	</dict>
 </dict>
 </plist>

ios/gutenberg/MediaPickCoordinator.swift

@@ -33,7 +33,7 @@ class MediaPickCoordinator: NSObject, UIImagePickerControllerDelegate, UINavigat
 
   func save(image: UIImage, toTemporaryDirectoryUsingName name: String) -> URL? {
     let url = URL(fileURLWithPath: NSTemporaryDirectory() + name + ".jpg")
-    guard let data = UIImageJPEGRepresentation(image, 1.0) else {
+    guard let data = image.jpegData(compressionQuality: 1.0) else {
       return nil
     }
     do {
@@ -44,11 +44,11 @@ class MediaPickCoordinator: NSObject, UIImagePickerControllerDelegate, UINavigat
     }
   }
 
-  func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [String : Any]) {
+  func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) {
     presenter.dismiss(animated: true, completion: nil)
     let mediaID = UUID().uuidString
     guard
-      let image = info[UIImagePickerControllerOriginalImage] as? UIImage,
+      let image = info[UIImagePickerController.InfoKey.originalImage] as? UIImage,
       let url = save(image: image, toTemporaryDirectoryUsingName: mediaID)
     else {
         callback(nil)

jest.config.js

@@ -13,8 +13,13 @@ if ( process.env.TEST_RN_PLATFORM ) {
 
 module.exports = {
 	verbose: true,
+	// Automatically clear mock calls and instances between every test
+	clearMocks: true,
 	preset: 'react-native',
-	setupFiles: [ './jest/setup.js' ],
+	setupFiles: [
+		'./jest/setup.js',
+		'<rootDir>/enzyme.config.js',
+	],
 	testEnvironment: 'jsdom',
 	testPathIgnorePatterns: [
 		'/node_modules/',
@@ -49,4 +54,7 @@ module.exports = {
 		// https://github.com/facebook/react-native/blob/master/jest-preset.json#L20
 		'node_modules/(?!(simple-html-tokenizer|(jest-)?react-native|react-clone-referenced-element))',
 	],
+	snapshotSerializers: [
+		'enzyme-to-json/serializer',
+	],
 };

jest/setup.js

@@ -9,6 +9,7 @@ jest.mock( '../react-native-gutenberg-bridge', () => {
 		subscribeUpdateHtml: jest.fn(),
 		subscribeMediaAppend: jest.fn(),
 		editorDidMount: jest.fn(),
+		subscribeMediaUpload: jest.fn(),
 	};
 } );
 
@@ -27,3 +28,11 @@ jest.mock( 'react-native-safe-area', () => {
 } );
 
 jest.mock( 'react-native-recyclerview-list' );
+
+if ( ! global.window.matchMedia ) {
+	global.window.matchMedia = () => ( {
+		matches: false,
+		addListener: () => {},
+		removeListener: () => {},
+	} );
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gutenberg-mobile",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "private": true,
   "config": {
     "jsfiles": "./*.js src/*.js src/**/*.js src/**/**/*.js",
@@ -22,6 +22,9 @@
     "babel-plugin-react-native-platform-specific-extensions": "^1.1.1",
     "cross-env": "^5.1.4",
     "empty": "^0.10.1",
+    "enzyme": "^3.9.0",
+    "enzyme-adapter-react-16": "^1.11.2",
+    "enzyme-to-json": "^3.3.5",
     "equivalent-key-map": "^0.2.0",
     "eslint": "^5.12.1",
     "eslint-plugin-flowtype": "^3.4.2",
@@ -56,22 +59,28 @@
     "bundle:ios": "mkdir -p bundle/ios && yarn react-native bundle --platform ios --dev false --entry-file index.js --assets-dest bundle/ios --bundle-output bundle/ios/App.js --sourcemap-output bundle/ios/App.js.map",
     "i18n-cache": "node i18n-cache/index.js",
     "postinstall": "yarn i18n-cache",
-    "makepot": "xgettext -f <( find . \\( -path './gutenberg/*/src/*.native.js' -or -path './src/*.js' \\) ! -path 'node_modules' -print ) --from-code=UTF-8 -k__ -k_n -k_x -k_nx -x ./gutenberg/languages/gutenberg.pot -o ./gutenberg-mobile.pot",
+    "install:wpcli": "(test -x bin/wp-cli.phar || curl -Ls https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -o bin/wp-cli.phar && chmod +x bin/wp-cli.phar) && bin/wp-cli.phar --info",
+    "prewp": "yarn install:wpcli",
+    "wp": "php -d memory_limit=512M bin/wp-cli.phar",
+    "premakepot": "( command -v xgettext >/dev/null 2>&1 || { echo \"ERROR: xgettext is required to parse our Flow code.\" >&2; exit 1; } ) && yarn makepot:gutenberg",
+    "makepot": "bash -c \"xgettext -f <( find . -path './src/*.js' ! -path 'node_modules' -print ) --from-code=UTF-8 -k__ -k_n -k_x -k_nx -x ./gutenberg.pot -o ./gutenberg-mobile.pot\"",
+    "makepot:gutenberg": "yarn clean:gutenberg && yarn wp i18n make-pot ./gutenberg --ignore-domain gutenberg.pot",
     "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": "yarn preios:xcode10 && yarn preios:carthage",
     "preios:carthage": "cd react-native-aztec && yarn install-aztec-ios",
     "preios:xcode10": "cd node_modules/react-native && ./scripts/ios-install-third-party.sh && cd third-party/glog-0.3.5 && [ -f libglog.pc ] || ../../scripts/ios-configure-glog.sh",
     "ios": "react-native run-ios",
-    "test": "cross-env NODE_ENV=test node node_modules/jest/bin/jest.js --verbose --config jest.config.js",
+    "test": "cross-env NODE_ENV=test node node_modules/jest/bin/jest.js --verbose false --config jest.config.js",
     "test:inside-gb": "cross-env NODE_ENV=test node node_modules/jest/bin/jest.js --verbose --config jest_gb.config.js",
     "test:debug": "cross-env NODE_ENV=test node --inspect-brk node_modules/jest/bin/jest.js --runInBand --verbose --config jest.config.js",
     "flow": "flow",
     "prettier": "prettier-eslint --write $npm_package_config_jsfiles $npm_package_config_scssfiles",
     "clean": "yarn clean:aztec; yarn cache clean; yarn clean:haste; yarn clean:jest; yarn clean:metro; yarn clean:react; yarn clean:watchman; yarn clean:node;",
     "clean:runtime": "yarn clean:haste; yarn clean:react; yarn clean:metro; yarn clean:jest; yarn clean:watchman; yarn clean:babel-cache",
     "clean:aztec": "cd react-native-aztec && yarn clean && cd example && yarn clean",
+    "clean:gutenberg": "cd gutenberg && npm run clean:packages && rm -rf build",
     "clean:haste": "rm -rf /tmp/haste-map-react-native-packager-*",
     "clean:install": "yarn clean; yarn",
     "clean:jest": "yarn jest --clearCache --config jest.config.js; rm -rf $TMPDIR/jest_*",
@@ -91,8 +100,10 @@
     "classnames": "^2.2.5",
     "dom-react": "^2.2.1",
     "domutils": "^1.7.0",
+    "fast-average-color": "^4.3.0",
     "hpq": "^1.2.0",
     "jed": "^1.1.1",
+    "jest-serializer-enzyme": "^1.0.0",
     "js-beautify": "^1.7.5",
     "jsc-android": "236355.x.x",
     "jsdom-jscore": "git+https://github.com/iamcco/jsdom-jscore-rn.git#a562f3d57c27c13e5bfc8cf82d496e69a3ba2800",
@@ -104,11 +115,11 @@
     "node-libs-react-native": "^1.0.2",
     "node-sass": "^4.8.3",
     "react": "16.8.3",
-    "react-native": "0.59.0",
+    "react-native": "0.59.3",
     "react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3",
     "react-native-keyboard-aware-scroll-view": "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.7",
     "react-native-modal": "^6.5.0",
-    "react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#v1.0.0",
+    "react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#v1.0.1",
     "react-native-safe-area": "^0.5.0",
     "react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5",
     "react-redux": "^5.0.7",