feat: android send space backspace

RNTAztecView.podspec

@@ -9,11 +9,11 @@ Pod::Spec.new do |s|
   s.license          = package['license']
   s.homepage         = 'https://github.com/wordpress-mobile/react-native-aztec'
   s.authors          = 'Automattic'
-  s.source           = { :git => 'https://github.com/wordpress-mobile/react-native-aztec.git' }
+  s.source           = { :git => 'https://github.com/ewindso/react-native-aztec' }
   s.source_files     = 'ios/RNTAztecView/*.{h,m,swift}'
   s.public_header_files = 'ios/RNTAztecView/*.h'
   s.requires_arc     = true
-  s.platforms        = { :ios => "10.0" }
+  s.platforms        = { :ios => "11.0" }
   s.xcconfig         = {'OTHER_LDFLAGS' => '-lxml2',
 						'HEADER_SEARCH_PATHS' => '/usr/include/libxml2'}
   s.dependency         'React'

android/build.gradle

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

android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java

@@ -3,12 +3,15 @@
 
 import android.graphics.Color;
 import android.graphics.Typeface;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.text.InputType;
+import android.text.util.Linkify;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.View;
+import android.view.ViewGroup.LayoutParams;
 
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactContext;
@@ -51,6 +54,9 @@ public class ReactAztecManager extends SimpleViewManager<ReactAztecText> {
 
     private static final int FOCUS_TEXT_INPUT = 1;
     private static final int BLUR_TEXT_INPUT = 2;
+    private static final int SET_HTML = 3;
+    private static final int SCROLL_TO_BOTTOM = 4;
+    private static final int SEND_SPACE_AND_BACKSPACE = 5;
     private static final int COMMAND_NOTIFY_APPLY_FORMAT = 100;
     private static final int UNSET = -1;
 
@@ -59,6 +65,9 @@ public class ReactAztecManager extends SimpleViewManager<ReactAztecText> {
     // see https://github.com/wordpress-mobile/react-native-aztec/pull/79
     private int mFocusTextInputCommandCode = FOCUS_TEXT_INPUT; // pre-init
     private int mBlurTextInputCommandCode = BLUR_TEXT_INPUT; // pre-init
+    private int mSetHTMLCommandCode = SET_HTML;
+    private int mScrollToBottomCode = SCROLL_TO_BOTTOM;
+    private int mSendSpaceAndBackspaceCode = SEND_SPACE_AND_BACKSPACE;
 
     private static final String TAG = "ReactAztecText";
 
@@ -87,6 +96,9 @@ protected ReactAztecText createViewInstance(ThemedReactContext reactContext) {
         aztecText.setFocusableInTouchMode(true);
         aztecText.setFocusable(true);
         aztecText.setCalypsoMode(false);
+        aztecText.setLinksClickable(true);
+        aztecText.setAutoLinkMask(Linkify.WEB_URLS);
+        aztecText.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
         return aztecText;
     }
 
@@ -286,6 +298,15 @@ public void setPlaceholderTextColor(ReactAztecText view, @Nullable Integer color
         }
     }
 
+    @ReactProp(name = "autoCorrect")
+    public void setAutoCorrect(ReactAztecText view, Boolean autoCorrect) {
+        if (autoCorrect) {
+            view.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES | InputType.TYPE_TEXT_FLAG_MULTI_LINE | InputType.TYPE_TEXT_FLAG_AUTO_CORRECT);
+        } else {
+            view.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES | InputType.TYPE_TEXT_FLAG_MULTI_LINE | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+        }
+    }
+
     @ReactProp(name = "maxImagesWidth")
     public void setMaxImagesWidth(ReactAztecText view, int maxWidth) {
         view.setMaxImagesWidth(maxWidth);
@@ -381,6 +402,9 @@ public Map<String, Integer> getCommandsMap() {
                 .put("applyFormat", COMMAND_NOTIFY_APPLY_FORMAT)
                 .put("focusTextInput", mFocusTextInputCommandCode)
                 .put("blurTextInput", mBlurTextInputCommandCode)
+                .put("setHTML", mSetHTMLCommandCode)
+                .put("scrollToBottom", mScrollToBottomCode)
+                .put("sendSpaceAndBackspace", mSendSpaceAndBackspaceCode)
                 .build();
     }
 
@@ -398,6 +422,15 @@ public void receiveCommand(final ReactAztecText parent, int commandType, @Nullab
         } else if (commandType == mBlurTextInputCommandCode) {
             parent.clearFocusFromJS();
             return;
+        } else if (commandType == mSetHTMLCommandCode) {
+            final String html = args.getString(0);
+            setTextfromJS(parent, html);
+            return;
+        } else if (commandType == mScrollToBottomCode) {
+            Log.d("SCROLLING", "1");
+            parent.scrollToBottom();
+        } else if (commandType == mSendSpaceAndBackspaceCode) {
+            parent.sendSpaceAndBackspace();
         }
         super.receiveCommand(parent, commandType, args);
     }
@@ -465,14 +498,6 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
                 return;
             }
 
-            // The event that contains the event counter and updates it must be sent first.
-            // TODO: t7936714 merge these events
-            mEventDispatcher.dispatchEvent(
-                    new ReactTextChangedEvent(
-                            mEditText.getId(),
-                            mEditText.toHtml(false),
-                            mEditText.incrementAndGetEventCounter()));
-
             mEventDispatcher.dispatchEvent(
                     new ReactTextInputEvent(
                             mEditText.getId(),
@@ -484,6 +509,11 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
 
         @Override
         public void afterTextChanged(Editable s) {
+            mEventDispatcher.dispatchEvent(
+                    new ReactTextChangedEvent(
+                            mEditText.getId(),
+                            mEditText.toHtml(false),
+                            mEditText.incrementAndGetEventCounter()));
         }
     }
 
@@ -562,3 +592,4 @@ public void onScrollChanged(int horiz, int vert, int oldHoriz, int oldVert) {
         }
     }
 }
+

android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecText.java

@@ -2,11 +2,16 @@
 
 import android.content.Context;
 import android.graphics.Rect;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
 import android.view.inputmethod.InputMethodManager;
+import android.text.Spannable;
+import android.view.Gravity;
+import android.widget.TextView;
+import android.view.inputmethod.BaseInputConnection;
+import android.view.KeyEvent;
 
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactContext;
@@ -19,6 +24,7 @@
 import com.facebook.react.views.textinput.ScrollWatcher;
 
 import org.wordpress.aztec.AztecText;
+import org.wordpress.aztec.AlignmentRendering;
 import org.wordpress.aztec.AztecTextFormat;
 import org.wordpress.aztec.ITextFormat;
 import org.wordpress.aztec.plugins.IAztecPlugin;
@@ -56,10 +62,7 @@ public ReactAztecText(ThemedReactContext reactContext) {
         super(reactContext);
         this.setAztecKeyListener(new ReactAztecText.OnAztecKeyListener() {
             @Override
-            public boolean onEnterKey() {
-                if (shouldHandleOnEnter) {
-                    return onEnter();
-                }
+            public boolean onEnterKey(Spannable text, boolean firedAfterTextChanged, int selStart, int selEnd) {
                 return false;
             }
             @Override
@@ -80,6 +83,19 @@ public void onSelectionChanged(int selStart, int selEnd) {
             }
         });
         this.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES | InputType.TYPE_TEXT_FLAG_MULTI_LINE);
+        this.setGravity(Gravity.TOP | Gravity.START);
+
+        BetterLinkMovementMethod linkClick = BetterLinkMovementMethod.newInstance();
+
+        linkClick.setOnLinkClickListener(new BetterLinkMovementMethod.OnLinkClickListener() {
+            @Override
+            public boolean onClick(TextView textView, String url) {
+                hideSoftKeyboard();
+                return false;
+            }
+        });
+
+        this.setMovementMethod(linkClick);
     }
 
     @Override
@@ -127,10 +143,35 @@ public boolean requestFocus(int direction, Rect previouslyFocusedRect) {
         }*/
         setFocusableInTouchMode(true);
         boolean focused = super.requestFocus(direction, previouslyFocusedRect);
+
+        final int scrollAmount = this.getLayout().getLineTop(this.getLineCount()) - this.getHeight();
+        if (scrollAmount > 0) {
+            this.scrollTo(0, scrollAmount + 50);
+        }
+
+        super.setSelection(this.length());
+
         showSoftKeyboard();
         return focused;
     }
 
+    public void sendSpaceAndBackspace() {
+        BaseInputConnection inputConnection = new BaseInputConnection(this, true);
+        inputConnection.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_SPACE));
+        inputConnection.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL));
+    }
+
+    public void scrollToBottom() {
+        final int scrollAmount = this.getLayout().getLineTop(this.getLineCount()) - this.getHeight() + 50;
+
+        // only scroll if the user is already at the bottom.  ignore otherwise
+        if (scrollAmount > 0 && this.getSelectionStart() >= this.getText().toString().length() - 1) {
+            this.scrollTo(0, scrollAmount);
+
+            super.setSelection(this.length());
+        }
+    }
+
     private boolean showSoftKeyboard() {
         return mInputMethodManager.showSoftInput(this, 0);
     }
