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

Merge branch 'ja2nicholl-update-attributes-on-delete'

Browse Source
This commit is contained in:
Kevin Jahns 2022-02-04 11:27:07 +01:00
commit 8ce107bd17
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/types/YText.js
View File

@ -338,14 +338,16 @@ const formatText = (transaction, parent, currPos, length, attributes) => {
* *
* @param {Transaction} transaction * @param {Transaction} transaction
* @param {Item} start * @param {Item} start
* @param {Item|null} end exclusive end, automatically iterates to the next Content Item * @param {Item|null} curr exclusive end, automatically iterates to the next Content Item
* @param {Map<string,any>} startAttributes * @param {Map<string,any>} startAttributes
* @param {Map<string,any>} endAttributes This attribute is modified! * @param {Map<string,any>} currAttributes
* @return {number} The amount of formatting Items deleted. * @return {number} The amount of formatting Items deleted.
* *
* @function * @function
*/ */
const cleanupFormattingGap = (transaction, start, end, startAttributes, endAttributes) => { const cleanupFormattingGap = (transaction, start, curr, startAttributes, currAttributes) => {
let end = curr
const endAttributes = map.copy(currAttributes)
while (end && (!end.countable || end.deleted)) { while (end && (!end.countable || end.deleted)) {
if (!end.deleted && end.content.constructor === ContentFormat) { if (!end.deleted && end.content.constructor === ContentFormat) {
updateCurrentAttributes(endAttributes, /** @type {ContentFormat} */ (end.content)) updateCurrentAttributes(endAttributes, /** @type {ContentFormat} */ (end.content))
@ -353,7 +355,11 @@ const cleanupFormattingGap = (transaction, start, end, startAttributes, endAttri
end = end.right end = end.right
} }
let cleanups = 0 let cleanups = 0
let reachedEndOfCurr = false
while (start !== end) { while (start !== end) {
if (curr === start) {
reachedEndOfCurr = true
}
if (!start.deleted) { if (!start.deleted) {
const content = start.content const content = start.content
switch (content.constructor) { switch (content.constructor) {
@ -363,6 +369,9 @@ const cleanupFormattingGap = (transaction, start, end, startAttributes, endAttri
// Either this format is overwritten or it is not necessary because the attribute already existed. // Either this format is overwritten or it is not necessary because the attribute already existed.
start.delete(transaction) start.delete(transaction)
cleanups++ cleanups++
if (!reachedEndOfCurr && (currAttributes.get(key) || null) === value) {
currAttributes.delete(key)
}
} }
break break
} }
@ -465,7 +474,7 @@ const deleteText = (transaction, currPos, length) => {
currPos.forward() currPos.forward()
} }
if (start) { if (start) {
cleanupFormattingGap(transaction, start, currPos.right, startAttrs, map.copy(currPos.currentAttributes)) cleanupFormattingGap(transaction, start, currPos.right, startAttrs, currPos.currentAttributes)
} }
const parent = /** @type {AbstractType<any>} */ (/** @type {Item} */ (currPos.left || currPos.right).parent) const parent = /** @type {AbstractType<any>} */ (/** @type {Item} */ (currPos.left || currPos.right).parent)
if (parent._searchMarker) { if (parent._searchMarker) {

22
tests/y-text.tests.js
View File

@ -138,6 +138,28 @@ export const testNotMergeEmptyLinesFormat = tc => {
]) ])
} }
/**
* @param {t.TestCase} tc
*/
export const testPreserveAttributesThroughDelete = tc => {
const ydoc = new Y.Doc()
const testText = ydoc.getText('test')
testText.applyDelta([
{ insert: 'Text' },
{ insert: '\n', attributes: { title: true } },
{ insert: '\n' }
])
testText.applyDelta([
{ retain: 4 },
{ delete: 1 },
{ retain: 1, attributes: { title: true } }
])
t.compare(testText.toDelta(), [
{ insert: 'Text' },
{ insert: '\n', attributes: { title: true } }
])
}
/** /**
* @param {t.TestCase} tc * @param {t.TestCase} tc
*/ */