Release v1.15.0

Gutenberg.podspec

@@ -11,12 +11,12 @@ Pod::Spec.new do |s|
   s.homepage     = 'https://github.com/wordpress-mobile/gutenberg-mobile'
   s.license      = package['license']
   s.authors          = 'Automattic'
-  s.platform     = :ios, '10.0'
+  s.platform     = :ios, '11.0'
   s.source       = { :git => 'https://github.com/wordpress-mobile/gutenberg-mobile.git' }
   s.source_files = 'react-native-gutenberg-bridge/ios/*.{h,m,swift}'
   s.requires_arc = true
   s.preserve_paths = 'bundle/ios/*'
-  s.swift_version = '4.2'
+  s.swift_version = '5.0'
 
   s.dependency 'React', react_native_version
   s.dependency 'React-RCTImage', react_native_version

RELEASE-NOTES.txt

@@ -1,3 +1,11 @@
+1.15.0
+------
+* Fix issue when multiple media selection adds only one image or video block on Android
+* Fix issue when force Touch app shortcut doesn't work properly selecting "New Photo Post" on iOS
+* Add Link Target (Open in new tab) to Image Block.
+* [iOS] DarkMode improvements.
+* New block: Media & Text
+
 1.14.0
 ------
 * Fix a bug on iOS 13.0 were tapping on a link opens Safari

RNTAztecView.podspec

@@ -13,10 +13,10 @@ Pod::Spec.new do |s|
   s.source_files     = 'react-native-aztec/ios/RNTAztecView/*.{h,m,swift}'
   s.public_header_files = 'react-native-aztec/ios/RNTAztecView/*.h'
   s.requires_arc     = true
-  s.platforms        = { :ios => "10.0" }
-  s.swift_version    = '4.2'
+  s.platforms        = { :ios => "11.0" }
+  s.swift_version    = '5.0'
   s.xcconfig         = {'OTHER_LDFLAGS' => '-lxml2',
-						'HEADER_SEARCH_PATHS' => '/usr/include/libxml2'}
+                        'HEADER_SEARCH_PATHS' => '/usr/include/libxml2'}
   s.dependency         'React-Core'
   s.dependency         'WordPress-Aztec-iOS'
 

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

@@ -45,11 +45,11 @@ public void requestMediaPickerFromDeviceCamera(MediaUploadCallback mediaUploadCa
             }
 
             @Override
