slate-react 0.71.0 → 0.71.1-2021114161528

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # slate-react
 
+## 0.71.1-2021114161528
+
+### Patch Changes
+
+- [#4706](https://github.com/ianstormtaylor/slate/pull/4706) [`6d194077`](https://github.com/ianstormtaylor/slate/commit/6d194077763ec0a9d5642be5cafef20e65dbce8e) Thanks [@BitPhinix](https://github.com/BitPhinix)! - Update android restoreDOM to use partial dom restoring
+
+* [#4707](https://github.com/ianstormtaylor/slate/pull/4707) [`c020ca23`](https://github.com/ianstormtaylor/slate/commit/c020ca23b6f5d2307eb62630566ec711def89fcf) Thanks [@ahoisl](https://github.com/ahoisl)! - fix: add 'readonly' dependency for onDragStart callback
+
+* Updated dependencies [[`2fc7ad92`](https://github.com/ianstormtaylor/slate/commit/2fc7ad924cfbb75de59f685eeabb0375769201b9)]:
+  - slate@0.71.1-2021114161528
+
 ## 0.71.0
 
 ### Minor Changes

package/dist/components/android/android-editable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"android-editable.d.ts","sourceRoot":"","sources":["../../packages/slate-react/src/components/android/android-editable.tsx"],"names":[],"mappings":";AACA,OAAO,EAAsB,OAAO,EAA2B,MAAM,OAAO,CAAA;AA2B5E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAY3C;;GAEG;AAEH,eAAO,MAAM,eAAe,UAAW,aAAa,KAAG,GAAG,CAAC,OAqb1D,CAAA"}
+{"version":3,"file":"android-editable.d.ts","sourceRoot":"","sources":["../../packages/slate-react/src/components/android/android-editable.tsx"],"names":[],"mappings":";AACA,OAAO,EAAsB,OAAO,EAA2B,MAAM,OAAO,CAAA;AAyB5E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAa3C;;GAEG;AAEH,eAAO,MAAM,eAAe,UAAW,aAAa,KAAG,GAAG,CAAC,OAgb1D,CAAA"}

package/dist/components/android/android-input-manager.d.ts

@@ -20,10 +20,12 @@ import { ReactEditor } from '../../plugin/react-editor';
  * - Line breaks
  *
  * @param editor
+ * @param restoreDOM
  */
 export declare class AndroidInputManager {
     private editor;
-    constructor(editor: ReactEditor);
+    private restoreDOM;
+    constructor(editor: ReactEditor, restoreDOM: () => void);
     /**
      * Handle MutationObserver flush
      *

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

@@ -1 +1 @@
-{"version":3,"file":"android-input-manager.d.ts","sourceRoot":"","sources":["../../packages/slate-react/src/components/android/android-input-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAuBvD;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,qBAAa,mBAAmB;IAClB,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,WAAW;IAIvC;;;;OAIG;IAEH,KAAK,cAAe,cAAc,EAAE,UAYnC;IAED;;;;OAIG;IAEH,OAAO,CAAC,kBAAkB,CAkBzB;IAED;;OAEG;IAEH,OAAO,CAAC,UAAU,CAuBjB;IAED;;OAEG;IAEH,OAAO,CAAC,WAAW,CAsBlB;IAED;;OAEG;IAEH,OAAO,CAAC,wBAAwB,CAY/B;IAED;;OAEG;IAEH,OAAO,CAAC,cAAc,CAOrB;IAED;;OAEG;IACH,OAAO,CAAC,eAAe,CAWtB;CACF;AAED,eAAe,mBAAmB,CAAA"}
+{"version":3,"file":"android-input-manager.d.ts","sourceRoot":"","sources":["../../packages/slate-react/src/components/android/android-input-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAsBvD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,qBAAa,mBAAmB;IAClB,OAAO,CAAC,MAAM;IAAe,OAAO,CAAC,UAAU;gBAAvC,MAAM,EAAE,WAAW,EAAU,UAAU,EAAE,MAAM,IAAI;IAKvE;;;;OAIG;IAEH,KAAK,cAAe,cAAc,EAAE,UAYnC;IAED;;;;OAIG;IAEH,OAAO,CAAC,kBAAkB,CAkBzB;IAED;;OAEG;IAEH,OAAO,CAAC,UAAU,CAuBjB;IAED;;OAEG;IAEH,OAAO,CAAC,WAAW,CAoBlB;IAED;;OAEG;IAEH,OAAO,CAAC,wBAAwB,CAY/B;IAED;;OAEG;IAEH,OAAO,CAAC,cAAc,CAOrB;IAED;;OAEG;IACH,OAAO,CAAC,eAAe,CAWtB;CACF;AAED,eAAe,mBAAmB,CAAA"}

package/dist/components/android/use-android-input-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-android-input-manager.d.ts","sourceRoot":"","sources":["../../packages/slate-react/src/components/android/use-android-input-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAiC,MAAM,OAAO,CAAA;AAehE,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC;;;EA8BlE"}
+{"version":3,"file":"use-android-input-manager.d.ts","sourceRoot":"","sources":["../../packages/slate-react/src/components/android/use-android-input-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA0C,MAAM,OAAO,CAAA;AAgBzE,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC;;;EAqClE"}

package/dist/components/android/use-restore-dom.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export declare function useRestoreDom(node: React.RefObject<HTMLElement>, receivedUserInput: React.RefObject<boolean>): () => void;
+//# sourceMappingURL=use-restore-dom.d.ts.map

package/dist/components/android/use-restore-dom.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-restore-dom.d.ts","sourceRoot":"","sources":["../../packages/slate-react/src/components/android/use-restore-dom.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAA;AAgC7D,wBAAgB,aAAa,CAC3B,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,EAClC,iBAAiB,EAAE,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,cA8C5C"}

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

@@ -1 +1 @@
-{"version":3,"file":"element.d.ts","sourceRoot":"","sources":["../packages/slate-react/src/components/element.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiB,MAAM,OAAO,CAAA;AAErC,OAAO,EAAgB,KAAK,EAAa,OAAO,IAAI,YAAY,EAAE,MAAM,OAAO,CAAA;AAc/E,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,sBAAsB,EACvB,MAAM,YAAY,CAAA;AAEnB;;GAEG;AAEH,QAAA,MAAM,OAAO;iBACE,KAAK,EAAE;aACX,YAAY;6BACG,kBAAkB,KAAK,GAAG,CAAC,OAAO;+BAC/B,sBAAsB,KAAK,GAAG,CAAC,OAAO;0BAC5C,eAAe,KAAK,GAAG,CAAC,OAAO;eACzC,KAAK,GAAG,IAAI;iBAsGxB,CAAA;AAED,QAAA,MAAM,eAAe;iBA7GN,KAAK,EAAE;aACX,YAAY;6BACG,kBAAkB,KAAK,GAAG,CAAC,OAAO;+BAC/B,sBAAsB,KAAK,GAAG,CAAC,OAAO;0BAC5C,eAAe,KAAK,GAAG,CAAC,OAAO;eACzC,KAAK,GAAG,IAAI;kBAmHvB,CAAA;AAEF;;GAEG;AAEH,eAAO,MAAM,cAAc,UAAW,kBAAkB,gBASvD,CAAA;AAED,eAAe,eAAe,CAAA"}
+{"version":3,"file":"element.d.ts","sourceRoot":"","sources":["../packages/slate-react/src/components/element.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2B,MAAM,OAAO,CAAA;AAE/C,OAAO,EAAgB,KAAK,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,OAAO,CAAA;AAcpE,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,sBAAsB,EACvB,MAAM,YAAY,CAAA;AAInB;;GAEG;AAEH,QAAA,MAAM,OAAO;iBACE,KAAK,EAAE;aACX,YAAY;6BACG,kBAAkB,KAAK,GAAG,CAAC,OAAO;+BAC/B,sBAAsB,KAAK,GAAG,CAAC,OAAO;0BAC5C,eAAe,KAAK,GAAG,CAAC,OAAO;eACzC,KAAK,GAAG,IAAI;iBA6GxB,CAAA;AAED,QAAA,MAAM,eAAe;iBApHN,KAAK,EAAE;aACX,YAAY;6BACG,kBAAkB,KAAK,GAAG,CAAC,OAAO;+BAC/B,sBAAsB,KAAK,GAAG,CAAC,OAAO;0BAC5C,eAAe,KAAK,GAAG,CAAC,OAAO;eACzC,KAAK,GAAG,IAAI;kBA0HvB,CAAA;AAEF;;GAEG;AAEH,eAAO,MAAM,cAAc,UAAW,kBAAkB,gBASvD,CAAA;AAED,eAAe,eAAe,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../packages/slate-react/src/components/text.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiB,MAAM,OAAO,CAAA;AACrC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,OAAO,CAAA;AAIzD,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAuEpE,QAAA,MAAM,YAAY;iBAzDH,KAAK,EAAE;YACZ,OAAO;YACP,OAAO;+BACY,sBAAsB,KAAK,GAAG,CAAC,OAAO;0BAC5C,eAAe,KAAK,GAAG,CAAC,OAAO;UAC9C,SAAS;kBA4Df,CAAA;AAEF,eAAe,YAAY,CAAA"}
+{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../packages/slate-react/src/components/text.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiB,MAAM,OAAO,CAAA;AACrC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,OAAO,CAAA;AAIzD,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AA2EpE,QAAA,MAAM,YAAY;iBA3DH,KAAK,EAAE;YACZ,OAAO;YACP,OAAO;+BACY,sBAAsB,KAAK,GAAG,CAAC,OAAO;0BAC5C,eAAe,KAAK,GAAG,CAAC,OAAO;UAC9C,SAAS;kBA8Df,CAAA;AAEF,eAAe,YAAY,CAAA"}

package/dist/hooks/use-children.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-children.d.ts","sourceRoot":"","sources":["../packages/slate-react/src/hooks/use-children.tsx"],"names":[],"mappings":";AACA,OAAO,EAAU,KAAK,EAAE,OAAO,EAAa,QAAQ,EAAc,MAAM,OAAO,CAAA;AAQ/E,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,sBAAsB,EACvB,MAAM,wBAAwB,CAAA;AAG/B;;GAEG;AAEH,QAAA,MAAM,WAAW;iBACF,KAAK,EAAE;UACd,QAAQ;6BACU,kBAAkB,KAAK,GAAG,CAAC,OAAO;+BAC/B,sBAAsB,KAAK,GAAG,CAAC,OAAO;0BAC5C,eAAe,KAAK,GAAG,CAAC,OAAO;eACzC,KAAK,GAAG,IAAI;mBAoExB,CAAA;AAED,eAAe,WAAW,CAAA"}
+{"version":3,"file":"use-children.d.ts","sourceRoot":"","sources":["../packages/slate-react/src/hooks/use-children.tsx"],"names":[],"mappings":";AACA,OAAO,EAAU,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAc,MAAM,OAAO,CAAA;AAQpE,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,sBAAsB,EACvB,MAAM,wBAAwB,CAAA;AAG/B;;GAEG;AAEH,QAAA,MAAM,WAAW;iBACF,KAAK,EAAE;UACd,QAAQ;6BACU,kBAAkB,KAAK,GAAG,CAAC,OAAO;+BAC/B,sBAAsB,KAAK,GAAG,CAAC,OAAO;0BAC5C,eAAe,KAAK,GAAG,CAAC,OAAO;eACzC,KAAK,GAAG,IAAI;mBAoExB,CAAA;AAED,eAAe,WAAW,CAAA"}

package/dist/hooks/use-content-key.d.ts

@@ -0,0 +1,3 @@
+import { Node as SlateNode } from 'slate';
+export declare function useContentKey(node: SlateNode): number;
+//# sourceMappingURL=use-content-key.d.ts.map

package/dist/hooks/use-content-key.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-content-key.d.ts","sourceRoot":"","sources":["../packages/slate-react/src/hooks/use-content-key.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,OAAO,CAAA;AAGzC,wBAAgB,aAAa,CAAC,IAAI,EAAE,SAAS,UAiC5C"}

package/dist/index.es.js

@@ -1,4 +1,4 @@
-import React, { useRef, useEffect, useLayoutEffect, useContext, createContext, useState, useMemo, useCallback } from 'react';
+import React, { useRef, useEffect, useLayoutEffect, useState, Fragment, useContext, createContext, useMemo, useCallback } from 'react';
 import { Path, Node, Editor, Text as Text$1, Range, Element as Element$1, Transforms } from 'slate';
 import getDirection from 'direction';
 import debounce from 'lodash/debounce';
@@ -177,7 +177,7 @@ var IS_FOCUSED = new WeakMap();
  */
 
 var EDITOR_TO_ON_CHANGE = new WeakMap();
-var EDITOR_TO_RESTORE_DOM = new WeakMap();
+var NODE_TO_RESTORE_DOM = new WeakMap();
 /**
  * Symbols.
  */
@@ -327,6 +327,36 @@ var isDecoratorRangeListEqual = (list, another) => {
   return true;
 };
 
+function useContentKey(node) {
+  var contentKeyRef = useRef(0);
+  var updateAnimationFrameRef = useRef(null);
+  var [, setForceRerenderCounter] = useState(0);
+  useEffect(() => {
+    NODE_TO_RESTORE_DOM.set(node, () => {
+      // Update is already queued and node hasn't re-render yet
+      if (updateAnimationFrameRef.current) {
+        return;
+      }
+
+      updateAnimationFrameRef.current = requestAnimationFrame(() => {
+        setForceRerenderCounter(state => state + 1);
+        updateAnimationFrameRef.current = null;
+      });
+      contentKeyRef.current++;
+    });
+    return () => {
+      NODE_TO_RESTORE_DOM.delete(node);
+    };
+  }, [node]); // Node was restored => clear scheduled update
+
+  if (updateAnimationFrameRef.current) {
+    cancelAnimationFrame(updateAnimationFrameRef.current);
+    updateAnimationFrameRef.current = null;
+  }
+
+  return contentKeyRef.current;
+}
+
 /**
  * Text.
  */
@@ -372,9 +402,11 @@ var Text = props => {
       NODE_TO_ELEMENT.delete(text);
     }
   });
+  var contentKey = IS_ANDROID ? useContentKey(text) : undefined;
   return /*#__PURE__*/React.createElement("span", {
     "data-slate-node": "text",
-    ref: ref
+    ref: ref,
+    key: contentKey
   }, children);
 };
 
@@ -472,11 +504,20 @@ var Element = props => {
       NODE_TO_ELEMENT.delete(element);
     }
   });
