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

fix fast undo-redo bug

Browse Source
This commit is contained in:
Kevin Jahns 2018-02-15 18:28:53 +01:00
parent f1f1bff901
commit 937de2c59f
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Util/UndoManager.js
View File

@ -32,12 +32,10 @@ function applyReverseOperation (y, scope, reverseBuffer) {
let undoOp = reverseBuffer.pop() let undoOp = reverseBuffer.pop()
// make sure that it is possible to iterate {from}-{to} // make sure that it is possible to iterate {from}-{to}
if (undoOp.fromState !== null) { if (undoOp.fromState !== null) {
let start = y.os.getItemCleanStart(undoOp.fromState) y.os.getItemCleanStart(undoOp.fromState)
y.os.getItemCleanEnd(undoOp.toState) y.os.getItemCleanEnd(undoOp.toState)
console.log(start)
y.os.iterate(undoOp.fromState, undoOp.toState, op => { y.os.iterate(undoOp.fromState, undoOp.toState, op => {
debugger while (op._deleted && op._redone !== null) {
if (op._deleted && op._redone !== null) {
op = op._redone op = op._redone
} }
if (op._deleted === false && isStructInScope(y, op, scope)) { if (op._deleted === false && isStructInScope(y, op, scope)) {
@ -49,7 +47,13 @@ function applyReverseOperation (y, scope, reverseBuffer) {
for (let op of undoOp.deletedStructs) { for (let op of undoOp.deletedStructs) {
if ( if (
isStructInScope(y, op, scope) && isStructInScope(y, op, scope) &&
op._parent !== y op._parent !== y &&
(
op._id.user !== y.userID ||
undoOp.fromState === null ||
op._id.clock < undoOp.fromState ||
op._id.clock > undoOp.toState
)
) { ) {
performedUndo = true performedUndo = true
op._redo(y) op._redo(y)
@ -78,7 +82,12 @@ export default class UndoManager {
let lastUndoOp = this._undoBuffer.length > 0 ? this._undoBuffer[this._undoBuffer.length - 1] : null let lastUndoOp = this._undoBuffer.length > 0 ? this._undoBuffer[this._undoBuffer.length - 1] : null
if (lastUndoOp !== null && reverseOperation.created - lastUndoOp.created <= options.captureTimeout) { if (lastUndoOp !== null && reverseOperation.created - lastUndoOp.created <= options.captureTimeout) {
lastUndoOp.created = reverseOperation.created lastUndoOp.created = reverseOperation.created
lastUndoOp.toState = reverseOperation.toState if (reverseOperation.toState !== null) {
lastUndoOp.toState = reverseOperation.toState
if (lastUndoOp.fromState === null) {
lastUndoOp.fromState = reverseOperation.fromState
}
}
reverseOperation.deletedStructs.forEach(lastUndoOp.deletedStructs.add, lastUndoOp.deletedStructs) reverseOperation.deletedStructs.forEach(lastUndoOp.deletedStructs.add, lastUndoOp.deletedStructs)
} else { } else {
this._undoBuffer.push(reverseOperation) this._undoBuffer.push(reverseOperation)