@ckeditor/ckeditor5-typing 37.0.0 → 37.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-typing",
-  "version": "37.0.0",
+  "version": "37.1.0",
   "description": "Typing feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -12,29 +12,29 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "^37.0.0",
-    "@ckeditor/ckeditor5-engine": "^37.0.0",
-    "@ckeditor/ckeditor5-utils": "^37.0.0",
+    "@ckeditor/ckeditor5-core": "^37.1.0",
+    "@ckeditor/ckeditor5-engine": "^37.1.0",
+    "@ckeditor/ckeditor5-utils": "^37.1.0",
     "lodash-es": "^4.17.15"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-autoformat": "^37.0.0",
-    "@ckeditor/ckeditor5-basic-styles": "^37.0.0",
-    "@ckeditor/ckeditor5-block-quote": "^37.0.0",
-    "@ckeditor/ckeditor5-code-block": "^37.0.0",
-    "@ckeditor/ckeditor5-editor-classic": "^37.0.0",
-    "@ckeditor/ckeditor5-enter": "^37.0.0",
-    "@ckeditor/ckeditor5-essentials": "^37.0.0",
-    "@ckeditor/ckeditor5-heading": "^37.0.0",
-    "@ckeditor/ckeditor5-image": "^37.0.0",
-    "@ckeditor/ckeditor5-indent": "^37.0.0",
-    "@ckeditor/ckeditor5-link": "^37.0.0",
-    "@ckeditor/ckeditor5-list": "^37.0.0",
-    "@ckeditor/ckeditor5-media-embed": "^37.0.0",
-    "@ckeditor/ckeditor5-mention": "^37.0.0",
-    "@ckeditor/ckeditor5-paragraph": "^37.0.0",
-    "@ckeditor/ckeditor5-table": "^37.0.0",
-    "@ckeditor/ckeditor5-undo": "^37.0.0",
+    "@ckeditor/ckeditor5-autoformat": "^37.1.0",
+    "@ckeditor/ckeditor5-basic-styles": "^37.1.0",
+    "@ckeditor/ckeditor5-block-quote": "^37.1.0",
+    "@ckeditor/ckeditor5-code-block": "^37.1.0",
+    "@ckeditor/ckeditor5-editor-classic": "^37.1.0",
+    "@ckeditor/ckeditor5-enter": "^37.1.0",
+    "@ckeditor/ckeditor5-essentials": "^37.1.0",
+    "@ckeditor/ckeditor5-heading": "^37.1.0",
+    "@ckeditor/ckeditor5-image": "^37.1.0",
+    "@ckeditor/ckeditor5-indent": "^37.1.0",
+    "@ckeditor/ckeditor5-link": "^37.1.0",
+    "@ckeditor/ckeditor5-list": "^37.1.0",
+    "@ckeditor/ckeditor5-media-embed": "^37.1.0",
+    "@ckeditor/ckeditor5-mention": "^37.1.0",
+    "@ckeditor/ckeditor5-paragraph": "^37.1.0",
+    "@ckeditor/ckeditor5-table": "^37.1.0",
+    "@ckeditor/ckeditor5-undo": "^37.1.0",
     "typescript": "^4.8.4",
     "webpack": "^5.58.1",
     "webpack-cli": "^4.9.0"

package/src/deleteobserver.js

@@ -5,7 +5,7 @@
 /**
  * @module typing/deleteobserver
  */
-import { env, keyCodes } from '@ckeditor/ckeditor5-utils';
+import { env, keyCodes, isInsideCombinedSymbol, isInsideEmojiSequence, isInsideSurrogatePair } from '@ckeditor/ckeditor5-utils';
 import { BubblingEventInfo, DomEventData, Observer } from '@ckeditor/ckeditor5-engine';
 const DELETE_CHARACTER = 'character';
 const DELETE_WORD = 'word';
@@ -133,14 +133,14 @@ export default class DeleteObserver extends Observer {
                 deleteData.selectionToRemove = view.createSelection(targetRanges[0]);
             }
             // The default deletion unit for deleteContentBackward is a single code point
-            // but on Android it sometimes passes a wider target range, so we need to change
-            // the unit of deletion to include the whole range to be removed and not a single code point.
-            if (env.isAndroid && inputType === 'deleteContentBackward') {
+            // but if the browser provides a wider target range then we should use it.
+            if (inputType === 'deleteContentBackward') {
                 // On Android, deleteContentBackward has sequence 1 by default.
-                deleteData.sequence = 1;
-                // IME wants more than a single character to be removed.
-                if (targetRanges.length == 1 && (targetRanges[0].start.parent != targetRanges[0].end.parent ||
-                    targetRanges[0].start.offset + 1 != targetRanges[0].end.offset)) {
+                if (env.isAndroid) {
+                    deleteData.sequence = 1;
+                }
+                // The beforeInput event wants more than a single character to be removed.
+                if (shouldUseTargetRanges(targetRanges)) {
                     deleteData.unit = DELETE_SELECTION;
                     deleteData.selectionToRemove = view.createSelection(targetRanges);
                 }
@@ -222,3 +222,40 @@ function enableChromeWorkaround(observer) {
         return keyCode == keyCodes.backspace ? DELETE_BACKWARD : DELETE_FORWARD;
     }
 }
+/**
+ * Verifies if the given target ranges cover more than a single character and should be used instead of single code-point deletion.
+ */
+function shouldUseTargetRanges(targetRanges) {
+    // The collapsed target range could happen for example while deleting inside an inline filler
+    // (it's mapped to collapsed position before an inline filler).
+    if (targetRanges.length != 1 || targetRanges[0].isCollapsed) {
+        return false;
+    }
+    const walker = targetRanges[0].getWalker({
+        direction: 'backward',
+        singleCharacters: true,
+        ignoreElementEnd: true
+    });
+    let count = 0;
+    for (const { nextPosition } of walker) {
+        // There is some element in the range so count it as a single character.
+        if (!nextPosition.parent.is('$text')) {
+            count++;
+        }
+        else {
+            const data = nextPosition.parent.data;
+            const offset = nextPosition.offset;
+            // Count combined symbols and emoji sequences as a single character.
+            if (isInsideSurrogatePair(data, offset) ||
+                isInsideCombinedSymbol(data, offset) ||
+                isInsideEmojiSequence(data, offset)) {
+                continue;
+            }
+            count++;
+        }
+        if (count > 1) {
+            return true;
+        }
+    }
+    return false;
+}