@@ -194,6 +235,10 @@ private void updateToolbarButtons(ArrayList<ITextFormat> appliedStyles) {
             if (currentStyle == AztecTextFormat.FORMAT_STRIKETHROUGH) {
                 formattingOptions.add("strikethrough");
             }
+
+            if (currentStyle == AztecTextFormat.FORMAT_UNDERLINE) {
+                formattingOptions.add("underline");
+            }
         }
 
         // Check if the same formatting event was already sent
@@ -331,6 +376,9 @@ public void applyFormat(String format) {
             case ("strikethrough"):
                 newFormats.add(AztecTextFormat.FORMAT_STRIKETHROUGH);
             break;
+            case ("underline"):
+                newFormats.add(AztecTextFormat.FORMAT_UNDERLINE);
+            break;
         }
 
         if (newFormats.size() == 0) {
@@ -413,3 +461,4 @@ public void afterTextChanged(Editable s) {
         }
     }
 }
+

android/src/main/res/values/betterlinkmovementmethod.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="bettermovementmethod_highlight_background_span" type="id" />
+</resources>

ios/RNTAztecView.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		397407BB263770E700DE50C1 /* MediaProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 397407BA263770E600DE50C1 /* MediaProvider.swift */; };
 		7ECFA93C21C39B5000FC131B /* HeadingBlockFormatHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7ECFA93B21C39B5000FC131B /* HeadingBlockFormatHandler.swift */; };
 		7ECFA94021C39BA000FC131B /* BlockFormatHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7ECFA93F21C39BA000FC131B /* BlockFormatHandler.swift */; };
 		7ECFA94221C39BBB00FC131B /* BlockModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7ECFA94121C39BBB00FC131B /* BlockModel.swift */; };
@@ -53,6 +54,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		397407BA263770E600DE50C1 /* MediaProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaProvider.swift; sourceTree = "<group>"; };
 		7ECFA93B21C39B5000FC131B /* HeadingBlockFormatHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadingBlockFormatHandler.swift; sourceTree = "<group>"; };
 		7ECFA93F21C39BA000FC131B /* BlockFormatHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlockFormatHandler.swift; sourceTree = "<group>"; };
 		7ECFA94121C39BBB00FC131B /* BlockModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlockModel.swift; sourceTree = "<group>"; };
@@ -105,6 +107,7 @@
 				7ECFA94121C39BBB00FC131B /* BlockModel.swift */,
 				7ECFA93B21C39B5000FC131B /* HeadingBlockFormatHandler.swift */,
 				7ECFA93F21C39BA000FC131B /* BlockFormatHandler.swift */,
+				397407BA263770E600DE50C1 /* MediaProvider.swift */,
 			);
 			path = RNTAztecView;
 			sourceTree = "<group>";
@@ -217,6 +220,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				7ECFA94021C39BA000FC131B /* BlockFormatHandler.swift in Sources */,
+				397407BB263770E700DE50C1 /* MediaProvider.swift in Sources */,
 				7ECFA93C21C39B5000FC131B /* HeadingBlockFormatHandler.swift in Sources */,
 				F13BF4A020ECF5450047D3F9 /* RCTAztecViewManager.swift in Sources */,
 				F1A879D020EE90C000FABD31 /* RCTAztecView.swift in Sources */,
@@ -287,7 +291,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 +345,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;

ios/RNTAztecView/HeadingBlockFormatHandler.swift

@@ -11,15 +11,15 @@ struct HeadingBlockFormatHandler: BlockFormatHandler {
         }
         self.level = level
         headerFormatter = HeaderFormatter(headerLevel: level)
-    }
+    } 
 
     func forceTypingFormat(on textView: RCTAztecView) {
-        var attributes = textView.typingAttributesSwifted
-
-        attributes = paragraphFormatter.remove(from: attributes)
-        attributes = headerFormatter.apply(to: attributes, andStore: nil)
-
-        textView.typingAttributesSwifted = attributes
+//        var attributes = textView.typingAttributesSwifted
+//
+//        attributes = paragraphFormatter.remove(from: attributes)
+//        attributes = headerFormatter.apply(to: attributes, andStore: nil)
+//
+//        textView.typingAttributesSwifted = attributes
     }
 
     private static func headerLevel(from levelString: String) -> Header.HeaderType? {