Mirrors/yjs
1
0
Fork 0
mirror of https://github.com/yjs/yjs.git synced 2026-02-24 12:10:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

proper merge for deletesets

Browse Source
This commit is contained in:
Kevin Jahns
2020-12-12 22:40:55 +01:00
parent 320da29b69
commit 1e0fd60df4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/DeleteSet.js
View File

@@ -121,8 +121,8 @@ export const sortAndMergeDeleteSet = ds => {
for (i = 1, j = 1; i < dels.length; i++) {
const left = dels[j - 1]
const right = dels[i]
if (left.clock + left.len === right.clock) {
left.len += right.len
if (left.clock + left.len >= right.clock) {
left.len = math.max(left.len, right.clock + right.len - left.clock)
} else {
if (j < i) {
dels[j] = right