v13.0.0-39 -- distribution files

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "yjs",
-  "version": "13.0.0-32",
+  "version": "13.0.0-39",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yjs",
-  "version": "13.0.0-36",
+  "version": "13.0.0-39",
   "description": "A framework for real-time p2p shared editing on any data",
   "main": "./y.node.js",
   "browser": "./y.js",

src/Type/YText.js

@@ -29,14 +29,17 @@ export default class YText extends YArray {
       let right = this._start
       let count = 0
       while (right !== null) {
-        if (count <= pos && pos < count + right._length) {
+        const rightLen = right._deleted ? 0 : (right._length - 1)
+        if (count <= pos && pos <= count + rightLen) {
           const splitDiff = pos - count
-          right = right._splitAt(this._y, pos - count)
+          right = right._splitAt(this._y, splitDiff)
           left = right._left
           count += splitDiff
           break
         }
-        count += right._length
+        if (!right._deleted) {
+          count += right._length
+        }
         left = right
         right = right._right
       }

src/Type/y-xml/YXmlFragment.js

@@ -17,7 +17,7 @@ function domToYXml (parent, doms, _document) {
     }
     if (parent._domFilter(d.nodeName, new Map()) !== null) {
       let type
-      const hookName = d._yjsHook
+      const hookName = d._yjsHook || (d.dataset != null ? d.dataset.yjsHook : undefined)
       if (hookName !== undefined) {
         type = new YXmlHook(hookName, d)
       } else if (d.nodeType === d.TEXT_NODE) {
@@ -254,7 +254,9 @@ export default class YXmlFragment extends YArray {
     })
     // Apply Y.Xml events to dom
     this.observeDeep(events => {
-      reflectChangesOnDom.call(this, events, _document)
+      this._mutualExclude(() => {
+        reflectChangesOnDom.call(this, events, _document)
+      })
     })
     // Apply Dom changes on Y.Xml
     if (typeof MutationObserver !== 'undefined') {

src/Type/y-xml/selection.js

@@ -76,7 +76,4 @@ export function afterTransactionSelectionFixer (y, transaction, remote) {
       focusOffset
     )
   }
-  // delete, so the objects can be gc'd
-  relativeSelection = null
-  browserSelection = null
 }

y.node.js

@@ -1,7 +1,7 @@
 
 /**
  * yjs - A framework for real-time p2p shared editing on any data
- * @version v13.0.0-36
+ * @version v13.0.0-39
  * @license MIT
  */
 
@@ -2556,14 +2556,17 @@ class YText extends YArray {
       let right = this._start;
       let count = 0;
       while (right !== null) {
-        if (count <= pos && pos < count + right._length) {
+        const rightLen = right._deleted ? 0 : (right._length - 1);
+        if (count <= pos && pos <= count + rightLen) {
           const splitDiff = pos - count;
-          right = right._splitAt(this._y, pos - count);
+          right = right._splitAt(this._y, splitDiff);
           left = right._left;
           count += splitDiff;
           break
         }
-        count += right._length;
+        if (!right._deleted) {
+          count += right._length;
+        }
         left = right;
         right = right._right;
       }
@@ -2944,9 +2947,6 @@ function afterTransactionSelectionFixer (y, transaction, remote) {
       focusOffset
     );
   }
-  // delete, so the objects can be gc'd
-  relativeSelection = null;
-  browserSelection = null;
 }
 
 class YXmlEvent extends YEvent {
@@ -3714,7 +3714,7 @@ function domToYXml (parent, doms, _document) {
     }
     if (parent._domFilter(d.nodeName, new Map()) !== null) {
       let type;
-      const hookName = d._yjsHook;
+      const hookName = d._yjsHook || (d.dataset != null ? d.dataset.yjsHook : undefined);
       if (hookName !== undefined) {
         type = new YXmlHook(hookName, d);
       } else if (d.nodeType === d.TEXT_NODE) {
@@ -3951,7 +3951,9 @@ class YXmlFragment extends YArray {
     });
     // Apply Y.Xml events to dom
     this.observeDeep(events => {
-      reflectChangesOnDom.call(this, events, _document);
+      this._mutualExclude(() => {
+        reflectChangesOnDom.call(this, events, _document);
+      });
     });
     // Apply Dom changes on Y.Xml
     if (typeof MutationObserver !== 'undefined') {