v13.0.0-40 -- distribution files

package-lock.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yjs",
-  "version": "13.0.0-36",
+  "version": "13.0.0-40",
   "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) {

src/Type/y-xml/selection.js

@@ -68,7 +68,6 @@ export function afterTransactionSelectionFixer (y, transaction, remote) {
     }
   }
   if (shouldUpdate) {
-    console.info('updating selection!!')
     browserSelection.setBaseAndExtent(
       anchorNode,
       anchorOffset,
@@ -76,7 +75,4 @@ export function afterTransactionSelectionFixer (y, transaction, remote) {
       focusOffset
     )
   }
-  // delete, so the objects can be gc'd
-  relativeSelection = null
-  browserSelection = null
 }

src/Type/y-xml/utils.js

@@ -193,19 +193,27 @@ export function reflectChangesOnDom (events, _document) {
            *       only in the attributes (above)
            */
           if (event.childListChanged && yxml.constructor !== YXmlHook) {
-            // create fragment of undeleted nodes
-            const fragment = _document.createDocumentFragment()
+            let currentChild = dom.firstChild
             yxml.forEach(function (t) {
-              fragment.appendChild(t.getDom(_document))
+              let expectedChild = t.getDom(_document)
+              if (expectedChild.parentNode === dom) {
+                // is already attached to the dom. Look for it
+                while (currentChild !== expectedChild) {
+                  let del = currentChild
+                  currentChild = currentChild.nextSibling
+                  dom.removeChild(del)
+                }
+                currentChild = currentChild.nextSibling
+              } else {
+                // this dom is not yet attached to dom
+                dom.insertBefore(expectedChild, currentChild)
+              }
             })
-            // remove remainding nodes
-            let lastChild = dom.lastChild
-            while (lastChild !== null) {
-              dom.removeChild(lastChild)
-              lastChild = dom.lastChild
+            while (currentChild !== null) {
+              let tmp = currentChild.nextSibling
+              dom.removeChild(currentChild)
+              currentChild = tmp
             }
-            // insert fragment of undeleted nodes
-            dom.appendChild(fragment)
           }
         }
         /* TODO: smartscrolling

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-40
  * @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;
       }
@@ -2742,19 +2745,27 @@ function reflectChangesOnDom (events, _document) {
            *       only in the attributes (above)
            */
           if (event.childListChanged && yxml.constructor !== YXmlHook) {
-            // create fragment of undeleted nodes
-            const fragment = _document.createDocumentFragment();
+            let currentChild = dom.firstChild;
             yxml.forEach(function (t) {
-              fragment.appendChild(t.getDom(_document));
+              let expectedChild = t.getDom(_document);
+              if (expectedChild.parentNode === dom) {
+                // is already attached to the dom. Look for it
+                while (currentChild !== expectedChild) {
+                  let del = currentChild;
+                  currentChild = currentChild.nextSibling;
+                  dom.removeChild(del);
+                }
+                currentChild = currentChild.nextSibling;
+              } else {
+                // this dom is not yet attached to dom
+                dom.insertBefore(expectedChild, currentChild);
+              }
             });
-            // remove remainding nodes
-            let lastChild = dom.lastChild;
-            while (lastChild !== null) {
-              dom.removeChild(lastChild);
-              lastChild = dom.lastChild;
+            while (currentChild !== null) {
+              let tmp = currentChild.nextSibling;
+              dom.removeChild(currentChild);
+              currentChild = tmp;
             }
-            // insert fragment of undeleted nodes
-            dom.appendChild(fragment);
           }
         }
         /* TODO: smartscrolling
@@ -2936,7 +2947,6 @@ function afterTransactionSelectionFixer (y, transaction, remote) {
     }
   }
   if (shouldUpdate) {
-    console.info('updating selection!!');
     browserSelection.setBaseAndExtent(
       anchorNode,
       anchorOffset,
@@ -2944,9 +2954,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 +3721,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) {