Release v1.1.0

README.md

@@ -1,7 +1,5 @@
 # Mobile Gutenberg
 
-Note: The project is at an early stage phase, it's not yet ready for integration.
-
 This is the mobile version of [Gutenberg](https://github.com/WordPress/gutenberg), targeting Android and iOS. It's a React Native library bootstrapped by CRNA and now ejected.
 
 ## Getting Started

i18n-cache/index.js

@@ -8,41 +8,56 @@ const fetch = require( 'node-fetch' );
 const supportedLocales = [
 	'ar', // Arabic
 	'bg', // Bulgarian
+	'bo', // Tibetan
+	'ca', // Catalan
 	'cs', // Czech
 	'cy', // Welsh
 	'da', // Danish
 	'de', // German
 	'en-au', // English (Australia)
 	'en-ca', // English (Canada)
 	'en-gb', // English (UK)
+	'en-nz', // English (New Zealand)
+	'en-za', // English (South Africa)
 	'el', // Greek
 	'es', // Spanish
+	'es-ar', // Spanish (Argentina)
+	'es-cl', // Spanish (Chile)
+	'es-cr', // Spanish (Costa Rica)
+	'fa', // Persian
 	'fr', // French
+	'gl', // Galician
 	'he', // Hebrew
 	'hr', // Croatian
 	'hu', // Hungarian
 	'id', // Indonesian
 	'is', // Icelandic
 	'it', // Italian
 	'ja', // Japanese
+	'ka', // Georgian
 	'ko', // Korean
 	'nb', // Norwegian (Bokmål)
 	'nl', // Dutch
+	'nl-be', // Dutch (Belgium)
 	'pl', // Polish
 	'pt', // Portuguese
 	'pt-br', // Portuguese (Brazil)
 	'ro', // Romainian
 	'ru', // Russian
 	'sk', // Slovak
 	'sq', // Albanian
+	'sr', // Serbian
 	'sv', // Swedish
 	'th', // Thai
 	'tr', // Turkish
+	'uk', // Ukrainian
+	'ur', // Urdu
+	'vi', // Vietnamese
 	'zh-cn', // Chinese (China)
 	'zh-tw', // Chinese (Taiwan)
 ];
 
-const getLanguageUrl = ( locale ) => `https://widgets.wp.com/languages/gutenberg/${ locale }.json`;
+const getLanguageUrl = ( locale ) => `https://translate.wordpress.org/projects/wp-plugins/gutenberg/dev/${ locale }/default/export-translations\?format\=json`;
 const getTranslationFilePath = ( locale ) => `./data/${ locale }.json`;
 
 const getTranslation = ( locale ) => require( getTranslationFilePath( locale ) );

ios/CustomImageLoader.swift

@@ -0,0 +1,36 @@
+import Foundation
+
+class CustomImageLoader: NSObject, RCTImageURLLoader {
+
+  static func moduleName() -> String! {
+    return "CustomImageLoader"
+  }
+
+  func canLoadImageURL(_ requestURL: URL!) -> Bool {
+    return !requestURL.isFileURL
+  }
+
+  func loadImage(for imageURL: URL!, size: CGSize, scale: CGFloat, resizeMode: RCTResizeMode, progressHandler: RCTImageLoaderProgressBlock!, partialLoadHandler: RCTImageLoaderPartialLoadBlock!, completionHandler: RCTImageLoaderCompletionBlock!) -> RCTImageLoaderCancellationBlock! {
+    let task = URLSession.shared.dataTask(with: imageURL) { (data, response, error) in
+      if let error = error {
+        completionHandler(error, nil)
+        return
+      }
+      guard let data = data,
+        let image = UIImage.init(data: data) else {
+        completionHandler?(NSError(domain: NSURLErrorDomain, code: NSURLErrorCancelled, userInfo: nil), nil)
+        return;
+      }
+      completionHandler?(nil, image)
+    }
+    task.resume()
+    return { () in
+      task.cancel()
+    }
+  }
+
+  func loaderPriority() -> Float {
+    return 100
+  }
+
+}

ios/gutenberg.xcodeproj/project.pbxproj

@@ -50,6 +50,7 @@
 		F1EE6F7A21E7F0A500241744 /* NotoSerif-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F1EE6F7621E7F0A500241744 /* NotoSerif-Italic.ttf */; };
 		F1EE6F7B21E7F0A500241744 /* NotoSerif-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F1EE6F7721E7F0A500241744 /* NotoSerif-Bold.ttf */; };
 		FF6836C822035EAB00A0C562 /* MediaUploadCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF6836C722035EAB00A0C562 /* MediaUploadCoordinator.swift */; };
