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

fix puzzle1

Browse Source
This commit is contained in:
Kevin Jahns
2025-05-30 18:50:39 +02:00
parent 671d1311e4
commit b0b89957f6
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/utils/AttributionManager.js
View File

@@ -335,22 +335,18 @@ export class DiffAttributionManager extends ObservableV2 {
readContent (contents, client, clock, deleted, content, shouldRender) {
const slice = (deleted ? this.deletes : this.inserts).slice(client, clock, content.getLength())
content = slice.length === 1 ? content : content.copy()
if (content instanceof ContentDeleted && slice[0].attrs != null && !this.inserts.has(client, clock)) {
// Retrieved item is never more fragmented than the newer item.
const prevItem = getItem(this._prevDocStore, createID(client, clock))
const originalContentLen = content.getLength()
content = prevItem.length > 1 ? prevItem.content.copy() : prevItem.content
// trim itemContent to the correct size.
const diffStart = clock - prevItem.id.clock
const diffEnd = prevItem.id.clock + prevItem.length - clock - originalContentLen
if (diffStart > 0) {
content = content.splice(diffStart)
}
if (diffEnd > 0) {
content.splice(content.getLength() - diffEnd)
}
}
slice.forEach(s => {
if (content.getLength() === 0 || (content instanceof ContentDeleted && (s.attrs != null || shouldRender) && !this.inserts.has(client, s.clock))) { // @todo possibly remove this.inserts..
// Retrieved item is never more fragmented than the newer item.
const prevItem = getItem(this._prevDocStore, createID(client, s.clock))
const originalContentLen = content.getLength()
content = prevItem.length > 1 ? prevItem.content.copy() : prevItem.content
// trim itemContent to the correct size.
const diffStart = s.clock - prevItem.id.clock
if (diffStart > 0) {
content = content.splice(diffStart)
}
}
const c = content
if (s.len < c.getLength()) {
content = c.splice(s.len)