-            public void requestMediaPickFromDeviceLibrary(MediaUploadCallback mediaUploadCallback, MediaType mediaType) {
+            public void requestMediaPickFromDeviceLibrary(MediaUploadCallback mediaUploadCallback, Boolean allowMultipleSelection, MediaType mediaType) {
             }
 
             @Override
-            public void requestMediaPickFromMediaLibrary(MediaSelectedCallback mediaSelectedCallback, MediaType mediaType) {
+            public void requestMediaPickFromMediaLibrary(MediaSelectedCallback mediaSelectedCallback, Boolean allowMultipleSelection, MediaType mediaType) {
             }
 
 

ios/gutenberg.xcodeproj/project.pbxproj

@@ -1544,7 +1544,7 @@
 					"$(SRCROOT)/../node_modules/react-native-video/ios/**",
 				);
 				INFOPLIST_FILE = gutenberg/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(SRCROOT)/../react-native-aztec/ios/**",
@@ -1558,7 +1558,7 @@
 				PRODUCT_NAME = gutenberg;
 				SWIFT_OBJC_BRIDGING_HEADER = "gutenberg-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@@ -1582,7 +1582,7 @@
 					"$(SRCROOT)/../node_modules/react-native-video/ios/**",
 				);
 				INFOPLIST_FILE = gutenberg/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(SRCROOT)/../react-native-aztec/ios/**",
@@ -1595,7 +1595,7 @@
 				);
 				PRODUCT_NAME = gutenberg;
 				SWIFT_OBJC_BRIDGING_HEADER = "gutenberg-Bridging-Header.h";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@@ -1797,7 +1797,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -1832,7 +1832,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;

ios/gutenberg/GutenbergViewController.swift

@@ -64,7 +64,7 @@ extension GutenbergViewController: GutenbergBridgeDelegate {
         print("↳ HTML: \(html)")
     }
 
-    func gutenbergDidRequestMedia(from source: MediaPickerSource, filter: [MediaFilter]?, with callback: @escaping MediaPickerDidPickMediaCallback) {
+    func gutenbergDidRequestMedia(from source: MediaPickerSource, filter: [MediaFilter]?, allowMultipleSelection: Bool, with callback: @escaping MediaPickerDidPickMediaCallback) {
         guard let currentFilter = filter?.first else {
             return
         }
@@ -73,9 +73,17 @@ extension GutenbergViewController: GutenbergBridgeDelegate {
             print("Gutenberg did request media picker, passing a sample url in callback")
             switch currentFilter {
             case .image:
-                callback(1, "https://cldup.com/cXyG__fTLN.jpg")
+                if(allowMultipleSelection) {
+                    callback([(1, "https://cldup.com/cXyG__fTLN.jpg", "image"), (3, "https://cldup.com/cXyG__fTLN.jpg", "image")])
+                } else {
+                    callback([(1, "https://cldup.com/cXyG__fTLN.jpg", "image")])
+                }
             case .video:
-                callback(2, "https://i.cloudup.com/YtZFJbuQCE.mov")
+                if(allowMultipleSelection) {
+                    callback([(2, "https://i.cloudup.com/YtZFJbuQCE.mov", "video"), (4, "https://i.cloudup.com/YtZFJbuQCE.mov", "video")])
+                } else {
+                    callback([(2, "https://i.cloudup.com/YtZFJbuQCE.mov", "video")])
+                }
             default:
                 break
             }
@@ -90,16 +98,16 @@ extension GutenbergViewController: GutenbergBridgeDelegate {
 
     func gutenbergDidRequestImport(from url: URL, with callback: @escaping MediaPickerDidPickMediaCallback) {
         let id = mediaUploadCoordinator.upload(url: url)
-        callback(id, url.absoluteString)
+        callback([(id, url.absoluteString, "image")])
     }
 
     func pickAndUpload(from source: UIImagePickerController.SourceType, filter: MediaFilter, callback: @escaping MediaPickerDidPickMediaCallback) {
         mediaPickCoordinator = MediaPickCoordinator(presenter: self, filter: filter, callback: { (url) in
             guard let url = url, let mediaID = self.mediaUploadCoordinator.upload(url: url) else {
-                callback(nil, nil)
+                callback([(nil, nil, nil)])
                 return
             }
-            callback(mediaID, url.absoluteString)
+            callback([(mediaID, url.absoluteString, "image")])
             self.mediaPickCoordinator = nil
         } )
         mediaPickCoordinator?.pick(from: source)

package.json

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

react-native-aztec/android/build.gradle

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

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

@@ -103,6 +103,7 @@ protected ReactAztecText createViewInstance(ThemedReactContext reactContext) {
                 new LinkFormatter.LinkStyle(
                         Color.parseColor("#016087"), true)
         ));
+        aztecText.addPlugin(new CssUnderlinePlugin());
         return aztecText;
     }
 
@@ -413,7 +414,6 @@ public void disableGBMode(final ReactAztecText view, boolean disable) {
             view.addPlugin(new VideoShortcodePlugin());
             view.addPlugin(new AudioShortcodePlugin());
             view.addPlugin(new HiddenGutenbergPlugin(view));
-            view.addPlugin(new CssUnderlinePlugin());
             view.setImageGetter(new GlideImageLoader(view.getContext()));
             view.setVideoThumbnailGetter(new GlideVideoThumbnailLoader(view.getContext()));
             // we need to restart the editor now

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

@@ -79,6 +79,7 @@ public class ReactAztecText extends AztecText {
             put(AztecTextFormat.FORMAT_ITALIC, "italic");
             put(AztecTextFormat.FORMAT_CITE, "italic");
             put(AztecTextFormat.FORMAT_STRIKETHROUGH, "strikethrough");
+            put(AztecTextFormat.FORMAT_UNDERLINE, "underline");
         }
     };
 
@@ -481,6 +482,9 @@ public void setActiveFormats(Iterable<String> newFormats) {
                 case "strikethrough":
                     newFormatsSet.add(AztecTextFormat.FORMAT_STRIKETHROUGH);
                     break;
+                case "underline":
+                    newFormatsSet.add(AztecTextFormat.FORMAT_UNDERLINE);
+                    break;
             }
         }
         selectedStylesSet.removeAll(typingFormatsMap.keySet());

react-native-aztec/ios/Cartfile

@@ -1 +1 @@
-github "wordpress-mobile/AztecEditor-iOS" "1.10.1"
+github "wordpress-mobile/AztecEditor-iOS" "81e1e1bb1cb209004d66bba75338595cc9aab147"

react-native-aztec/ios/Cartfile.resolved

@@ -1 +1 @@
-github "wordpress-mobile/AztecEditor-iOS" "1.10.1"
+github "wordpress-mobile/AztecEditor-iOS" "81e1e1bb1cb209004d66bba75338595cc9aab147"

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

@@ -167,7 +167,7 @@
 				TargetAttributes = {
 					F145CFC52087D16A006C159A = {
 						CreatedOnToolsVersion = 9.3;
-						LastSwiftMigration = 0940;
+						LastSwiftMigration = 1110;
 					};
 				};
 			};
@@ -287,7 +287,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -341,7 +341,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -371,7 +371,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "RNTAztecView/RCTAztecView-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -396,7 +396,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "RNTAztecView/RCTAztecView-Bridging-Header.h";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

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

@@ -132,9 +132,7 @@ class RCTAztecView: Aztec.TextView {
         textContainerInset = .zero
         contentInset = .zero
         addPlaceholder()
-        if #available(iOS 11.0, *) {
-            textDragInteraction?.isEnabled = false
-        }
+        textDragInteraction?.isEnabled = false        
         storage.htmlConverter.characterToReplaceLastEmptyLine = Character(.zeroWidthSpace)
         shouldNotifyOfNonUserChanges = false
     }
@@ -407,12 +405,23 @@ class RCTAztecView: Aztec.TextView {
         }
     }
 
+    override var textColor: UIColor? {
+        didSet {
+            typingAttributes[NSAttributedString.Key.foregroundColor] = self.textColor
+        }
+    }
+
+    override var typingAttributes: [NSAttributedString.Key : Any] {
+        didSet {
+            // Keep placeholder attributes in sync with typing attributes.
+            placeholderLabel.attributedText = NSAttributedString(string: placeholderLabel.text ?? "", attributes: placeholderAttributes)
+        }
+    }
+
     // MARK: - Placeholder
 
     @objc var placeholder: String {
         set {
-            var placeholderAttributes = typingAttributes
-            placeholderAttributes[.foregroundColor] = placeholderTextColor
             placeholderLabel.attributedText = NSAttributedString(string: newValue, attributes: placeholderAttributes)
         }
 
@@ -421,6 +430,13 @@ class RCTAztecView: Aztec.TextView {
         }
     }
 
+    /// Attributes to use on the placeholder.
+    var placeholderAttributes: [NSAttributedString.Key: Any] {
+        var placeholderAttributes = typingAttributes
+        placeholderAttributes[.foregroundColor] = placeholderTextColor
+        return placeholderAttributes
+    }
+
     @objc var placeholderTextColor: UIColor {
         set {
             placeholderLabel.textColor = newValue

react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/GutenbergBridgeJS2Parent.java

@@ -1,18 +1,28 @@
 package org.wordpress.mobile.ReactNativeGutenbergBridge;
 
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.WritableMap;
+
+import java.util.List;
 
 public interface GutenbergBridgeJS2Parent {
+    interface RNMedia {
+        String getUrl();
+        int getId();
+        String getType();
+        WritableMap toMap();
+    }
+
     void responseHtml(String title, String html, boolean changed);
 
     void editorDidMount(ReadableArray unsupportedBlockNames);
 
     interface MediaSelectedCallback {
-        void onMediaSelected(int mediaId, String mediaUrl);
+        void onMediaSelected(List<RNMedia> mediaList);
     }
 
     interface MediaUploadCallback {
-        void onUploadMediaFileSelected(int mediaId, String mediaUri);
+        void onUploadMediaFileSelected(List<RNMedia> mediaList);
         void onUploadMediaFileClear(int mediaId);
         void onMediaFileUploadProgress(int mediaId, float progress);
         void onMediaFileUploadSucceeded(int mediaId, String mediaUrl, int serverId);
@@ -45,6 +55,7 @@ public static LogLevel valueOf(int id) {
     enum MediaType {
         IMAGE("image"),
         VIDEO("video"),
+        MEDIA("media"),
         AUDIO("audio"),
         OTHER("other");
 
@@ -65,9 +76,9 @@ public static MediaType getEnum(String value) {
         }
     }
 
-    void requestMediaPickFromMediaLibrary(MediaSelectedCallback mediaSelectedCallback, MediaType mediaType);
+    void requestMediaPickFromMediaLibrary(MediaSelectedCallback mediaSelectedCallback, Boolean allowMultipleSelection, MediaType mediaType);
 
-    void requestMediaPickFromDeviceLibrary(MediaUploadCallback mediaUploadCallback, MediaType mediaType);
+    void requestMediaPickFromDeviceLibrary(MediaUploadCallback mediaUploadCallback, Boolean allowMultipleSelection, MediaType mediaType);
 
     void requestMediaPickerFromDeviceCamera(MediaUploadCallback mediaUploadCallback, MediaType mediaType);