-  return renderElement({
+  var content = renderElement({
     attributes,
     children,
     element
   });
+
+  if (IS_ANDROID) {
+    var contentKey = useContentKey(element);
+    return /*#__PURE__*/React.createElement(Fragment, {
+      key: contentKey
+    }, content);
+  }
+
+  return content;
 };
 
 var MemoizedElement = /*#__PURE__*/React.memo(Element, (prev, next) => {
@@ -1656,7 +1697,7 @@ var Editable$1 = props => {
         state.isDraggingInternally = true;
         ReactEditor.setFragmentData(editor, event.dataTransfer);
       }
-    }, [attributes.onDragStart]),
+    }, [readOnly, attributes.onDragStart]),
     onDrop: useCallback(event => {
       if (!readOnly && hasTarget(editor, event.target) && !isEventHandled(event, attributes.onDrop)) {
         event.preventDefault(); // Keep a reference to the dragged range before updating selection
@@ -3032,19 +3073,6 @@ var isRemoveLeafNodes = (_, _ref7) => {
   return removedNodes.length > 0 && addedNodes.length === 0 && characterDataMutations.length > 0;
 };
 
-function restoreDOM(editor) {
-  try {
-    var onRestoreDOM = EDITOR_TO_RESTORE_DOM.get(editor);
-
-    if (onRestoreDOM) {
-      onRestoreDOM();
-    }
-  } catch (err) {
-    // eslint-disable-next-line no-console
-    console.error(err);
-  }
-}
-
 function ownKeys$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread$1(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$1(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -3069,12 +3097,14 @@ function _objectSpread$1(target) { for (var i = 1; i < arguments.length; i++) {
  * - Line breaks
  *
  * @param editor
+ * @param restoreDOM
  */
 
 
 class AndroidInputManager {
-  constructor(editor) {
+  constructor(editor, restoreDOM) {
     this.editor = editor;
+    this.restoreDOM = restoreDOM;
     /**
      * Handle MutationObserver flush
      *
@@ -3089,7 +3119,7 @@ class AndroidInputManager {
         // eslint-disable-next-line no-console
         console.error(err); // Failed to reconcile mutations, restore DOM to its previous state
 
-        restoreDOM(this.editor);
+        this.restoreDOM();
       }
     };
     /**
@@ -3161,10 +3191,8 @@ class AndroidInputManager {
       var {
         selection
       } = this.editor;
-      Editor.insertBreak(this.editor); // To-do: Need a more granular solution to restoring only a specific portion
-      // of the document. Restoring the entire document is expensive.
-
-      restoreDOM(this.editor);
+      Editor.insertBreak(this.editor);
+      this.restoreDOM();
 
       if (selection) {
         // Compat: Move selection to the newly inserted block if it has not moved
@@ -3189,7 +3217,7 @@ class AndroidInputManager {
         Editor.insertText(this.editor, text);
       }
 
-      restoreDOM(this.editor);
+      this.restoreDOM();
     };
     /**
      * Handle `backspace` that merges blocks
@@ -3199,7 +3227,7 @@ class AndroidInputManager {
     this.deleteBackward = () => {
       Editor.deleteBackward(this.editor);
       ReactEditor.focus(this.editor);
-      restoreDOM(this.editor);
+      this.restoreDOM();
     };
     /**
      * Handle mutations that remove specific leaves
@@ -3215,12 +3243,13 @@ class AndroidInputManager {
           Transforms.delete(this.editor, {
             at: path
           });
-          restoreDOM(this.editor);
+          this.restoreDOM();
         }
       }
     };
 
     this.editor = editor;
+    this.restoreDOM = restoreDOM;
   }
 
 }
@@ -3243,6 +3272,70 @@ function useMutationObserver(node, callback, options) {
   });
 }
 
+var MUTATION_OBSERVER_CONFIG$1 = {
+  childList: true,
+  characterData: true,
+  subtree: true
+};
+
+function findClosestKnowSlateNode(domNode) {
+  var _domEl;
+
+  var domEl = isDOMElement(domNode) ? domNode : domNode.parentElement;
+
+  if (domEl && !domEl.hasAttribute('data-slate-node')) {
+    domEl = domEl.closest("[data-slate-node]");
+  }
+
+  var slateNode = domEl && ELEMENT_TO_NODE.get(domEl);
+
+  if (slateNode) {
+    return slateNode;
+  } // Unknown dom element with a slate-slate-node attribute => the IME
+  // most likely duplicated the node so we have to restore the parent
+
+
+  return (_domEl = domEl) !== null && _domEl !== void 0 && _domEl.parentElement ? findClosestKnowSlateNode(domEl.parentElement) : null;
+}
+
+function useRestoreDom(node, receivedUserInput) {
+  var editor = useSlateStatic();
+  var mutatedNodes = useRef(new Set());
+  var handleDOMMutation = useCallback(mutations => {
+    if (!receivedUserInput.current) {
+      return;
+    }
+
+    mutations.forEach(_ref => {
+      var {
+        target
+      } = _ref;
+      var slateNode = findClosestKnowSlateNode(target);
+
+      if (!slateNode) {
+        return;
+      }
+
+      return mutatedNodes.current.add(slateNode);
+    });
+  }, []);
+  useMutationObserver(node, handleDOMMutation, MUTATION_OBSERVER_CONFIG$1); // Clear mutated nodes on every render
+
+  mutatedNodes.current.clear();
+  var restore = useCallback(() => {
+    var mutated = Array.from(mutatedNodes.current.values()); // Filter out child nodes of nodes that will be restored anyway
+
+    var nodesToRestore = mutated.filter(n => !mutated.some(m => Path.isParent(ReactEditor.findPath(editor, m), ReactEditor.findPath(editor, n))));
+    nodesToRestore.forEach(n => {
+      var _NODE_TO_RESTORE_DOM$;
+
+      (_NODE_TO_RESTORE_DOM$ = NODE_TO_RESTORE_DOM.get(n)) === null || _NODE_TO_RESTORE_DOM$ === void 0 ? void 0 : _NODE_TO_RESTORE_DOM$();
+    });
+    mutatedNodes.current.clear();
+  }, []);
+  return restore;
+}
+
 function useTrackUserInput() {
   var editor = useSlateStatic();
   var receivedUserInput = useRef(false);
@@ -3282,11 +3375,12 @@ var MUTATION_OBSERVER_CONFIG = {
 };
 function useAndroidInputManager(node) {
   var editor = useSlateStatic();
-  var [inputManager] = useState(() => new AndroidInputManager(editor));
   var {
     receivedUserInput,
     onUserInput
   } = useTrackUserInput();
+  var restoreDom = useRestoreDom(node, receivedUserInput);
+  var inputManager = useMemo(() => new AndroidInputManager(editor, restoreDom), [restoreDom, editor]);
   var timeoutId = useRef(null);
   var isReconciling = useRef(false);
   var flush = useCallback(mutations => {
@@ -3347,10 +3441,7 @@ var AndroidEditable = props => {
     isUpdatingSelection: false,
     latestElement: null
   }), []);
-  var [contentKey, setContentKey] = useState(0);
-  var onRestoreDOM = useCallback(() => {
-    setContentKey(prev => prev + 1);
-  }, [contentKey]); // Whenever the editor updates...
+  var contentKey = useContentKey(editor); // Whenever the editor updates...
 
   useIsomorphicLayoutEffect(() => {
     // Update element-related weak maps with the DOM element ref.
@@ -3361,10 +3452,8 @@ var AndroidEditable = props => {
       EDITOR_TO_ELEMENT.set(editor, ref.current);
       NODE_TO_ELEMENT.set(editor, ref.current);
       ELEMENT_TO_NODE.set(ref.current, editor);
-      EDITOR_TO_RESTORE_DOM.set(editor, onRestoreDOM);
     } else {
       NODE_TO_ELEMENT.delete(editor);
-      EDITOR_TO_RESTORE_DOM.delete(editor);
     }
 
     try {