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

fixed a bunch of issues related to attribution of formats

Browse Source
This commit is contained in:
Kevin Jahns
2025-06-09 21:21:33 +02:00
parent 10a019806a
commit a9f802d77e
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/types/YText.js
View File

@@ -972,7 +972,7 @@ export class YText extends AbstractType {
const renderDelete = c.render && c.deleted const renderDelete = c.render && c.deleted
// existing content that should be retained, only adding changed attributes // existing content that should be retained, only adding changed attributes
const retainContent = !c.render && (!c.deleted || c.attrs != null) const retainContent = !c.render && (!c.deleted || c.attrs != null)
const attribution = renderContent ? createAttributionFromAttributionItems(c.attrs, c.deleted) : null const attribution = (renderContent || c.content.constructor === ContentFormat) ? createAttributionFromAttributionItems(c.attrs, c.deleted) : null
switch (c.content.constructor) { switch (c.content.constructor) {
case ContentDeleted: { case ContentDeleted: {
if (renderDelete) d.delete(c.content.getLength()) if (renderDelete) d.delete(c.content.getLength())
@@ -1032,15 +1032,15 @@ export class YText extends AbstractType {
if (renderContent || renderDelete) { if (renderContent || renderDelete) {
if (c.deleted) { if (c.deleted) {
// content was deleted, but is possibly attributed // content was deleted, but is possibly attributed
if (equalAttrs(value, currAttrVal)) { if (!equalAttrs(value, currAttrVal)) { // do nothing if nothing changed
// nop if (equalAttrs(currAttrVal, previousAttributes[key] ?? null) && changedAttributes[key] !== undefined) {
} else if (equalAttrs(currAttrVal, previousAttributes[key] ?? null) && changedAttributes[key] !== undefined) {
delete changedAttributes[key] delete changedAttributes[key]
} else { } else {
changedAttributes[key] = currAttrVal changedAttributes[key] = currAttrVal
} }
// current attributes doesn't change // current attributes doesn't change
previousAttributes[key] = value previousAttributes[key] = value
}
} else { // !c.deleted } else { // !c.deleted
// content was inserted, and is possibly attributed // content was inserted, and is possibly attributed
if (equalAttrs(value, currAttrVal)) { if (equalAttrs(value, currAttrVal)) {