From 43db5763ddbd6b062e2bf79a5d285b732c8a00bd Mon Sep 17 00:00:00 2001
From: thecodrr <thecodrr@protonmail.com>
Date: Wed, 1 Sep 2021 11:02:04 +0500
Subject: [PATCH] tinymce-plugins: fix keyboardquirks plugin

---
 packages/tinymce-plugins/keyboardquirks/index.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/tinymce-plugins/keyboardquirks/index.js b/packages/tinymce-plugins/keyboardquirks/index.js
index 03c98820d..1402693b8 100644
--- a/packages/tinymce-plugins/keyboardquirks/index.js
+++ b/packages/tinymce-plugins/keyboardquirks/index.js
@@ -73,7 +73,7 @@ function androidGboardEnterKeyBug(editor) {
     if (e.inputType === "insertCompositionText") {
       if (e.data?.endsWith("\n") && inputState.isKeyUnidentified) {
         inputState.isKeyUnidentified = null;
-        inputState.moveSelectionToNextNode = true;
+        inputState.forceMoveSelectionToNextNode = true;
       }
     } else {
       inputState.isKeyUnidentified = null;
@@ -162,6 +162,13 @@ function androidBackspaceKeyQuirk(editor) {
         container: range.startContainer,
         offset: range.startOffset,
       };
+
+      // Weird behavior: tinymce removes 1 (and only 1) trailing whitespace.
+      // It doesn't matter if there are more than 1. So we need to account for that.
+      if (range.startContainer.textContent.endsWith(" ")) {
+        inputState.selection.offset -= 1;
+      }
+
       inputState.forcePreserveSelection = true;
     } else {
       inputState.selection = {};