v13.0.0-40 -- distribution files

package-lock.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yjs",
-  "version": "13.0.0-39",
+  "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/y-xml/YXmlFragment.js

@@ -254,9 +254,7 @@ export default class YXmlFragment extends YArray {
     })
     // Apply Y.Xml events to dom
     this.observeDeep(events => {
-      this._mutualExclude(() => {
-        reflectChangesOnDom.call(this, events, _document)
-      })
+      reflectChangesOnDom.call(this, events, _document)
     })
     // Apply Dom changes on Y.Xml
     if (typeof MutationObserver !== 'undefined') {

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,

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-39
+ * @version v13.0.0-40
  * @license MIT
  */
 
@@ -2745,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
@@ -2939,7 +2947,6 @@ function afterTransactionSelectionFixer (y, transaction, remote) {
     }
   }
   if (shouldUpdate) {
-    console.info('updating selection!!');
     browserSelection.setBaseAndExtent(
       anchorNode,
       anchorOffset,
@@ -3951,9 +3958,7 @@ class YXmlFragment extends YArray {
     });
     // Apply Y.Xml events to dom
     this.observeDeep(events => {
-      this._mutualExclude(() => {
-        reflectChangesOnDom.call(this, events, _document);
-      });
+      reflectChangesOnDom.call(this, events, _document);
     });
     // Apply Dom changes on Y.Xml
     if (typeof MutationObserver !== 'undefined') {