v13.0.0-43 -- distribution files

package-lock.json

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

package.json

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

rollup.test.js

@@ -3,7 +3,7 @@ import commonjs from 'rollup-plugin-commonjs'
 import multiEntry from 'rollup-plugin-multi-entry'
 
 export default {
-  input: 'test/*.tests.js',
+  input: 'test/y-xml.tests.js',
   name: 'y-tests',
   sourcemap: true,
   output: {
@@ -11,12 +11,12 @@ export default {
     format: 'umd'
   },
   plugins: [
+    multiEntry(),
     nodeResolve({
       main: true,
       module: true,
       browser: true
     }),
-    commonjs(),
-    multiEntry()
+    commonjs()
   ]
 }

src/Type/YArray.js

@@ -207,8 +207,12 @@ export default class YArray extends Type {
           prevJsonIns._content.push(c)
         }
       }
-      if (prevJsonIns !== null && y !== null) {
-        prevJsonIns._integrate(y)
+      if (prevJsonIns !== null) {
+        if (y !== null) {
+          prevJsonIns._integrate(y)
+        } else if (prevJsonIns._left === null) {
+          this._start = prevJsonIns
+        }
       }
     })
   }

src/Type/y-xml/YXmlFragment.js

@@ -143,6 +143,23 @@ export default class YXmlFragment extends YArray {
   }
   setDomFilter (f) {
     this._domFilter = f
+    let attributes = new Map()
+    if (this.getAttributes !== undefined) {
+      let attrs = this.getAttributes()
+      for (let key in attrs) {
+        attributes.set(key, attrs[key])
+      }
+    }
+    let result = this._domFilter(this.nodeName, new Map(attributes))
+    if (result === null) {
+      this._delete(this._y)
+    } else {
+      attributes.forEach((value, key) => {
+        if (!result.has(key)) {
+          this.removeAttribute(key)
+        }
+      })
+    }
     this.forEach(xml => {
       xml.setDomFilter(f)
     })

src/Type/y-xml/YXmlHook.js

@@ -24,6 +24,11 @@ export default class YXmlHook extends YMap {
     }
     return this._dom
   }
+  _unbindFromDom () {
+    this._dom._yxml = null
+    this._yxml = null
+    // TODO: cleanup hook?
+  }
   _fromBinary (y, decoder) {
     const missing = super._fromBinary(y, decoder)
     this.hookName = decoder.readVarString()

src/Type/y-xml/utils.js

@@ -174,7 +174,7 @@ export function reflectChangesOnDom (events, _document) {
         // let anchorViewPosition = getAnchorViewPosition(yxml._scrollElement)
         if (yxml.constructor === YXmlText) {
           yxml._dom.nodeValue = yxml.toString()
-        } else {
+        } else if (event.attributesChanged !== undefined) {
           // update attributes
           event.attributesChanged.forEach(attributeName => {
             const value = yxml.getAttribute(attributeName)

y.node.js

@@ -1,7 +1,7 @@
 
 /**
  * yjs - A framework for real-time p2p shared editing on any data
- * @version v13.0.0-41
+ * @version v13.0.0-43
  * @license MIT
  */
 
@@ -2406,8 +2406,12 @@ class YArray extends Type {
           prevJsonIns._content.push(c);
         }
       }
-      if (prevJsonIns !== null && y !== null) {
-        prevJsonIns._integrate(y);
+      if (prevJsonIns !== null) {
+        if (y !== null) {
+          prevJsonIns._integrate(y);
+        } else if (prevJsonIns._left === null) {
+          this._start = prevJsonIns;
+        }
       }
     });
   }
@@ -2760,7 +2764,7 @@ function reflectChangesOnDom (events, _document) {
         // let anchorViewPosition = getAnchorViewPosition(yxml._scrollElement)
         if (yxml.constructor === YXmlText) {
           yxml._dom.nodeValue = yxml.toString();
-        } else {
+        } else if (event.attributesChanged !== undefined) {
           // update attributes
           event.attributesChanged.forEach(attributeName => {
             const value = yxml.getAttribute(attributeName);
@@ -3881,6 +3885,23 @@ class YXmlFragment extends YArray {
   }
   setDomFilter (f) {
     this._domFilter = f;
+    let attributes = new Map();
+    if (this.getAttributes !== undefined) {
+      let attrs = this.getAttributes();
+      for (let key in attrs) {
+        attributes.set(key, attrs[key]);
+      }
+    }
+    let result = this._domFilter(this.nodeName, new Map(attributes));
+    if (result === null) {
+      this._delete(this._y);
+    } else {
+      attributes.forEach((value, key) => {
+        if (!result.has(key)) {
+          this.removeAttribute(key);
+        }
+      });
+    }
     this.forEach(xml => {
       xml.setDomFilter(f);
     });
@@ -4237,6 +4258,11 @@ class YXmlHook extends YMap {
     }
     return this._dom
   }
+  _unbindFromDom () {
+    this._dom._yxml = null;
+    this._yxml = null;
+    // TODO: cleanup hook?
+  }
   _fromBinary (y, decoder) {
     const missing = super._fromBinary(y, decoder);
     this.hookName = decoder.readVarString();