Merge pull request #1370 from wordpress-mobile/issue/562_add_underline

Issue/562 add underline
wordpress-mobile · Oct 4, 2019 · 00b7b05 · 00b7b05
2 parents 70061b2 + 84db3e6
commit 00b7b05
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/gutenberg b/gutenberg
diff --git a/...-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java b/...-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/...ive-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecText.java b/...ive-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());

diff --git 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
@@ -1 +1 @@
-github "wordpress-mobile/AztecEditor-iOS" "1.9.0"
+github "wordpress-mobile/AztecEditor-iOS" "1.10.1"
+566 −256		package-lock.json
+1 −1		package.json
+32 −0		packages/block-library/src/heading/deprecated.js
+1 −0		packages/block-library/src/heading/save.js
+4 −0		packages/block-library/src/image/editor.scss
+0 −4		packages/block-library/src/image/style.scss
+9 −9		packages/dependency-extraction-webpack-plugin/test/__snapshots__/build.js.snap
+8 −0		packages/e2e-tests/fixtures/block-transforms.js
+3 −0		packages/e2e-tests/fixtures/blocks/core__heading__deprecated-2.html
+14 −0		packages/e2e-tests/fixtures/blocks/core__heading__deprecated-2.json
+22 −0		packages/e2e-tests/fixtures/blocks/core__heading__deprecated-2.parsed.json
+3 −0		packages/e2e-tests/fixtures/blocks/core__heading__deprecated-2.serialized.html
+3 −0		packages/e2e-tests/fixtures/blocks/core__heading__deprecated-3.html
+14 −0		packages/e2e-tests/fixtures/blocks/core__heading__deprecated-3.json
+22 −0		packages/e2e-tests/fixtures/blocks/core__heading__deprecated-3.parsed.json
+3 −0		packages/e2e-tests/fixtures/blocks/core__heading__deprecated-3.serialized.html
+4 −0		packages/e2e-tests/fixtures/blocks/core__heading__h2-color.html
+14 −0		packages/e2e-tests/fixtures/blocks/core__heading__h2-color.json
+22 −0		packages/e2e-tests/fixtures/blocks/core__heading__h2-color.parsed.json
+3 −0		packages/e2e-tests/fixtures/blocks/core__heading__h2-color.serialized.html
+12 −0		packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap
+2 −2		packages/e2e-tests/specs/blocks/__snapshots__/heading.test.js.snap
+1 −1		packages/editor/src/components/post-excerpt/index.js
+4 −0		packages/scripts/CHANGELOG.md
+4 −4		packages/scripts/package.json
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "wordpress-mobile/AztecEditor-iOS" "1.9.0"
		github "wordpress-mobile/AztecEditor-iOS" "1.10.1"