+		FF83DAA92226905A00A34C93 /* CustomImageLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF83DAA82226905A00A34C93 /* CustomImageLoader.swift */; };
 		FF9A6F4121FA8E2500D36D14 /* MediaPickCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF9A6F1621FA8E2500D36D14 /* MediaPickCoordinator.swift */; };
 /* End PBXBuildFile section */
 
@@ -435,6 +436,7 @@
 		F1EE6F7721E7F0A500241744 /* NotoSerif-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSerif-Bold.ttf"; sourceTree = "<group>"; };
 		F619623252704B46A619C33C /* RNTAztecView.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNTAztecView.xcodeproj; path = "../react-native-aztec/ios/RNTAztecView.xcodeproj"; sourceTree = "<group>"; };
 		FF6836C722035EAB00A0C562 /* MediaUploadCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MediaUploadCoordinator.swift; path = gutenberg/MediaUploadCoordinator.swift; sourceTree = "<group>"; };
+		FF83DAA82226905A00A34C93 /* CustomImageLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomImageLoader.swift; sourceTree = "<group>"; };
 		FF9A6F1621FA8E2500D36D14 /* MediaPickCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MediaPickCoordinator.swift; path = gutenberg/MediaPickCoordinator.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -592,6 +594,7 @@
 				13B07FB51A68108700A75B9A /* Images.xcassets */,
 				13B07FB61A68108700A75B9A /* Info.plist */,
 				13B07FB11A68108700A75B9A /* LaunchScreen.xib */,
+				FF83DAA82226905A00A34C93 /* CustomImageLoader.swift */,
 			);
 			name = gutenberg;
 			sourceTree = "<group>";
@@ -1371,6 +1374,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				F151983C2100DC3D000F6E97 /* AppDelegate.swift in Sources */,
+				FF83DAA92226905A00A34C93 /* CustomImageLoader.swift in Sources */,
 				FF9A6F4121FA8E2500D36D14 /* MediaPickCoordinator.swift in Sources */,
 				F151983D2100DC3D000F6E97 /* MediaProvider.swift in Sources */,
 				FF6836C822035EAB00A0C562 /* MediaUploadCoordinator.swift in Sources */,

ios/gutenberg/GutenbergViewController.swift

