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

bulk-merging structs - replaces #542, fixes #541

Browse Source
This commit is contained in:
Kevin Jahns
2023-07-17 14:29:54 +02:00
parent 90f2a06b5e
commit c77dedb68d
2 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/structs/ContentType.js
View File

@@ -108,7 +108,7 @@ export class ContentType {
while (item !== null) {
if (!item.deleted) {
item.delete(transaction)
} else {
} else if (item.id.clock < (transaction.beforeState.get(item.id.client) || 0)) {
// This will be gc'd later and we want to merge it if possible
// We try to merge all deleted items after each transaction,
// but we have no knowledge about that this needs to be merged
@@ -120,7 +120,7 @@ export class ContentType {
this.type._map.forEach(item => {
if (!item.deleted) {
item.delete(transaction)
} else {
} else if (item.id.clock < (transaction.beforeState.get(item.id.client) || 0)) {
// same as above
transaction._mergeStructs.push(item)
}