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

cleanup redundant text attributes when delete attributes

Browse Source 
fixes #392
This commit is contained in:
dkuhnert 2022-02-23 18:20:26 +01:00
parent abf3fab1b6
commit fddb620d41
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/types/YText.js
View File

@ -164,20 +164,6 @@ const insertNegatedAttributes = (transaction, parent, currPos, negatedAttributes
const doc = transaction.doc const doc = transaction.doc
const ownClientId = doc.clientID const ownClientId = doc.clientID
negatedAttributes.forEach((val, key) => { negatedAttributes.forEach((val, key) => {
// check if we really need to create attributes
// (the attribute may be set the desired value already)
let n = currPos.right
while(
n !== null && (n.deleted === true || n.content.constructor === ContentFormat)
) {
if (!n.deleted && equalAttrs(currPos.currentAttributes.get(/** @type {ContentFormat} */ (n.content).key) ?? null, /** @type {ContentFormat} */ (n.content).value)) {
n.delete(transaction)
return
}
n = n.right
}
// create negated attribute
const left = currPos.left const left = currPos.left
const right = currPos.right const right = currPos.right
const nextFormat = new Item(createID(ownClientId, getState(doc.store, ownClientId)), left, left && left.lastId, right, right && right.id, parent, null, new ContentFormat(key, val)) const nextFormat = new Item(createID(ownClientId, getState(doc.store, ownClientId)), left, left && left.lastId, right, right && right.id, parent, null, new ContentFormat(key, val))
@ -305,7 +291,8 @@ const formatText = (transaction, parent, currPos, length, attributes) => {
const negatedAttributes = insertAttributes(transaction, parent, currPos, attributes) const negatedAttributes = insertAttributes(transaction, parent, currPos, attributes)
// iterate until first non-format or null is found // iterate until first non-format or null is found
// delete all formats with attributes[format.key] != null // delete all formats with attributes[format.key] != null
while (length > 0 && currPos.right !== null) { // also check the attributes after the first non-format as we do not want to insert redundant negated attributes there
while (currPos.right !== null && (length > 0 || currPos.right.content.constructor === ContentFormat)) {
if (!currPos.right.deleted) { if (!currPos.right.deleted) {
switch (currPos.right.content.constructor) { switch (currPos.right.content.constructor) {
case ContentFormat: { case ContentFormat: {