@@ -5,7 +5,7 @@ import Aztec
 
 class GutenbergViewController: UIViewController {
 
-    fileprivate lazy var gutenberg = Gutenberg(dataSource: self)
+    fileprivate lazy var gutenberg = Gutenberg(dataSource: self, extraModules: [CustomImageLoader()])
     fileprivate var htmlMode = false
     fileprivate var mediaPickCoordinator: MediaPickCoordinator?
     fileprivate lazy var mediaUploadCoordinator: MediaUploadCoordinator = {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gutenberg-mobile",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "private": true,
   "config": {
     "jsfiles": "./*.js src/*.js src/**/*.js src/**/**/*.js",
@@ -108,7 +108,7 @@
     "react": "16.6.1",
     "react-native": "0.57.5",
     "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.4",
+    "react-native-keyboard-aware-scroll-view": "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.6",
     "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-safe-area": "^0.5.0",

react-native-aztec/android/build.gradle

@@ -12,7 +12,7 @@ buildscript {
         wordpressUtilsVersion = '1.22'
         espressoVersion = '3.0.1'
 
-        aztecVersion = 'v1.3.20'
+        aztecVersion = 'v1.3.21'
     }
 
     repositories {

react-native-aztec/ios/Cartfile

@@ -1,2 +1,2 @@
-github "wordpress-mobile/AztecEditor-iOS" ~> 1.4.3
+github "wordpress-mobile/AztecEditor-iOS" ~> 1.4.4
 

react-native-aztec/ios/Cartfile.resolved

@@ -1 +1 @@
-github "wordpress-mobile/AztecEditor-iOS" "1.4.3"
+github "wordpress-mobile/AztecEditor-iOS" "1.4.4"

react-native-aztec/ios/RNTAztecView.xcodeproj/project.pbxproj

@@ -360,6 +360,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Carthage/Build/iOS",
 				);
+				HEADER_SEARCH_PATHS = /usr/include/libxml2;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -370,7 +371,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "RNTAztecView/RCTAztecView-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -385,6 +386,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Carthage/Build/iOS",
 				);
+				HEADER_SEARCH_PATHS = /usr/include/libxml2;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -394,7 +396,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "RNTAztecView/RCTAztecView-Bridging-Header.h";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

react-native-aztec/ios/RNTAztecView/HeadingBlockFormatHandler.swift

@@ -14,12 +14,13 @@ struct HeadingBlockFormatHandler: BlockFormatHandler {
     }
 
     func forceTypingFormat(on textView: RCTAztecView) {
-        var attributes = textView.typingAttributesSwifted
+        var attributes = textView.typingAttributes
 
-        attributes = paragraphFormatter.remove(from: attributes)
-        attributes = headerFormatter.apply(to: attributes, andStore: nil)
 
-        textView.typingAttributesSwifted = attributes
+        attributes = paragraphFormatter.remove(from: textView.typingAttributes)
+        attributes = headerFormatter.apply(to: textView.typingAttributes, andStore: nil)
+
+        textView.typingAttributes = attributes
     }
 
     private static func headerLevel(from levelString: String) -> Header.HeaderType? {

react-native-aztec/ios/RNTAztecView/RCTAztecView.swift

@@ -54,6 +54,7 @@ class RCTAztecView: Aztec.TextView {
         label.translatesAutoresizingMaskIntoConstraints = false
         label.textAlignment = .natural
         label.font = font
+
         return label
     }()
 
@@ -74,6 +75,10 @@ class RCTAztecView: Aztec.TextView {
         )
     }()
 
+    /// If a dictation start with an empty UITextView,
+    /// the dictation engine refreshes the TextView with an empty string when the dictation finishes.
+    /// This helps to avoid propagating that unwanted empty string to RN. (Solving #606)
+    /// on `textViewDidChange` and `textViewDidChangeSelection`
     private var isInsertingDictationResult = false
 
     // MARK: - Font
@@ -405,10 +410,10 @@ class RCTAztecView: Aztec.TextView {
     /// This method should not be called directly.  Call `refreshFont()` instead.
     ///
     private func refreshTypingAttributesAndPlaceholderFont() {
-        let oldFont = font(from: typingAttributesSwifted)
+        let oldFont = font(from: typingAttributes)
         let newFont = applyFontConstraints(to: oldFont)
 
-        typingAttributesSwifted[.font] = newFont
+        typingAttributes[.font] = newFont
         placeholderLabel.font = newFont
     }
 
@@ -452,15 +457,15 @@ class RCTAztecView: Aztec.TextView {
 extension RCTAztecView: UITextViewDelegate {
 
     func textViewDidChangeSelection(_ textView: UITextView) {
+        guard isInsertingDictationResult == false else {
+            return
+        }
+
         propagateSelectionChanges()
     }
 
     func textViewDidChange(_ textView: UITextView) {
-
         guard isInsertingDictationResult == false else {
-            // If a dictation start with an empty UITextView,
-            // the dictation engine refreshes the TextView with an empty string when the dictation finishes.
-            // This avoid propagating that unwanted empty string to RN. (Solving #606)
             return
         }
 

react-native-aztec/package.json

@@ -4,6 +4,7 @@
   "license": "GPL-2.0",
   "scripts": {
     "install-aztec-ios": "cd ./ios && carthage bootstrap --platform iOS --cache-builds",
+    "update-aztec-ios": "cd ./ios && carthage update --platform iOS --cache-builds",
     "clean": "yarn clean-watchman; yarn clean-node; yarn clean-react; yarn clean-metro; yarn clean-jest;",
     "clean-jest": "rm -rf $TMPDIR/jest_*;",
     "clean-metro": "rm -rf $TMPDIR/metro-cache-*; rm -rf $TMPDIR/metro-bundler-cache-*;",

react-native-gutenberg-bridge/ios/Gutenberg.swift

@@ -9,6 +9,9 @@ import RNTAztecView
 
 @objc
 public class Gutenberg: NSObject {
+
+    private var extraModules: [RCTBridgeModule];
+
     public lazy var rootView: UIView = {
         return RCTRootView(bridge: bridge, moduleName: "gutenberg", initialProperties: initialProps)
     }()
@@ -55,8 +58,9 @@ public class Gutenberg: NSObject {
         return initialProps
     }
 
-    public init(dataSource: GutenbergBridgeDataSource) {
+    public init(dataSource: GutenbergBridgeDataSource, extraModules: [RCTBridgeModule] = []) {
         self.dataSource = dataSource
+        self.extraModules = extraModules
     }
 
     public func invalidate() {
@@ -104,8 +108,8 @@ extension Gutenberg: RCTBridgeDelegate {
     public func extraModules(for bridge: RCTBridge!) -> [RCTBridgeModule]! {
         let aztecManager = RCTAztecViewManager()
         aztecManager.attachmentDelegate = dataSource.aztecAttachmentDelegate()
-
-        return [bridgeModule, aztecManager]
+        let baseModules:[RCTBridgeModule] = [bridgeModule, aztecManager]
+        return baseModules + extraModules
     }
 }
 

react-native-gutenberg-bridge/ios/RNReactNativeGutenbergBridge-Bridging-Header.h

@@ -7,3 +7,4 @@
 #import <React/RCTViewManager.h>
 #import <React/RCTBundleURLProvider.h>
 #import <React/RCTRootView.h>
+#import <React/RCTImageLoader.h>

react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-keyboard-aware-scroll-view",
-  "version": "0.8.4",
+  "version": "0.8.6",
   "homepage": "https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view",
   "summary": "React Native module to arrange scroll poisition according to keyboard on input fields.",
   "license": "MIT",
@@ -10,7 +10,7 @@
   },
   "source": {
     "git": "https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git",
-    "tag": "gb-v0.8.4"
+    "tag": "gb-v0.8.6"
   },
   "source_files": "ios/RNKeyboardAwareScrollView/*.{h,m}",
   "preserve_paths": "**/*.js",

src/variables.ios.scss

@@ -8,4 +8,4 @@ $title-block-padding-bottom: 12;
 
 $min-height-title: 30;
 $min-height-paragraph: 24;
-$min-height-heading: 24;
+$min-height-heading: 30;

yarn.lock

@@ -7316,9 +7316,9 @@ react-native-iphone-x-helper@^1.0.3:
   resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.2.0.tgz#9f8a376eb00bc712115abff4420318a0063fa796"
   integrity sha512-xIeTo4s77wwKgBZLVRIZC9tM9/PkXS46Ul76NXmvmixEb3ZwqGdQesR3zRiLMOoIdfOURB6N9bba9po7+x9Bag==
 
-"react-native-keyboard-aware-scroll-view@git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.4":
-  version "0.8.4"
-  resolved "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#589873f90f75d1362eac6f2dd1f27893368bf1b7"
+"react-native-keyboard-aware-scroll-view@git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.6":
+  version "0.8.6"
+  resolved "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#f8fa3a3372ae46fe798bb6c843a5475b8f080673"
   dependencies:
     prop-types "^15.6.2"
     react-native-iphone-x-helper "^1.0.3"