yonote/yjs
24
0
Fork 0
Code Pull Requests 1 Releases Activity

UndoManager: keep item before item is deleted (fixes some edge cases of followRedo)

Browse Source
This commit is contained in:
Kevin Jahns 2019-06-25 11:56:41 +02:00
parent d064e6e96e
commit 463065ac21
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/utils/UndoManager.js
View File

@ -62,17 +62,18 @@ const popStackItem = (undoManager, stack, eventType) => {
}) })
const structs = /** @type {Array<GC|Item>} */ (store.clients.get(doc.clientID)) const structs = /** @type {Array<GC|Item>} */ (store.clients.get(doc.clientID))
iterateStructs(transaction, structs, stackItem.start, stackItem.len, struct => { iterateStructs(transaction, structs, stackItem.start, stackItem.len, struct => {
if (struct instanceof Item && struct.redone !== null) { if (struct instanceof Item && !struct.deleted && scope.some(type => isParentOf(type, /** @type {Item} */ (struct)))) {
let { item, diff } = followRedone(store, struct.id) if (struct.redone !== null) {
if (diff > 0) { let { item, diff } = followRedone(store, struct.id)
item = getItemCleanStart(transaction, store, struct.id) if (diff > 0) {
item = getItemCleanStart(transaction, store, createID(item.id.client, item.id.clock + diff))
}
if (item.length > stackItem.len) {
getItemCleanStart(transaction, store, createID(item.id.client, item.id.clock + stackItem.len))
}
struct = item
} }
if (item.length > stackItem.len) { keepItem(struct)
getItemCleanStart(transaction, store, createID(item.id.client, item.id.clock + stackItem.len))
}
struct = item
}
if (!struct.deleted && scope.some(type => isParentOf(type, /** @type {Item} */ (struct)))) {
struct.delete(transaction) struct.delete(transaction)
performedChange = true performedChange = true
} }