v13.0.0-54 -- distribution files

package-lock.json

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

package.json

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

src/Struct/Item.js

@@ -77,18 +77,19 @@ export default class Item {
     if (parent._redone !== null) {
       parent = parent._redone
       // find next cloned items
-      while (left !== null && left._redone === null) {
+      while (left !== null) {
+        if (left._redone !== null && left._redone._parent === parent) {
+          left = left._redone
+          break
+        }
         left = left._left
       }
-      if (left !== null) {
-        left = left._redone
-      }
-      while (right !== null && right._redone === null) {
+      while (right !== null) {
+        if (right._redone !== null && right._redone._parent === parent) {
+          right = right._redone
+        }
         right = right._right
       }
-      if (right !== null) {
-        right = right._redone
-      }
     }
     struct._origin = left
     struct._left = left

src/Util/UndoManager.js

@@ -73,6 +73,7 @@ export default class UndoManager {
     this._scope = scope
     this._undoing = false
     this._redoing = false
+    this._lastTransactionWasUndo = false
     const y = scope._y
     this.y = y
     y.on('afterTransaction', (y, transaction, remote) => {
@@ -80,7 +81,12 @@ export default class UndoManager {
         let reverseOperation = new ReverseOperation(y, transaction)
         if (!this._undoing) {
           let lastUndoOp = this._undoBuffer.length > 0 ? this._undoBuffer[this._undoBuffer.length - 1] : null
-          if (lastUndoOp !== null && reverseOperation.created - lastUndoOp.created <= options.captureTimeout) {
+          if (
+            this._redoing === false &&
+            this._lastTransactionWasUndo === false &&
+            lastUndoOp !== null &&
+            reverseOperation.created - lastUndoOp.created <= options.captureTimeout
+          ) {
             lastUndoOp.created = reverseOperation.created
             if (reverseOperation.toState !== null) {
               lastUndoOp.toState = reverseOperation.toState
@@ -90,12 +96,14 @@ export default class UndoManager {
             }
             reverseOperation.deletedStructs.forEach(lastUndoOp.deletedStructs.add, lastUndoOp.deletedStructs)
           } else {
+            this._lastTransactionWasUndo = false
             this._undoBuffer.push(reverseOperation)
           }
           if (!this._redoing) {
             this._redoBuffer = []
           }
         } else {
+          this._lastTransactionWasUndo = true
           this._redoBuffer.push(reverseOperation)
         }
       }

y.node.js

@@ -1,7 +1,7 @@
 
 /**
  * yjs - A framework for real-time p2p shared editing on any data
- * @version v13.0.0-53
+ * @version v13.0.0-54
  * @license MIT
  */
 
@@ -1366,18 +1366,19 @@ class Item {
     if (parent._redone !== null) {
       parent = parent._redone;
       // find next cloned items
-      while (left !== null && left._redone === null) {
+      while (left !== null) {
+        if (left._redone !== null && left._redone._parent === parent) {
+          left = left._redone;
+          break
+        }
         left = left._left;
       }
-      if (left !== null) {
-        left = left._redone;
-      }
-      while (right !== null && right._redone === null) {
+      while (right !== null) {
+        if (right._redone !== null && right._redone._parent === parent) {
+          right = right._redone;
+        }
         right = right._right;
       }
-      if (right !== null) {
-        right = right._redone;
-      }
     }
     struct._origin = left;
     struct._left = left;
@@ -3745,6 +3746,7 @@ class UndoManager {
     this._scope = scope;
     this._undoing = false;
     this._redoing = false;
+    this._lastTransactionWasUndo = false;
     const y = scope._y;
     this.y = y;
     y.on('afterTransaction', (y, transaction, remote) => {
@@ -3752,7 +3754,12 @@ class UndoManager {
         let reverseOperation = new ReverseOperation(y, transaction);
         if (!this._undoing) {
           let lastUndoOp = this._undoBuffer.length > 0 ? this._undoBuffer[this._undoBuffer.length - 1] : null;
-          if (lastUndoOp !== null && reverseOperation.created - lastUndoOp.created <= options.captureTimeout) {
+          if (
+            this._redoing === false &&
+            this._lastTransactionWasUndo === false &&
+            lastUndoOp !== null &&
+            reverseOperation.created - lastUndoOp.created <= options.captureTimeout
+          ) {
             lastUndoOp.created = reverseOperation.created;
             if (reverseOperation.toState !== null) {
               lastUndoOp.toState = reverseOperation.toState;
@@ -3762,12 +3769,14 @@ class UndoManager {
             }
             reverseOperation.deletedStructs.forEach(lastUndoOp.deletedStructs.add, lastUndoOp.deletedStructs);
           } else {
+            this._lastTransactionWasUndo = false;
             this._undoBuffer.push(reverseOperation);
           }
           if (!this._redoing) {
             this._redoBuffer = [];
           }
         } else {
+          this._lastTransactionWasUndo = true;
           this._redoBuffer.push(reverseOperation);
         }
       }