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

fix prevMove bug

Browse Source
This commit is contained in:
Kevin Jahns 2022-03-26 11:03:28 +01:00
parent cc93f346ce
commit c4b28aceec
3 changed files with 3946 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3956
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

6
src/structs/ContentMove.js
View File

@ -191,9 +191,11 @@ export class ContentMove {
} }
maxPriority = math.max(maxPriority, nextPrio) maxPriority = math.max(maxPriority, nextPrio)
// was already moved // was already moved
if (start.moved && !transaction.prevMoved.has(start)) { const prevMove = start.moved
if (prevMove && !transaction.prevMoved.has(start) && prevMove.id.clock < (transaction.beforeState.get(prevMove.id.client) || 0)) {
// only override prevMoved if the prevMoved item is not new
// we need to know which item previously moved an item // we need to know which item previously moved an item
transaction.prevMoved.set(start, start.moved) transaction.prevMoved.set(start, prevMove)
} }
start.moved = item start.moved = item
} else { } else {

1
tests/y-array.tests.js
View File

@ -634,6 +634,7 @@ const monitorArrayTestObject = user => {
arr.splice(currpos, d.delete) arr.splice(currpos, d.delete)
} }
} }
t.compare(arr, yarr.toArray())
}) })
return arr return arr
} }