slate-react 0.91.7 → 0.91.8-202322171954

package/dist/hooks/android-input-manager/android-input-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"android-input-manager.d.ts","sourceRoot":"","sources":["../../packages/slate-react/src/hooks/android-input-manager/android-input-manager.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAA;AACtC,OAAO,EAAsB,KAAK,EAAE,KAAK,EAAoB,MAAM,OAAO,CAAA;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAuBvD,oBAAY,MAAM,GAAG;IAAE,EAAE,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IAAC,GAAG,EAAE,MAAM,IAAI,CAAA;CAAE,CAAA;AAY5D,oBAAY,gCAAgC,GAAG;IAC7C,MAAM,EAAE,WAAW,CAAA;IAEnB,4BAA4B,EAAE,aAAa,CAAC,MAAM,IAAI,CAAC,CAAA;IACvD,oBAAoB,EAAE,aAAa,CAAC,MAAM,IAAI,CAAC,CAAA;CAChD,CAAA;AAED,oBAAY,mBAAmB,GAAG;IAChC,KAAK,EAAE,MAAM,IAAI,CAAA;IACjB,aAAa,EAAE,MAAM,IAAI,CAAA;IAEzB,eAAe,EAAE,MAAM,OAAO,CAAA;IAC9B,gBAAgB,EAAE,MAAM,OAAO,CAAA;IAC/B,iBAAiB,EAAE,MAAM,OAAO,CAAA;IAChC,UAAU,EAAE,MAAM,OAAO,GAAG,QAAQ,CAAA;IAEpC,gBAAgB,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,CAAA;IAC/C,oBAAoB,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC,cAAc,CAAC,KAAK,IAAI,CAAA;IAC7E,sBAAsB,EAAE,CACtB,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC,cAAc,CAAC,KAC1C,IAAI,CAAA;IACT,oBAAoB,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAA;IACjD,aAAa,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,cAAc,CAAC,KAAK,IAAI,CAAA;IAEnE,kBAAkB,EAAE,CAAC,SAAS,EAAE,cAAc,EAAE,KAAK,IAAI,CAAA;IACzD,WAAW,EAAE,MAAM,IAAI,CAAA;CACxB,CAAA;AAED,wBAAgB,yBAAyB,CAAC,EACxC,MAAM,EACN,4BAA4B,EAC5B,oBAAoB,GACrB,EAAE,gCAAgC,GAAG,mBAAmB,CAmpBxD"}
+{"version":3,"file":"android-input-manager.d.ts","sourceRoot":"","sources":["../../packages/slate-react/src/hooks/android-input-manager/android-input-manager.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAA;AACtC,OAAO,EAAsB,KAAK,EAAE,KAAK,EAAoB,MAAM,OAAO,CAAA;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAwBvD,oBAAY,MAAM,GAAG;IAAE,EAAE,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IAAC,GAAG,EAAE,MAAM,IAAI,CAAA;CAAE,CAAA;AAY5D,oBAAY,gCAAgC,GAAG;IAC7C,MAAM,EAAE,WAAW,CAAA;IAEnB,4BAA4B,EAAE,aAAa,CAAC,MAAM,IAAI,CAAC,CAAA;IACvD,oBAAoB,EAAE,aAAa,CAAC,MAAM,IAAI,CAAC,CAAA;CAChD,CAAA;AAED,oBAAY,mBAAmB,GAAG;IAChC,KAAK,EAAE,MAAM,IAAI,CAAA;IACjB,aAAa,EAAE,MAAM,IAAI,CAAA;IAEzB,eAAe,EAAE,MAAM,OAAO,CAAA;IAC9B,gBAAgB,EAAE,MAAM,OAAO,CAAA;IAC/B,iBAAiB,EAAE,MAAM,OAAO,CAAA;IAChC,UAAU,EAAE,MAAM,OAAO,GAAG,QAAQ,CAAA;IAEpC,gBAAgB,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,CAAA;IAC/C,oBAAoB,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC,cAAc,CAAC,KAAK,IAAI,CAAA;IAC7E,sBAAsB,EAAE,CACtB,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC,cAAc,CAAC,KAC1C,IAAI,CAAA;IACT,oBAAoB,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAA;IACjD,aAAa,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,cAAc,CAAC,KAAK,IAAI,CAAA;IAEnE,kBAAkB,EAAE,CAAC,SAAS,EAAE,cAAc,EAAE,KAAK,IAAI,CAAA;IACzD,WAAW,EAAE,MAAM,IAAI,CAAA;CACxB,CAAA;AAED,wBAAgB,yBAAyB,CAAC,EACxC,MAAM,EACN,4BAA4B,EAC5B,oBAAoB,GACrB,EAAE,gCAAgC,GAAG,mBAAmB,CA2rBxD"}

package/dist/index.es.js

@@ -375,7 +375,8 @@ var IS_EDGE_LEGACY = typeof navigator !== 'undefined' && /Edge?\/(?:[0-6][0-9]|[
 var IS_CHROME = typeof navigator !== 'undefined' && /Chrome/i.test(navigator.userAgent); // Native `beforeInput` events don't work well with react on Chrome 75
 // and older, Chrome 76+ can use `beforeInput` though.
 
-var IS_CHROME_LEGACY = typeof navigator !== 'undefined' && /Chrome?\/(?:[0-7][0-5]|[0-6][0-9])(?:\.)/i.test(navigator.userAgent); // Firefox did not support `beforeInput` until `v87`.
+var IS_CHROME_LEGACY = typeof navigator !== 'undefined' && /Chrome?\/(?:[0-7][0-5]|[0-6][0-9])(?:\.)/i.test(navigator.userAgent);
+var IS_ANDROID_CHROME_LEGACY = IS_ANDROID && typeof navigator !== 'undefined' && /Chrome?\/(?:[0-5]?\d)(?:\.)/i.test(navigator.userAgent); // Firefox did not support `beforeInput` until `v87`.
 
 var IS_FIREFOX_LEGACY = typeof navigator !== 'undefined' && /^(?!.*Seamonkey)(?=.*Firefox\/(?:[0-7][0-9]|[0-8][0-6])(?:\.)).*/i.test(navigator.userAgent); // UC mobile browser
 
@@ -387,7 +388,7 @@ var IS_WECHATBROWSER = typeof navigator !== 'undefined' && /.*Wechat/.test(navig
 var CAN_USE_DOM = !!(typeof window !== 'undefined' && typeof window.document !== 'undefined' && typeof window.document.createElement !== 'undefined'); // COMPAT: Firefox/Edge Legacy don't support the `beforeinput` event
 // Chrome Legacy doesn't support `beforeinput` correctly
 
-var HAS_BEFORE_INPUT_SUPPORT = !IS_CHROME_LEGACY && !IS_EDGE_LEGACY && // globalThis is undefined in older browsers
+var HAS_BEFORE_INPUT_SUPPORT = (!IS_CHROME_LEGACY || !IS_ANDROID_CHROME_LEGACY) && !IS_EDGE_LEGACY && // globalThis is undefined in older browsers
 typeof globalThis !== 'undefined' && globalThis.InputEvent && // @ts-ignore The `getTargetRanges` property isn't recognized.
 typeof globalThis.InputEvent.prototype.getTargetRanges === 'function';
 
@@ -2003,7 +2004,6 @@ function verifyDiffState(editor, textDiff) {
   var nextNode = Node.get(editor, nextPath);
   return Text$1.isText(nextNode) && nextNode.text.startsWith(diff.text);
 }
-
 function applyStringDiff(text) {
   for (var _len = arguments.length, diffs = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
     diffs[_key - 1] = arguments[_key];
@@ -2472,8 +2472,6 @@ function createAndroidInputManager(_ref) {
   };
 
   var flush = () => {
-    var _EDITOR_TO_PENDING_DI;
-
     if (flushTimeoutId) {
       clearTimeout(flushTimeoutId);
       flushTimeoutId = null;
@@ -2503,11 +2501,11 @@ function createAndroidInputManager(_ref) {
     });
     EDITOR_TO_USER_MARKS.set(editor, editor.marks);
     debug('flush', EDITOR_TO_PENDING_ACTION.get(editor), EDITOR_TO_PENDING_DIFFS.get(editor));
-    var scheduleSelectionChange = !!((_EDITOR_TO_PENDING_DI = EDITOR_TO_PENDING_DIFFS.get(editor)) !== null && _EDITOR_TO_PENDING_DI !== void 0 && _EDITOR_TO_PENDING_DI.length);
+    var scheduleSelectionChange = hasPendingDiffs();
     var diff;
 
-    while (diff = (_EDITOR_TO_PENDING_DI2 = EDITOR_TO_PENDING_DIFFS.get(editor)) === null || _EDITOR_TO_PENDING_DI2 === void 0 ? void 0 : _EDITOR_TO_PENDING_DI2[0]) {
-      var _EDITOR_TO_PENDING_DI2, _EDITOR_TO_PENDING_DI3;
+    while (diff = (_EDITOR_TO_PENDING_DI = EDITOR_TO_PENDING_DIFFS.get(editor)) === null || _EDITOR_TO_PENDING_DI === void 0 ? void 0 : _EDITOR_TO_PENDING_DI[0]) {
+      var _EDITOR_TO_PENDING_DI, _EDITOR_TO_PENDING_DI2;
 
       var pendingMarks = EDITOR_TO_PENDING_INSERTION_MARKS.get(editor);
 
@@ -2534,7 +2532,7 @@ function createAndroidInputManager(_ref) {
       // pending ranges.
 
 
-      EDITOR_TO_PENDING_DIFFS.set(editor, (_EDITOR_TO_PENDING_DI3 = EDITOR_TO_PENDING_DIFFS.get(editor)) === null || _EDITOR_TO_PENDING_DI3 === void 0 ? void 0 : _EDITOR_TO_PENDING_DI3.filter(_ref2 => {
+      EDITOR_TO_PENDING_DIFFS.set(editor, (_EDITOR_TO_PENDING_DI2 = EDITOR_TO_PENDING_DIFFS.get(editor)) === null || _EDITOR_TO_PENDING_DI2 === void 0 ? void 0 : _EDITOR_TO_PENDING_DI2.filter(_ref2 => {
         var {
           id
         } = _ref2;
@@ -2622,8 +2620,8 @@ function createAndroidInputManager(_ref) {
   };
 
   var storeDiff = (path, diff) => {
-    var _EDITOR_TO_PENDING_DI4;
-    var pendingDiffs = (_EDITOR_TO_PENDING_DI4 = EDITOR_TO_PENDING_DIFFS.get(editor)) !== null && _EDITOR_TO_PENDING_DI4 !== void 0 ? _EDITOR_TO_PENDING_DI4 : [];
+    var _EDITOR_TO_PENDING_DI3;
+    var pendingDiffs = (_EDITOR_TO_PENDING_DI3 = EDITOR_TO_PENDING_DIFFS.get(editor)) !== null && _EDITOR_TO_PENDING_DI3 !== void 0 ? _EDITOR_TO_PENDING_DI3 : [];
     EDITOR_TO_PENDING_DIFFS.set(editor, pendingDiffs);
     var target = Node.leaf(editor, path);
     var idx = pendingDiffs.findIndex(change => Path.equals(change.path, path));
@@ -2723,49 +2721,77 @@ function createAndroidInputManager(_ref) {
 
     if (!targetRange) {
       return;
-    }
+    } // By default, the input manager tries to store text diffs so that we can
+    // defer flushing them at a later point in time. We don't want to flush
+    // for every input event as this can be expensive. However, there are some
+    // scenarios where we cannot safely store the text diff and must instead
+    // schedule an action to let Slate normalize the editor state.
 
-    if (Range.isExpanded(targetRange) && type.startsWith('delete')) {
-      var [start, end] = Range.edges(targetRange);
-      var leaf = Node.leaf(editor, start.path);
 
-      if (leaf.text.length === start.offset && end.offset === 0) {
-        var next = Editor.next(editor, {
-          at: start.path,
-          match: Text$1.isText
-        });
+    var canStoreDiff = true;
 
-        if (next && Path.equals(next[1], end.path)) {
-          targetRange = {
-            anchor: end,
-            focus: end
-          };
+    if (type.startsWith('delete')) {
+      if (Range.isExpanded(targetRange)) {
+        var [_start, _end] = Range.edges(targetRange);
+
+        var _leaf = Node.leaf(editor, _start.path);
+
+        if (_leaf.text.length === _start.offset && _end.offset === 0) {
+          var next = Editor.next(editor, {
+            at: _start.path,
+            match: Text$1.isText
+          });
+
+          if (next && Path.equals(next[1], _end.path)) {
+            targetRange = {
+              anchor: _end,
+              focus: _end
+            };
+          }
         }
       }
-    }
 
-    if (Range.isExpanded(targetRange) && type.startsWith('delete')) {
-      if (Path.equals(targetRange.anchor.path, targetRange.focus.path)) {
-        var [_start, _end] = Range.edges(targetRange);
-        var point = {
-          path: targetRange.anchor.path,
-          offset: _start.offset
-        };
-        var range = Editor.range(editor, point, point);
-        handleUserSelect(range);
-        return storeDiff(targetRange.anchor.path, {
-          text: '',
-          end: _end.offset,
-          start: _start.offset
-        });
+      var direction = type.endsWith('Backward') ? 'backward' : 'forward';
+      var [start, end] = Range.edges(targetRange);
+      var [leaf, path] = Editor.leaf(editor, start.path);
+      var diff = {
+        text: '',
+        start: start.offset,
+        end: end.offset
+      };
+      var pendingDiffs = EDITOR_TO_PENDING_DIFFS.get(editor);
+      var relevantPendingDiffs = pendingDiffs === null || pendingDiffs === void 0 ? void 0 : pendingDiffs.find(change => Path.equals(change.path, path));
+      var diffs = relevantPendingDiffs ? [relevantPendingDiffs.diff, diff] : [diff];
+      var text = applyStringDiff(leaf.text, ...diffs);
+
+      if (text.length === 0) {
+        // Text leaf will be removed, so we need to schedule an
+        // action to remove it so that Slate can normalize instead
+        // of storing as a diff
+        canStoreDiff = false;
       }
 
-      var direction = type.endsWith('Backward') ? 'backward' : 'forward';
-      return scheduleAction(() => Editor.deleteFragment(editor, {
-        direction
-      }), {
-        at: targetRange
-      });
+      if (Range.isExpanded(targetRange)) {
+        if (canStoreDiff && Path.equals(targetRange.anchor.path, targetRange.focus.path)) {
+          var point = {
+            path: targetRange.anchor.path,
+            offset: start.offset
+          };
+          var range = Editor.range(editor, point, point);
+          handleUserSelect(range);
+          return storeDiff(targetRange.anchor.path, {
+            text: '',
+            end: end.offset,
+            start: start.offset
+          });
+        }
+
+        return scheduleAction(() => Editor.deleteFragment(editor, {
+          direction
+        }), {
+          at: targetRange
+        });
+      }
     }
 
     switch (type) {
@@ -2785,7 +2811,7 @@ function createAndroidInputManager(_ref) {
             anchor
           } = targetRange;
 
-          if (Range.isCollapsed(targetRange)) {
+          if (canStoreDiff && Range.isCollapsed(targetRange)) {
             var targetNode = Node.leaf(editor, anchor.path);
 
             if (anchor.offset < targetNode.text.length) {
@@ -2814,7 +2840,7 @@ function createAndroidInputManager(_ref) {
 
           var nativeCollapsed = isDOMSelection(nativeTargetRange) ? nativeTargetRange.isCollapsed : !!((_nativeTargetRange = nativeTargetRange) !== null && _nativeTargetRange !== void 0 && _nativeTargetRange.collapsed);
 
-          if (nativeCollapsed && Range.isCollapsed(targetRange) && _anchor.offset > 0) {
+          if (canStoreDiff && nativeCollapsed && Range.isCollapsed(targetRange) && _anchor.offset > 0) {
             return storeDiff(_anchor.path, {
               text: '',
               start: _anchor.offset - 1,
@@ -2930,19 +2956,20 @@ function createAndroidInputManager(_ref) {
             });
           }
 
-          var text = data !== null && data !== void 0 ? data : ''; // COMPAT: If we are writing inside a placeholder, the ime inserts the text inside
+          var _text = data !== null && data !== void 0 ? data : ''; // COMPAT: If we are writing inside a placeholder, the ime inserts the text inside
           // the placeholder itself and thus includes the zero-width space inside edit events.
 
+
           if (EDITOR_TO_PENDING_INSERTION_MARKS.get(editor)) {
-            text = text.replace('\uFEFF', '');
+            _text = _text.replace('\uFEFF', '');
           }
 
           if (Path.equals(targetRange.anchor.path, targetRange.focus.path)) {
             var [_start2, _end2] = Range.edges(targetRange);
-            var diff = {
+            var _diff = {
               start: _start2.offset,
               end: _end2.offset,
-              text
+              text: _text
             }; // COMPAT: Swiftkey has a weird bug where the target range of the 2nd word
             // inserted after a mark placeholder is inserted with an anchor offset off by 1.
             // So writing 'some text' will result in 'some ttext'. Luckily all 'normal' insert
@@ -2950,12 +2977,13 @@ function createAndroidInputManager(_ref) {
             // isn't, so we can adjust the target range start offset if we are confident this is the
             // swiftkey insert causing the issue.
 
-            if (text && insertPositionHint && type === 'insertCompositionText') {
+            if (_text && insertPositionHint && type === 'insertCompositionText') {
               var hintPosition = insertPositionHint.start + insertPositionHint.text.search(/\S|$/);
-              var diffPosition = diff.start + diff.text.search(/\S|$/);
 
-              if (diffPosition === hintPosition + 1 && diff.end === insertPositionHint.start + insertPositionHint.text.length) {
-                diff.start -= 1;
+              var diffPosition = _diff.start + _diff.text.search(/\S|$/);
+
+              if (diffPosition === hintPosition + 1 && _diff.end === insertPositionHint.start + insertPositionHint.text.length) {
+                _diff.start -= 1;
                 insertPositionHint = null;
                 scheduleFlush();
               } else {
@@ -2963,10 +2991,10 @@ function createAndroidInputManager(_ref) {
               }
             } else if (type === 'insertText') {
               if (insertPositionHint === null) {
-                insertPositionHint = diff;
+                insertPositionHint = _diff;
               } else if (insertPositionHint && Range.isCollapsed(targetRange) && insertPositionHint.end + insertPositionHint.text.length === _start2.offset) {
                 insertPositionHint = _objectSpread$3(_objectSpread$3({}, insertPositionHint), {}, {
-                  text: insertPositionHint.text + text
+                  text: insertPositionHint.text + _text
                 });
               } else {
                 insertPositionHint = false;
@@ -2975,11 +3003,13 @@ function createAndroidInputManager(_ref) {
               insertPositionHint = false;
             }
 
-            storeDiff(_start2.path, diff);
-            return;
+            if (canStoreDiff) {
+              storeDiff(_start2.path, _diff);
+              return;
+            }
           }
 
-          return scheduleAction(() => Editor.insertText(editor, text), {
+          return scheduleAction(() => Editor.insertText(editor, _text), {
             at: targetRange
           });
         }
@@ -2991,9 +3021,9 @@ function createAndroidInputManager(_ref) {
   };
 
   var hasPendingDiffs = () => {
-    var _EDITOR_TO_PENDING_DI5;
+    var _EDITOR_TO_PENDING_DI4;
 
-    return !!((_EDITOR_TO_PENDING_DI5 = EDITOR_TO_PENDING_DIFFS.get(editor)) !== null && _EDITOR_TO_PENDING_DI5 !== void 0 && _EDITOR_TO_PENDING_DI5.length);
+    return !!((_EDITOR_TO_PENDING_DI4 = EDITOR_TO_PENDING_DIFFS.get(editor)) !== null && _EDITOR_TO_PENDING_DI4 !== void 0 && _EDITOR_TO_PENDING_DI4.length);
   };
 
   var hasPendingChanges = () => {