After two blocks are merged, show cursor on the end of the text field

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

@@ -0,0 +1,21 @@
+package org.wordpress.mobile.ReactNativeAztec;
+
+import android.text.Selection;
+import android.text.Spannable;
+import android.text.method.ArrowKeyMovementMethod;
+import android.view.View;
+import android.widget.TextView;
+
+public class ReactAztecArrowKeyMovementMethod extends ArrowKeyMovementMethod {
+
+    @Override
+    public void onTakeFocus(TextView view, Spannable text, int dir) {
+        if ((dir & (View.FOCUS_FORWARD | View.FOCUS_DOWN)) != 0) {
+            if (view.getLayout() == null) {
+                Selection.setSelection(text, 0); // <-- setting caret to end of text
+            }
+        } else {
+            Selection.setSelection(text, text.length());  // <-- same as original Android implementation. Not sure if we should change this too
+        }
+    }
+}

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

@@ -460,7 +460,7 @@ public void onFocusChange(View v, boolean hasFocus) {
                         }
                     }
                 });
-
+        
         // Don't think we need to add setOnEditorActionListener here (intercept Enter for example), but
         // in case check ReactTextInputManager
     }

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

@@ -7,13 +7,9 @@
 import android.support.annotation.Nullable;
 import android.text.Editable;
 import android.text.InputType;
-import android.text.Selection;
-import android.text.Spannable;
+import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.text.method.ArrowKeyMovementMethod;
-import android.view.View;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.TextView;
 
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactContext;
@@ -100,11 +96,21 @@ public boolean onEnterKey() {
             @Override
             public boolean onBackspaceKey() {
                 if (shouldHandleOnBackspace) {
-                    return onBackspace();
+                    String content = toHtml(false);
+                    if (TextUtils.isEmpty(content)) {
+                        return onBackspace();
+                    }
+                    else {
+                        String emptyTag = "<" + getTagName() + "></" + getTagName() + ">";
+                        if (!content.equals(emptyTag)) {
+                            return onBackspace();
+                        }
+                    }
                 }
                 return false;
             }
         });
+
         mInputMethodManager = (InputMethodManager)
                 Assertions.assertNotNull(getContext().getSystemService(Context.INPUT_METHOD_SERVICE));
         this.setOnSelectionChangedListener(new OnSelectionChangedListener() {
@@ -122,20 +128,7 @@ private void forceCaretAtStartOnTakeFocus() {
         // Fixes https://github.com/wordpress-mobile/gutenberg-mobile/issues/602
         // onTakeFocus adapted from the Android source code at:
         //  https://android.googlesource.com/platform/frameworks/base/+/refs/heads/pie-release/core/java/android/text/method/ArrowKeyMovementMethod.java#316
-        setMovementMethod(new ArrowKeyMovementMethod() {
-            @Override
-            public void onTakeFocus(TextView view, Spannable text, int dir) {
-                if ((dir & (View.FOCUS_FORWARD | View.FOCUS_DOWN)) != 0) {
-                    if (view.getLayout() == null) {
-                        // This shouldn't be null, but do something sensible if it is.
-                        Selection.setSelection(text, 0); // <-- setting caret to start of text
-                    }
-                } else {
-                    Selection.setSelection(text, text.length());  // <-- same as original Android implementation. Not sure if we should change this too
-                }
-            }
-        });
-
+        setMovementMethod(new ReactAztecArrowKeyMovementMethod());
     }
 
     @Override
@@ -245,13 +238,14 @@ public void run() {
     }
 
     public void setTagName(@Nullable String tagName) {
-        this.mTagName = tagName;
+        mTagName = tagName;
     }
 
     public String getTagName() {
-        return this.mTagName;
+        return mTagName;
     }
 
+
     private void updateToolbarButtons(int selStart, int selEnd) {
         ArrayList<ITextFormat> appliedStyles = getAppliedStyles(selStart, selEnd);
         updateToolbarButtons(appliedStyles);

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

@@ -366,7 +366,7 @@ class RCTAztecView: Aztec.TextView {
         }
     }
 
-    func setSelection(start: NSNumber, end: NSNumber) {        
+    func setSelection(start: NSNumber, end: NSNumber) {
         if let startPosition = position(from: beginningOfDocument, offset: start.intValue),
             let endPosition = position(from: beginningOfDocument, offset: end.intValue) {
             selectedTextRange = textRange(from: startPosition, to: endPosition)