Mirrors/yjs
1
0
Fork 0
mirror of https://github.com/yjs/yjs.git synced 2025-12-16 03:37:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix am.readContent

Browse Source
This commit is contained in:
Kevin Jahns
2025-06-01 01:09:52 +02:00
parent d9490c43d1
commit 6d7ccf66ed
1 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/utils/AttributionManager.js
View File

@@ -17,7 +17,8 @@ import {
applyUpdate, applyUpdate,
writeIdSet, writeIdSet,
UpdateEncoderV1, UpdateEncoderV1,
transact transact,
createMaybeAttrRange
} from '../internals.js' } from '../internals.js'
import * as error from 'lib0/error' import * as error from 'lib0/error'
@@ -329,29 +330,41 @@ export class DiffAttributionManager extends ObservableV2 {
* @param {number} client * @param {number} client
* @param {number} clock * @param {number} clock
* @param {boolean} deleted * @param {boolean} deleted
* @param {AbstractContent} content * @param {AbstractContent} _content
* @param {0|1|2} shouldRender - whether this should render or just result in a `retain` operation * @param {0|1|2} shouldRender - whether this should render or just result in a `retain` operation
*/ */
readContent (contents, client, clock, deleted, content, shouldRender) { readContent (contents, client, clock, deleted, _content, shouldRender) {
const slice = (deleted ? this.deletes : this.inserts).slice(client, clock, content.getLength()) const slice = (deleted ? this.deletes : this.inserts).slice(client, clock, _content.getLength())
content = slice.length === 1 ? content : content.copy() /**
slice.forEach(s => { * @type {AbstractContent?}
if (content.getLength() === 0 || (content instanceof ContentDeleted && (s.attrs != null || shouldRender) && !this.inserts.has(client, s.clock))) { // @todo possibly remove this.inserts.. */
let content = slice.length === 1 ? _content : _content.copy()
for (let i = 0; i < slice.length; i++) {
const s = slice[i]
if (content == null || content instanceof ContentDeleted) {
if ((!shouldRender && s.attrs == null) || this.inserts.has(client, s.clock)) {
continue
}
// Retrieved item is never more fragmented than the newer item. // Retrieved item is never more fragmented than the newer item.
const prevItem = getItem(this._prevDocStore, createID(client, s.clock)) const prevItem = getItem(this._prevDocStore, createID(client, s.clock))
const diffStart = s.clock - prevItem.id.clock
content = prevItem.length > 1 ? prevItem.content.copy() : prevItem.content content = prevItem.length > 1 ? prevItem.content.copy() : prevItem.content
// trim itemContent to the correct size. // trim itemContent to the correct size.
const diffStart = s.clock - prevItem.id.clock
if (diffStart > 0) { if (diffStart > 0) {
content = content.splice(diffStart) content = content.splice(diffStart)
} }
} }
const c = content const c = /** @type {AbstractContent} */ (content)
content = c.splice(s.len) const clen = c.getLength()
if (clen < s.len) {
slice.splice(i + 1, 0, createMaybeAttrRange(s.clock + clen, s.len - clen, s.attrs))
s.len = clen
}
content = s.len < clen ? c.splice(s.len) : null
if (shouldRender || !deleted || s.attrs != null) { if (shouldRender || !deleted || s.attrs != null) {
contents.push(new AttributedContent(c, deleted, s.attrs, shouldRender)) contents.push(new AttributedContent(c, deleted, s.attrs, shouldRender))
} }
}) }
} }
/** /**
@@ -362,16 +375,12 @@ export class DiffAttributionManager extends ObservableV2 {
if (!item.deleted) { if (!item.deleted) {
return item.content.isCountable() ? item.length : 0 return item.content.isCountable() ? item.length : 0
} }
const slice = this.deletes.sliceId(item.id, item.length) /**
let content = item.content * @type {Array<AttributedContent<any>>}
if (content instanceof ContentDeleted && slice[0].attrs != null && !this.inserts.hasId(item.id)) { */
const prevItem = getItem(this._prevDocStore, item.id) const cs = []
content = prevItem.content this.readContent(cs, item.id.client, item.id.clock, true, item.content, 0)
} return cs.reduce((cnt, c) => cnt + ((c.attrs != null && c.content.isCountable()) ? c.content.getLength() : 0), 0)
if (!content.isCountable()) {
return 0
}
return slice.reduce((len, s) => s.attrs != null ? len + s.len : len, 0)
} }
} }