v13.0.0-30 -- distribution files

package-lock.json

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

package.json

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

src/Type/y-xml/YXmlElement.js

@@ -5,7 +5,7 @@ import YMap from '../YMap.js'
 import YXmlFragment from './YXmlFragment.js'
 
 export default class YXmlElement extends YXmlFragment {
-  constructor (arg1, arg2, _document) {
+  constructor (arg1, arg2) {
     super()
     this.nodeName = null
     this._scrollElement = null
@@ -13,7 +13,7 @@ export default class YXmlElement extends YXmlFragment {
       this.nodeName = arg1.toUpperCase()
     } else if (arg1 != null && arg1.nodeType != null && arg1.nodeType === arg1.ELEMENT_NODE) {
       this.nodeName = arg1.nodeName
-      this._setDom(arg1, _document)
+      this._setDom(arg1)
     } else {
       this.nodeName = 'UNDEFINED'
     }
@@ -26,12 +26,14 @@ export default class YXmlElement extends YXmlFragment {
     struct.nodeName = this.nodeName
     return struct
   }
-  _setDom (dom, _document) {
+  _setDom (dom) {
     if (this._dom != null) {
       throw new Error('Only call this method if you know what you are doing ;)')
     } else if (dom._yxml != null) { // TODO do i need to check this? - no.. but for dev purps..
       throw new Error('Already bound to an YXml type')
     } else {
+      this._dom = dom
+      dom._yxml = this
       // tag is already set in constructor
       // set attributes
       let attrNames = []
@@ -44,8 +46,8 @@ export default class YXmlElement extends YXmlFragment {
         let attrValue = dom.getAttribute(attrName)
         this.setAttribute(attrName, attrValue)
       }
-      this.insertDomElements(0, Array.prototype.slice.call(dom.childNodes), _document)
+      this.insertDomElements(0, Array.prototype.slice.call(dom.childNodes))
-      this._bindToDom(dom, _document)
+      this._bindToDom(dom)
       return dom
     }
   }
@@ -113,6 +115,7 @@ export default class YXmlElement extends YXmlFragment {
     let dom = this._dom
     if (dom == null) {
       dom = _document.createElement(this.nodeName)
+      this._dom = dom
       dom._yxml = this
       let attrs = this.getAttributes()
       for (let key in attrs) {
@@ -121,7 +124,7 @@ export default class YXmlElement extends YXmlFragment {
       this.forEach(yxml => {
         dom.appendChild(yxml.getDom(_document))
       })
-      this._bindToDom(dom, _document)
+      this._bindToDom(dom)
     }
     return dom
   }

src/Type/y-xml/YXmlFragment.js

@@ -9,7 +9,7 @@ import YXmlEvent from './YXmlEvent.js'
 import { logID } from '../../MessageHandler/messageToString.js'
 import diff from 'fast-diff'
 
-function domToYXml (parent, doms, _document) {
+function domToYXml (parent, doms) {
   const types = []
   doms.forEach(d => {
     if (d._yxml != null && d._yxml !== false) {
@@ -20,7 +20,7 @@ function domToYXml (parent, doms, _document) {
       if (d.nodeType === d.TEXT_NODE) {
         type = new YXmlText(d)
       } else if (d.nodeType === d.ELEMENT_NODE) {
-        type = new YXmlFragment._YXmlElement(d, parent._domFilter, _document)
+        type = new YXmlFragment._YXmlElement(d, parent._domFilter)
       } else {
         throw new Error('Unsupported node!')
       }
@@ -98,9 +98,7 @@ export default class YXmlFragment extends YArray {
         } catch (e) {
           console.error(e)
         }
-        if (this._domObserver !== null) {
+        this._domObserver.takeRecords()
-          this._domObserver.takeRecords()
-        }
         token = true
       }
     }
@@ -164,116 +162,113 @@ export default class YXmlFragment extends YArray {
       this._dom = null
     }
   }
-  insertDomElementsAfter (prev, doms, _document) {
+  insertDomElementsAfter (prev, doms) {
-    const types = domToYXml(this, doms, _document)
+    const types = domToYXml(this, doms)
     this.insertAfter(prev, types)
     return types
   }
-  insertDomElements (pos, doms, _document) {
+  insertDomElements (pos, doms) {
-    const types = domToYXml(this, doms, _document)
+    const types = domToYXml(this, doms)
     this.insert(pos, types)
     return types
   }
   getDom () {
     return this._dom
   }
-  bindToDom (dom, _document) {
+  bindToDom (dom) {
     if (this._dom != null) {
       this._unbindFromDom()
     }
     if (dom._yxml != null) {
       dom._yxml._unbindFromDom()
     }
+    if (MutationObserver == null) {
+      throw new Error('Not able to bind to a DOM element, because MutationObserver is not available!')
+    }
     dom.innerHTML = ''
+    this._dom = dom
+    dom._yxml = this
     this.forEach(t => {
-      dom.insertBefore(t.getDom(_document), null)
+      dom.insertBefore(t.getDom(), null)
     })
-    this._bindToDom(dom, _document)
+    this._bindToDom(dom)
   }
   // binds to a dom element
   // Only call if dom and YXml are isomorph
-  _bindToDom (dom, _document) {
+  _bindToDom (dom) {
-    _document = _document || document
+    if (this._parent === null || this._parent._dom != null || typeof MutationObserver === 'undefined') {
-    this._dom = dom
+      // only bind if parent did not already bind
-    dom._yxml = this
-    // TODO: refine this..
-    if ((this.constructor !== YXmlFragment && this._parent !== this._y) || this._parent === null) {
-      // TODO: only top level YXmlFragment can bind. Also allow YXmlElements..
       return
     }
+    this._y.on('beforeTransaction', () => {
+      this._domObserverListener(this._domObserver.takeRecords())
+    })
     this._y.on('beforeTransaction', beforeTransactionSelectionFixer)
     this._y.on('afterTransaction', afterTransactionSelectionFixer)
     // Apply Y.Xml events to dom
-    this.observeDeep(events => {
+    this.observeDeep(reflectChangesOnDom.bind(this))
-      reflectChangesOnDom.call(this, events, _document)
-    })
     // Apply Dom changes on Y.Xml
-    if (typeof MutationObserver !== 'undefined') {
+    this._domObserverListener = mutations => {
-      this._y.on('beforeTransaction', () => {
+      this._mutualExclude(() => {
-        this._domObserverListener(this._domObserver.takeRecords())
+        this._y.transact(() => {
-      })
+          let diffChildren = new Set()
-      this._domObserverListener = mutations => {
+          mutations.forEach(mutation => {
-        this._mutualExclude(() => {
+            const dom = mutation.target
-          this._y.transact(() => {
+            const yxml = dom._yxml
-            let diffChildren = new Set()
+            if (yxml == null) {
-            mutations.forEach(mutation => {
+              // dom element is filtered
-              const dom = mutation.target
+              return
-              const yxml = dom._yxml
+            }
-              if (yxml == null) {
+            switch (mutation.type) {
-                // dom element is filtered
+              case 'characterData':
-                return
+                var diffs = diff(yxml.toString(), dom.nodeValue)
-              }
+                var pos = 0
-              switch (mutation.type) {
+                for (var i = 0; i < diffs.length; i++) {
-                case 'characterData':
+                  var d = diffs[i]
-                  var diffs = diff(yxml.toString(), dom.nodeValue)
+                  if (d[0] === 0) { // EQUAL
-                  var pos = 0
+                    pos += d[1].length
-                  for (var i = 0; i < diffs.length; i++) {
+                  } else if (d[0] === -1) { // DELETE
-                    var d = diffs[i]
+                    yxml.delete(pos, d[1].length)
-                    if (d[0] === 0) { // EQUAL
+                  } else { // INSERT
-                      pos += d[1].length
+                    yxml.insert(pos, d[1])
-                    } else if (d[0] === -1) { // DELETE
+                    pos += d[1].length
-                      yxml.delete(pos, d[1].length)
+                  }
-                    } else { // INSERT
+                }
-                      yxml.insert(pos, d[1])
+                break
-                      pos += d[1].length
+              case 'attributes':
+                let name = mutation.attributeName
+                // check if filter accepts attribute
+                if (this._domFilter(dom, [name]).length > 0 && this.constructor !== YXmlFragment) {
+                  var val = dom.getAttribute(name)
+                  if (yxml.getAttribute(name) !== val) {
+                    if (val == null) {
+                      yxml.removeAttribute(name)
+                    } else {
+                      yxml.setAttribute(name, val)
                     }
                   }
-                  break
+                }
-                case 'attributes':
+                break
-                  let name = mutation.attributeName
+              case 'childList':
-                  // check if filter accepts attribute
+                diffChildren.add(mutation.target)
-                  if (this._domFilter(dom, [name]).length > 0 && this.constructor !== YXmlFragment) {
+                break
-                    var val = dom.getAttribute(name)
-                    if (yxml.getAttribute(name) !== val) {
-                      if (val == null) {
-                        yxml.removeAttribute(name)
-                      } else {
-                        yxml.setAttribute(name, val)
-                      }
-                    }
-                  }
-                  break
-                case 'childList':
-                  diffChildren.add(mutation.target)
-                  break
-              }
-            })
-            for (let dom of diffChildren) {
-              if (dom._yxml != null && dom._yxml !== false) {
-                applyChangesFromDom(dom)
-              }
             }
           })
+          for (let dom of diffChildren) {
+            if (dom._yxml != null && dom._yxml !== false) {
+              applyChangesFromDom(dom)
+            }
+          }
         })
-      }
-      this._domObserver = new MutationObserver(this._domObserverListener)
-      this._domObserver.observe(dom, {
-        childList: true,
-        attributes: true,
-        characterData: true,
-        subtree: true
       })
     }
+    this._domObserver = new MutationObserver(this._domObserverListener)
+    this._domObserver.observe(dom, {
+      childList: true,
+      attributes: true,
+      characterData: true,
+      subtree: true
+    })
     return dom
   }
   _logString () {

src/Type/y-xml/utils.js

@@ -135,7 +135,7 @@ export function applyChangesFromDom (dom) {
   }
 }
 
-export function reflectChangesOnDom (events, _document) {
+export function reflectChangesOnDom (events) {
   // Make sure that no filtered attributes are applied to the structure
   // if they were, delete them
   /*
@@ -183,9 +183,9 @@ export function reflectChangesOnDom (events, _document) {
           })
           if (event.childListChanged) {
             // create fragment of undeleted nodes
-            const fragment = _document.createDocumentFragment()
+            const fragment = document.createDocumentFragment()
             yxml.forEach(function (t) {
-              fragment.appendChild(t.getDom(_document))
+              fragment.append(t.getDom())
             })
             // remove remainding nodes
             let lastChild = dom.lastChild
@@ -194,7 +194,7 @@ export function reflectChangesOnDom (events, _document) {
               lastChild = dom.lastChild
             }
             // insert fragment of undeleted nodes
-            dom.appendChild(fragment)
+            dom.append(fragment)
           }
         }
         /* TODO: smartscrolling

tests-lib/helper.js

@@ -153,7 +153,7 @@ export async function initArrays (t, opts) {
     result['array' + i] = y.define('array', Y.Array)
     result['map' + i] = y.define('map', Y.Map)
     result['xml' + i] = y.define('xml', Y.XmlElement)
-    y.get('xml').setDomFilter(function (d, attrs) {
+    y.get('xml', Y.Xml).setDomFilter(function (d, attrs) {
       if (d.nodeName === 'HIDDEN') {
         return null
       } else {