From 3b31764b6e9d8c432e8d881903bb40452d7793cd Mon Sep 17 00:00:00 2001 From: Kevin Jahns Date: Sat, 9 Jul 2022 16:57:56 +0200 Subject: [PATCH] Fixed all tests - full support for collapsed move deletions --- src/utils/YEvent.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/YEvent.js b/src/utils/YEvent.js index 0f232418..a8ea497f 100644 --- a/src/utils/YEvent.js +++ b/src/utils/YEvent.js @@ -245,7 +245,7 @@ export class YEvent { lastOp.delete += item.length } } else if (item.deleted) { - if (!currMoveIsNew && this.deletes(item) && !this.adds(item)) { + if (!currMoveIsNew && this.deletes(item) && !this.adds(item) && !this.transaction.prevMoved.has(item)) { if (lastOp === null || lastOp.delete === undefined) { packOp() lastOp = { delete: 0 } @@ -274,7 +274,7 @@ export class YEvent { } item = /** @type {Item} */ (item).right } - if (lastOp !== null && lastOp.retain === undefined) { + if (lastOp !== null && lastOp.retain == null) { packOp() } }