slate-react 0.126.0 → 0.126.3

package/dist/components/string.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"string.d.ts","sourceRoot":"","sources":["../../../../packages/slate-react/src/components/string.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAA;AACjE,OAAO,EAAU,IAAI,EAAQ,OAAO,EAAQ,MAAM,OAAO,CAAA;AAOzD;;GAEG;AAEH,QAAA,MAAM,MAAM,UAAW;IACrB,MAAM,EAAE,OAAO,CAAA;IACf,IAAI,EAAE,IAAI,CAAA;IACV,QAAQ,OAAO,CAAA;IACf,IAAI,EAAE,IAAI,CAAA;CACX,sBAuCA,CAAA;AAiDD;;GAEG;AAEH,eAAO,MAAM,eAAe,UAAW;IACrC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B,sBA8BA,CAAA;AAED,eAAe,MAAM,CAAA"}
+{"version":3,"file":"string.d.ts","sourceRoot":"","sources":["../../../../packages/slate-react/src/components/string.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAA;AACjE,OAAO,EAAU,IAAI,EAAQ,OAAO,EAAQ,MAAM,OAAO,CAAA;AAOzD;;GAEG;AAEH,QAAA,MAAM,MAAM,UAAW;IACrB,MAAM,EAAE,OAAO,CAAA;IACf,IAAI,EAAE,IAAI,CAAA;IACV,QAAQ,OAAO,CAAA;IACf,IAAI,EAAE,IAAI,CAAA;CACX,sBAuCA,CAAA;AAgED;;GAEG;AAEH,eAAO,MAAM,eAAe,UAAW;IACrC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B,sBAoCA,CAAA;AAED,eAAe,MAAM,CAAA"}

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,EAAgC,KAAK,EAAE,KAAK,EAAc,MAAM,OAAO,CAAA;AAC9E,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAyBvD,MAAM,MAAM,MAAM,GAAG;IAAE,EAAE,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IAAC,GAAG,EAAE,MAAM,IAAI,CAAA;CAAE,CAAA;AAgB5D,MAAM,MAAM,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,MAAM,MAAM,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,CA+uBxD"}
+{"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;AAItC,OAAO,EAAgC,KAAK,EAAE,KAAK,EAAc,MAAM,OAAO,CAAA;AAC9E,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAyBvD,MAAM,MAAM,MAAM,GAAG;IAAE,EAAE,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IAAC,GAAG,EAAE,MAAM,IAAI,CAAA;CAAE,CAAA;AA0B5D,MAAM,MAAM,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,MAAM,MAAM,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,CA21BxD"}

package/dist/index.es.js

@@ -3,11 +3,11 @@ import debounce from 'lodash/debounce';
 import throttle from 'lodash/throttle';
 import React, { createContext, useContext, useRef, useEffect, useLayoutEffect, useState, memo, forwardRef, useCallback, useReducer, useMemo, Fragment, Component } from 'react';
 import scrollIntoView from 'scroll-into-view-if-needed';
-import { Range, Editor, Node, Path, Transforms, Location, Text as Text$1, Scrubber } from 'slate';
-import { DOMEditor, isTrackedMutation, EDITOR_TO_FORCE_RENDER, IS_NODE_MAP_DIRTY, EDITOR_TO_PENDING_DIFFS, applyStringDiff, EDITOR_TO_PENDING_INSERTION_MARKS, isDOMSelection, IS_COMPOSING, EDITOR_TO_PENDING_SELECTION, EDITOR_TO_PENDING_ACTION, EDITOR_TO_USER_MARKS, targetRange, verifyDiffState, EDITOR_TO_PLACEHOLDER_ELEMENT, normalizeStringDiff, mergeStringDiffs, normalizeRange, normalizePoint, CAN_USE_DOM, IS_ANDROID, EDITOR_TO_SCHEDULE_FLUSH, MARK_PLACEHOLDER_SYMBOL, PLACEHOLDER_SYMBOL, IS_WEBKIT, isTextDecorationsEqual, isElementDecorationsEqual, EDITOR_TO_KEY_TO_ELEMENT, NODE_TO_ELEMENT, ELEMENT_TO_NODE, NODE_TO_INDEX, NODE_TO_PARENT, Key, splitDecorationsByChild, IS_READ_ONLY, getActiveElement, getSelection, IS_FOCUSED, getDefaultView, EDITOR_TO_WINDOW, EDITOR_TO_ELEMENT, IS_FIREFOX, containsShadowAware, EDITOR_TO_USER_SELECTION, HAS_BEFORE_INPUT_SUPPORT, isPlainTextOnlyPaste, Hotkeys, IS_CHROME, IS_FIREFOX_LEGACY, IS_IOS, IS_WECHATBROWSER, IS_UC_MOBILE, isDOMNode, TRIPLE_CLICK, isDOMElement, EDITOR_TO_ON_CHANGE, withDOM } from 'slate-dom';
+import { Node, Range, Editor, Path, Transforms, Location, Text as Text$1, Scrubber } from 'slate';
+import { DOMEditor, isTrackedMutation, EDITOR_TO_FORCE_RENDER, IS_NODE_MAP_DIRTY, EDITOR_TO_PENDING_DIFFS, EDITOR_TO_PENDING_SELECTION, applyStringDiff, EDITOR_TO_PENDING_INSERTION_MARKS, isDOMSelection, IS_COMPOSING, EDITOR_TO_PENDING_ACTION, EDITOR_TO_USER_MARKS, targetRange, verifyDiffState, EDITOR_TO_PLACEHOLDER_ELEMENT, normalizeStringDiff, mergeStringDiffs, normalizeRange, normalizePoint, CAN_USE_DOM, IS_ANDROID, EDITOR_TO_SCHEDULE_FLUSH, MARK_PLACEHOLDER_SYMBOL, PLACEHOLDER_SYMBOL, IS_WEBKIT, isTextDecorationsEqual, isElementDecorationsEqual, EDITOR_TO_KEY_TO_ELEMENT, NODE_TO_ELEMENT, ELEMENT_TO_NODE, NODE_TO_INDEX, NODE_TO_PARENT, Key, splitDecorationsByChild, IS_READ_ONLY, getActiveElement, getSelection, IS_FOCUSED, getDefaultView, EDITOR_TO_WINDOW, EDITOR_TO_ELEMENT, IS_FIREFOX, containsShadowAware, EDITOR_TO_USER_SELECTION, HAS_BEFORE_INPUT_SUPPORT, isPlainTextOnlyPaste, Hotkeys, IS_CHROME, IS_FIREFOX_LEGACY, IS_IOS, IS_WECHATBROWSER, IS_UC_MOBILE, isDOMNode, TRIPLE_CLICK, isDOMElement, EDITOR_TO_ON_CHANGE, withDOM } from 'slate-dom';
 export { NODE_TO_INDEX, NODE_TO_PARENT } from 'slate-dom';
-import { ResizeObserver } from '@juggle/resize-observer';
 import ReactDOM from 'react-dom';
+import { ResizeObserver } from '@juggle/resize-observer';
 
 function _objectWithoutPropertiesLoose(source, excluded) {
   if (source == null) return {};
@@ -104,6 +104,14 @@ function _objectSpread$8(e) { for (var r = 1; r < arguments.length; r++) { var t
 var RESOLVE_DELAY = 25;
 // Time with no user interaction before the current user action is considered as done.
 var FLUSH_DELAY = 200;
+// Time with no composition input after which a composition that never ended is
+// treated as stale. Long enough that pausing mid-word does not cut a live
+// composition short.
+var COMPOSITION_IDLE_TIMEOUT = 5000;
+// How often a deferred flush re-checks whether the composition is still live.
+// Only bounds how quickly the value catches up with a composition that ended
+// without firing `compositionend`; one that ends normally flushes immediately.
+var COMPOSITION_RECHECK_DELAY = 50;
 // Replace with `const debug = console.log` to debug
 var debug = function debug() {};
 // Type guard to check if a value is a DataTransfer
@@ -118,6 +126,8 @@ function createAndroidInputManager(_ref) {
   var compositionEndTimeoutId = null;
   var flushTimeoutId = null;
   var actionTimeoutId = null;
+  var lastCompositionActivity = 0;
+  var compositionCleared = false;
   var idCounter = 0;
   var insertPositionHint = false;
   var applyPendingSelection = () => {
@@ -151,6 +161,47 @@ function createAndroidInputManager(_ref) {
     }
     action.run();
   };
+  // `compositionend` is not fired reliably in every browser, which Slate
+  // already works around on keydown. Deferring flushes on a composition that
+  // never ends would strand the typed text outside the value, so a composition
+  // that has gone quiet, or that has lost focus, no longer holds flushes back.
+  var isCompositionLive = () => {
+    if (!IS_COMPOSING.get(editor) || compositionCleared) {
+      return false;
+    }
+    try {
+      var editable = ReactEditor.toDOMNode(editor, editor);
+      var {
+        activeElement
+      } = ReactEditor.getWindow(editor).document;
+      if (activeElement !== editable && !editable.contains(activeElement)) {
+        return false;
+      }
+    } catch (_unused) {
+      // Fall back to the idle check below if the editable can't be resolved.
+    }
+    return Date.now() - lastCompositionActivity < COMPOSITION_IDLE_TIMEOUT;
+  };
+  // A leaf that Slate models as empty renders as a zero-width string, which on
+  // Android is a `<br>` rather than a text node. When the IME composes the
+  // first character into such a leaf, the browser creates a text node for the
+  // composition. Applying the pending diffs re-renders that leaf as a text
+  // leaf, which unmounts the zero-width span and takes the text node the IME is
+  // composing in with it, silently cancelling the composition.
+  var hasPendingDiffsInEmptyLeaf = () => {
+    var _EDITOR_TO_PENDING_DI;
+    return !!((_EDITOR_TO_PENDING_DI = EDITOR_TO_PENDING_DIFFS.get(editor)) !== null && _EDITOR_TO_PENDING_DI !== void 0 && _EDITOR_TO_PENDING_DI.some(_ref2 => {
+      var {
+        path
+      } = _ref2;
+      try {
+        return Node.leaf(editor, path).text.length === 0;
+      } catch (_unused2) {
+        // The path may no longer resolve if the editor changed underneath us.
+        return false;
+      }
+    }));
+  };
   var flush = () => {
     if (flushTimeoutId) {
       clearTimeout(flushTimeoutId);
@@ -160,6 +211,15 @@ function createAndroidInputManager(_ref) {
       clearTimeout(actionTimeoutId);
       actionTimeoutId = null;
     }
+    // Defer flushing until the composition ends, so that the re-render that
+    // would replace the composing text node cannot happen mid-composition.
+    // Composing into a leaf that already has text is unaffected: applying the
+    // diff there only updates `textContent`, so the value still updates on
+    // every `compositionupdate`.
+    if (isCompositionLive() && hasPendingDiffsInEmptyLeaf()) {
+      flushTimeoutId = setTimeout(flush, COMPOSITION_RECHECK_DELAY);
+      return;
+    }
     if (!hasPendingDiffs() && !hasPendingAction()) {
       applyPendingSelection();
       return;
@@ -178,8 +238,8 @@ function createAndroidInputManager(_ref) {
     debug('flush', EDITOR_TO_PENDING_ACTION.get(editor), EDITOR_TO_PENDING_DIFFS.get(editor));
     var scheduleSelectionChange = hasPendingDiffs();
     var diff;
-    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;
+    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;
       var pendingMarks = EDITOR_TO_PENDING_INSERTION_MARKS.get(editor);
       if (pendingMarks !== undefined) {
         EDITOR_TO_PENDING_INSERTION_MARKS.delete(editor);
@@ -199,10 +259,10 @@ function createAndroidInputManager(_ref) {
       }
       // Remove diff only after we have applied it to account for it when transforming
       // pending ranges.
-      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 => {
+      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(_ref3 => {
         var {
           id
-        } = _ref2;
+        } = _ref3;
         return id !== diff.id;
       }));
       if (!verifyDiffState(editor, diff)) {
@@ -246,13 +306,35 @@ function createAndroidInputManager(_ref) {
     if (compositionEndTimeoutId) {
       clearTimeout(compositionEndTimeoutId);
     }
+    // Diffs deferred by `flush` have to be applied synchronously here. IMEs
+    // that compose one syllable at a time (Hangul, kana) start the next
+    // composition in the same tick as this event, so an asynchronous render
+    // would replace the text node that composition has already started in.
+    if (hasPendingDiffsInEmptyLeaf() && !flushing) {
+      ReactDOM.flushSync(() => {
+        IS_COMPOSING.set(editor, false);
+        flush();
+      });
+      updatePlaceholderVisibility();
+      return;
+    }
     compositionEndTimeoutId = setTimeout(() => {
       IS_COMPOSING.set(editor, false);
       flush();
+      if (compositionCleared) {
+        var _EDITOR_TO_FORCE_REND;
+        // A cancelled composition can take the empty leaf's text node with
+        // it. A forced render lets RestoreDOM put the leaf's DOM back, so the
+        // next composition starts from a clean state instead of a bare <br>.
+        (_EDITOR_TO_FORCE_REND = EDITOR_TO_FORCE_RENDER.get(editor)) === null || _EDITOR_TO_FORCE_REND === void 0 || _EDITOR_TO_FORCE_REND();
+      }
+      updatePlaceholderVisibility();
     }, RESOLVE_DELAY);
   };
   var handleCompositionStart = _event => {
     IS_COMPOSING.set(editor, true);
+    lastCompositionActivity = Date.now();
+    compositionCleared = false;
     if (compositionEndTimeoutId) {
       clearTimeout(compositionEndTimeoutId);
       compositionEndTimeoutId = null;
@@ -271,8 +353,8 @@ function createAndroidInputManager(_ref) {
     placeholderElement.style.removeProperty('display');
   };
   var storeDiff = (path, diff) => {
-    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 : [];
+    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 : [];
     EDITOR_TO_PENDING_DIFFS.set(editor, pendingDiffs);
     var target = Node.leaf(editor, path);
     var idx = pendingDiffs.findIndex(change => Path.equals(change.path, path));
@@ -330,6 +412,36 @@ function createAndroidInputManager(_ref) {
     var {
       inputType: type
     } = event;
+    if (type === 'insertCompositionText' || type === 'deleteCompositionText') {
+      lastCompositionActivity = Date.now();
+      if (event.data) {
+        compositionCleared = false;
+      } else {
+        // The IME threw away what it was composing. The deferred text never
+        // reached the value, so the value is already in the desired state -
+        // drop the deferral instead of applying and re-deleting it, which
+        // would churn the DOM mid-composition and can make Android close the
+        // keyboard.
+        compositionCleared = true;
+        var deferredDiffs = EDITOR_TO_PENDING_DIFFS.get(editor);
+        if (deferredDiffs !== null && deferredDiffs !== void 0 && deferredDiffs.length) {
+          var allInEmptyLeaves = deferredDiffs.every(_ref4 => {
+            var {
+              path
+            } = _ref4;
+            try {
+              return Node.leaf(editor, path).text.length === 0;
+            } catch (_unused3) {
+              return false;
+            }
+          });
+          if (allInEmptyLeaves) {
+            EDITOR_TO_PENDING_DIFFS.set(editor, []);
+            EDITOR_TO_PENDING_SELECTION.delete(editor);
+          }
+        }
+      }
+    }
     var targetRange = null;
     var data = event.dataTransfer || event.data || undefined;
     if (insertPositionHint !== false && type !== 'insertText' && type !== 'insertCompositionText') {
@@ -662,8 +774,8 @@ function createAndroidInputManager(_ref) {
     return !!EDITOR_TO_PENDING_ACTION.get(editor);
   };
   var hasPendingDiffs = () => {
-    var _EDITOR_TO_PENDING_DI4;
-    return !!((_EDITOR_TO_PENDING_DI4 = EDITOR_TO_PENDING_DIFFS.get(editor)) !== null && _EDITOR_TO_PENDING_DI4 !== void 0 && _EDITOR_TO_PENDING_DI4.length);
+    var _EDITOR_TO_PENDING_DI5;
+    return !!((_EDITOR_TO_PENDING_DI5 = EDITOR_TO_PENDING_DIFFS.get(editor)) !== null && _EDITOR_TO_PENDING_DI5 !== void 0 && _EDITOR_TO_PENDING_DI5.length);
   };
   var hasPendingChanges = () => {
     return hasPendingAction() || hasPendingDiffs();
@@ -718,10 +830,10 @@ function createAndroidInputManager(_ref) {
       return;
     }
     if (mutations.some(mutation => isTrackedMutation(editor, mutation, mutations))) {
-      var _EDITOR_TO_FORCE_REND;
+      var _EDITOR_TO_FORCE_REND2;
       // Cause a re-render to restore the dom state if we encounter tracked mutations without
       // a corresponding pending action.
-      (_EDITOR_TO_FORCE_REND = EDITOR_TO_FORCE_RENDER.get(editor)) === null || _EDITOR_TO_FORCE_REND === void 0 || _EDITOR_TO_FORCE_REND();
+      (_EDITOR_TO_FORCE_REND2 = EDITOR_TO_FORCE_RENDER.get(editor)) === null || _EDITOR_TO_FORCE_REND2 === void 0 || _EDITOR_TO_FORCE_REND2();
     }
   };
   return {
@@ -862,6 +974,7 @@ var TextString = props => {
     text,
     isTrailing = false
   } = props;
+  var editor = useSlateStatic();
   var ref = useRef(null);
   var getTextContent = () => {
     return "".concat(text !== null && text !== void 0 ? text : '').concat(isTrailing ? '\n' : '');
@@ -879,6 +992,18 @@ var TextString = props => {
     // null coalescing text to make sure we're not outputing "null" as a string in the extreme case it is nullish at runtime
     var textWithTrailing = getTextContent();
     if (ref.current && ref.current.textContent !== textWithTrailing) {
+      // On Android the DOM intentionally runs ahead of the value while the IME
+      // composes, since input is buffered as pending diffs. Writing
+      // `textContent` here would replace the text node the composition lives in
+      // and cancel it; the pending diffs reconcile this span when the
+      // composition ends.
+      if (IS_ANDROID && IS_COMPOSING.get(editor)) {
+        var _ReactEditor$getWindo;
+        var composingNode = (_ReactEditor$getWindo = ReactEditor.getWindow(editor).getSelection()) === null || _ReactEditor$getWindo === void 0 ? void 0 : _ReactEditor$getWindo.anchorNode;
+        if (composingNode && ref.current.contains(composingNode)) {
+          return;
+        }
+      }
       ref.current.textContent = textWithTrailing;
     }
     // intentionally not specifying dependencies, so that this effect runs on every render
@@ -920,7 +1045,13 @@ var ZeroWidthString = props => {
   // be because accepting an IME suggestion when at the start of a block (no
   // preceding \uFEFF) removes one or more DOM elements that `toSlateRange`
   // depends on. (https://github.com/ianstormtaylor/slate/issues/5703)
-  return /*#__PURE__*/React.createElement("span", _objectSpread$6({}, attributes), !IS_ANDROID || !isLineBreak ? '\uFEFF' : null, isLineBreak ? /*#__PURE__*/React.createElement("br", null) : null);
+  // A leaf with no text node at all forces the IME to create one when the
+  // first character is composed there, and no re-render can then touch the
+  // leaf without cancelling the composition. Rendering the zero-width space on
+  // Android too gives the composition a React-owned text node to live in; the
+  // wrapper keeps its data-slate-zero-width attributes, so selection mapping
+  // is unchanged.
+  return /*#__PURE__*/React.createElement("span", _objectSpread$6({}, attributes), '\uFEFF', isLineBreak ? /*#__PURE__*/React.createElement("br", null) : null);
 };
 
 function ownKeys$5(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }