diff --git a/gutenberg b/gutenberg index 0e0b65f76d..7835e3f85c 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 0e0b65f76d06bcf0cf74bfc659d823289b93bded +Subproject commit 7835e3f85c6d42006a7a087c16af904ff251368a diff --git a/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java b/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java index 5a048a1e68..3388e171a1 100644 --- a/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java +++ b/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 diff --git a/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecText.java b/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecText.java index 379b59ba27..475c30ba7a 100644 --- a/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecText.java +++ b/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 newFormats) { case "strikethrough": newFormatsSet.add(AztecTextFormat.FORMAT_STRIKETHROUGH); break; + case "underline": + newFormatsSet.add(AztecTextFormat.FORMAT_UNDERLINE); + break; } } selectedStylesSet.removeAll(typingFormatsMap.keySet()); diff --git a/react-native-aztec/ios/Cartfile b/react-native-aztec/ios/Cartfile index 0eb1586c84..56d22285cc 100644 --- a/react-native-aztec/ios/Cartfile +++ b/react-native-aztec/ios/Cartfile @@ -1 +1 @@ -github "wordpress-mobile/AztecEditor-iOS" "1.9.0" +github "wordpress-mobile/AztecEditor-iOS" "1.10.1" diff --git a/react-native-aztec/ios/Cartfile.resolved b/react-native-aztec/ios/Cartfile.resolved index 0eb1586c84..56d22285cc 100644 --- a/react-native-aztec/ios/Cartfile.resolved +++ b/react-native-aztec/ios/Cartfile.resolved @@ -1 +1 @@ -github "wordpress-mobile/AztecEditor-iOS" "1.9.0" +github "wordpress-mobile/AztecEditor-iOS" "1.10.1"