@lexical/yjs 0.36.3-nightly.20251006.0 → 0.36.3-nightly.20251007.0

package/LexicalYjs.dev.js

@@ -35,30 +35,62 @@ function formatDevErrorMessage(message) {
  *
  */
 
-class CollabLineBreakNode {
-  _map;
+function simpleDiffWithCursor(a, b, cursor) {
+  const aLength = a.length;
+  const bLength = b.length;
+  let left = 0; // number of same characters counting from left
+  let right = 0; // number of same characters counting from right
+  // Iterate left to the right until we find a changed character
+  // First iteration considers the current cursor position
+  while (left < aLength && left < bLength && a[left] === b[left] && left < cursor) {
+    left++;
+  }
+  // Iterate right to the left until we find a changed character
+  while (right + left < aLength && right + left < bLength && a[aLength - right - 1] === b[bLength - right - 1]) {
+    right++;
+  }
+  // Try to iterate left further to the right without caring about the current cursor position
+  while (right + left < aLength && right + left < bLength && a[left] === b[left]) {
+    left++;
+  }
+  return {
+    index: left,
+    insert: b.slice(left, bLength - right),
+    remove: aLength - left - right
+  };
+}
+
+class CollabDecoratorNode {
+  _xmlElem;
   _key;
   _parent;
   _type;
-  constructor(map, parent) {
+  constructor(xmlElem, parent, type) {
     this._key = '';
-    this._map = map;
+    this._xmlElem = xmlElem;
     this._parent = parent;
-    this._type = 'linebreak';
+    this._type = type;
+  }
+  getPrevNode(nodeMap) {
+    if (nodeMap === null) {
+      return null;
+    }
+    const node = nodeMap.get(this._key);
+    return lexical.$isDecoratorNode(node) ? node : null;
   }
   getNode() {
     const node = lexical.$getNodeByKey(this._key);
-    return lexical.$isLineBreakNode(node) ? node : null;
-  }
-  getKey() {
-    return this._key;
+    return lexical.$isDecoratorNode(node) ? node : null;
   }
   getSharedType() {
-    return this._map;
+    return this._xmlElem;
   }
   getType() {
     return this._type;
   }
+  getKey() {
+    return this._key;
+  }
   getSize() {
     return 1;
   }
@@ -66,6 +98,19 @@ class CollabLineBreakNode {
     const collabElementNode = this._parent;
     return collabElementNode.getChildOffset(this);
   }
+  syncPropertiesFromLexical(binding, nextLexicalNode, prevNodeMap) {
+    const prevLexicalNode = this.getPrevNode(prevNodeMap);
+    const xmlElem = this._xmlElem;
+    syncPropertiesFromLexical(binding, xmlElem, prevLexicalNode, nextLexicalNode);
+  }
+  syncPropertiesFromYjs(binding, keysChanged) {
+    const lexicalNode = this.getNode();
+    if (!(lexicalNode !== null)) {
+      formatDevErrorMessage(`syncPropertiesFromYjs: could not find decorator node`);
+    }
+    const xmlElem = this._xmlElem;
+    $syncPropertiesFromYjs(binding, xmlElem, lexicalNode, keysChanged);
+  }
   destroy(binding) {
     const collabNodeMap = binding.collabNodeMap;
     if (collabNodeMap.get(this._key) === this) {
@@ -73,9 +118,9 @@ class CollabLineBreakNode {
     }
   }
 }
-function $createCollabLineBreakNode(map, parent) {
-  const collabNode = new CollabLineBreakNode(map, parent);
-  map._collabNode = collabNode;
+function $createCollabDecoratorNode(xmlElem, parent, type) {
+  const collabNode = new CollabDecoratorNode(xmlElem, parent, type);
+  xmlElem._collabNode = collabNode;
   return collabNode;
 }
 
@@ -87,29 +132,48 @@ function $createCollabLineBreakNode(map, parent) {
  *
  */
 
-function simpleDiffWithCursor(a, b, cursor) {
-  const aLength = a.length;
-  const bLength = b.length;
-  let left = 0; // number of same characters counting from left
-  let right = 0; // number of same characters counting from right
-  // Iterate left to the right until we find a changed character
-  // First iteration considers the current cursor position
-  while (left < aLength && left < bLength && a[left] === b[left] && left < cursor) {
-    left++;
+class CollabLineBreakNode {
+  _map;
+  _key;
+  _parent;
+  _type;
+  constructor(map, parent) {
+    this._key = '';
+    this._map = map;
+    this._parent = parent;
+    this._type = 'linebreak';
   }
-  // Iterate right to the left until we find a changed character
-  while (right + left < aLength && right + left < bLength && a[aLength - right - 1] === b[bLength - right - 1]) {
-    right++;
+  getNode() {
+    const node = lexical.$getNodeByKey(this._key);
+    return lexical.$isLineBreakNode(node) ? node : null;
   }
-  // Try to iterate left further to the right without caring about the current cursor position
-  while (right + left < aLength && right + left < bLength && a[left] === b[left]) {
-    left++;
+  getKey() {
+    return this._key;
   }
-  return {
-    index: left,
-    insert: b.slice(left, bLength - right),
-    remove: aLength - left - right
-  };
+  getSharedType() {
+    return this._map;
+  }
+  getType() {
+    return this._type;
+  }
+  getSize() {
+    return 1;
+  }
+  getOffset() {
+    const collabElementNode = this._parent;
+    return collabElementNode.getChildOffset(this);
+  }
+  destroy(binding) {
+    const collabNodeMap = binding.collabNodeMap;
+    if (collabNodeMap.get(this._key) === this) {
+      collabNodeMap.delete(this._key);
+    }
+  }
+}
+function $createCollabLineBreakNode(map, parent) {
+  const collabNode = new CollabLineBreakNode(map, parent);
+  map._collabNode = collabNode;
+  return collabNode;
 }
 
 function $diffTextContentAndApplyDelta(collabNode, key, prevText, nextText) {
@@ -214,485 +278,49 @@ function $createCollabTextNode(map, text, parent, type) {
   return collabNode;
 }
 
-const baseExcludedProperties = new Set(['__key', '__parent', '__next', '__prev', '__state']);
-const elementExcludedProperties = new Set(['__first', '__last', '__size']);
-const rootExcludedProperties = new Set(['__cachedText']);
-const textExcludedProperties = new Set(['__text']);
-function isExcludedProperty(name, node, binding) {
-  if (baseExcludedProperties.has(name) || typeof node[name] === 'function') {
-    return true;
+class CollabElementNode {
+  _key;
+  _children;
+  _xmlText;
+  _type;
+  _parent;
+  constructor(xmlText, parent, type) {
+    this._key = '';
+    this._children = [];
+    this._xmlText = xmlText;
+    this._type = type;
+    this._parent = parent;
   }
-  if (lexical.$isTextNode(node)) {
-    if (textExcludedProperties.has(name)) {
-      return true;
-    }
-  } else if (lexical.$isElementNode(node)) {
-    if (elementExcludedProperties.has(name) || lexical.$isRootNode(node) && rootExcludedProperties.has(name)) {
-      return true;
+  getPrevNode(nodeMap) {
+    if (nodeMap === null) {
+      return null;
     }
+    const node = nodeMap.get(this._key);
+    return lexical.$isElementNode(node) ? node : null;
   }
-  const nodeKlass = node.constructor;
-  const excludedProperties = binding.excludedProperties.get(nodeKlass);
-  return excludedProperties != null && excludedProperties.has(name);
-}
-function initializeNodeProperties(binding) {
-  const {
-    editor,
-    nodeProperties
-  } = binding;
-  editor.update(() => {
-    editor._nodes.forEach(nodeInfo => {
-      const node = new nodeInfo.klass();
-      const defaultProperties = {};
-      for (const [property, value] of Object.entries(node)) {
-        if (!isExcludedProperty(property, node, binding)) {
-          defaultProperties[property] = value;
-        }
-      }
-      nodeProperties.set(node.__type, Object.freeze(defaultProperties));
-    });
-  });
-}
-function getDefaultNodeProperties(node, binding) {
-  const type = node.__type;
-  const {
-    nodeProperties
-  } = binding;
-  const properties = nodeProperties.get(type);
-  if (!(properties !== undefined)) {
-    formatDevErrorMessage(`Node properties for ${type} not initialized for sync`);
+  getNode() {
+    const node = lexical.$getNodeByKey(this._key);
+    return lexical.$isElementNode(node) ? node : null;
   }
-  return properties;
-}
-function $createCollabNodeFromLexicalNode(binding, lexicalNode, parent) {
-  const nodeType = lexicalNode.__type;
-  let collabNode;
-  if (lexical.$isElementNode(lexicalNode)) {
-    const xmlText = new yjs.XmlText();
-    collabNode = $createCollabElementNode(xmlText, parent, nodeType);
-    collabNode.syncPropertiesFromLexical(binding, lexicalNode, null);
-    collabNode.syncChildrenFromLexical(binding, lexicalNode, null, null, null);
-  } else if (lexical.$isTextNode(lexicalNode)) {
-    // TODO create a token text node for token, segmented nodes.
-    const map = new yjs.Map();
-    collabNode = $createCollabTextNode(map, lexicalNode.__text, parent, nodeType);
-    collabNode.syncPropertiesAndTextFromLexical(binding, lexicalNode, null);
-  } else if (lexical.$isLineBreakNode(lexicalNode)) {
-    const map = new yjs.Map();
-    map.set('__type', 'linebreak');
-    collabNode = $createCollabLineBreakNode(map, parent);
-  } else if (lexical.$isDecoratorNode(lexicalNode)) {
-    const xmlElem = new yjs.XmlElement();
-    collabNode = $createCollabDecoratorNode(xmlElem, parent, nodeType);
-    collabNode.syncPropertiesFromLexical(binding, lexicalNode, null);
-  } else {
-    {
-      formatDevErrorMessage(`Expected text, element, decorator, or linebreak node`);
-    }
+  getSharedType() {
+    return this._xmlText;
   }
-  collabNode._key = lexicalNode.__key;
-  return collabNode;
-}
-function getNodeTypeFromSharedType(sharedType) {
-  const type = sharedTypeGet(sharedType, '__type');
-  if (!(typeof type === 'string' || typeof type === 'undefined')) {
-    formatDevErrorMessage(`Expected shared type to include type attribute`);
+  getType() {
+    return this._type;
   }
-  return type;
-}
-function $getOrInitCollabNodeFromSharedType(binding, sharedType, parent) {
-  const collabNode = sharedType._collabNode;
-  if (collabNode === undefined) {
-    const registeredNodes = binding.editor._nodes;
-    const type = getNodeTypeFromSharedType(sharedType);
-    if (!(typeof type === 'string')) {
-      formatDevErrorMessage(`Expected shared type to include type attribute`);
-    }
-    const nodeInfo = registeredNodes.get(type);
-    if (!(nodeInfo !== undefined)) {
-      formatDevErrorMessage(`Node ${type} is not registered`);
-    }
-    const sharedParent = sharedType.parent;
-    const targetParent = parent === undefined && sharedParent !== null ? $getOrInitCollabNodeFromSharedType(binding, sharedParent) : parent || null;
-    if (!(targetParent instanceof CollabElementNode)) {
-      formatDevErrorMessage(`Expected parent to be a collab element node`);
-    }
-    if (sharedType instanceof yjs.XmlText) {
-      return $createCollabElementNode(sharedType, targetParent, type);
-    } else if (sharedType instanceof yjs.Map) {
-      if (type === 'linebreak') {
-        return $createCollabLineBreakNode(sharedType, targetParent);
-      }
-      return $createCollabTextNode(sharedType, '', targetParent, type);
-    } else if (sharedType instanceof yjs.XmlElement) {
-      return $createCollabDecoratorNode(sharedType, targetParent, type);
-    }
-  }
-  return collabNode;
-}
-function createLexicalNodeFromCollabNode(binding, collabNode, parentKey) {
-  const type = collabNode.getType();
-  const registeredNodes = binding.editor._nodes;
-  const nodeInfo = registeredNodes.get(type);
-  if (!(nodeInfo !== undefined)) {
-    formatDevErrorMessage(`Node ${type} is not registered`);
-  }
-  const lexicalNode = new nodeInfo.klass();
-  lexicalNode.__parent = parentKey;
-  collabNode._key = lexicalNode.__key;
-  if (collabNode instanceof CollabElementNode) {
-    const xmlText = collabNode._xmlText;
-    collabNode.syncPropertiesFromYjs(binding, null);
-    collabNode.applyChildrenYjsDelta(binding, xmlText.toDelta());
-    collabNode.syncChildrenFromYjs(binding);
-  } else if (collabNode instanceof CollabTextNode) {
-    collabNode.syncPropertiesAndTextFromYjs(binding, null);
-  } else if (collabNode instanceof CollabDecoratorNode) {
-    collabNode.syncPropertiesFromYjs(binding, null);
-  }
-  binding.collabNodeMap.set(lexicalNode.__key, collabNode);
-  return lexicalNode;
-}
-function $syncPropertiesFromYjs(binding, sharedType, lexicalNode, keysChanged) {
-  const properties = keysChanged === null ? sharedType instanceof yjs.Map ? Array.from(sharedType.keys()) : sharedType instanceof yjs.XmlText || sharedType instanceof yjs.XmlElement ? Object.keys(sharedType.getAttributes()) : Object.keys(sharedType) : Array.from(keysChanged);
-  let writableNode;
-  for (let i = 0; i < properties.length; i++) {
-    const property = properties[i];
-    if (isExcludedProperty(property, lexicalNode, binding)) {
-      if (property === '__state' && isBindingV1(binding)) {
-        if (!writableNode) {
-          writableNode = lexicalNode.getWritable();
-        }
-        $syncNodeStateToLexical(sharedType, writableNode);
-      }
-      continue;
-    }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const prevValue = lexicalNode[property];
-    let nextValue = sharedTypeGet(sharedType, property);
-    if (prevValue !== nextValue) {
-      if (nextValue instanceof yjs.Doc) {
-        const yjsDocMap = binding.docMap;
-        if (prevValue instanceof yjs.Doc) {
-          yjsDocMap.delete(prevValue.guid);
-        }
-        const nestedEditor = lexical.createEditor();
-        const key = nextValue.guid;
-        nestedEditor._key = key;
-        yjsDocMap.set(key, nextValue);
-        nextValue = nestedEditor;
-      }
-      if (writableNode === undefined) {
-        writableNode = lexicalNode.getWritable();
-      }
-
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      writableNode[property] = nextValue;
-    }
-  }
-}
-function sharedTypeGet(sharedType, property) {
-  if (sharedType instanceof yjs.Map) {
-    return sharedType.get(property);
-  } else if (sharedType instanceof yjs.XmlText || sharedType instanceof yjs.XmlElement) {
-    return sharedType.getAttribute(property);
-  } else {
-    return sharedType[property];
-  }
-}
-function sharedTypeSet(sharedType, property, nextValue) {
-  if (sharedType instanceof yjs.Map) {
-    sharedType.set(property, nextValue);
-  } else {
-    sharedType.setAttribute(property, nextValue);
-  }
-}
-function $syncNodeStateToLexical(sharedType, lexicalNode) {
-  const existingState = sharedTypeGet(sharedType, '__state');
-  if (!(existingState instanceof yjs.Map)) {
-    return;
-  }
-  // This should only called when creating the node initially,
-  // incremental updates to state come in through YMapEvent
-  // with the __state as the target.
-  lexical.$getWritableNodeState(lexicalNode).updateFromJSON(existingState.toJSON());
-}
-function syncNodeStateFromLexical(binding, sharedType, prevLexicalNode, nextLexicalNode) {
-  const nextState = nextLexicalNode.__state;
-  const existingState = sharedTypeGet(sharedType, '__state');
-  if (!nextState) {
-    return;
-  }
-  const [unknown, known] = nextState.getInternalState();
-  const prevState = prevLexicalNode && prevLexicalNode.__state;
-  const stateMap = existingState instanceof yjs.Map ? existingState : new yjs.Map();
-  if (prevState === nextState) {
-    return;
-  }
-  const [prevUnknown, prevKnown] = prevState && stateMap.doc ? prevState.getInternalState() : [undefined, new Map()];
-  if (unknown) {
-    for (const [k, v] of Object.entries(unknown)) {
-      if (prevUnknown && v !== prevUnknown[k]) {
-        stateMap.set(k, v);
-      }
-    }
-  }
-  for (const [stateConfig, v] of known) {
-    if (prevKnown.get(stateConfig) !== v) {
-      stateMap.set(stateConfig.key, stateConfig.unparse(v));
-    }
-  }
-  if (!existingState) {
-    sharedTypeSet(sharedType, '__state', stateMap);
-  }
-}
-function syncPropertiesFromLexical(binding, sharedType, prevLexicalNode, nextLexicalNode) {
-  const properties = Object.keys(getDefaultNodeProperties(nextLexicalNode, binding));
-  const EditorClass = binding.editor.constructor;
-  syncNodeStateFromLexical(binding, sharedType, prevLexicalNode, nextLexicalNode);
-  for (let i = 0; i < properties.length; i++) {
-    const property = properties[i];
-    const prevValue =
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    prevLexicalNode === null ? undefined : prevLexicalNode[property];
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    let nextValue = nextLexicalNode[property];
-    if (prevValue !== nextValue) {
-      if (nextValue instanceof EditorClass) {
-        const yjsDocMap = binding.docMap;
-        let prevDoc;
-        if (prevValue instanceof EditorClass) {
-          const prevKey = prevValue._key;
-          prevDoc = yjsDocMap.get(prevKey);
-          yjsDocMap.delete(prevKey);
-        }
-
-        // If we already have a document, use it.
-        const doc = prevDoc || new yjs.Doc();
-        const key = doc.guid;
-        nextValue._key = key;
-        yjsDocMap.set(key, doc);
-        nextValue = doc;
-        // Mark the node dirty as we've assigned a new key to it
-        binding.editor.update(() => {
-          nextLexicalNode.markDirty();
-        });
-      }
-      sharedTypeSet(sharedType, property, nextValue);
-    }
-  }
-}
-function spliceString(str, index, delCount, newText) {
-  return str.slice(0, index) + newText + str.slice(index + delCount);
-}
-function getPositionFromElementAndOffset(node, offset, boundaryIsEdge) {
-  let index = 0;
-  let i = 0;
-  const children = node._children;
-  const childrenLength = children.length;
-  for (; i < childrenLength; i++) {
-    const child = children[i];
-    const childOffset = index;
-    const size = child.getSize();
-    index += size;
-    const exceedsBoundary = boundaryIsEdge ? index >= offset : index > offset;
-    if (exceedsBoundary && child instanceof CollabTextNode) {
-      let textOffset = offset - childOffset - 1;
-      if (textOffset < 0) {
-        textOffset = 0;
-      }
-      const diffLength = index - offset;
-      return {
-        length: diffLength,
-        node: child,
-        nodeIndex: i,
-        offset: textOffset
-      };
-    }
-    if (index > offset) {
-      return {
-        length: 0,
-        node: child,
-        nodeIndex: i,
-        offset: childOffset
-      };
-    } else if (i === childrenLength - 1) {
-      return {
-        length: 0,
-        node: null,
-        nodeIndex: i + 1,
-        offset: childOffset + 1
-      };
-    }
-  }
-  return {
-    length: 0,
-    node: null,
-    nodeIndex: 0,
-    offset: 0
-  };
-}
-function doesSelectionNeedRecovering(selection) {
-  const anchor = selection.anchor;
-  const focus = selection.focus;
-  let recoveryNeeded = false;
-  try {
-    const anchorNode = anchor.getNode();
-    const focusNode = focus.getNode();
-    if (
-    // We might have removed a node that no longer exists
-    !anchorNode.isAttached() || !focusNode.isAttached() ||
-    // If we've split a node, then the offset might not be right
-    lexical.$isTextNode(anchorNode) && anchor.offset > anchorNode.getTextContentSize() || lexical.$isTextNode(focusNode) && focus.offset > focusNode.getTextContentSize()) {
-      recoveryNeeded = true;
-    }
-  } catch (_e) {
-    // Sometimes checking nor a node via getNode might trigger
-    // an error, so we need recovery then too.
-    recoveryNeeded = true;
-  }
-  return recoveryNeeded;
-}
-function syncWithTransaction(binding, fn) {
-  binding.doc.transact(fn, binding);
-}
-function $moveSelectionToPreviousNode(anchorNodeKey, currentEditorState) {
-  const anchorNode = currentEditorState._nodeMap.get(anchorNodeKey);
-  if (!anchorNode) {
-    lexical.$getRoot().selectStart();
-    return;
-  }
-  // Get previous node
-  const prevNodeKey = anchorNode.__prev;
-  let prevNode = null;
-  if (prevNodeKey) {
-    prevNode = lexical.$getNodeByKey(prevNodeKey);
-  }
-
-  // If previous node not found, get parent node
-  if (prevNode === null && anchorNode.__parent !== null) {
-    prevNode = lexical.$getNodeByKey(anchorNode.__parent);
-  }
-  if (prevNode === null) {
-    lexical.$getRoot().selectStart();
-    return;
-  }
-  if (prevNode !== null && prevNode.isAttached()) {
-    prevNode.selectEnd();
-    return;
-  } else {
-    // If the found node is also deleted, select the next one
-    $moveSelectionToPreviousNode(prevNode.__key, currentEditorState);
-  }
-}
-
-class CollabDecoratorNode {
-  _xmlElem;
-  _key;
-  _parent;
-  _type;
-  constructor(xmlElem, parent, type) {
-    this._key = '';
-    this._xmlElem = xmlElem;
-    this._parent = parent;
-    this._type = type;
-  }
-  getPrevNode(nodeMap) {
-    if (nodeMap === null) {
-      return null;
-    }
-    const node = nodeMap.get(this._key);
-    return lexical.$isDecoratorNode(node) ? node : null;
-  }
-  getNode() {
-    const node = lexical.$getNodeByKey(this._key);
-    return lexical.$isDecoratorNode(node) ? node : null;
-  }
-  getSharedType() {
-    return this._xmlElem;
-  }
-  getType() {
-    return this._type;
-  }
-  getKey() {
-    return this._key;
-  }
-  getSize() {
-    return 1;
-  }
-  getOffset() {
-    const collabElementNode = this._parent;
-    return collabElementNode.getChildOffset(this);
-  }
-  syncPropertiesFromLexical(binding, nextLexicalNode, prevNodeMap) {
-    const prevLexicalNode = this.getPrevNode(prevNodeMap);
-    const xmlElem = this._xmlElem;
-    syncPropertiesFromLexical(binding, xmlElem, prevLexicalNode, nextLexicalNode);
-  }
-  syncPropertiesFromYjs(binding, keysChanged) {
-    const lexicalNode = this.getNode();
-    if (!(lexicalNode !== null)) {
-      formatDevErrorMessage(`syncPropertiesFromYjs: could not find decorator node`);
-    }
-    const xmlElem = this._xmlElem;
-    $syncPropertiesFromYjs(binding, xmlElem, lexicalNode, keysChanged);
-  }
-  destroy(binding) {
-    const collabNodeMap = binding.collabNodeMap;
-    if (collabNodeMap.get(this._key) === this) {
-      collabNodeMap.delete(this._key);
-    }
-  }
-}
-function $createCollabDecoratorNode(xmlElem, parent, type) {
-  const collabNode = new CollabDecoratorNode(xmlElem, parent, type);
-  xmlElem._collabNode = collabNode;
-  return collabNode;
-}
-
-class CollabElementNode {
-  _key;
-  _children;
-  _xmlText;
-  _type;
-  _parent;
-  constructor(xmlText, parent, type) {
-    this._key = '';
-    this._children = [];
-    this._xmlText = xmlText;
-    this._type = type;
-    this._parent = parent;
-  }
-  getPrevNode(nodeMap) {
-    if (nodeMap === null) {
-      return null;
-    }
-    const node = nodeMap.get(this._key);
-    return lexical.$isElementNode(node) ? node : null;
-  }
-  getNode() {
-    const node = lexical.$getNodeByKey(this._key);
-    return lexical.$isElementNode(node) ? node : null;
-  }
-  getSharedType() {
-    return this._xmlText;
-  }
-  getType() {
-    return this._type;
-  }
-  getKey() {
-    return this._key;
-  }
-  isEmpty() {
-    return this._children.length === 0;
-  }
-  getSize() {
-    return 1;
-  }
-  getOffset() {
-    const collabElementNode = this._parent;
-    if (!(collabElementNode !== null)) {
-      formatDevErrorMessage(`getOffset: could not find collab element node`);
+  getKey() {
+    return this._key;
+  }
+  isEmpty() {
+    return this._children.length === 0;
+  }
+  getSize() {
+    return 1;
+  }
+  getOffset() {
+    const collabElementNode = this._parent;
+    if (!(collabElementNode !== null)) {
+      formatDevErrorMessage(`getOffset: could not find collab element node`);
     }
     return collabElementNode.getChildOffset(this);
   }
@@ -1172,6 +800,11 @@ class CollabV2Mapping {
   has(sharedType) {
     return this._sharedTypeToNodeKeys.has(sharedType);
   }
+  clear() {
+    this._nodeMap.clear();
+    this._sharedTypeToNodeKeys.clear();
+    this._nodeKeyToSharedType.clear();
+  }
 }
 
 function createBaseBinding(editor, id, doc, docMap, excludedProperties) {
@@ -1196,1091 +829,1518 @@ function createBinding(editor, provider, id, doc, docMap, excludedProperties) {
   if (!(doc !== undefined && doc !== null)) {
     formatDevErrorMessage(`createBinding: doc is null or undefined`);
   }
-  const rootXmlText = doc.get('root', yjs.XmlText);
-  const root = $createCollabElementNode(rootXmlText, null, 'root');
-  root._key = 'root';
-  return {
-    ...createBaseBinding(editor, id, doc, docMap, excludedProperties),
-    collabNodeMap: new Map(),
-    root
-  };
+  const rootXmlText = doc.get('root', yjs.XmlText);
+  const root = $createCollabElementNode(rootXmlText, null, 'root');
+  root._key = 'root';
+  return {
+    ...createBaseBinding(editor, id, doc, docMap, excludedProperties),
+    collabNodeMap: new Map(),
+    root
+  };
+}
+function createBindingV2__EXPERIMENTAL(editor, id, doc, docMap, options = {}) {
+  if (!(doc !== undefined && doc !== null)) {
+    formatDevErrorMessage(`createBinding: doc is null or undefined`);
+  }
+  const {
+    excludedProperties,
+    rootName = 'root-v2'
+  } = options;
+  return {
+    ...createBaseBinding(editor, id, doc, docMap, excludedProperties),
+    mapping: new CollabV2Mapping(),
+    root: doc.get(rootName, yjs.XmlElement)
+  };
+}
+function isBindingV1(binding) {
+  return Object.hasOwn(binding, 'collabNodeMap');
+}
+
+const baseExcludedProperties = new Set(['__key', '__parent', '__next', '__prev', '__state']);
+const elementExcludedProperties = new Set(['__first', '__last', '__size']);
+const rootExcludedProperties = new Set(['__cachedText']);
+const textExcludedProperties = new Set(['__text']);
+function isExcludedProperty(name, node, binding) {
+  if (baseExcludedProperties.has(name) || typeof node[name] === 'function') {
+    return true;
+  }
+  if (lexical.$isTextNode(node)) {
+    if (textExcludedProperties.has(name)) {
+      return true;
+    }
+  } else if (lexical.$isElementNode(node)) {
+    if (elementExcludedProperties.has(name) || lexical.$isRootNode(node) && rootExcludedProperties.has(name)) {
+      return true;
+    }
+  }
+  const nodeKlass = node.constructor;
+  const excludedProperties = binding.excludedProperties.get(nodeKlass);
+  return excludedProperties != null && excludedProperties.has(name);
+}
+function initializeNodeProperties(binding) {
+  const {
+    editor,
+    nodeProperties
+  } = binding;
+  editor.update(() => {
+    editor._nodes.forEach(nodeInfo => {
+      const node = new nodeInfo.klass();
+      const defaultProperties = {};
+      for (const [property, value] of Object.entries(node)) {
+        if (!isExcludedProperty(property, node, binding)) {
+          defaultProperties[property] = value;
+        }
+      }
+      nodeProperties.set(node.__type, Object.freeze(defaultProperties));
+    });
+  });
+}
+function getDefaultNodeProperties(node, binding) {
+  const type = node.__type;
+  const {
+    nodeProperties
+  } = binding;
+  const properties = nodeProperties.get(type);
+  if (!(properties !== undefined)) {
+    formatDevErrorMessage(`Node properties for ${type} not initialized for sync`);
+  }
+  return properties;
+}
+function $createCollabNodeFromLexicalNode(binding, lexicalNode, parent) {
+  const nodeType = lexicalNode.__type;
+  let collabNode;
+  if (lexical.$isElementNode(lexicalNode)) {
+    const xmlText = new yjs.XmlText();
+    collabNode = $createCollabElementNode(xmlText, parent, nodeType);
+    collabNode.syncPropertiesFromLexical(binding, lexicalNode, null);
+    collabNode.syncChildrenFromLexical(binding, lexicalNode, null, null, null);
+  } else if (lexical.$isTextNode(lexicalNode)) {
+    // TODO create a token text node for token, segmented nodes.
+    const map = new yjs.Map();
+    collabNode = $createCollabTextNode(map, lexicalNode.__text, parent, nodeType);
+    collabNode.syncPropertiesAndTextFromLexical(binding, lexicalNode, null);
+  } else if (lexical.$isLineBreakNode(lexicalNode)) {
+    const map = new yjs.Map();
+    map.set('__type', 'linebreak');
+    collabNode = $createCollabLineBreakNode(map, parent);
+  } else if (lexical.$isDecoratorNode(lexicalNode)) {
+    const xmlElem = new yjs.XmlElement();
+    collabNode = $createCollabDecoratorNode(xmlElem, parent, nodeType);
+    collabNode.syncPropertiesFromLexical(binding, lexicalNode, null);
+  } else {
+    {
+      formatDevErrorMessage(`Expected text, element, decorator, or linebreak node`);
+    }
+  }
+  collabNode._key = lexicalNode.__key;
+  return collabNode;
+}
+function getNodeTypeFromSharedType(sharedType) {
+  const type = sharedTypeGet(sharedType, '__type');
+  if (!(typeof type === 'string' || typeof type === 'undefined')) {
+    formatDevErrorMessage(`Expected shared type to include type attribute`);
+  }
+  return type;
+}
+function $getOrInitCollabNodeFromSharedType(binding, sharedType, parent) {
+  const collabNode = sharedType._collabNode;
+  if (collabNode === undefined) {
+    const registeredNodes = binding.editor._nodes;
+    const type = getNodeTypeFromSharedType(sharedType);
+    if (!(typeof type === 'string')) {
+      formatDevErrorMessage(`Expected shared type to include type attribute`);
+    }
+    const nodeInfo = registeredNodes.get(type);
+    if (!(nodeInfo !== undefined)) {
+      formatDevErrorMessage(`Node ${type} is not registered`);
+    }
+    const sharedParent = sharedType.parent;
+    const targetParent = parent === undefined && sharedParent !== null ? $getOrInitCollabNodeFromSharedType(binding, sharedParent) : parent || null;
+    if (!(targetParent instanceof CollabElementNode)) {
+      formatDevErrorMessage(`Expected parent to be a collab element node`);
+    }
+    if (sharedType instanceof yjs.XmlText) {
+      return $createCollabElementNode(sharedType, targetParent, type);
+    } else if (sharedType instanceof yjs.Map) {
+      if (type === 'linebreak') {
+        return $createCollabLineBreakNode(sharedType, targetParent);
+      }
+      return $createCollabTextNode(sharedType, '', targetParent, type);
+    } else if (sharedType instanceof yjs.XmlElement) {
+      return $createCollabDecoratorNode(sharedType, targetParent, type);
+    }
+  }
+  return collabNode;
+}
+function createLexicalNodeFromCollabNode(binding, collabNode, parentKey) {
+  const type = collabNode.getType();
+  const registeredNodes = binding.editor._nodes;
+  const nodeInfo = registeredNodes.get(type);
+  if (!(nodeInfo !== undefined)) {
+    formatDevErrorMessage(`Node ${type} is not registered`);
+  }
+  const lexicalNode = new nodeInfo.klass();
+  lexicalNode.__parent = parentKey;
+  collabNode._key = lexicalNode.__key;
+  if (collabNode instanceof CollabElementNode) {
+    const xmlText = collabNode._xmlText;
+    collabNode.syncPropertiesFromYjs(binding, null);
+    collabNode.applyChildrenYjsDelta(binding, xmlText.toDelta());
+    collabNode.syncChildrenFromYjs(binding);
+  } else if (collabNode instanceof CollabTextNode) {
+    collabNode.syncPropertiesAndTextFromYjs(binding, null);
+  } else if (collabNode instanceof CollabDecoratorNode) {
+    collabNode.syncPropertiesFromYjs(binding, null);
+  }
+  binding.collabNodeMap.set(lexicalNode.__key, collabNode);
+  return lexicalNode;
+}
+function $syncPropertiesFromYjs(binding, sharedType, lexicalNode, keysChanged) {
+  const properties = keysChanged === null ? sharedType instanceof yjs.Map ? Array.from(sharedType.keys()) : sharedType instanceof yjs.XmlText || sharedType instanceof yjs.XmlElement ? Object.keys(sharedType.getAttributes()) : Object.keys(sharedType) : Array.from(keysChanged);
+  let writableNode;
+  for (let i = 0; i < properties.length; i++) {
+    const property = properties[i];
+    if (isExcludedProperty(property, lexicalNode, binding)) {
+      if (property === '__state' && isBindingV1(binding)) {
+        if (!writableNode) {
+          writableNode = lexicalNode.getWritable();
+        }
+        $syncNodeStateToLexical(sharedType, writableNode);
+      }
+      continue;
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const prevValue = lexicalNode[property];
+    let nextValue = sharedTypeGet(sharedType, property);
+    if (prevValue !== nextValue) {
+      if (nextValue instanceof yjs.Doc) {
+        const yjsDocMap = binding.docMap;
+        if (prevValue instanceof yjs.Doc) {
+          yjsDocMap.delete(prevValue.guid);
+        }
+        const nestedEditor = lexical.createEditor();
+        const key = nextValue.guid;
+        nestedEditor._key = key;
+        yjsDocMap.set(key, nextValue);
+        nextValue = nestedEditor;
+      }
+      if (writableNode === undefined) {
+        writableNode = lexicalNode.getWritable();
+      }
+
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      writableNode[property] = nextValue;
+    }
+  }
+}
+function sharedTypeGet(sharedType, property) {
+  if (sharedType instanceof yjs.Map) {
+    return sharedType.get(property);
+  } else if (sharedType instanceof yjs.XmlText || sharedType instanceof yjs.XmlElement) {
+    return sharedType.getAttribute(property);
+  } else {
+    return sharedType[property];
+  }
 }
-function createBindingV2__EXPERIMENTAL(editor, id, doc, docMap, options = {}) {
-  if (!(doc !== undefined && doc !== null)) {
-    formatDevErrorMessage(`createBinding: doc is null or undefined`);
+function sharedTypeSet(sharedType, property, nextValue) {
+  if (sharedType instanceof yjs.Map) {
+    sharedType.set(property, nextValue);
+  } else {
+    sharedType.setAttribute(property, nextValue);
   }
-  const {
-    excludedProperties,
-    rootName = 'root-v2'
-  } = options;
-  return {
-    ...createBaseBinding(editor, id, doc, docMap, excludedProperties),
-    mapping: new CollabV2Mapping(),
-    root: doc.get(rootName, yjs.XmlElement)
-  };
 }
-function isBindingV1(binding) {
-  return Object.hasOwn(binding, 'collabNodeMap');
+function $syncNodeStateToLexical(sharedType, lexicalNode) {
+  const existingState = sharedTypeGet(sharedType, '__state');
+  if (!(existingState instanceof yjs.Map)) {
+    return;
+  }
+  // This should only called when creating the node initially,
+  // incremental updates to state come in through YMapEvent
+  // with the __state as the target.
+  lexical.$getWritableNodeState(lexicalNode).updateFromJSON(existingState.toJSON());
 }
-
-function createRelativePosition(point, binding) {
-  const collabNodeMap = binding.collabNodeMap;
-  const collabNode = collabNodeMap.get(point.key);
-  if (collabNode === undefined) {
-    return null;
+function syncNodeStateFromLexical(binding, sharedType, prevLexicalNode, nextLexicalNode) {
+  const nextState = nextLexicalNode.__state;
+  const existingState = sharedTypeGet(sharedType, '__state');
+  if (!nextState) {
+    return;
   }
-  let offset = point.offset;
-  let sharedType = collabNode.getSharedType();
-  if (collabNode instanceof CollabTextNode) {
-    sharedType = collabNode._parent._xmlText;
-    const currentOffset = collabNode.getOffset();
-    if (currentOffset === -1) {
-      return null;
-    }
-    offset = currentOffset + 1 + offset;
-  } else if (collabNode instanceof CollabElementNode && point.type === 'element') {
-    const parent = point.getNode();
-    if (!lexical.$isElementNode(parent)) {
-      formatDevErrorMessage(`Element point must be an element node`);
-    }
-    let accumulatedOffset = 0;
-    let i = 0;
-    let node = parent.getFirstChild();
-    while (node !== null && i++ < offset) {
-      if (lexical.$isTextNode(node)) {
-        accumulatedOffset += node.getTextContentSize() + 1;
-      } else {
-        accumulatedOffset++;
+  const [unknown, known] = nextState.getInternalState();
+  const prevState = prevLexicalNode && prevLexicalNode.__state;
+  const stateMap = existingState instanceof yjs.Map ? existingState : new yjs.Map();
+  if (prevState === nextState) {
+    return;
+  }
+  const [prevUnknown, prevKnown] = prevState && stateMap.doc ? prevState.getInternalState() : [undefined, new Map()];
+  if (unknown) {
+    for (const [k, v] of Object.entries(unknown)) {
+      if (prevUnknown && v !== prevUnknown[k]) {
+        stateMap.set(k, v);
       }
-      node = node.getNextSibling();
     }
-    offset = accumulatedOffset;
-  }
-  return yjs.createRelativePositionFromTypeIndex(sharedType, offset);
-}
-function createRelativePositionV2(point, binding) {
-  const {
-    mapping
-  } = binding;
-  const {
-    offset
-  } = point;
-  const node = point.getNode();
-  const yType = mapping.getSharedType(node);
-  if (yType === undefined) {
-    return null;
   }
-  if (point.type === 'text') {
-    if (!lexical.$isTextNode(node)) {
-      formatDevErrorMessage(`Text point must be a text node`);
-    }
-    let prevSibling = node.getPreviousSibling();
-    let adjustedOffset = offset;
-    while (lexical.$isTextNode(prevSibling)) {
-      adjustedOffset += prevSibling.getTextContentSize();
-      prevSibling = prevSibling.getPreviousSibling();
-    }
-    return yjs.createRelativePositionFromTypeIndex(yType, adjustedOffset);
-  } else if (point.type === 'element') {
-    if (!lexical.$isElementNode(node)) {
-      formatDevErrorMessage(`Element point must be an element node`);
+  for (const [stateConfig, v] of known) {
+    if (prevKnown.get(stateConfig) !== v) {
+      stateMap.set(stateConfig.key, stateConfig.unparse(v));
     }
-    let i = 0;
-    let child = node.getFirstChild();
-    while (child !== null && i < offset) {
-      if (lexical.$isTextNode(child)) {
-        let nextSibling = child.getNextSibling();
-        while (lexical.$isTextNode(nextSibling)) {
-          nextSibling = nextSibling.getNextSibling();
+  }
+  if (!existingState) {
+    sharedTypeSet(sharedType, '__state', stateMap);
+  }
+}
+function syncPropertiesFromLexical(binding, sharedType, prevLexicalNode, nextLexicalNode) {
+  const properties = Object.keys(getDefaultNodeProperties(nextLexicalNode, binding));
+  const EditorClass = binding.editor.constructor;
+  syncNodeStateFromLexical(binding, sharedType, prevLexicalNode, nextLexicalNode);
+  for (let i = 0; i < properties.length; i++) {
+    const property = properties[i];
+    const prevValue =
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    prevLexicalNode === null ? undefined : prevLexicalNode[property];
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    let nextValue = nextLexicalNode[property];
+    if (prevValue !== nextValue) {
+      if (nextValue instanceof EditorClass) {
+        const yjsDocMap = binding.docMap;
+        let prevDoc;
+        if (prevValue instanceof EditorClass) {
+          const prevKey = prevValue._key;
+          prevDoc = yjsDocMap.get(prevKey);
+          yjsDocMap.delete(prevKey);
         }
+
+        // If we already have a document, use it.
+        const doc = prevDoc || new yjs.Doc();
+        const key = doc.guid;
+        nextValue._key = key;
+        yjsDocMap.set(key, doc);
+        nextValue = doc;
+        // Mark the node dirty as we've assigned a new key to it
+        binding.editor.update(() => {
+          nextLexicalNode.markDirty();
+        });
       }
-      i++;
-      child = child.getNextSibling();
+      sharedTypeSet(sharedType, property, nextValue);
     }
-    return yjs.createRelativePositionFromTypeIndex(yType, i);
   }
-  return null;
 }
-function createAbsolutePosition(relativePosition, binding) {
-  return yjs.createAbsolutePositionFromRelativePosition(relativePosition, binding.doc);
+function spliceString(str, index, delCount, newText) {
+  return str.slice(0, index) + newText + str.slice(index + delCount);
 }
-function shouldUpdatePosition(currentPos, pos) {
-  if (currentPos == null) {
-    if (pos != null) {
-      return true;
+function getPositionFromElementAndOffset(node, offset, boundaryIsEdge) {
+  let index = 0;
+  let i = 0;
+  const children = node._children;
+  const childrenLength = children.length;
+  for (; i < childrenLength; i++) {
+    const child = children[i];
+    const childOffset = index;
+    const size = child.getSize();
+    index += size;
+    const exceedsBoundary = boundaryIsEdge ? index >= offset : index > offset;
+    if (exceedsBoundary && child instanceof CollabTextNode) {
+      let textOffset = offset - childOffset - 1;
+      if (textOffset < 0) {
+        textOffset = 0;
+      }
+      const diffLength = index - offset;
+      return {
+        length: diffLength,
+        node: child,
+        nodeIndex: i,
+        offset: textOffset
+      };
+    }
+    if (index > offset) {
+      return {
+        length: 0,
+        node: child,
+        nodeIndex: i,
+        offset: childOffset
+      };
+    } else if (i === childrenLength - 1) {
+      return {
+        length: 0,
+        node: null,
+        nodeIndex: i + 1,
+        offset: childOffset + 1
+      };
     }
-  } else if (pos == null || !yjs.compareRelativePositions(currentPos, pos)) {
-    return true;
   }
-  return false;
-}
-function createCursor(name, color) {
   return {
-    color: color,
-    name: name,
-    selection: null
+    length: 0,
+    node: null,
+    nodeIndex: 0,
+    offset: 0
   };
 }
-function destroySelection(binding, selection) {
-  const cursorsContainer = binding.cursorsContainer;
-  if (cursorsContainer !== null) {
-    const selections = selection.selections;
-    const selectionsLength = selections.length;
-    for (let i = 0; i < selectionsLength; i++) {
-      cursorsContainer.removeChild(selections[i]);
+function doesSelectionNeedRecovering(selection) {
+  const anchor = selection.anchor;
+  const focus = selection.focus;
+  let recoveryNeeded = false;
+  try {
+    const anchorNode = anchor.getNode();
+    const focusNode = focus.getNode();
+    if (
+    // We might have removed a node that no longer exists
+    !anchorNode.isAttached() || !focusNode.isAttached() ||
+    // If we've split a node, then the offset might not be right
+    lexical.$isTextNode(anchorNode) && anchor.offset > anchorNode.getTextContentSize() || lexical.$isTextNode(focusNode) && focus.offset > focusNode.getTextContentSize()) {
+      recoveryNeeded = true;
     }
+  } catch (_e) {
+    // Sometimes checking nor a node via getNode might trigger
+    // an error, so we need recovery then too.
+    recoveryNeeded = true;
+  }
+  return recoveryNeeded;
+}
+function syncWithTransaction(binding, fn) {
+  binding.doc.transact(fn, binding);
+}
+function $moveSelectionToPreviousNode(anchorNodeKey, currentEditorState) {
+  const anchorNode = currentEditorState._nodeMap.get(anchorNodeKey);
+  if (!anchorNode) {
+    lexical.$getRoot().selectStart();
+    return;
+  }
+  // Get previous node
+  const prevNodeKey = anchorNode.__prev;
+  let prevNode = null;
+  if (prevNodeKey) {
+    prevNode = lexical.$getNodeByKey(prevNodeKey);
   }
-}
-function destroyCursor(binding, cursor) {
-  const selection = cursor.selection;
-  if (selection !== null) {
-    destroySelection(binding, selection);
+
+  // If previous node not found, get parent node
+  if (prevNode === null && anchorNode.__parent !== null) {
+    prevNode = lexical.$getNodeByKey(anchorNode.__parent);
   }
-}
-function createCursorSelection(cursor, anchorKey, anchorOffset, focusKey, focusOffset) {
-  const color = cursor.color;
-  const caret = document.createElement('span');
-  caret.style.cssText = `position:absolute;top:0;bottom:0;right:-1px;width:1px;background-color:${color};z-index:10;`;
-  const name = document.createElement('span');
-  name.textContent = cursor.name;
-  name.style.cssText = `position:absolute;left:-2px;top:-16px;background-color:${color};color:#fff;line-height:12px;font-size:12px;padding:2px;font-family:Arial;font-weight:bold;white-space:nowrap;`;
-  caret.appendChild(name);
-  return {
-    anchor: {
-      key: anchorKey,
-      offset: anchorOffset
-    },
-    caret,
-    color,
-    focus: {
-      key: focusKey,
-      offset: focusOffset
-    },
-    name,
-    selections: []
-  };
-}
-function updateCursor(binding, cursor, nextSelection, nodeMap) {
-  const editor = binding.editor;
-  const rootElement = editor.getRootElement();
-  const cursorsContainer = binding.cursorsContainer;
-  if (cursorsContainer === null || rootElement === null) {
+  if (prevNode === null) {
+    lexical.$getRoot().selectStart();
     return;
   }
-  const cursorsContainerOffsetParent = cursorsContainer.offsetParent;
-  if (cursorsContainerOffsetParent === null) {
+  if (prevNode !== null && prevNode.isAttached()) {
+    prevNode.selectEnd();
     return;
+  } else {
+    // If the found node is also deleted, select the next one
+    $moveSelectionToPreviousNode(prevNode.__key, currentEditorState);
   }
-  const containerRect = cursorsContainerOffsetParent.getBoundingClientRect();
-  const prevSelection = cursor.selection;
-  if (nextSelection === null) {
-    if (prevSelection === null) {
-      return;
+}
+
+// https://docs.yjs.dev/api/shared-types/y.xmlelement
+// "Define a top-level type; Note that the nodeName is always "undefined""
+const isRootElement = el => el.nodeName === 'UNDEFINED';
+const $createOrUpdateNodeFromYElement = (el, binding, keysChanged, childListChanged, snapshot, prevSnapshot, computeYChange) => {
+  let node = binding.mapping.get(el);
+  if (node && keysChanged && keysChanged.size === 0 && !childListChanged) {
+    return node;
+  }
+  const type = isRootElement(el) ? lexical.RootNode.getType() : el.nodeName;
+  const registeredNodes = binding.editor._nodes;
+  const nodeInfo = registeredNodes.get(type);
+  if (nodeInfo === undefined) {
+    throw new Error(`$createOrUpdateNodeFromYElement: Node ${type} is not registered`);
+  }
+  if (!node) {
+    node = new nodeInfo.klass();
+    keysChanged = null;
+    childListChanged = true;
+  }
+  if (childListChanged && node instanceof lexical.ElementNode) {
+    const children = [];
+    const $createChildren = childType => {
+      if (childType instanceof yjs.XmlElement) {
+        const n = $createOrUpdateNodeFromYElement(childType, binding, new Set(), false, snapshot, prevSnapshot, computeYChange);
+        if (n !== null) {
+          children.push(n);
+        }
+      } else if (childType instanceof yjs.XmlText) {
+        const ns = $createOrUpdateTextNodesFromYText(childType, binding, snapshot, prevSnapshot, computeYChange);
+        if (ns !== null) {
+          ns.forEach(textchild => {
+            if (textchild !== null) {
+              children.push(textchild);
+            }
+          });
+        }
+      } else {
+        {
+          formatDevErrorMessage(`XmlHook is not supported`);
+        }
+      }
+    };
+    if (snapshot === undefined || prevSnapshot === undefined) {
+      el.toArray().forEach($createChildren);
     } else {
-      cursor.selection = null;
-      destroySelection(binding, prevSelection);
-      return;
+      yjs.typeListToArraySnapshot(el, new yjs.Snapshot(prevSnapshot.ds, snapshot.sv)).forEach($createChildren);
     }
-  } else {
-    cursor.selection = nextSelection;
-  }
-  const caret = nextSelection.caret;
-  const color = nextSelection.color;
-  const selections = nextSelection.selections;
-  const anchor = nextSelection.anchor;
-  const focus = nextSelection.focus;
-  const anchorKey = anchor.key;
-  const focusKey = focus.key;
-  const anchorNode = nodeMap.get(anchorKey);
-  const focusNode = nodeMap.get(focusKey);
-  if (anchorNode == null || focusNode == null) {
-    return;
+    $spliceChildren(node, children);
   }
-  let selectionRects;
 
-  // In the case of a collapsed selection on a linebreak, we need
-  // to improvise as the browser will return nothing here as <br>
-  // apparently take up no visual space :/
-  // This won't work in all cases, but it's better than just showing
-  // nothing all the time.
-  if (anchorNode === focusNode && lexical.$isLineBreakNode(anchorNode)) {
-    const brRect = editor.getElementByKey(anchorKey).getBoundingClientRect();
-    selectionRects = [brRect];
-  } else {
-    const range = selection.createDOMRange(editor, anchorNode, anchor.offset, focusNode, focus.offset);
-    if (range === null) {
-      return;
+  // TODO(collab-v2): typing for XmlElement generic
+  const attrs = el.getAttributes(snapshot);
+  if (!isRootElement(el) && snapshot !== undefined) {
+    if (!isItemVisible(el._item, snapshot)) {
+      attrs[stateKeyToAttrKey('ychange')] = computeYChange ? computeYChange('removed', el._item.id) : {
+        type: 'removed'
+      };
+    } else if (!isItemVisible(el._item, prevSnapshot)) {
+      attrs[stateKeyToAttrKey('ychange')] = computeYChange ? computeYChange('added', el._item.id) : {
+        type: 'added'
+      };
     }
-    selectionRects = selection.createRectsFromDOMRange(editor, range);
   }
-  const selectionsLength = selections.length;
-  const selectionRectsLength = selectionRects.length;
-  for (let i = 0; i < selectionRectsLength; i++) {
-    const selectionRect = selectionRects[i];
-    let selection = selections[i];
-    if (selection === undefined) {
-      selection = document.createElement('span');
-      selections[i] = selection;
-      const selectionBg = document.createElement('span');
-      selection.appendChild(selectionBg);
-      cursorsContainer.appendChild(selection);
+  const properties = {
+    ...getDefaultNodeProperties(node, binding)
+  };
+  const state = {};
+  for (const k in attrs) {
+    if (k.startsWith(STATE_KEY_PREFIX)) {
+      state[attrKeyToStateKey(k)] = attrs[k];
+    } else {
+      properties[k] = attrs[k];
     }
-    const top = selectionRect.top - containerRect.top;
-    const left = selectionRect.left - containerRect.left;
-    const style = `position:absolute;top:${top}px;left:${left}px;height:${selectionRect.height}px;width:${selectionRect.width}px;pointer-events:none;z-index:5;`;
-    selection.style.cssText = style;
-    selection.firstChild.style.cssText = `${style}left:0;top:0;background-color:${color};opacity:0.3;`;
-    if (i === selectionRectsLength - 1) {
-      if (caret.parentNode !== selection) {
-        selection.appendChild(caret);
+  }
+  $syncPropertiesFromYjs(binding, properties, node, keysChanged);
+  if (!keysChanged) {
+    lexical.$getWritableNodeState(node).updateFromJSON(state);
+  } else {
+    const stateKeysChanged = Object.keys(state).filter(k => keysChanged.has(stateKeyToAttrKey(k)));
+    if (stateKeysChanged.length > 0) {
+      const writableState = lexical.$getWritableNodeState(node);
+      for (const k of stateKeysChanged) {
+        writableState.updateFromUnknown(k, state[k]);
       }
     }
   }
-  for (let i = selectionsLength - 1; i >= selectionRectsLength; i--) {
-    const selection = selections[i];
-    cursorsContainer.removeChild(selection);
-    selections.pop();
-  }
-}
-/**
- * @deprecated Use `$getAnchorAndFocusForUserState` instead.
- */
-function getAnchorAndFocusCollabNodesForUserState(binding, userState) {
-  const {
-    anchorPos,
-    focusPos
-  } = userState;
-  let anchorCollabNode = null;
-  let anchorOffset = 0;
-  let focusCollabNode = null;
-  let focusOffset = 0;
-  if (anchorPos !== null && focusPos !== null) {
-    const anchorAbsPos = createAbsolutePosition(anchorPos, binding);
-    const focusAbsPos = createAbsolutePosition(focusPos, binding);
-    if (anchorAbsPos !== null && focusAbsPos !== null) {
-      [anchorCollabNode, anchorOffset] = getCollabNodeAndOffset(anchorAbsPos.type, anchorAbsPos.index);
-      [focusCollabNode, focusOffset] = getCollabNodeAndOffset(focusAbsPos.type, focusAbsPos.index);
+  const latestNode = node.getLatest();
+  binding.mapping.set(el, latestNode);
+  return latestNode;
+};
+const $spliceChildren = (node, nextChildren) => {
+  const prevChildren = node.getChildren();
+  const prevChildrenKeySet = new Set(prevChildren.map(child => child.getKey()));
+  const nextChildrenKeySet = new Set(nextChildren.map(child => child.getKey()));
+  const prevEndIndex = prevChildren.length - 1;
+  const nextEndIndex = nextChildren.length - 1;
+  let prevIndex = 0;
+  let nextIndex = 0;
+  while (prevIndex <= prevEndIndex && nextIndex <= nextEndIndex) {
+    const prevKey = prevChildren[prevIndex].getKey();
+    const nextKey = nextChildren[nextIndex].getKey();
+    if (prevKey === nextKey) {
+      prevIndex++;
+      nextIndex++;
+      continue;
+    }
+    const nextHasPrevKey = nextChildrenKeySet.has(prevKey);
+    const prevHasNextKey = prevChildrenKeySet.has(nextKey);
+    if (!nextHasPrevKey) {
+      // If removing the last node, insert remaining new nodes immediately, otherwise if the node
+      // cannot be empty, it will remove itself from its parent.
+      if (nextIndex === 0 && node.getChildrenSize() === 1) {
+        node.splice(nextIndex, 1, nextChildren.slice(nextIndex));
+        return;
+      }
+      // Remove
+      node.splice(nextIndex, 1, []);
+      prevIndex++;
+      continue;
+    }
+
+    // Create or replace
+    const nextChildNode = nextChildren[nextIndex];
+    if (prevHasNextKey) {
+      node.splice(nextIndex, 1, [nextChildNode]);
+      prevIndex++;
+      nextIndex++;
+    } else {
+      node.splice(nextIndex, 0, [nextChildNode]);
+      nextIndex++;
     }
   }
-  return {
-    anchorCollabNode,
-    anchorOffset,
-    focusCollabNode,
-    focusOffset
-  };
-}
-function $getAnchorAndFocusForUserState(binding, userState) {
-  const {
-    anchorPos,
-    focusPos
-  } = userState;
-  const anchorAbsPos = anchorPos ? createAbsolutePosition(anchorPos, binding) : null;
-  const focusAbsPos = focusPos ? createAbsolutePosition(focusPos, binding) : null;
-  if (anchorAbsPos === null || focusAbsPos === null) {
-    return {
-      anchorKey: null,
-      anchorOffset: 0,
-      focusKey: null,
-      focusOffset: 0
-    };
-  }
-  if (isBindingV1(binding)) {
-    const [anchorCollabNode, anchorOffset] = getCollabNodeAndOffset(anchorAbsPos.type, anchorAbsPos.index);
-    const [focusCollabNode, focusOffset] = getCollabNodeAndOffset(focusAbsPos.type, focusAbsPos.index);
-    return {
-      anchorKey: anchorCollabNode !== null ? anchorCollabNode.getKey() : null,
-      anchorOffset,
-      focusKey: focusCollabNode !== null ? focusCollabNode.getKey() : null,
-      focusOffset
-    };
+  const appendNewChildren = prevIndex > prevEndIndex;
+  const removeOldChildren = nextIndex > nextEndIndex;
+  if (appendNewChildren && !removeOldChildren) {
+    node.append(...nextChildren.slice(nextIndex));
+  } else if (removeOldChildren && !appendNewChildren) {
+    node.splice(nextChildren.length, node.getChildrenSize() - nextChildren.length, []);
   }
-  let [anchorNode, anchorOffset] = $getNodeAndOffsetV2(binding.mapping, anchorAbsPos);
-  let [focusNode, focusOffset] = $getNodeAndOffsetV2(binding.mapping, focusAbsPos);
-  // For a non-collapsed selection, if the start of the selection is as the end of a text node,
-  // move it to the beginning of the next text node (if one exists).
-  if (focusNode && anchorNode && (focusNode !== anchorNode || focusOffset !== anchorOffset)) {
-    const isBackwards = focusNode.isBefore(anchorNode);
-    const startNode = isBackwards ? focusNode : anchorNode;
-    const startOffset = isBackwards ? focusOffset : anchorOffset;
-    if (lexical.$isTextNode(startNode) && lexical.$isTextNode(startNode.getNextSibling()) && startOffset === startNode.getTextContentSize()) {
-      if (isBackwards) {
-        focusNode = startNode.getNextSibling();
-        focusOffset = 0;
-      } else {
-        anchorNode = startNode.getNextSibling();
-        anchorOffset = 0;
+};
+const isItemVisible = (item, snapshot) => snapshot === undefined ? !item.deleted : snapshot.sv.has(item.id.client) && snapshot.sv.get(item.id.client) > item.id.clock && !yjs.isDeleted(snapshot.ds, item.id);
+const $createOrUpdateTextNodesFromYText = (text, binding, snapshot, prevSnapshot, computeYChange) => {
+  const deltas = toDelta(text, snapshot, prevSnapshot, computeYChange);
+
+  // Use existing text nodes if the count and types all align, otherwise throw out the existing
+  // nodes and create new ones.
+  let nodes = binding.mapping.get(text) ?? [];
+  const nodeTypes = deltas.map(delta => delta.attributes.t ?? lexical.TextNode.getType());
+  const canReuseNodes = nodes.length === nodeTypes.length && nodes.every((node, i) => node.getType() === nodeTypes[i]);
+  if (!canReuseNodes) {
+    const registeredNodes = binding.editor._nodes;
+    nodes = nodeTypes.map(type => {
+      const nodeInfo = registeredNodes.get(type);
+      if (nodeInfo === undefined) {
+        throw new Error(`$createTextNodesFromYText: Node ${type} is not registered`);
+      }
+      const node = new nodeInfo.klass();
+      if (!lexical.$isTextNode(node)) {
+        throw new Error(`$createTextNodesFromYText: Node ${type} is not a TextNode`);
       }
+      return node;
+    });
+  }
+
+  // Sync text, properties and state to the text nodes.
+  for (let i = 0; i < deltas.length; i++) {
+    const node = nodes[i];
+    const delta = deltas[i];
+    const {
+      attributes,
+      insert
+    } = delta;
+    if (node.__text !== insert) {
+      node.setTextContent(insert);
     }
+    const properties = {
+      ...getDefaultNodeProperties(node, binding),
+      ...attributes.p
+    };
+    const state = Object.fromEntries(Object.entries(attributes).filter(([k]) => k.startsWith(STATE_KEY_PREFIX)).map(([k, v]) => [attrKeyToStateKey(k), v]));
+    $syncPropertiesFromYjs(binding, properties, node, null);
+    lexical.$getWritableNodeState(node).updateFromJSON(state);
   }
-  return {
-    anchorKey: anchorNode !== null ? anchorNode.getKey() : null,
-    anchorOffset,
-    focusKey: focusNode !== null ? focusNode.getKey() : null,
-    focusOffset
+  const latestNodes = nodes.map(node => node.getLatest());
+  binding.mapping.set(text, latestNodes);
+  return latestNodes;
+};
+const $createTypeFromTextNodes = (nodes, binding) => {
+  const type = new yjs.XmlText();
+  $updateYText(type, nodes, binding);
+  return type;
+};
+const createTypeFromElementNode = (node, binding) => {
+  const type = new yjs.XmlElement(node.getType());
+  const attrs = {
+    ...propertiesToAttributes(node, binding),
+    ...stateToAttributes(node)
   };
-}
-function $syncLocalCursorPosition(binding, provider) {
-  const awareness = provider.awareness;
-  const localState = awareness.getLocalState();
-  if (localState === null) {
-    return;
-  }
-  const {
-    anchorKey,
-    anchorOffset,
-    focusKey,
-    focusOffset
-  } = $getAnchorAndFocusForUserState(binding, localState);
-  if (anchorKey !== null && focusKey !== null) {
-    const selection = lexical.$getSelection();
-    if (!lexical.$isRangeSelection(selection)) {
-      return;
+  for (const key in attrs) {
+    const val = attrs[key];
+    if (val !== null) {
+      // TODO(collab-v2): typing for XmlElement generic
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      type.setAttribute(key, val);
     }
-    $setPoint(selection.anchor, anchorKey, anchorOffset);
-    $setPoint(selection.focus, focusKey, focusOffset);
   }
-}
-function $setPoint(point, key, offset) {
-  if (point.key !== key || point.offset !== offset) {
-    let anchorNode = lexical.$getNodeByKey(key);
-    if (anchorNode !== null && !lexical.$isElementNode(anchorNode) && !lexical.$isTextNode(anchorNode)) {
-      const parent = anchorNode.getParentOrThrow();
-      key = parent.getKey();
-      offset = anchorNode.getIndexWithinParent();
-      anchorNode = parent;
-    }
-    point.set(key, offset, lexical.$isElementNode(anchorNode) ? 'element' : 'text');
+  if (!(node instanceof lexical.ElementNode)) {
+    return type;
   }
-}
-function getCollabNodeAndOffset(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-sharedType, offset) {
-  const collabNode = sharedType._collabNode;
-  if (collabNode === undefined) {
-    return [null, 0];
+  type.insert(0, normalizeNodeContent(node).map(n => $createTypeFromTextOrElementNode(n, binding)));
+  binding.mapping.set(type, node);
+  return type;
+};
+const $createTypeFromTextOrElementNode = (node, meta) => node instanceof Array ? $createTypeFromTextNodes(node, meta) : createTypeFromElementNode(node, meta);
+const isObject = val => typeof val === 'object' && val != null;
+const equalAttrs = (pattrs, yattrs) => {
+  const keys = Object.keys(pattrs).filter(key => pattrs[key] !== null);
+  if (yattrs == null) {
+    return keys.length === 0;
   }
-  if (collabNode instanceof CollabElementNode) {
-    const {
-      node,
-      offset: collabNodeOffset
-    } = getPositionFromElementAndOffset(collabNode, offset, true);
-    if (node === null) {
-      return [collabNode, 0];
-    } else {
-      return [node, collabNodeOffset];
-    }
+  let eq = keys.length === Object.keys(yattrs).filter(key => yattrs[key] !== null).length;
+  for (let i = 0; i < keys.length && eq; i++) {
+    const key = keys[i];
+    const l = pattrs[key];
+    const r = yattrs[key];
+    eq = key === 'ychange' || l === r || isObject(l) && isObject(r) && equalAttrs(l, r);
   }
-  return [null, 0];
-}
-function $getNodeAndOffsetV2(mapping, absolutePosition) {
-  const yType = absolutePosition.type;
-  const yOffset = absolutePosition.index;
-  if (yType instanceof yjs.XmlElement) {
-    const node = mapping.get(yType);
-    if (node === undefined) {
-      return [null, 0];
-    }
-    if (!lexical.$isElementNode(node)) {
-      return [node, yOffset];
-    }
-    let remainingYOffset = yOffset;
-    let lexicalOffset = 0;
-    const children = node.getChildren();
-    while (remainingYOffset > 0 && lexicalOffset < children.length) {
-      const child = children[lexicalOffset];
-      remainingYOffset -= 1;
-      lexicalOffset += 1;
-      if (lexical.$isTextNode(child)) {
-        while (lexicalOffset < children.length && lexical.$isTextNode(children[lexicalOffset])) {
-          lexicalOffset += 1;
-        }
+  return eq;
+};
+const normalizeNodeContent = node => {
+  if (!(node instanceof lexical.ElementNode)) {
+    return [];
+  }
+  const c = node.getChildren();
+  const res = [];
+  for (let i = 0; i < c.length; i++) {
+    const n = c[i];
+    if (lexical.$isTextNode(n)) {
+      const textNodes = [];
+      for (let maybeTextNode = c[i]; i < c.length && lexical.$isTextNode(maybeTextNode); maybeTextNode = c[++i]) {
+        textNodes.push(maybeTextNode);
       }
+      i--;
+      res.push(textNodes);
+    } else {
+      res.push(n);
     }
-    return [node, lexicalOffset];
-  } else {
-    const nodes = mapping.get(yType);
-    if (nodes === undefined) {
-      return [null, 0];
+  }
+  return res;
+};
+const equalYTextLText = (ytext, ltexts, binding) => {
+  const deltas = toDelta(ytext);
+  return deltas.length === ltexts.length && deltas.every((d, i) => {
+    const ltext = ltexts[i];
+    const type = d.attributes.t ?? lexical.TextNode.getType();
+    const propertyAttrs = d.attributes.p ?? {};
+    const stateAttrs = Object.fromEntries(Object.entries(d.attributes).filter(([k]) => k.startsWith(STATE_KEY_PREFIX)));
+    return d.insert === ltext.getTextContent() && type === ltext.getType() && equalAttrs(propertyAttrs, propertiesToAttributes(ltext, binding)) && equalAttrs(stateAttrs, stateToAttributes(ltext));
+  });
+};
+const equalYTypePNode = (ytype, lnode, binding) => {
+  if (ytype instanceof yjs.XmlElement && !(lnode instanceof Array) && matchNodeName(ytype, lnode)) {
+    const normalizedContent = normalizeNodeContent(lnode);
+    return ytype._length === normalizedContent.length && equalAttrs(ytype.getAttributes(), {
+      ...propertiesToAttributes(lnode, binding),
+      ...stateToAttributes(lnode)
+    }) && ytype.toArray().every((ychild, i) => equalYTypePNode(ychild, normalizedContent[i], binding));
+  }
+  return ytype instanceof yjs.XmlText && lnode instanceof Array && equalYTextLText(ytype, lnode, binding);
+};
+const mappedIdentity = (mapped, lcontent) => mapped === lcontent || mapped instanceof Array && lcontent instanceof Array && mapped.length === lcontent.length && mapped.every((a, i) => lcontent[i] === a);
+const computeChildEqualityFactor = (ytype, lnode, binding) => {
+  const yChildren = ytype.toArray();
+  const pChildren = normalizeNodeContent(lnode);
+  const pChildCnt = pChildren.length;
+  const yChildCnt = yChildren.length;
+  const minCnt = Math.min(yChildCnt, pChildCnt);
+  let left = 0;
+  let right = 0;
+  let foundMappedChild = false;
+  for (; left < minCnt; left++) {
+    const leftY = yChildren[left];
+    const leftP = pChildren[left];
+    if (leftY instanceof yjs.XmlHook) {
+      break;
+    } else if (mappedIdentity(binding.mapping.get(leftY), leftP)) {
+      foundMappedChild = true; // definite (good) match!
+    } else if (!equalYTypePNode(leftY, leftP, binding)) {
+      break;
     }
-    let i = 0;
-    let adjustedOffset = yOffset;
-    while (adjustedOffset > nodes[i].getTextContentSize() && i + 1 < nodes.length) {
-      adjustedOffset -= nodes[i].getTextContentSize();
-      i++;
+  }
+  for (; left + right < minCnt; right++) {
+    const rightY = yChildren[yChildCnt - right - 1];
+    const rightP = pChildren[pChildCnt - right - 1];
+    if (rightY instanceof yjs.XmlHook) {
+      break;
+    } else if (mappedIdentity(binding.mapping.get(rightY), rightP)) {
+      foundMappedChild = true;
+    } else if (!equalYTypePNode(rightY, rightP, binding)) {
+      break;
     }
-    const textNode = nodes[i];
-    return [textNode, Math.min(adjustedOffset, textNode.getTextContentSize())];
   }
-}
-function getAwarenessStatesDefault(_binding, provider) {
-  return provider.awareness.getStates();
-}
-function syncCursorPositions(binding, provider, options) {
-  const {
-    getAwarenessStates = getAwarenessStatesDefault
-  } = options ?? {};
-  const awarenessStates = Array.from(getAwarenessStates(binding, provider));
-  const localClientID = binding.clientID;
-  const cursors = binding.cursors;
-  const editor = binding.editor;
-  const nodeMap = editor._editorState._nodeMap;
-  const visitedClientIDs = new Set();
-  for (let i = 0; i < awarenessStates.length; i++) {
-    const awarenessState = awarenessStates[i];
-    const [clientID, awareness] = awarenessState;
-    if (clientID !== localClientID) {
-      visitedClientIDs.add(clientID);
-      const {
-        name,
-        color,
-        focusing
-      } = awareness;
-      let selection = null;
-      let cursor = cursors.get(clientID);
-      if (cursor === undefined) {
-        cursor = createCursor(name, color);
-        cursors.set(clientID, cursor);
-      }
-      if (focusing) {
-        const {
-          anchorKey,
-          anchorOffset,
-          focusKey,
-          focusOffset
-        } = editor.read(() => $getAnchorAndFocusForUserState(binding, awareness));
-        if (anchorKey !== null && focusKey !== null) {
-          selection = cursor.selection;
-          if (selection === null) {
-            selection = createCursorSelection(cursor, anchorKey, anchorOffset, focusKey, focusOffset);
-          } else {
-            const anchor = selection.anchor;
-            const focus = selection.focus;
-            anchor.key = anchorKey;
-            anchor.offset = anchorOffset;
-            focus.key = focusKey;
-            focus.offset = focusOffset;
-          }
-        }
+  return {
+    equalityFactor: left + right,
+    foundMappedChild
+  };
+};
+const ytextTrans = ytext => {
+  let str = '';
+  let n = ytext._start;
+  const nAttrs = {};
+  while (n !== null) {
+    if (!n.deleted) {
+      if (n.countable && n.content instanceof yjs.ContentString) {
+        str += n.content.str;
+      } else if (n.content instanceof yjs.ContentFormat) {
+        nAttrs[n.content.key] = null;
       }
-      updateCursor(binding, cursor, selection, nodeMap);
     }
+    n = n.right;
   }
-  const allClientIDs = Array.from(cursors.keys());
-  for (let i = 0; i < allClientIDs.length; i++) {
-    const clientID = allClientIDs[i];
-    if (!visitedClientIDs.has(clientID)) {
-      const cursor = cursors.get(clientID);
-      if (cursor !== undefined) {
-        destroyCursor(binding, cursor);
-        cursors.delete(clientID);
+  return {
+    nAttrs,
+    str
+  };
+};
+const $updateYText = (ytext, ltexts, binding) => {
+  binding.mapping.set(ytext, ltexts);
+  const {
+    nAttrs,
+    str
+  } = ytextTrans(ytext);
+  const content = ltexts.map((node, i) => {
+    const nodeType = node.getType();
+    let p = propertiesToAttributes(node, binding);
+    if (Object.keys(p).length === 0) {
+      p = null;
+    }
+    return {
+      attributes: Object.assign({}, nAttrs, {
+        ...(nodeType !== lexical.TextNode.getType() && {
+          t: nodeType
+        }),
+        p,
+        ...stateToAttributes(node),
+        ...(i > 0 && {
+          i
+        }) // Prevent Yjs from merging text nodes itself.
+      }),
+      insert: node.getTextContent(),
+      nodeKey: node.getKey()
+    };
+  });
+  const nextText = content.map(c => c.insert).join('');
+  const selection = lexical.$getSelection();
+  let cursorOffset;
+  if (lexical.$isRangeSelection(selection) && selection.isCollapsed()) {
+    cursorOffset = 0;
+    for (const c of content) {
+      if (c.nodeKey === selection.anchor.key) {
+        cursorOffset += selection.anchor.offset;
+        break;
       }
+      cursorOffset += c.insert.length;
     }
-  }
-}
-function syncLexicalSelectionToYjs(binding, provider, prevSelection, nextSelection) {
-  const awareness = provider.awareness;
-  const localState = awareness.getLocalState();
-  if (localState === null) {
-    return;
+  } else {
+    cursorOffset = nextText.length;
   }
   const {
-    anchorPos: currentAnchorPos,
-    focusPos: currentFocusPos,
-    name,
-    color,
-    focusing,
-    awarenessData
-  } = localState;
-  let anchorPos = null;
-  let focusPos = null;
-  if (nextSelection === null || currentAnchorPos !== null && !nextSelection.is(prevSelection)) {
-    if (prevSelection === null) {
-      return;
+    insert,
+    remove,
+    index
+  } = simpleDiffWithCursor(str, nextText, cursorOffset);
+  ytext.delete(index, remove);
+  ytext.insert(index, insert);
+  ytext.applyDelta(content.map(c => ({
+    attributes: c.attributes,
+    retain: c.insert.length
+  })));
+};
+const toDelta = (ytext, snapshot, prevSnapshot, computeYChange) => {
+  return ytext.toDelta(snapshot, prevSnapshot, computeYChange).map(delta => {
+    const attributes = delta.attributes ?? {};
+    if ('ychange' in attributes) {
+      attributes[stateKeyToAttrKey('ychange')] = attributes.ychange;
+      delete attributes.ychange;
     }
-  }
-  if (lexical.$isRangeSelection(nextSelection)) {
-    if (isBindingV1(binding)) {
-      anchorPos = createRelativePosition(nextSelection.anchor, binding);
-      focusPos = createRelativePosition(nextSelection.focus, binding);
-    } else {
-      anchorPos = createRelativePositionV2(nextSelection.anchor, binding);
-      focusPos = createRelativePositionV2(nextSelection.focus, binding);
+    return {
+      ...delta,
+      attributes
+    };
+  });
+};
+const propertiesToAttributes = (node, meta) => {
+  const defaultProperties = getDefaultNodeProperties(node, meta);
+  const attrs = {};
+  Object.entries(defaultProperties).forEach(([property, defaultValue]) => {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const value = node[property];
+    if (value !== defaultValue) {
+      attrs[property] = value;
     }
+  });
+  return attrs;
+};
+const STATE_KEY_PREFIX = 's_';
+const stateKeyToAttrKey = key => `s_${key}`;
+const attrKeyToStateKey = key => {
+  if (!key.startsWith(STATE_KEY_PREFIX)) {
+    throw new Error(`Invalid state key: ${key}`);
   }
-  if (shouldUpdatePosition(currentAnchorPos, anchorPos) || shouldUpdatePosition(currentFocusPos, focusPos)) {
-    awareness.setLocalState({
-      ...localState,
-      anchorPos,
-      awarenessData,
-      color,
-      focusPos,
-      focusing,
-      name
-    });
-  }
-}
-
-/*
-const isVisible = (item: Item, snapshot?: Snapshot): boolean =>
-  snapshot === undefined
-    ? !item.deleted
-    : snapshot.sv.has(item.id.client) &&
-      snapshot.sv.get(item.id.client)! > item.id.clock &&
-      !isDeleted(snapshot.ds, item.id);
-*/
-
-// https://docs.yjs.dev/api/shared-types/y.xmlelement
-// "Define a top-level type; Note that the nodeName is always "undefined""
-const isRootElement = el => el.nodeName === 'UNDEFINED';
-const $createOrUpdateNodeFromYElement = (el, binding, keysChanged, childListChanged, snapshot, prevSnapshot, computeYChange) => {
-  let node = binding.mapping.get(el);
-  if (node && keysChanged && keysChanged.size === 0 && !childListChanged) {
-    return node;
+  return key.slice(STATE_KEY_PREFIX.length);
+};
+const stateToAttributes = node => {
+  const state = node.__state;
+  if (!state) {
+    return {};
   }
-  const type = isRootElement(el) ? lexical.RootNode.getType() : el.nodeName;
-  const registeredNodes = binding.editor._nodes;
-  const nodeInfo = registeredNodes.get(type);
-  if (nodeInfo === undefined) {
-    throw new Error(`$createOrUpdateNodeFromYElement: Node ${type} is not registered`);
+  const [unknown = {}, known] = state.getInternalState();
+  const attrs = {};
+  for (const [k, v] of Object.entries(unknown)) {
+    attrs[stateKeyToAttrKey(k)] = v;
   }
-  if (!node) {
-    node = new nodeInfo.klass();
-    keysChanged = null;
-    childListChanged = true;
+  for (const [stateConfig, v] of known) {
+    attrs[stateKeyToAttrKey(stateConfig.key)] = stateConfig.unparse(v);
   }
-  if (childListChanged && node instanceof lexical.ElementNode) {
-    const children = [];
-    const $createChildren = childType => {
-      if (childType instanceof yjs.XmlElement) {
-        const n = $createOrUpdateNodeFromYElement(childType, binding, new Set(), false, snapshot, prevSnapshot, computeYChange);
-        if (n !== null) {
-          children.push(n);
-        }
-      } else if (childType instanceof yjs.XmlText) {
-        const ns = $createOrUpdateTextNodesFromYText(childType, binding, snapshot, prevSnapshot, computeYChange);
-        if (ns !== null) {
-          ns.forEach(textchild => {
-            if (textchild !== null) {
-              children.push(textchild);
-            }
-          });
+  return attrs;
+};
+const $updateYFragment = (y, yDomFragment, node, binding, dirtyElements) => {
+  if (yDomFragment instanceof yjs.XmlElement && yDomFragment.nodeName !== node.getType() && !(isRootElement(yDomFragment) && node.getType() === lexical.RootNode.getType())) {
+    throw new Error('node name mismatch!');
+  }
+  binding.mapping.set(yDomFragment, node);
+  // update attributes
+  if (yDomFragment instanceof yjs.XmlElement) {
+    const yDomAttrs = yDomFragment.getAttributes();
+    const lexicalAttrs = {
+      ...propertiesToAttributes(node, binding),
+      ...stateToAttributes(node)
+    };
+    for (const key in lexicalAttrs) {
+      if (lexicalAttrs[key] != null) {
+        if (yDomAttrs[key] !== lexicalAttrs[key] && key !== 'ychange') {
+          // TODO(collab-v2): typing for XmlElement generic
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          yDomFragment.setAttribute(key, lexicalAttrs[key]);
         }
       } else {
-        {
-          formatDevErrorMessage(`XmlHook is not supported`);
-        }
+        yDomFragment.removeAttribute(key);
+      }
+    }
+    // remove all keys that are no longer in pAttrs
+    for (const key in yDomAttrs) {
+      if (lexicalAttrs[key] === undefined) {
+        yDomFragment.removeAttribute(key);
       }
-    };
-    {
-      el.toArray().forEach($createChildren);
     }
-    $spliceChildren(node, children);
   }
-  const attrs = el.getAttributes(snapshot);
-  // TODO(collab-v2): support for ychange
-  /*
-  if (snapshot !== undefined) {
-    if (!isVisible(el._item!, snapshot)) {
-      attrs.ychange = computeYChange
-        ? computeYChange('removed', el._item!.id)
-        : {type: 'removed'};
-    } else if (!isVisible(el._item!, prevSnapshot)) {
-      attrs.ychange = computeYChange
-        ? computeYChange('added', el._item!.id)
-        : {type: 'added'};
-    }
-  }
-  */
-  const properties = {
-    ...getDefaultNodeProperties(node, binding)
-  };
-  const state = {};
-  for (const k in attrs) {
-    if (k.startsWith(STATE_KEY_PREFIX)) {
-      state[attrKeyToStateKey(k)] = attrs[k];
+  // update children
+  const lChildren = normalizeNodeContent(node);
+  const lChildCnt = lChildren.length;
+  const yChildren = yDomFragment.toArray();
+  const yChildCnt = yChildren.length;
+  const minCnt = Math.min(lChildCnt, yChildCnt);
+  let left = 0;
+  let right = 0;
+  // find number of matching elements from left
+  for (; left < minCnt; left++) {
+    const leftY = yChildren[left];
+    const leftL = lChildren[left];
+    if (leftY instanceof yjs.XmlHook) {
+      break;
+    } else if (mappedIdentity(binding.mapping.get(leftY), leftL)) {
+      if (leftL instanceof lexical.ElementNode && dirtyElements.has(leftL.getKey())) {
+        $updateYFragment(y, leftY, leftL, binding, dirtyElements);
+      }
+    } else if (equalYTypePNode(leftY, leftL, binding)) {
+      // update mapping
+      binding.mapping.set(leftY, leftL);
     } else {
-      properties[k] = attrs[k];
+      break;
     }
   }
-  $syncPropertiesFromYjs(binding, properties, node, keysChanged);
-  if (!keysChanged) {
-    lexical.$getWritableNodeState(node).updateFromJSON(state);
-  } else {
-    const stateKeysChanged = Object.keys(state).filter(k => keysChanged.has(stateKeyToAttrKey(k)));
-    if (stateKeysChanged.length > 0) {
-      const writableState = lexical.$getWritableNodeState(node);
-      for (const k of stateKeysChanged) {
-        writableState.updateFromUnknown(k, state[k]);
+  // find number of matching elements from right
+  for (; right + left < minCnt; right++) {
+    const rightY = yChildren[yChildCnt - right - 1];
+    const rightL = lChildren[lChildCnt - right - 1];
+    if (rightY instanceof yjs.XmlHook) {
+      break;
+    } else if (mappedIdentity(binding.mapping.get(rightY), rightL)) {
+      if (rightL instanceof lexical.ElementNode && dirtyElements.has(rightL.getKey())) {
+        $updateYFragment(y, rightY, rightL, binding, dirtyElements);
       }
+    } else if (equalYTypePNode(rightY, rightL, binding)) {
+      // update mapping
+      binding.mapping.set(rightY, rightL);
+    } else {
+      break;
     }
   }
-  const latestNode = node.getLatest();
-  binding.mapping.set(el, latestNode);
-  return latestNode;
-};
-const $spliceChildren = (node, nextChildren) => {
-  const prevChildren = node.getChildren();
-  const prevChildrenKeySet = new Set(prevChildren.map(child => child.getKey()));
-  const nextChildrenKeySet = new Set(nextChildren.map(child => child.getKey()));
-  const prevEndIndex = prevChildren.length - 1;
-  const nextEndIndex = nextChildren.length - 1;
-  let prevIndex = 0;
-  let nextIndex = 0;
-  while (prevIndex <= prevEndIndex && nextIndex <= nextEndIndex) {
-    const prevKey = prevChildren[prevIndex].getKey();
-    const nextKey = nextChildren[nextIndex].getKey();
-    if (prevKey === nextKey) {
-      prevIndex++;
-      nextIndex++;
-      continue;
-    }
-    const nextHasPrevKey = nextChildrenKeySet.has(prevKey);
-    const prevHasNextKey = prevChildrenKeySet.has(nextKey);
-    if (!nextHasPrevKey) {
-      // If removing the last node, insert remaining new nodes immediately, otherwise if the node
-      // cannot be empty, it will remove itself from its parent.
-      if (nextIndex === 0 && node.getChildrenSize() === 1) {
-        node.splice(nextIndex, 1, nextChildren.slice(nextIndex));
-        return;
+  // try to compare and update
+  while (yChildCnt - left - right > 0 && lChildCnt - left - right > 0) {
+    const leftY = yChildren[left];
+    const leftL = lChildren[left];
+    const rightY = yChildren[yChildCnt - right - 1];
+    const rightL = lChildren[lChildCnt - right - 1];
+    if (leftY instanceof yjs.XmlText && leftL instanceof Array) {
+      if (!equalYTextLText(leftY, leftL, binding)) {
+        $updateYText(leftY, leftL, binding);
       }
-      // Remove
-      node.splice(nextIndex, 1, []);
-      prevIndex++;
-      continue;
-    }
-
-    // Create or replace
-    const nextChildNode = nextChildren[nextIndex];
-    if (prevHasNextKey) {
-      node.splice(nextIndex, 1, [nextChildNode]);
-      prevIndex++;
-      nextIndex++;
+      left += 1;
     } else {
-      node.splice(nextIndex, 0, [nextChildNode]);
-      nextIndex++;
+      let updateLeft = leftY instanceof yjs.XmlElement && matchNodeName(leftY, leftL);
+      let updateRight = rightY instanceof yjs.XmlElement && matchNodeName(rightY, rightL);
+      if (updateLeft && updateRight) {
+        // decide which which element to update
+        const equalityLeft = computeChildEqualityFactor(leftY, leftL, binding);
+        const equalityRight = computeChildEqualityFactor(rightY, rightL, binding);
+        if (equalityLeft.foundMappedChild && !equalityRight.foundMappedChild) {
+          updateRight = false;
+        } else if (!equalityLeft.foundMappedChild && equalityRight.foundMappedChild) {
+          updateLeft = false;
+        } else if (equalityLeft.equalityFactor < equalityRight.equalityFactor) {
+          updateLeft = false;
+        } else {
+          updateRight = false;
+        }
+      }
+      if (updateLeft) {
+        $updateYFragment(y, leftY, leftL, binding, dirtyElements);
+        left += 1;
+      } else if (updateRight) {
+        $updateYFragment(y, rightY, rightL, binding, dirtyElements);
+        right += 1;
+      } else {
+        binding.mapping.delete(yDomFragment.get(left));
+        yDomFragment.delete(left, 1);
+        yDomFragment.insert(left, [$createTypeFromTextOrElementNode(leftL, binding)]);
+        left += 1;
+      }
     }
   }
-  const appendNewChildren = prevIndex > prevEndIndex;
-  const removeOldChildren = nextIndex > nextEndIndex;
-  if (appendNewChildren && !removeOldChildren) {
-    node.append(...nextChildren.slice(nextIndex));
-  } else if (removeOldChildren && !appendNewChildren) {
-    node.splice(nextChildren.length, node.getChildrenSize() - nextChildren.length, []);
+  const yDelLen = yChildCnt - left - right;
+  if (yChildCnt === 1 && lChildCnt === 0 && yChildren[0] instanceof yjs.XmlText) {
+    binding.mapping.delete(yChildren[0]);
+    // Edge case handling https://github.com/yjs/y-prosemirror/issues/108
+    // Only delete the content of the Y.Text to retain remote changes on the same Y.Text object
+    yChildren[0].delete(0, yChildren[0].length);
+  } else if (yDelLen > 0) {
+    yDomFragment.slice(left, left + yDelLen).forEach(type => binding.mapping.delete(type));
+    yDomFragment.delete(left, yDelLen);
+  }
+  if (left + right < lChildCnt) {
+    const ins = [];
+    for (let i = left; i < lChildCnt - right; i++) {
+      ins.push($createTypeFromTextOrElementNode(lChildren[i], binding));
+    }
+    yDomFragment.insert(left, ins);
   }
 };
-const $createOrUpdateTextNodesFromYText = (text, binding, snapshot, prevSnapshot, computeYChange) => {
-  const deltas = toDelta(text, snapshot, prevSnapshot, computeYChange);
+const matchNodeName = (yElement, lnode) => !(lnode instanceof Array) && yElement.nodeName === lnode.getType();
 
-  // Use existing text nodes if the count and types all align, otherwise throw out the existing
-  // nodes and create new ones.
-  let nodes = binding.mapping.get(text) ?? [];
-  const nodeTypes = deltas.map(delta => delta.attributes.t ?? lexical.TextNode.getType());
-  const canReuseNodes = nodes.length === nodeTypes.length && nodes.every((node, i) => node.getType() === nodeTypes[i]);
-  if (!canReuseNodes) {
-    const registeredNodes = binding.editor._nodes;
-    nodes = nodeTypes.map(type => {
-      const nodeInfo = registeredNodes.get(type);
-      if (nodeInfo === undefined) {
-        throw new Error(`$createTextNodesFromYText: Node ${type} is not registered`);
+const STATE_KEY = 'ychange';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+const ychangeState = lexical.createState(STATE_KEY, {
+  isEqual: (a, b) => a === b,
+  parse: value => value ?? null
+});
+function $getYChangeState(node) {
+  return lexical.$getState(node, ychangeState);
+}
+
+// Not exposing $setState because it should only be created by SyncV2.ts.
+
+/**
+ * Replaces the editor content with a view that compares the state between two given snapshots.
+ * Any added or removed nodes between the two snapshots will have {@link YChange} attached to them.
+ *
+ * @param binding Yjs binding
+ * @param snapshot Ending snapshot state (default: current state of the Yjs document)
+ * @param prevSnapshot Starting snapshot state (default: empty snapshot)
+ */
+const renderSnapshot__EXPERIMENTAL = (binding, snapshot = yjs.snapshot(binding.doc), prevSnapshot = yjs.emptySnapshot) => {
+  // The document that contains the full history of this document.
+  const {
+    doc
+  } = binding;
+  if (!!doc.gc) {
+    formatDevErrorMessage(`GC must be disabled to render snapshot`);
+  }
+  doc.transact(transaction => {
+    // Before rendering, we are going to sanitize ops and split deleted ops
+    // if they were deleted by seperate users.
+    const pud = new yjs.PermanentUserData(doc);
+    if (pud) {
+      pud.dss.forEach(ds => {
+        yjs.iterateDeletedStructs(transaction, ds, _item => {});
+      });
+    }
+    const computeYChange = (type, id) => {
+      const user = type === 'added' ? pud.getUserByClientId(id.client) : pud.getUserByDeletedId(id);
+      return {
+        id,
+        type,
+        user: user ?? null
+      };
+    };
+    binding.mapping.clear();
+    binding.editor.update(() => {
+      lexical.$getRoot().clear();
+      $createOrUpdateNodeFromYElement(binding.root, binding, null, true, snapshot, prevSnapshot, computeYChange);
+    });
+  }, binding);
+};
+
+function createRelativePosition(point, binding) {
+  const collabNodeMap = binding.collabNodeMap;
+  const collabNode = collabNodeMap.get(point.key);
+  if (collabNode === undefined) {
+    return null;
+  }
+  let offset = point.offset;
+  let sharedType = collabNode.getSharedType();
+  if (collabNode instanceof CollabTextNode) {
+    sharedType = collabNode._parent._xmlText;
+    const currentOffset = collabNode.getOffset();
+    if (currentOffset === -1) {
+      return null;
+    }
+    offset = currentOffset + 1 + offset;
+  } else if (collabNode instanceof CollabElementNode && point.type === 'element') {
+    const parent = point.getNode();
+    if (!lexical.$isElementNode(parent)) {
+      formatDevErrorMessage(`Element point must be an element node`);
+    }
+    let accumulatedOffset = 0;
+    let i = 0;
+    let node = parent.getFirstChild();
+    while (node !== null && i++ < offset) {
+      if (lexical.$isTextNode(node)) {
+        accumulatedOffset += node.getTextContentSize() + 1;
+      } else {
+        accumulatedOffset++;
       }
-      const node = new nodeInfo.klass();
-      if (!lexical.$isTextNode(node)) {
-        throw new Error(`$createTextNodesFromYText: Node ${type} is not a TextNode`);
+      node = node.getNextSibling();
+    }
+    offset = accumulatedOffset;
+  }
+  return yjs.createRelativePositionFromTypeIndex(sharedType, offset);
+}
+function createRelativePositionV2(point, binding) {
+  const {
+    mapping
+  } = binding;
+  const {
+    offset
+  } = point;
+  const node = point.getNode();
+  const yType = mapping.getSharedType(node);
+  if (yType === undefined) {
+    return null;
+  }
+  if (point.type === 'text') {
+    if (!lexical.$isTextNode(node)) {
+      formatDevErrorMessage(`Text point must be a text node`);
+    }
+    let prevSibling = node.getPreviousSibling();
+    let adjustedOffset = offset;
+    while (lexical.$isTextNode(prevSibling)) {
+      adjustedOffset += prevSibling.getTextContentSize();
+      prevSibling = prevSibling.getPreviousSibling();
+    }
+    return yjs.createRelativePositionFromTypeIndex(yType, adjustedOffset);
+  } else if (point.type === 'element') {
+    if (!lexical.$isElementNode(node)) {
+      formatDevErrorMessage(`Element point must be an element node`);
+    }
+    let i = 0;
+    let child = node.getFirstChild();
+    while (child !== null && i < offset) {
+      if (lexical.$isTextNode(child)) {
+        let nextSibling = child.getNextSibling();
+        while (lexical.$isTextNode(nextSibling)) {
+          nextSibling = nextSibling.getNextSibling();
+        }
       }
-      return node;
-    });
+      i++;
+      child = child.getNextSibling();
+    }
+    return yjs.createRelativePositionFromTypeIndex(yType, i);
   }
-
-  // Sync text, properties and state to the text nodes.
-  for (let i = 0; i < deltas.length; i++) {
-    const node = nodes[i];
-    const delta = deltas[i];
-    const {
-      attributes,
-      insert
-    } = delta;
-    if (node.__text !== insert) {
-      node.setTextContent(insert);
+  return null;
+}
+function createAbsolutePosition(relativePosition, binding) {
+  return yjs.createAbsolutePositionFromRelativePosition(relativePosition, binding.doc);
+}
+function shouldUpdatePosition(currentPos, pos) {
+  if (currentPos == null) {
+    if (pos != null) {
+      return true;
     }
-    const properties = {
-      ...getDefaultNodeProperties(node, binding),
-      ...attributes.p
-    };
-    const state = Object.fromEntries(Object.entries(attributes).filter(([k]) => k.startsWith(STATE_KEY_PREFIX)).map(([k, v]) => [attrKeyToStateKey(k), v]));
-    $syncPropertiesFromYjs(binding, properties, node, null);
-    lexical.$getWritableNodeState(node).updateFromJSON(state);
+  } else if (pos == null || !yjs.compareRelativePositions(currentPos, pos)) {
+    return true;
   }
-  const latestNodes = nodes.map(node => node.getLatest());
-  binding.mapping.set(text, latestNodes);
-  return latestNodes;
-};
-const $createTypeFromTextNodes = (nodes, binding) => {
-  const type = new yjs.XmlText();
-  $updateYText(type, nodes, binding);
-  return type;
-};
-const createTypeFromElementNode = (node, binding) => {
-  const type = new yjs.XmlElement(node.getType());
-  const attrs = {
-    ...propertiesToAttributes(node, binding),
-    ...stateToAttributes(node)
+  return false;
+}
+function createCursor(name, color) {
+  return {
+    color: color,
+    name: name,
+    selection: null
   };
-  for (const key in attrs) {
-    const val = attrs[key];
-    if (val !== null) {
-      // TODO(collab-v2): typing for XmlElement generic
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      type.setAttribute(key, val);
+}
+function destroySelection(binding, selection) {
+  const cursorsContainer = binding.cursorsContainer;
+  if (cursorsContainer !== null) {
+    const selections = selection.selections;
+    const selectionsLength = selections.length;
+    for (let i = 0; i < selectionsLength; i++) {
+      cursorsContainer.removeChild(selections[i]);
     }
   }
-  if (!(node instanceof lexical.ElementNode)) {
-    return type;
-  }
-  type.insert(0, normalizeNodeContent(node).map(n => $createTypeFromTextOrElementNode(n, binding)));
-  binding.mapping.set(type, node);
-  return type;
-};
-const $createTypeFromTextOrElementNode = (node, meta) => node instanceof Array ? $createTypeFromTextNodes(node, meta) : createTypeFromElementNode(node, meta);
-const isObject = val => typeof val === 'object' && val != null;
-const equalAttrs = (pattrs, yattrs) => {
-  const keys = Object.keys(pattrs).filter(key => pattrs[key] !== null);
-  if (yattrs == null) {
-    return keys.length === 0;
+}
+function destroyCursor(binding, cursor) {
+  const selection = cursor.selection;
+  if (selection !== null) {
+    destroySelection(binding, selection);
   }
-  let eq = keys.length === Object.keys(yattrs).filter(key => yattrs[key] !== null).length;
-  for (let i = 0; i < keys.length && eq; i++) {
-    const key = keys[i];
-    const l = pattrs[key];
-    const r = yattrs[key];
-    eq = key === 'ychange' || l === r || isObject(l) && isObject(r) && equalAttrs(l, r);
+}
+function createCursorSelection(cursor, anchorKey, anchorOffset, focusKey, focusOffset) {
+  const color = cursor.color;
+  const caret = document.createElement('span');
+  caret.style.cssText = `position:absolute;top:0;bottom:0;right:-1px;width:1px;background-color:${color};z-index:10;`;
+  const name = document.createElement('span');
+  name.textContent = cursor.name;
+  name.style.cssText = `position:absolute;left:-2px;top:-16px;background-color:${color};color:#fff;line-height:12px;font-size:12px;padding:2px;font-family:Arial;font-weight:bold;white-space:nowrap;`;
+  caret.appendChild(name);
+  return {
+    anchor: {
+      key: anchorKey,
+      offset: anchorOffset
+    },
+    caret,
+    color,
+    focus: {
+      key: focusKey,
+      offset: focusOffset
+    },
+    name,
+    selections: []
+  };
+}
+function updateCursor(binding, cursor, nextSelection, nodeMap) {
+  const editor = binding.editor;
+  const rootElement = editor.getRootElement();
+  const cursorsContainer = binding.cursorsContainer;
+  if (cursorsContainer === null || rootElement === null) {
+    return;
   }
-  return eq;
-};
-const normalizeNodeContent = node => {
-  if (!(node instanceof lexical.ElementNode)) {
-    return [];
+  const cursorsContainerOffsetParent = cursorsContainer.offsetParent;
+  if (cursorsContainerOffsetParent === null) {
+    return;
   }
-  const c = node.getChildren();
-  const res = [];
-  for (let i = 0; i < c.length; i++) {
-    const n = c[i];
-    if (lexical.$isTextNode(n)) {
-      const textNodes = [];
-      for (let maybeTextNode = c[i]; i < c.length && lexical.$isTextNode(maybeTextNode); maybeTextNode = c[++i]) {
-        textNodes.push(maybeTextNode);
-      }
-      i--;
-      res.push(textNodes);
+  const containerRect = cursorsContainerOffsetParent.getBoundingClientRect();
+  const prevSelection = cursor.selection;
+  if (nextSelection === null) {
+    if (prevSelection === null) {
+      return;
     } else {
-      res.push(n);
+      cursor.selection = null;
+      destroySelection(binding, prevSelection);
+      return;
     }
+  } else {
+    cursor.selection = nextSelection;
   }
-  return res;
-};
-const equalYTextLText = (ytext, ltexts, binding) => {
-  const deltas = toDelta(ytext);
-  return deltas.length === ltexts.length && deltas.every((d, i) => {
-    const ltext = ltexts[i];
-    const type = d.attributes.t ?? lexical.TextNode.getType();
-    const propertyAttrs = d.attributes.p ?? {};
-    const stateAttrs = Object.fromEntries(Object.entries(d.attributes).filter(([k]) => k.startsWith(STATE_KEY_PREFIX)));
-    return d.insert === ltext.getTextContent() && type === ltext.getType() && equalAttrs(propertyAttrs, propertiesToAttributes(ltext, binding)) && equalAttrs(stateAttrs, stateToAttributes(ltext));
-  });
-};
-const equalYTypePNode = (ytype, lnode, binding) => {
-  if (ytype instanceof yjs.XmlElement && !(lnode instanceof Array) && matchNodeName(ytype, lnode)) {
-    const normalizedContent = normalizeNodeContent(lnode);
-    return ytype._length === normalizedContent.length && equalAttrs(ytype.getAttributes(), {
-      ...propertiesToAttributes(lnode, binding),
-      ...stateToAttributes(lnode)
-    }) && ytype.toArray().every((ychild, i) => equalYTypePNode(ychild, normalizedContent[i], binding));
-  }
-  return ytype instanceof yjs.XmlText && lnode instanceof Array && equalYTextLText(ytype, lnode, binding);
-};
-const mappedIdentity = (mapped, lcontent) => mapped === lcontent || mapped instanceof Array && lcontent instanceof Array && mapped.length === lcontent.length && mapped.every((a, i) => lcontent[i] === a);
-const computeChildEqualityFactor = (ytype, lnode, binding) => {
-  const yChildren = ytype.toArray();
-  const pChildren = normalizeNodeContent(lnode);
-  const pChildCnt = pChildren.length;
-  const yChildCnt = yChildren.length;
-  const minCnt = Math.min(yChildCnt, pChildCnt);
-  let left = 0;
-  let right = 0;
-  let foundMappedChild = false;
-  for (; left < minCnt; left++) {
-    const leftY = yChildren[left];
-    const leftP = pChildren[left];
-    if (leftY instanceof yjs.XmlHook) {
-      break;
-    } else if (mappedIdentity(binding.mapping.get(leftY), leftP)) {
-      foundMappedChild = true; // definite (good) match!
-    } else if (!equalYTypePNode(leftY, leftP, binding)) {
-      break;
-    }
+  const caret = nextSelection.caret;
+  const color = nextSelection.color;
+  const selections = nextSelection.selections;
+  const anchor = nextSelection.anchor;
+  const focus = nextSelection.focus;
+  const anchorKey = anchor.key;
+  const focusKey = focus.key;
+  const anchorNode = nodeMap.get(anchorKey);
+  const focusNode = nodeMap.get(focusKey);
+  if (anchorNode == null || focusNode == null) {
+    return;
   }
-  for (; left + right < minCnt; right++) {
-    const rightY = yChildren[yChildCnt - right - 1];
-    const rightP = pChildren[pChildCnt - right - 1];
-    if (rightY instanceof yjs.XmlHook) {
-      break;
-    } else if (mappedIdentity(binding.mapping.get(rightY), rightP)) {
-      foundMappedChild = true;
-    } else if (!equalYTypePNode(rightY, rightP, binding)) {
-      break;
+  let selectionRects;
+
+  // In the case of a collapsed selection on a linebreak, we need
+  // to improvise as the browser will return nothing here as <br>
+  // apparently take up no visual space :/
+  // This won't work in all cases, but it's better than just showing
+  // nothing all the time.
+  if (anchorNode === focusNode && lexical.$isLineBreakNode(anchorNode)) {
+    const brRect = editor.getElementByKey(anchorKey).getBoundingClientRect();
+    selectionRects = [brRect];
+  } else {
+    const range = selection.createDOMRange(editor, anchorNode, anchor.offset, focusNode, focus.offset);
+    if (range === null) {
+      return;
     }
+    selectionRects = selection.createRectsFromDOMRange(editor, range);
   }
-  return {
-    equalityFactor: left + right,
-    foundMappedChild
-  };
-};
-const ytextTrans = ytext => {
-  let str = '';
-  let n = ytext._start;
-  const nAttrs = {};
-  while (n !== null) {
-    if (!n.deleted) {
-      if (n.countable && n.content instanceof yjs.ContentString) {
-        str += n.content.str;
-      } else if (n.content instanceof yjs.ContentFormat) {
-        nAttrs[n.content.key] = null;
+  const selectionsLength = selections.length;
+  const selectionRectsLength = selectionRects.length;
+  for (let i = 0; i < selectionRectsLength; i++) {
+    const selectionRect = selectionRects[i];
+    let selection = selections[i];
+    if (selection === undefined) {
+      selection = document.createElement('span');
+      selections[i] = selection;
+      const selectionBg = document.createElement('span');
+      selection.appendChild(selectionBg);
+      cursorsContainer.appendChild(selection);
+    }
+    const top = selectionRect.top - containerRect.top;
+    const left = selectionRect.left - containerRect.left;
+    const style = `position:absolute;top:${top}px;left:${left}px;height:${selectionRect.height}px;width:${selectionRect.width}px;pointer-events:none;z-index:5;`;
+    selection.style.cssText = style;
+    selection.firstChild.style.cssText = `${style}left:0;top:0;background-color:${color};opacity:0.3;`;
+    if (i === selectionRectsLength - 1) {
+      if (caret.parentNode !== selection) {
+        selection.appendChild(caret);
       }
     }
-    n = n.right;
+  }
+  for (let i = selectionsLength - 1; i >= selectionRectsLength; i--) {
+    const selection = selections[i];
+    cursorsContainer.removeChild(selection);
+    selections.pop();
+  }
+}
+/**
+ * @deprecated Use `$getAnchorAndFocusForUserState` instead.
+ */
+function getAnchorAndFocusCollabNodesForUserState(binding, userState) {
+  const {
+    anchorPos,
+    focusPos
+  } = userState;
+  let anchorCollabNode = null;
+  let anchorOffset = 0;
+  let focusCollabNode = null;
+  let focusOffset = 0;
+  if (anchorPos !== null && focusPos !== null) {
+    const anchorAbsPos = createAbsolutePosition(anchorPos, binding);
+    const focusAbsPos = createAbsolutePosition(focusPos, binding);
+    if (anchorAbsPos !== null && focusAbsPos !== null) {
+      [anchorCollabNode, anchorOffset] = getCollabNodeAndOffset(anchorAbsPos.type, anchorAbsPos.index);
+      [focusCollabNode, focusOffset] = getCollabNodeAndOffset(focusAbsPos.type, focusAbsPos.index);
+    }
   }
   return {
-    nAttrs,
-    str
+    anchorCollabNode,
+    anchorOffset,
+    focusCollabNode,
+    focusOffset
   };
-};
-const $updateYText = (ytext, ltexts, binding) => {
-  binding.mapping.set(ytext, ltexts);
+}
+function $getAnchorAndFocusForUserState(binding, userState) {
   const {
-    nAttrs,
-    str
-  } = ytextTrans(ytext);
-  const content = ltexts.map((node, i) => {
-    const nodeType = node.getType();
-    let p = propertiesToAttributes(node, binding);
-    if (Object.keys(p).length === 0) {
-      p = null;
-    }
+    anchorPos,
+    focusPos
+  } = userState;
+  const anchorAbsPos = anchorPos ? createAbsolutePosition(anchorPos, binding) : null;
+  const focusAbsPos = focusPos ? createAbsolutePosition(focusPos, binding) : null;
+  if (anchorAbsPos === null || focusAbsPos === null) {
     return {
-      attributes: Object.assign({}, nAttrs, {
-        ...(nodeType !== lexical.TextNode.getType() && {
-          t: nodeType
-        }),
-        p,
-        ...stateToAttributes(node),
-        ...(i > 0 && {
-          i
-        }) // Prevent Yjs from merging text nodes itself.
-      }),
-      insert: node.getTextContent(),
-      nodeKey: node.getKey()
+      anchorKey: null,
+      anchorOffset: 0,
+      focusKey: null,
+      focusOffset: 0
     };
-  });
-  const nextText = content.map(c => c.insert).join('');
-  const selection = lexical.$getSelection();
-  let cursorOffset;
-  if (lexical.$isRangeSelection(selection) && selection.isCollapsed()) {
-    cursorOffset = 0;
-    for (const c of content) {
-      if (c.nodeKey === selection.anchor.key) {
-        cursorOffset += selection.anchor.offset;
-        break;
+  }
+  if (isBindingV1(binding)) {
+    const [anchorCollabNode, anchorOffset] = getCollabNodeAndOffset(anchorAbsPos.type, anchorAbsPos.index);
+    const [focusCollabNode, focusOffset] = getCollabNodeAndOffset(focusAbsPos.type, focusAbsPos.index);
+    return {
+      anchorKey: anchorCollabNode !== null ? anchorCollabNode.getKey() : null,
+      anchorOffset,
+      focusKey: focusCollabNode !== null ? focusCollabNode.getKey() : null,
+      focusOffset
+    };
+  }
+  let [anchorNode, anchorOffset] = $getNodeAndOffsetV2(binding.mapping, anchorAbsPos);
+  let [focusNode, focusOffset] = $getNodeAndOffsetV2(binding.mapping, focusAbsPos);
+  // For a non-collapsed selection, if the start of the selection is as the end of a text node,
+  // move it to the beginning of the next text node (if one exists).
+  if (focusNode && anchorNode && (focusNode !== anchorNode || focusOffset !== anchorOffset)) {
+    const isBackwards = focusNode.isBefore(anchorNode);
+    const startNode = isBackwards ? focusNode : anchorNode;
+    const startOffset = isBackwards ? focusOffset : anchorOffset;
+    if (lexical.$isTextNode(startNode) && lexical.$isTextNode(startNode.getNextSibling()) && startOffset === startNode.getTextContentSize()) {
+      if (isBackwards) {
+        focusNode = startNode.getNextSibling();
+        focusOffset = 0;
+      } else {
+        anchorNode = startNode.getNextSibling();
+        anchorOffset = 0;
       }
-      cursorOffset += c.insert.length;
     }
-  } else {
-    cursorOffset = nextText.length;
+  }
+  return {
+    anchorKey: anchorNode !== null ? anchorNode.getKey() : null,
+    anchorOffset,
+    focusKey: focusNode !== null ? focusNode.getKey() : null,
+    focusOffset
+  };
+}
+function $syncLocalCursorPosition(binding, provider) {
+  const awareness = provider.awareness;
+  const localState = awareness.getLocalState();
+  if (localState === null) {
+    return;
   }
   const {
-    insert,
-    remove,
-    index
-  } = simpleDiffWithCursor(str, nextText, cursorOffset);
-  ytext.delete(index, remove);
-  ytext.insert(index, insert);
-  ytext.applyDelta(content.map(c => ({
-    attributes: c.attributes,
-    retain: c.insert.length
-  })));
-};
-const toDelta = (ytext, snapshot, prevSnapshot, computeYChange) => {
-  return ytext.toDelta(snapshot, prevSnapshot, computeYChange).map(delta => ({
-    ...delta,
-    attributes: delta.attributes ?? {}
-  }));
-};
-const propertiesToAttributes = (node, meta) => {
-  const defaultProperties = getDefaultNodeProperties(node, meta);
-  const attrs = {};
-  Object.entries(defaultProperties).forEach(([property, defaultValue]) => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const value = node[property];
-    if (value !== defaultValue) {
-      attrs[property] = value;
+    anchorKey,
+    anchorOffset,
+    focusKey,
+    focusOffset
+  } = $getAnchorAndFocusForUserState(binding, localState);
+  if (anchorKey !== null && focusKey !== null) {
+    const selection = lexical.$getSelection();
+    if (!lexical.$isRangeSelection(selection)) {
+      return;
     }
-  });
-  return attrs;
-};
-const STATE_KEY_PREFIX = 's_';
-const stateKeyToAttrKey = key => STATE_KEY_PREFIX + key;
-const attrKeyToStateKey = key => {
-  if (!key.startsWith(STATE_KEY_PREFIX)) {
-    throw new Error(`Invalid state key: ${key}`);
-  }
-  return key.slice(STATE_KEY_PREFIX.length);
-};
-const stateToAttributes = node => {
-  const state = node.__state;
-  if (!state) {
-    return {};
-  }
-  const [unknown = {}, known] = state.getInternalState();
-  const attrs = {};
-  for (const [k, v] of Object.entries(unknown)) {
-    attrs[stateKeyToAttrKey(k)] = v;
-  }
-  for (const [stateConfig, v] of known) {
-    attrs[stateKeyToAttrKey(stateConfig.key)] = stateConfig.unparse(v);
-  }
-  return attrs;
-};
-const $updateYFragment = (y, yDomFragment, node, binding, dirtyElements) => {
-  if (yDomFragment instanceof yjs.XmlElement && yDomFragment.nodeName !== node.getType() && !(isRootElement(yDomFragment) && node.getType() === lexical.RootNode.getType())) {
-    throw new Error('node name mismatch!');
+    $setPoint(selection.anchor, anchorKey, anchorOffset);
+    $setPoint(selection.focus, focusKey, focusOffset);
   }
-  binding.mapping.set(yDomFragment, node);
-  // update attributes
-  if (yDomFragment instanceof yjs.XmlElement) {
-    const yDomAttrs = yDomFragment.getAttributes();
-    const lexicalAttrs = {
-      ...propertiesToAttributes(node, binding),
-      ...stateToAttributes(node)
-    };
-    for (const key in lexicalAttrs) {
-      if (lexicalAttrs[key] != null) {
-        if (yDomAttrs[key] !== lexicalAttrs[key] && key !== 'ychange') {
-          // TODO(collab-v2): typing for XmlElement generic
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yDomFragment.setAttribute(key, lexicalAttrs[key]);
-        }
-      } else {
-        yDomFragment.removeAttribute(key);
-      }
-    }
-    // remove all keys that are no longer in pAttrs
-    for (const key in yDomAttrs) {
-      if (lexicalAttrs[key] === undefined) {
-        yDomFragment.removeAttribute(key);
-      }
+}
+function $setPoint(point, key, offset) {
+  if (point.key !== key || point.offset !== offset) {
+    let anchorNode = lexical.$getNodeByKey(key);
+    if (anchorNode !== null && !lexical.$isElementNode(anchorNode) && !lexical.$isTextNode(anchorNode)) {
+      const parent = anchorNode.getParentOrThrow();
+      key = parent.getKey();
+      offset = anchorNode.getIndexWithinParent();
+      anchorNode = parent;
     }
+    point.set(key, offset, lexical.$isElementNode(anchorNode) ? 'element' : 'text');
   }
-  // update children
-  const lChildren = normalizeNodeContent(node);
-  const lChildCnt = lChildren.length;
-  const yChildren = yDomFragment.toArray();
-  const yChildCnt = yChildren.length;
-  const minCnt = Math.min(lChildCnt, yChildCnt);
-  let left = 0;
-  let right = 0;
-  // find number of matching elements from left
-  for (; left < minCnt; left++) {
-    const leftY = yChildren[left];
-    const leftL = lChildren[left];
-    if (leftY instanceof yjs.XmlHook) {
-      break;
-    } else if (mappedIdentity(binding.mapping.get(leftY), leftL)) {
-      if (leftL instanceof lexical.ElementNode && dirtyElements.has(leftL.getKey())) {
-        $updateYFragment(y, leftY, leftL, binding, dirtyElements);
-      }
-    } else if (equalYTypePNode(leftY, leftL, binding)) {
-      // update mapping
-      binding.mapping.set(leftY, leftL);
+}
+function getCollabNodeAndOffset(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+sharedType, offset) {
+  const collabNode = sharedType._collabNode;
+  if (collabNode === undefined) {
+    return [null, 0];
+  }
+  if (collabNode instanceof CollabElementNode) {
+    const {
+      node,
+      offset: collabNodeOffset
+    } = getPositionFromElementAndOffset(collabNode, offset, true);
+    if (node === null) {
+      return [collabNode, 0];
     } else {
-      break;
+      return [node, collabNodeOffset];
     }
   }
-  // find number of matching elements from right
-  for (; right + left < minCnt; right++) {
-    const rightY = yChildren[yChildCnt - right - 1];
-    const rightL = lChildren[lChildCnt - right - 1];
-    if (rightY instanceof yjs.XmlHook) {
-      break;
-    } else if (mappedIdentity(binding.mapping.get(rightY), rightL)) {
-      if (rightL instanceof lexical.ElementNode && dirtyElements.has(rightL.getKey())) {
-        $updateYFragment(y, rightY, rightL, binding, dirtyElements);
+  return [null, 0];
+}
+function $getNodeAndOffsetV2(mapping, absolutePosition) {
+  const yType = absolutePosition.type;
+  const yOffset = absolutePosition.index;
+  if (yType instanceof yjs.XmlElement) {
+    const node = mapping.get(yType);
+    if (node === undefined) {
+      return [null, 0];
+    }
+    if (!lexical.$isElementNode(node)) {
+      return [node, yOffset];
+    }
+    let remainingYOffset = yOffset;
+    let lexicalOffset = 0;
+    const children = node.getChildren();
+    while (remainingYOffset > 0 && lexicalOffset < children.length) {
+      const child = children[lexicalOffset];
+      remainingYOffset -= 1;
+      lexicalOffset += 1;
+      if (lexical.$isTextNode(child)) {
+        while (lexicalOffset < children.length && lexical.$isTextNode(children[lexicalOffset])) {
+          lexicalOffset += 1;
+        }
       }
-    } else if (equalYTypePNode(rightY, rightL, binding)) {
-      // update mapping
-      binding.mapping.set(rightY, rightL);
-    } else {
-      break;
     }
+    return [node, lexicalOffset];
+  } else {
+    const nodes = mapping.get(yType);
+    if (nodes === undefined) {
+      return [null, 0];
+    }
+    let i = 0;
+    let adjustedOffset = yOffset;
+    while (adjustedOffset > nodes[i].getTextContentSize() && i + 1 < nodes.length) {
+      adjustedOffset -= nodes[i].getTextContentSize();
+      i++;
+    }
+    const textNode = nodes[i];
+    return [textNode, Math.min(adjustedOffset, textNode.getTextContentSize())];
   }
-  // try to compare and update
-  while (yChildCnt - left - right > 0 && lChildCnt - left - right > 0) {
-    const leftY = yChildren[left];
-    const leftL = lChildren[left];
-    const rightY = yChildren[yChildCnt - right - 1];
-    const rightL = lChildren[lChildCnt - right - 1];
-    if (leftY instanceof yjs.XmlText && leftL instanceof Array) {
-      if (!equalYTextLText(leftY, leftL, binding)) {
-        $updateYText(leftY, leftL, binding);
+}
+function getAwarenessStatesDefault(_binding, provider) {
+  return provider.awareness.getStates();
+}
+function syncCursorPositions(binding, provider, options) {
+  const {
+    getAwarenessStates = getAwarenessStatesDefault
+  } = options ?? {};
+  const awarenessStates = Array.from(getAwarenessStates(binding, provider));
+  const localClientID = binding.clientID;
+  const cursors = binding.cursors;
+  const editor = binding.editor;
+  const nodeMap = editor._editorState._nodeMap;
+  const visitedClientIDs = new Set();
+  for (let i = 0; i < awarenessStates.length; i++) {
+    const awarenessState = awarenessStates[i];
+    const [clientID, awareness] = awarenessState;
+    if (clientID !== 0 && clientID !== localClientID) {
+      visitedClientIDs.add(clientID);
+      const {
+        name,
+        color,
+        focusing
+      } = awareness;
+      let selection = null;
+      let cursor = cursors.get(clientID);
+      if (cursor === undefined) {
+        cursor = createCursor(name, color);
+        cursors.set(clientID, cursor);
       }
-      left += 1;
-    } else {
-      let updateLeft = leftY instanceof yjs.XmlElement && matchNodeName(leftY, leftL);
-      let updateRight = rightY instanceof yjs.XmlElement && matchNodeName(rightY, rightL);
-      if (updateLeft && updateRight) {
-        // decide which which element to update
-        const equalityLeft = computeChildEqualityFactor(leftY, leftL, binding);
-        const equalityRight = computeChildEqualityFactor(rightY, rightL, binding);
-        if (equalityLeft.foundMappedChild && !equalityRight.foundMappedChild) {
-          updateRight = false;
-        } else if (!equalityLeft.foundMappedChild && equalityRight.foundMappedChild) {
-          updateLeft = false;
-        } else if (equalityLeft.equalityFactor < equalityRight.equalityFactor) {
-          updateLeft = false;
-        } else {
-          updateRight = false;
+      if (focusing) {
+        const {
+          anchorKey,
+          anchorOffset,
+          focusKey,
+          focusOffset
+        } = editor.read(() => $getAnchorAndFocusForUserState(binding, awareness));
+        if (anchorKey !== null && focusKey !== null) {
+          selection = cursor.selection;
+          if (selection === null) {
+            selection = createCursorSelection(cursor, anchorKey, anchorOffset, focusKey, focusOffset);
+          } else {
+            const anchor = selection.anchor;
+            const focus = selection.focus;
+            anchor.key = anchorKey;
+            anchor.offset = anchorOffset;
+            focus.key = focusKey;
+            focus.offset = focusOffset;
+          }
         }
       }
-      if (updateLeft) {
-        $updateYFragment(y, leftY, leftL, binding, dirtyElements);
-        left += 1;
-      } else if (updateRight) {
-        $updateYFragment(y, rightY, rightL, binding, dirtyElements);
-        right += 1;
-      } else {
-        binding.mapping.delete(yDomFragment.get(left));
-        yDomFragment.delete(left, 1);
-        yDomFragment.insert(left, [$createTypeFromTextOrElementNode(leftL, binding)]);
-        left += 1;
+      updateCursor(binding, cursor, selection, nodeMap);
+    }
+  }
+  const allClientIDs = Array.from(cursors.keys());
+  for (let i = 0; i < allClientIDs.length; i++) {
+    const clientID = allClientIDs[i];
+    if (!visitedClientIDs.has(clientID)) {
+      const cursor = cursors.get(clientID);
+      if (cursor !== undefined) {
+        destroyCursor(binding, cursor);
+        cursors.delete(clientID);
       }
     }
   }
-  const yDelLen = yChildCnt - left - right;
-  if (yChildCnt === 1 && lChildCnt === 0 && yChildren[0] instanceof yjs.XmlText) {
-    binding.mapping.delete(yChildren[0]);
-    // Edge case handling https://github.com/yjs/y-prosemirror/issues/108
-    // Only delete the content of the Y.Text to retain remote changes on the same Y.Text object
-    yChildren[0].delete(0, yChildren[0].length);
-  } else if (yDelLen > 0) {
-    yDomFragment.slice(left, left + yDelLen).forEach(type => binding.mapping.delete(type));
-    yDomFragment.delete(left, yDelLen);
+}
+function syncLexicalSelectionToYjs(binding, provider, prevSelection, nextSelection) {
+  const awareness = provider.awareness;
+  const localState = awareness.getLocalState();
+  if (localState === null) {
+    return;
   }
-  if (left + right < lChildCnt) {
-    const ins = [];
-    for (let i = left; i < lChildCnt - right; i++) {
-      ins.push($createTypeFromTextOrElementNode(lChildren[i], binding));
+  const {
+    anchorPos: currentAnchorPos,
+    focusPos: currentFocusPos,
+    name,
+    color,
+    focusing,
+    awarenessData
+  } = localState;
+  let anchorPos = null;
+  let focusPos = null;
+  if (nextSelection === null || currentAnchorPos !== null && !nextSelection.is(prevSelection)) {
+    if (prevSelection === null) {
+      return;
     }
-    yDomFragment.insert(left, ins);
   }
-};
-const matchNodeName = (yElement, lnode) => !(lnode instanceof Array) && yElement.nodeName === lnode.getType();
+  if (lexical.$isRangeSelection(nextSelection)) {
+    if (isBindingV1(binding)) {
+      anchorPos = createRelativePosition(nextSelection.anchor, binding);
+      focusPos = createRelativePosition(nextSelection.focus, binding);
+    } else {
+      anchorPos = createRelativePositionV2(nextSelection.anchor, binding);
+      focusPos = createRelativePositionV2(nextSelection.focus, binding);
+    }
+  }
+  if (shouldUpdatePosition(currentAnchorPos, anchorPos) || shouldUpdatePosition(currentFocusPos, focusPos)) {
+    awareness.setLocalState({
+      ...localState,
+      anchorPos,
+      awarenessData,
+      color,
+      focusPos,
+      focusing,
+      name
+    });
+  }
+}
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function $syncStateEvent(binding, event) {
@@ -2548,6 +2608,25 @@ function syncYjsChangesToLexicalV2__EXPERIMENTAL(binding, provider, events, tran
     tag: isFromUndoManger ? lexical.HISTORIC_TAG : lexical.COLLABORATION_TAG
   });
 }
+function syncYjsStateToLexicalV2__EXPERIMENTAL(binding, provider) {
+  binding.mapping.clear();
+  const editor = binding.editor;
+  editor.update(() => {
+    lexical.$getRoot().clear();
+    $createOrUpdateNodeFromYElement(binding.root, binding, null, true);
+    lexical.$addUpdateTag(lexical.COLLABORATION_TAG);
+  }, {
+    // Need any text node normalization to be synchronously updated back to Yjs, otherwise the
+    // binding.mapping will get out of sync.
+    discrete: true,
+    onUpdate: () => {
+      syncCursorPositions(binding, provider);
+      editor.update(() => $ensureEditorNotEmpty());
+    },
+    skipTransforms: true,
+    tag: lexical.COLLABORATION_TAG
+  });
+}
 function syncLexicalUpdateToYjsV2__EXPERIMENTAL(binding, provider, prevEditorState, currEditorState, dirtyElements, normalizedNodes, tags) {
   const isFromYjs = tags.has(lexical.COLLABORATION_TAG) || tags.has(lexical.HISTORIC_TAG);
   if (isFromYjs && normalizedNodes.size === 0) {
@@ -2581,6 +2660,8 @@ function syncLexicalUpdateToYjsV2__EXPERIMENTAL(binding, provider, prevEditorSta
 
 const CONNECTED_COMMAND = lexical.createCommand('CONNECTED_COMMAND');
 const TOGGLE_CONNECT_COMMAND = lexical.createCommand('TOGGLE_CONNECT_COMMAND');
+const DIFF_VERSIONS_COMMAND__EXPERIMENTAL = lexical.createCommand('DIFF_VERSIONS_COMMAND');
+const CLEAR_DIFF_VERSIONS_COMMAND__EXPERIMENTAL = lexical.createCommand('CLEAR_DIFF_VERSIONS_COMMAND');
 function createUndoManager(binding, root) {
   return new yjs.UndoManager(root, {
     trackedOrigins: new Set([binding, null])
@@ -2615,16 +2696,21 @@ function setLocalStateFocus(provider, name, color, focusing, awarenessData) {
   awareness.setLocalState(localState);
 }
 
+exports.$getYChangeState = $getYChangeState;
+exports.CLEAR_DIFF_VERSIONS_COMMAND__EXPERIMENTAL = CLEAR_DIFF_VERSIONS_COMMAND__EXPERIMENTAL;
 exports.CONNECTED_COMMAND = CONNECTED_COMMAND;
+exports.DIFF_VERSIONS_COMMAND__EXPERIMENTAL = DIFF_VERSIONS_COMMAND__EXPERIMENTAL;
 exports.TOGGLE_CONNECT_COMMAND = TOGGLE_CONNECT_COMMAND;
 exports.createBinding = createBinding;
 exports.createBindingV2__EXPERIMENTAL = createBindingV2__EXPERIMENTAL;
 exports.createUndoManager = createUndoManager;
 exports.getAnchorAndFocusCollabNodesForUserState = getAnchorAndFocusCollabNodesForUserState;
 exports.initLocalState = initLocalState;
+exports.renderSnapshot__EXPERIMENTAL = renderSnapshot__EXPERIMENTAL;
 exports.setLocalStateFocus = setLocalStateFocus;
 exports.syncCursorPositions = syncCursorPositions;
 exports.syncLexicalUpdateToYjs = syncLexicalUpdateToYjs;
 exports.syncLexicalUpdateToYjsV2__EXPERIMENTAL = syncLexicalUpdateToYjsV2__EXPERIMENTAL;
 exports.syncYjsChangesToLexical = syncYjsChangesToLexical;
 exports.syncYjsChangesToLexicalV2__EXPERIMENTAL = syncYjsChangesToLexicalV2__EXPERIMENTAL;
+exports.syncYjsStateToLexicalV2__EXPERIMENTAL = syncYjsStateToLexicalV2__EXPERIMENTAL;