v13.0.0-46 -- distribution files

2018-01-10 00:20:34 +01:00
43 changed files with 6134 additions and 6240 deletions
--- a/examples/ace/index.html
+++ b/examples/ace/index.html
@@ -24,8 +24,7 @@
  <body>

    <div id="aceContainer"></div>
-    <script src="../../y.js"></script>
-    <script src='../../../y-websockets-client/y-websockets-client.js'></script>
+    <script src="../bower_components/yjs/y.js"></script>
    <script src="../bower_components/ace-builds/src/ace.js"></script>

    <script src="./index.js"></script>
--- a/examples/ace/index.js
+++ b/examples/ace/index.js
@@ -1,17 +1,24 @@
 /* global Y, ace */

-let y = new Y('ace-example', {
+Y({
+  db: {
+    name: 'memory'
+  },
  connector: {
    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
+    room: 'ace-example'
+  },
+  sourceDir: '/bower_components',
+  share: {
+    ace: 'Text' // y.share.textarea is of type Y.Text
  }
+}).then(function (y) {
+  window.yAce = y
+
+  // bind the textarea to a shared text element
+  var editor = ace.edit('aceContainer')
+  editor.setTheme('ace/theme/chrome')
+  editor.getSession().setMode('ace/mode/javascript')
+
+  y.share.ace.bindAce(editor)
 })
-
-window.yAce = y
-
-// bind the textarea to a shared text element
-var editor = ace.edit('aceContainer')
-editor.setTheme('ace/theme/chrome')
-editor.getSession().setMode('ace/mode/javascript')
-
-y.define('ace', Y.Text).bindAce(editor)
--- a/examples/chat/index.html
+++ b/examples/chat/index.html
@@ -13,7 +13,7 @@
      <input type="submit" value="Send">
    </form>
    <script src="../../y.js"></script>
-    <script src='../../../y-websockets-client/y-websockets-client.js'></script>
+    <script src="../../../y-websockets-client/dist/y-websockets-client.js"></script>
    <script src="./index.js"></script>
  </body>
 </html>
--- a/examples/chat/index.js
+++ b/examples/chat/index.js
@@ -1,9 +1,10 @@
 /* global Y */

-let y = new Y('chat-example', {
+// initialize a shared object. This function call returns a promise!
+var y = new Y({
  connector: {
    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
+    room: 'chat-example'
  }
 })

@@ -22,7 +23,6 @@ function appendMessage (message, position) {
  p.appendChild(document.createTextNode(message.message))
  chatcontainer.insertBefore(p, chatcontainer.children[position] || null)
 }
-
 // This function makes sure that only 7 messages exist in the chat history.
 // The rest is deleted
 function cleanupChat () {
@@ -30,17 +30,23 @@ function cleanupChat () {
    chatprotocol.delete(0, chatprotocol.length - 7)
  }
 }
-cleanupChat()
-
 // Insert the initial content
 chatprotocol.toArray().forEach(appendMessage)
+cleanupChat()

 // whenever content changes, make sure to reflect the changes in the DOM
 chatprotocol.observe(function (event) {
+  if (event.type === 'insert') {
+    for (let i = 0; i < event.length; i++) {
+      appendMessage(event.values[i], event.index + i)
+    }
+  } else if (event.type === 'delete') {
+    for (let i = 0; i < event.length; i++) {
+      chatcontainer.children[event.index].remove()
+    }
+  }
  // concurrent insertions may result in a history > 7, so cleanup here
  cleanupChat()
-  chatcontainer.innerHTML = ''
-  chatprotocol.toArray().forEach(appendMessage)
 })
 document.querySelector('#chatform').onsubmit = function (event) {
  // the form is submitted
--- a/examples/codemirror/index.html
+++ b/examples/codemirror/index.html
@@ -5,8 +5,7 @@
  <body>
    <div id="codeMirrorContainer"></div>

-    <script src="../../y.js"></script>
-    <script src='../../../y-websockets-client/y-websockets-client.js'></script>
+    <script src="../bower_components/yjs/y.js"></script>
    <script src="../bower_components/codemirror/lib/codemirror.js"></script>
    <script src="../bower_components/codemirror/mode/javascript/javascript.js"></script>
    <link rel="stylesheet" href="../bower_components/codemirror/lib/codemirror.css">
--- a/examples/codemirror/index.js
+++ b/examples/codemirror/index.js
@@ -1,16 +1,24 @@
 /* global Y, CodeMirror */

-let y = new Y('codemirror-example', {
+// initialize a shared object. This function call returns a promise!
+Y({
+  db: {
+    name: 'memory'
+  },
  connector: {
    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
+    room: 'codemirror-example'
+  },
+  sourceDir: '/bower_components',
+  share: {
+    codemirror: 'Text' // y.share.codemirror is of type Y.Text
  }
-})
+}).then(function (y) {
+  window.yCodeMirror = y

-window.yCodeMirror = y
-
-var editor = CodeMirror(document.querySelector('#codeMirrorContainer'), {
-  mode: 'javascript',
-  lineNumbers: true
+  var editor = CodeMirror(document.querySelector('#codeMirrorContainer'), {
+    mode: 'javascript',
+    lineNumbers: true
+  })
+  y.share.codemirror.bindCodeMirror(editor)
 })
-y.define('codemirror', Y.Text).bindCodeMirror(editor)
--- a/examples/drawing/index.html
+++ b/examples/drawing/index.html
@@ -12,8 +12,7 @@
  </style>
  <button type="button" id="clearDrawingCanvas">Clear Drawing</button>
  <svg id="drawingCanvas" viewbox="0 0 100 100" width="100%"></svg>
-  <script src="../../y.js"></script>
-  <script src='../../../y-websockets-client/y-websockets-client.js'></script>
+  <script src="../yjs-dist.js"></script>
  <script src="../bower_components/d3/d3.min.js"></script>
  <script src="./index.js"></script>
 </body>
--- a/examples/drawing/index.js
+++ b/examples/drawing/index.js
@@ -1,9 +1,11 @@
 /* globals Y, d3 */

-let y = new Y('drawing-example', {
+let y = new Y({
  connector: {
    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
+    url: 'http://127.0.0.1:1234',
+    room: 'drawing-example'
+    // maxBufferLength: 100
  }
 })

--- a/examples/html-editor-drawing-hook/index.html
+++ b/examples/html-editor-drawing-hook/index.html
@@ -1,8 +1,7 @@
 <!DOCTYPE html>
 <html>
 </head>
-  <script src="../../y.js"></script>
-  <script src='../../../y-websockets-client/y-websockets-client.js'></script>
+  <script src="../yjs-dist.js"></script>
  <script src="../bower_components/d3/d3.min.js"></script>
  <script src="./index.js"></script>
  <style>
--- a/examples/html-editor-drawing-hook/index.js
+++ b/examples/html-editor-drawing-hook/index.js
@@ -107,13 +107,15 @@ Y.XmlHook.addHook('magic-drawing', {
  }
 })

-let y = new Y('html-editor-drawing-hook-example', {
+// initialize a shared object. This function call returns a promise!
+let y = new Y({
  connector: {
    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
+    url: 'http://127.0.0.1:1234',
+    room: 'html-editor-example6'
+    // maxBufferLength: 100
  }
 })
-
 window.yXml = y
 window.yXmlType = y.define('xml', Y.XmlFragment)
 window.undoManager = new Y.utils.UndoManager(window.yXmlType, {
--- a/examples/html-editor/index.html
+++ b/examples/html-editor/index.html
@@ -1,8 +1,7 @@
 <!DOCTYPE html>
 <html>
 </head>
-  <script src="../../y.js"></script>
-  <script src='../../../y-websockets-client/y-websockets-client.js'></script>
+  <script src="../yjs-dist.js"></script>
  <script src="./index.js"></script>
 </head>
 <body contenteditable="true">
--- a/examples/html-editor/index.js
+++ b/examples/html-editor/index.js
@@ -4,14 +4,18 @@ window.onload = function () {
  window.yXmlType.bindToDom(document.body)
 }

-let y = new Y('htmleditor', {
+let persistence = null //  new Y.IndexedDBPersistence()
+
+// initialize a shared object. This function call returns a promise!
+let y = new Y({
  connector: {
    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
+    url: 'http://127.0.0.1:1234',
+    room: 'x'
+    // maxBufferLength: 100
  }
-})
-
-window.y = y
+}, persistence)
+window.yXml = y
 window.yXmlType = y.define('xml', Y.XmlFragment)
 window.undoManager = new Y.utils.UndoManager(window.yXmlType, {
  captureTimeout: 500
--- a/examples/indexeddb/index.html
+++ b/examples/indexeddb/index.html
@@ -16,9 +16,6 @@
        width: 100%;
      }
    </style>
-    <script src="../../y.js"></script>
-    <script src='../../../y-websockets-client/y-websockets-client.js'></script>
-    <script src='../../../y-indexeddb/y-indexeddb.js'></script>
-    <script src="./index.js"></script>
+    <script type="module" src="./index.js"></script>
  </body>
 </html>
--- a/examples/indexeddb/index.js
+++ b/examples/indexeddb/index.js
@@ -1,19 +1,24 @@
 /* global Y, CodeMirror */

-const persistence = new Y.IndexedDB()
-const connector = {
+// initialize a shared object. This function call returns a promise!
+Y({
+  db: {
+    name: 'memory'
+  },
  connector: {
    name: 'websockets-client',
    room: 'codemirror-example'
+  },
+  sourceDir: '/bower_components',
+  share: {
+    codemirror: 'Text' // y.share.codemirror is of type Y.Text
  }
-}
+}).then(function (y) {
+  window.yCodeMirror = y

-const y = new Y('codemirror-example', connector, persistence)
-window.yCodeMirror = y
-
-var editor = CodeMirror(document.querySelector('#codeMirrorContainer'), {
-  mode: 'javascript',
-  lineNumbers: true
+  var editor = CodeMirror(document.querySelector('#codeMirrorContainer'), {
+    mode: 'javascript',
+    lineNumbers: true
+  })
+  y.share.codemirror.bindCodeMirror(editor)
 })
-
-y.define('codemirror', Y.Text).bindCodeMirror(editor)
--- a/examples/infiniteyjs/index.html
+++ b/examples/infiniteyjs/index.html
@@ -10,7 +10,7 @@
    .one {
      grid-column: 1 ;
    }
-    .two {
+    .two { 
      grid-column: 2;
    }
    .three {
@@ -49,7 +49,10 @@
    </div>
  </div>
  <script src="../../y.js"></script>
-  <script src='../../../y-websockets-client/y-websockets-client.js'></script>
+  <script src="../../../y-array/y-array.js"></script>
+  <script src="../../../y-text/dist/y-text.js"></script>
+  <script src="../../../y-memory/y-memory.js"></script>
+  <script src="../../../y-websockets-client/y-websockets-client.js"></script>
  <script src="./index.js"></script>
 </body>
 </html>
--- a/examples/infiniteyjs/index.js
+++ b/examples/infiniteyjs/index.js
@@ -1,38 +1,64 @@
 /* global Y */

-function bindYjsInstance (y, suffix) {
-  y.define('textarea', Y.Text).bind(document.getElementById('textarea' + suffix))
+Y({
+  db: {
+    name: 'memory'
+  },
+  connector: {
+    name: 'websockets-client',
+    room: 'Textarea-example',
+    url: 'https://yjs-v13.herokuapp.com/'
+  },
+  share: {
+    textarea: 'Text'
+  }
+}).then(function (y) {
+  window.y1 = y
+  y.share.textarea.bind(document.getElementById('textarea1'))
+})
+
+Y({
+  db: {
+    name: 'memory'
+  },
+  connector: {
+    name: 'websockets-client',
+    room: 'Textarea-example',
+    url: 'https://yjs-v13-second.herokuapp.com/'
+  },
+  share: {
+    textarea: 'Text'
+  }
+}).then(function (y) {
+  window.y2 = y
+  y.share.textarea.bind(document.getElementById('textarea2'))
  y.connector.socket.on('connection', function () {
-    document.getElementById('container' + suffix).removeAttribute('disconnected')
+    document.getElementById('container2').removeAttribute('disconnected')
  })
  y.connector.socket.on('disconnect', function () {
-    document.getElementById('container' + suffix).setAttribute('disconnected', true)
+    document.getElementById('container2').setAttribute('disconnected', true)
  })
-}
+})

-let y1 = new Y('infinite-example', {
+Y({
+  db: {
+    name: 'memory'
+  },
  connector: {
    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
+    room: 'Textarea-example',
+    url: 'https://yjs-v13-third.herokuapp.com/'
+  },
+  share: {
+    textarea: 'Text'
  }
+}).then(function (y) {
+  window.y3 = y
+  y.share.textarea.bind(document.getElementById('textarea3'))
+  y.connector.socket.on('connection', function () {
+    document.getElementById('container3').removeAttribute('disconnected')
+  })
+  y.connector.socket.on('disconnect', function () {
+    document.getElementById('container3').setAttribute('disconnected', true)
+  })
 })
-window.y1 = y1
-bindYjsInstance(y1, '1')
-
-let y2 = new Y('infinite-example', {
-  connector: {
-    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
-  }
-})
-window.y2 = y2
-bindYjsInstance(y2, '2')
-
-let y3 = new Y('infinite-example', {
-  connector: {
-    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
-  }
-})
-window.y3 = y3
-bindYjsInstance(y1, '3')
--- a/examples/jigsaw/index.html
+++ b/examples/jigsaw/index.html
@@ -17,7 +17,9 @@
 		</g>
  </svg>
  <script src="../../y.js"></script>
-  <script src='../../../y-websockets-client/y-websockets-client.js'></script>
+  <script src="../../../y-map/dist/y-map.js"></script>
+  <script src="../../../y-memory/y-memory.js"></script>
+  <script src="../../../y-websockets-client/y-websockets-client.js"></script>
  <script src="../bower_components/d3/d3.js"></script>
  <script src="./index.js"></script>
 </body>
--- a/examples/jigsaw/index.js
+++ b/examples/jigsaw/index.js
@@ -1,67 +1,74 @@
+/* @flow */
 /* global Y, d3 */

-let y = new Y('jigsaw-example', {
+// initialize a shared object. This function call returns a promise!
+Y({
+  db: {
+    name: 'memory'
+  },
  connector: {
    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
+    room: 'Puzzle-example',
+    url: 'http://localhost:1234'
+  },
+  share: {
+    piece1: 'Map',
+    piece2: 'Map',
+    piece3: 'Map',
+    piece4: 'Map'
  }
-})
+}).then(function (y) {
+  window.yJigsaw = y
+  var origin // mouse start position - translation of piece
+  var drag = d3.behavior.drag()
+    .on('dragstart', function (params) {
+      // get the translation of the element
+      var translation = d3
+        .select(this)
+        .attr('transform')
+        .slice(10, -1)
+        .split(',')
+        .map(Number)
+      // mouse coordinates
+      var mouse = d3.mouse(this.parentNode)
+      origin = {
+        x: mouse[0] - translation[0],
+        y: mouse[1] - translation[1]
+      }
+    })
+    .on('drag', function () {
+      var mouse = d3.mouse(this.parentNode)
+      var x = mouse[0] - origin.x // =^= mouse - mouse at dragstart + translation at dragstart
+      var y = mouse[1] - origin.y
+      d3.select(this).attr('transform', 'translate(' + x + ',' + y + ')')
+    })
+    .on('dragend', function (piece, i) {
+      // save the current translation of the puzzle piece
+      var mouse = d3.mouse(this.parentNode)
+      var x = mouse[0] - origin.x
+      var y = mouse[1] - origin.y
+      piece.set('translation', {x: x, y: y})
+    })

-let jigsaw = y.define('jigsaw', Y.Map)
-window.yJigsaw = y
+  var data = [y.share.piece1, y.share.piece2, y.share.piece3, y.share.piece4]
+  var pieces = d3.select(document.querySelector('#puzzle-example')).selectAll('path').data(data)

-var origin // mouse start position - translation of piece
-var drag = d3.behavior.drag()
-  .on('dragstart', function (params) {
-    // get the translation of the element
-    var translation = d3
-      .select(this)
-      .attr('transform')
-      .slice(10, -1)
-      .split(',')
-      .map(Number)
-    // mouse coordinates
-    var mouse = d3.mouse(this.parentNode)
-    origin = {
-      x: mouse[0] - translation[0],
-      y: mouse[1] - translation[1]
-    }
-  })
-  .on('drag', function () {
-    var mouse = d3.mouse(this.parentNode)
-    var x = mouse[0] - origin.x // =^= mouse - mouse at dragstart + translation at dragstart
-    var y = mouse[1] - origin.y
-    d3.select(this).attr('transform', 'translate(' + x + ',' + y + ')')
-  })
-  .on('dragend', function (piece, i) {
-    // save the current translation of the puzzle piece
-    var mouse = d3.mouse(this.parentNode)
-    var x = mouse[0] - origin.x
-    var y = mouse[1] - origin.y
-    jigsaw.set(piece, {x: x, y: y})
-  })
+  pieces
+    .classed('draggable', true)
+    .attr('transform', function (piece) {
+      var translation = piece.get('translation') || {x: 0, y: 0}
+      return 'translate(' + translation.x + ',' + translation.y + ')'
+    }).call(drag)

-var data = ['piece1', 'piece2', 'piece3', 'piece4']
-var pieces = d3.select(document.querySelector('#puzzle-example')).selectAll('path').data(data)
-
-pieces
-  .classed('draggable', true)
-  .attr('transform', function (piece) {
-    var translation = piece.get('translation') || {x: 0, y: 0}
-    return 'translate(' + translation.x + ',' + translation.y + ')'
-  }).call(drag)
-
-data.forEach(function (piece) {
-  jigsaw.observe(function () {
-    // whenever a property of a piece changes, update the translation of the pieces
-    pieces
-      .transition()
-      .attr('transform', function (piece) {
-        var translation = piece.get(piece)
-        if (translation == null || typeof translation.x !== 'number' || typeof translation.y !== 'number') {
-          translation = { x: 0, y: 0 }
-        }
-        return 'translate(' + translation.x + ',' + translation.y + ')'
-      })
+  data.forEach(function (piece) {
+    piece.observe(function () {
+      // whenever a property of a piece changes, update the translation of the pieces
+      pieces
+        .transition()
+        .attr('transform', function (piece) {
+          var translation = piece.get('translation') || {x: 0, y: 0}
+          return 'translate(' + translation.x + ',' + translation.y + ')'
+        })
+    })
  })
 })
--- a/examples/monaco/index.html
+++ b/examples/monaco/index.html
@@ -13,8 +13,8 @@
        width: 100%;
      }
    </style>
-    <script src="../../y.js"></script>
-    <script src='../../../y-websockets-client/y-websockets-client.js'></script>
+    <script src="../bower_components/yjs/y.js"></script>
+    <script src="../bower_components/y-websockets-client/y-websockets-client.js"></script>
    <script src="../node_modules/monaco-editor/min/vs/loader.js"></script>
    <script src="./index.js"></script>
  </body>
--- a/examples/monaco/index.js
+++ b/examples/monaco/index.js
@@ -2,21 +2,29 @@

 require.config({ paths: { 'vs': '../node_modules/monaco-editor/min/vs' } })

-let y = new Y('monaco-example', {
-  connector: {
-    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
-  }
-})
-
 require(['vs/editor/editor.main'], function () {
-  window.yMonaco = y
+  // Initialize a shared object. This function call returns a promise!
+  Y({
+    db: {
+      name: 'memory'
+    },
+    connector: {
+      name: 'websockets-client',
+      room: 'monaco-example'
+    },
+    sourceDir: '/bower_components',
+    share: {
+      monaco: 'Text' // y.share.monaco is of type Y.Text
+    }
+  }).then(function (y) {
+    window.yMonaco = y

-  // Create Monaco editor
-  var editor = monaco.editor.create(document.getElementById('monacoContainer'), {
-    language: 'javascript'
+    // Create Monaco editor
+    var editor = monaco.editor.create(document.getElementById('monacoContainer'), {
+      language: 'javascript'
+    })
+
+    // Bind to y.share.monaco
+    y.share.monaco.bindMonaco(editor)
  })
-
-  // Bind to y.share.monaco
-  y.define('monaco', Y.Text).bindMonaco(editor)
 })
--- a/examples/quill/index.html
+++ b/examples/quill/index.html
@@ -26,7 +26,10 @@
  <script src="../bower_components/quill/dist/quill.js"></script>
  -->
  <script src="../../y.js"></script>
-  <script src='../../../y-websockets-client/y-websockets-client.js'></script>
+  <script src="../../../y-array/y-array.js"></script>
+  <script src="../../../y-richtext/dist/y-richtext.js"></script>
+  <script src="../../../y-memory/y-memory.js"></script>
+  <script src="../../../y-websockets-client/y-websockets-client.js"></script>
  <script src="./index.js"></script>
 </body>
 </html>
--- a/examples/textarea/index.html
+++ b/examples/textarea/index.html
@@ -1,9 +1,11 @@
 <!DOCTYPE html>
 <html>
 <body>
-  <textarea style="width:80%;" rows=40 autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"></textarea>
+  <textarea style="width:80%;" rows=40 id="textfield" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"></textarea>
  <script src="../../y.js"></script>
-  <script src='../../../y-websockets-client/y-websockets-client.js'></script>
+  <script src="../../../y-array/y-array.js"></script>
+  <script src="../../../y-text/y-text.js"></script>
+  <script src="../../../y-websockets-client/y-websockets-client.js"></script>
  <script src="./index.js"></script>
 </body>
 </html>
--- a/examples/textarea/index.js
+++ b/examples/textarea/index.js
@@ -1,15 +1,23 @@
 /* global Y */

-let y = new Y('textarea-example', {
+// initialize a shared object. This function call returns a promise!
+Y({
+  db: {
+    name: 'memory'
+  },
  connector: {
    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
-  }
+    room: 'Textarea-example2',
+    // url: '//localhost:1234',
+    url: 'https://yjs-v13.herokuapp.com/'
+  },
+  share: {
+    textarea: 'Text'
+  },
+  timeout: 5000 // reject if no connection was established within 5 seconds
+}).then(function (y) {
+  window.yTextarea = y
+
+  // bind the textarea to a shared text element
+  y.share.textarea.bind(document.getElementById('textfield'))
 })
-
-window.yTextarea = y
-
-// bind the textarea to a shared text element
-let type = y.define('textarea', Y.Text)
-let textarea = document.querySelector('textarea')
-window.binding = new Y.TextareaBinding(type, textarea)
--- a/examples/xml/index.html
+++ b/examples/xml/index.html
@@ -3,8 +3,7 @@
 </head>
  <!-- jquery is not required for y-xml. It is just here for convenience, and to test batch operations. -->
  <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
-  <script src="../../y.js"></script>
-  <script src='../../../y-websockets-client/y-websockets-client.js'></script>
+  <script src="../yjs-dist.js"></script>
  <script src="./index.js"></script>
 </head>
 <body>
--- a/examples/xml/index.js
+++ b/examples/xml/index.js
@@ -1,13 +1,23 @@
 /* global Y */

-let y = new Y('xml-example', {
+// initialize a shared object. This function call returns a promise!
+Y({
+  db: {
+    name: 'memory'
+  },
  connector: {
    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
+    // url: 'http://127.0.0.1:1234',
+    url: 'http://192.168.178.81:1234',
+    room: 'Xml-example'
+  },
+  sourceDir: '/bower_components',
+  share: {
+    xml: 'Xml("p")' // y.share.xml is of type Y.Xml with tagname "p"
  }
+}).then(function (y) {
+  window.yXml = y
+  // bind xml type to a dom, and put it in body
+  window.sharedDom = y.share.xml.getDom()
+  document.body.appendChild(window.sharedDom)
 })
-
-window.yXml = y
-// bind xml type to a dom, and put it in body
-window.sharedDom = y.define('xml', Y.XmlElement).getDom()
-document.body.appendChild(window.sharedDom)
--- a/examples/yjs-dist.mjs
+++ b/examples/yjs-dist.mjs
@@ -1,9 +1,9 @@

 import Y from '../src/Y.js'
 import yWebsocketsClient from '../../y-websockets-client/src/y-websockets-client.js'
-import extendYIndexedDBPersistence from '../../y-indexeddb/src/y-indexeddb.js'
+import IndexedDBPersistence from '../../y-indexeddb/src/y-indexeddb.js'

 Y.extend(yWebsocketsClient)
-extendYIndexedDBPersistence(Y)
+Y.IndexedDBPersistence = IndexedDBPersistence

 export default Y
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "yjs",
-  "version": "13.0.0-48",
+  "version": "13.0.0-46",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "yjs",
-  "version": "13.0.0-48",
+  "version": "13.0.0-46",
  "description": "A framework for real-time p2p shared editing on any data",
  "main": "./y.node.js",
  "browser": "./y.js",
--- a/src/Binding/Binding.js
+++ b/src/Binding/Binding.js
@@ -1,14 +0,0 @@
-
-import { createMutualExclude } from '../Util/mutualExclude.js'
-
-export default class Binding {
-  constructor (type, target) {
-    this.type = type
-    this.target = target
-    this._mutualExclude = createMutualExclude()
-  }
-  destroy () {
-    this.type = null
-    this.target = null
-  }
-}
--- a/src/Binding/DomBinding.js
+++ b/src/Binding/DomBinding.js
--- a/src/Binding/TextareaBinding.js
+++ b/src/Binding/TextareaBinding.js
@@ -1,45 +0,0 @@
-
-import Binding from './Binding.js'
-import simpleDiff from '../Util/simpleDiff.js'
-import { getRelativePosition, fromRelativePosition } from '../Util/relativePosition.js'
-
-function typeObserver () {
-  this._mutualExclude(() => {
-    const textarea = this.target
-    const textType = this.type
-    const relativeStart = getRelativePosition(textType, textarea.selectionStart)
-    const relativeEnd = getRelativePosition(textType, textarea.selectionEnd)
-    textarea.value = textType.toString()
-    const start = fromRelativePosition(textType._y, relativeStart)
-    const end = fromRelativePosition(textType._y, relativeEnd)
-    textarea.setSelectionRange(start, end)
-  })
-}
-
-function domObserver () {
-  this._mutualExclude(() => {
-    let diff = simpleDiff(this.type.toString(), this.target.value)
-    this.type.delete(diff.pos, diff.remove)
-    this.type.insert(diff.pos, diff.insert)
-  })
-}
-
-export default class TextareaBinding extends Binding {
-  constructor (textType, domTextarea) {
-    // Binding handles textType as this.type and domTextarea as this.target
-    super(textType, domTextarea)
-    // set initial value
-    domTextarea.value = textType.toString()
-    // Observers are handled by this class
-    this._typeObserver = typeObserver.bind(this)
-    this._domObserver = domObserver.bind(this)
-    textType.observe(this._typeObserver)
-    domTextarea.addEventListener('input', this._domObserver)
-  }
-  destroy () {
-    // Remove everything that is handled by this class
-    this.type.unobserve(this._typeObserver)
-    this.target.unobserve(this._domObserver)
-    super.destroy()
-  }
-}
--- a/src/Persistence.js
+++ b/src/Persistence.js
@@ -25,55 +25,32 @@ export default class AbstractPersistence {
    if (cnf === undefined) {
      cnf = getFreshCnf()
      this.ys.set(y, cnf)
-      return this.init(y).then(() => {
-        y.on('afterTransaction', (y, transaction) => {
-          let cnf = this.ys.get(y)
-          if (cnf.len > 0) {
-            cnf.buffer.setUint32(0, cnf.len)
-            this.saveUpdate(y, cnf.buffer.createBuffer(), transaction)
-            let _cnf = getFreshCnf()
-            for (let key in _cnf) {
-              cnf[key] = _cnf[key]
-            }
+      this.init(y)
+      y.on('afterTransaction', (y, transaction) => {
+        let cnf = this.ys.get(y)
+        if (cnf.len > 0) {
+          cnf.buffer.setUint32(0, cnf.len)
+          this.saveUpdate(y, cnf.buffer.createBuffer(), transaction)
+          let _cnf = getFreshCnf()
+          for (let key in _cnf) {
+            cnf[key] = _cnf[key]
          }
-        })
-        return this.retrieve(y)
-      }).then(function () {
-        return Promise.resolve(cnf)
+        }
      })
-    } else {
-      return Promise.resolve(cnf)
    }
+    return this.retrieve(y).then(function () {
+      return Promise.resolve(cnf)
+    })
  }
+
  deinit (y) {
    this.ys.delete(y)
-    y.persistence = null
  }

  destroy () {
    this.ys = null
  }

-  /**
-   * Remove all persisted data that belongs to a room.
-   * Automatically destroys all Yjs all Yjs instances that persist to
-   * the room. If `destroyYjsInstances = false` the persistence functionality
-   * will be removed from the Yjs instances.
-   *
-   * ** Must be overwritten! **
-   */
-  removePersistedData (room, destroyYjsInstances = true) {
-    this.ys.forEach((cnf, y) => {
-      if (y.room === room) {
-        if (destroyYjsInstances) {
-          y.destroy()
-        } else {
-          this.deinit(y)
-        }
-      }
-    })
-  }
-
  /* overwrite */
  saveUpdate (buffer) {
  }
@@ -98,17 +75,17 @@ export default class AbstractPersistence {
      y.transact(function () {
        if (model != null) {
          fromBinary(y, new BinaryDecoder(new Uint8Array(model)))
+          y._setContentReady()
        }
        if (updates != null) {
          for (let i = 0; i < updates.length; i++) {
            integrateRemoteStructs(y, new BinaryDecoder(new Uint8Array(updates[i])))
+            y._setContentReady()
          }
        }
      })
-      y.emit('persistenceReady')
    })
  }
-
  /* overwrite */
  persist (y) {
    return toBinary(y).createBuffer()
--- a/src/Struct/Item.js
+++ b/src/Struct/Item.js
@@ -113,11 +113,9 @@ export default class Item {
   * - Check if this is struct deleted
   */
  _integrate (y) {
-    y._transaction.newTypes.add(this)
    const parent = this._parent
    const selfID = this._id
-    const user = selfID === null ? y.userID : selfID.user
-    const userState = y.ss.getState(user)
+    const userState = selfID === null ? 0 : y.ss.getState(selfID.user)
    if (selfID === null) {
      this._id = y.ss.getNextID(this._length)
    } else if (selfID.user === RootFakeUserID) {
--- a/src/Struct/Type.js
+++ b/src/Struct/Type.js
@@ -133,6 +133,7 @@ export default class Type extends Item {
    this._deepEventHandler.removeEventListener(f)
  }
  _integrate (y) {
+    y._transaction.newTypes.add(this)
    super._integrate(y)
    this._y = y
    // when integrating children we must make sure to
--- a/src/Type/YArray.js
+++ b/src/Type/YArray.js
@@ -9,21 +9,17 @@ class YArrayEvent extends YEvent {
    super(yarray)
    this.remote = remote
    this._transaction = transaction
-    this._addedElements = null
  }
  get addedElements () {
-    if (this._addedElements === null) {
-      const target = this.target
-      const transaction = this._transaction
-      const addedElements = new Set()
-      transaction.newTypes.forEach(function (type) {
-        if (type._parent === target && !transaction.deletedStructs.has(type)) {
-          addedElements.add(type)
-        }
-      })
-      this._addedElements = addedElements
-    }
-    return this._addedElements
+    const target = this.target
+    const transaction = this._transaction
+    const addedElements = new Set()
+    transaction.newTypes.forEach(function (type) {
+      if (type._parent === target && !transaction.deletedStructs.has(type)) {
+        addedElements.add(type)
+      }
+    })
+    return addedElements
  }
  get removedElements () {
    const target = this.target
--- a/src/Util/NamedEventHandler.js
+++ b/src/Util/NamedEventHandler.js
@@ -1,7 +1,6 @@
 export default class NamedEventHandler {
  constructor () {
    this._eventListener = new Map()
-    this._stateListener = new Map()
  }
  _getListener (name) {
    let listeners = this._eventListener.get(name)
@@ -22,20 +21,6 @@ export default class NamedEventHandler {
    let listeners = this._getListener(name)
    listeners.on.add(f)
  }
-  _initStateListener (name) {
-    let state = this._stateListener.get(name)
-    if (state === undefined) {
-      state = {}
-      state.promise = new Promise(function (resolve) {
-        state.resolve = resolve
-      })
-      this._stateListener.set(name, state)
-    }
-    return state
-  }
-  when (name) {
-    return this._initStateListener(name).promise
-  }
  off (name, f) {
    if (name == null || f == null) {
      throw new Error('You must specify event name and function!')
@@ -47,7 +32,6 @@ export default class NamedEventHandler {
    }
  }
  emit (name, ...args) {
-    this._initStateListener(name).resolve()
    const listener = this._eventListener.get(name)
    if (listener !== undefined) {
      listener.on.forEach(f => f.apply(null, args))
--- a/src/Y.js
+++ b/src/Y.js
@@ -5,7 +5,6 @@ import { generateUserID } from './Util/generateUserID.js'
 import RootID from './Util/RootID.js'
 import NamedEventHandler from './Util/NamedEventHandler.js'
 import UndoManager from './Util/UndoManager.js'
-import { integrateRemoteStructs } from './MessageHandler/integrateRemoteStructs.js'

 import { messageToString, messageToRoomname } from './MessageHandler/messageToString.js'

@@ -22,10 +21,6 @@ import { addStruct as addType } from './Util/structReferences.js'
 import debug from 'debug'
 import Transaction from './Transaction.js'

-import TextareaBinding from './Binding/TextareaBinding.js'
-
-import { toBinary, fromBinary } from './MessageHandler/binaryEncode.js'
-
 export default class Y extends NamedEventHandler {
  constructor (room, opts, persistence) {
    super()
@@ -66,15 +61,6 @@ export default class Y extends NamedEventHandler {
      this.emit('content')
    }
  }
-  whenContentReady () {
-    if (this._contentReady) {
-      return Promise.resolve()
-    } else {
-      return new Promise(resolve => {
-        this.once('content', resolve)
-      })
-    }
-  }
  _beforeChange () {}
  transact (f, remote = false) {
    let initialCall = this._transaction === null
@@ -201,17 +187,12 @@ Y.XmlFragment = YXmlFragment
 Y.XmlText = YXmlText
 Y.XmlHook = YXmlHook

-Y.TextareaBinding = TextareaBinding
-
 Y.utils = {
  BinaryDecoder,
  UndoManager,
  getRelativePosition,
  fromRelativePosition,
-  addType,
-  integrateRemoteStructs,
-  toBinary,
-  fromBinary
+  addType
 }

 Y.debug = debug
--- a/y.js
+++ b/y.js
--- a/y.js.map
+++ b/y.js.map
--- a/y.node.js
+++ b/y.node.js
@@ -1,7 +1,7 @@

 /**
 * yjs - A framework for real-time p2p shared editing on any data
- * @version v13.0.0-48
+ * @version v13.0.0-46
 * @license MIT
 */

@@ -1402,11 +1402,9 @@ class Item {
   * - Check if this is struct deleted
   */
  _integrate (y) {
-    y._transaction.newTypes.add(this);
    const parent = this._parent;
    const selfID = this._id;
-    const user = selfID === null ? y.userID : selfID.user;
-    const userState = y.ss.getState(user);
+    const userState = selfID === null ? 0 : y.ss.getState(selfID.user);
    if (selfID === null) {
      this._id = y.ss.getNextID(this._length);
    } else if (selfID.user === RootFakeUserID) {
@@ -1772,6 +1770,7 @@ class Type extends Item {
    this._deepEventHandler.removeEventListener(f);
  }
  _integrate (y) {
+    y._transaction.newTypes.add(this);
    super._integrate(y);
    this._y = y;
    // when integrating children we must make sure to
@@ -1945,21 +1944,17 @@ class YArrayEvent extends YEvent {
    super(yarray);
    this.remote = remote;
    this._transaction = transaction;
-    this._addedElements = null;
  }
  get addedElements () {
-    if (this._addedElements === null) {
-      const target = this.target;
-      const transaction = this._transaction;
-      const addedElements = new Set();
-      transaction.newTypes.forEach(function (type) {
-        if (type._parent === target && !transaction.deletedStructs.has(type)) {
-          addedElements.add(type);
-        }
-      });
-      this._addedElements = addedElements;
-    }
-    return this._addedElements
+    const target = this.target;
+    const transaction = this._transaction;
+    const addedElements = new Set();
+    transaction.newTypes.forEach(function (type) {
+      if (type._parent === target && !transaction.deletedStructs.has(type)) {
+        addedElements.add(type);
+      }
+    });
+    return addedElements
  }
  get removedElements () {
    const target = this.target;
@@ -3596,7 +3591,6 @@ function generateUserID () {
 class NamedEventHandler {
  constructor () {
    this._eventListener = new Map();
-    this._stateListener = new Map();
  }
  _getListener (name) {
    let listeners = this._eventListener.get(name);
@@ -3617,20 +3611,6 @@ class NamedEventHandler {
    let listeners = this._getListener(name);
    listeners.on.add(f);
  }
-  _initStateListener (name) {
-    let state = this._stateListener.get(name);
-    if (state === undefined) {
-      state = {};
-      state.promise = new Promise(function (resolve) {
-        state.resolve = resolve;
-      });
-      this._stateListener.set(name, state);
-    }
-    return state
-  }
-  when (name) {
-    return this._initStateListener(name).promise
-  }
  off (name, f) {
    if (name == null || f == null) {
      throw new Error('You must specify event name and function!')
@@ -3642,7 +3622,6 @@ class NamedEventHandler {
    }
  }
  emit (name, ...args) {
-    this._initStateListener(name).resolve();
    const listener = this._eventListener.get(name);
    if (listener !== undefined) {
      listener.on.forEach(f => f.apply(null, args));
@@ -4663,55 +4642,32 @@ class AbstractPersistence {
    if (cnf === undefined) {
      cnf = getFreshCnf();
      this.ys.set(y, cnf);
-      return this.init(y).then(() => {
-        y.on('afterTransaction', (y, transaction) => {
-          let cnf = this.ys.get(y);
-          if (cnf.len > 0) {
-            cnf.buffer.setUint32(0, cnf.len);
-            this.saveUpdate(y, cnf.buffer.createBuffer(), transaction);
-            let _cnf = getFreshCnf();
-            for (let key in _cnf) {
-              cnf[key] = _cnf[key];
-            }
+      this.init(y);
+      y.on('afterTransaction', (y, transaction) => {
+        let cnf = this.ys.get(y);
+        if (cnf.len > 0) {
+          cnf.buffer.setUint32(0, cnf.len);
+          this.saveUpdate(y, cnf.buffer.createBuffer(), transaction);
+          let _cnf = getFreshCnf();
+          for (let key in _cnf) {
+            cnf[key] = _cnf[key];
          }
-        });
-        return this.retrieve(y)
-      }).then(function () {
-        return Promise.resolve(cnf)
-      })
-    } else {
-      return Promise.resolve(cnf)
+        }
+      });
    }
+    return this.retrieve(y).then(function () {
+      return Promise.resolve(cnf)
+    })
  }
+
  deinit (y) {
    this.ys.delete(y);
-    y.persistence = null;
  }

  destroy () {
    this.ys = null;
  }

-  /**
-   * Remove all persisted data that belongs to a room.
-   * Automatically destroys all Yjs all Yjs instances that persist to
-   * the room. If `destroyYjsInstances = false` the persistence functionality
-   * will be removed from the Yjs instances.
-   *
-   * ** Must be overwritten! **
-   */
-  removePersistedData (room, destroyYjsInstances = true) {
-    this.ys.forEach((cnf, y) => {
-      if (y.room === room) {
-        if (destroyYjsInstances) {
-          y.destroy();
-        } else {
-          this.deinit(y);
-        }
-      }
-    });
-  }
-
  /* overwrite */
  saveUpdate (buffer) {
  }
@@ -4736,76 +4692,23 @@ class AbstractPersistence {
      y.transact(function () {
        if (model != null) {
          fromBinary(y, new BinaryDecoder(new Uint8Array(model)));
+          y._setContentReady();
        }
        if (updates != null) {
          for (let i = 0; i < updates.length; i++) {
            integrateRemoteStructs(y, new BinaryDecoder(new Uint8Array(updates[i])));
+            y._setContentReady();
          }
        }
      });
-      y.emit('persistenceReady');
    });
  }
-
  /* overwrite */
  persist (y) {
    return toBinary(y).createBuffer()
  }
 }

-class Binding {
-  constructor (type, target) {
-    this.type = type;
-    this.target = target;
-    this._mutualExclude = createMutualExclude();
-  }
-  destroy () {
-    this.type = null;
-    this.target = null;
-  }
-}
-
-function typeObserver () {
-  this._mutualExclude(() => {
-    const textarea = this.target;
-    const textType = this.type;
-    const relativeStart = getRelativePosition(textType, textarea.selectionStart);
-    const relativeEnd = getRelativePosition(textType, textarea.selectionEnd);
-    textarea.value = textType.toString();
-    const start = fromRelativePosition(textType._y, relativeStart);
-    const end = fromRelativePosition(textType._y, relativeEnd);
-    textarea.setSelectionRange(start, end);
-  });
-}
-
-function domObserver () {
-  this._mutualExclude(() => {
-    let diff = simpleDiff(this.type.toString(), this.target.value);
-    this.type.delete(diff.pos, diff.remove);
-    this.type.insert(diff.pos, diff.insert);
-  });
-}
-
-class TextareaBinding extends Binding {
-  constructor (textType, domTextarea) {
-    // Binding handles textType as this.type and domTextarea as this.target
-    super(textType, domTextarea);
-    // set initial value
-    domTextarea.value = textType.toString();
-    // Observers are handled by this class
-    this._typeObserver = typeObserver.bind(this);
-    this._domObserver = domObserver.bind(this);
-    textType.observe(this._typeObserver);
-    domTextarea.addEventListener('input', this._domObserver);
-  }
-  destroy () {
-    // Remove everything that is handled by this class
-    this.type.unobserve(this._typeObserver);
-    this.target.unobserve(this._domObserver);
-    super.destroy();
-  }
-}
-
 class Y$1 extends NamedEventHandler {
  constructor (room, opts, persistence) {
    super();
@@ -4846,15 +4749,6 @@ class Y$1 extends NamedEventHandler {
      this.emit('content');
    }
  }
-  whenContentReady () {
-    if (this._contentReady) {
-      return Promise.resolve()
-    } else {
-      return new Promise(resolve => {
-        this.once('content', resolve);
-      })
-    }
-  }
  _beforeChange () {}
  transact (f, remote = false) {
    let initialCall = this._transaction === null;
@@ -4981,17 +4875,12 @@ Y$1.XmlFragment = YXmlFragment;
 Y$1.XmlText = YXmlText;
 Y$1.XmlHook = YXmlHook;

-Y$1.TextareaBinding = TextareaBinding;
-
 Y$1.utils = {
  BinaryDecoder,
  UndoManager,
  getRelativePosition,
  fromRelativePosition,
-  addType: addStruct,
-  integrateRemoteStructs,
-  toBinary,
-  fromBinary
+  addType: addStruct
 };

 Y$1.debug = browser;
--- a/y.node.js.map
+++ b/y.node.js.map
--- a/y.test.js
+++ b/y.test.js
--- a/y.test.js.map
+++ b/y.test.js.map