ianhitchman/tiptap
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: better merge mark attributes for existing marks, fix #1039

Browse Source
This commit is contained in:
Philipp Kühn
2021-04-23 08:58:03 +02:00
parent 5e53e444d5
commit cfd29fac86
2 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/core/src/commands/updateAttributes.ts
View File

@@ -40,7 +40,10 @@ export const updateAttributes: RawCommands['updateAttributes'] = (typeOrName, at
if (dispatch) {
tr.selection.ranges.forEach(range => {
state.doc.nodesBetween(range.$from.pos, range.$to.pos, (node, pos) => {
const from = range.$from.pos
const to = range.$to.pos
state.doc.nodesBetween(from, to, (node, pos) => {
if (nodeType && nodeType === node.type) {
tr.setNodeMarkup(pos, undefined, {
...node.attrs,
@@ -51,7 +54,10 @@ export const updateAttributes: RawCommands['updateAttributes'] = (typeOrName, at
if (markType && node.marks.length) {
node.marks.forEach(mark => {
if (markType === mark.type) {
tr.addMark(pos, pos + node.nodeSize, markType.create({
const trimmedFrom = Math.max(pos, from)
const trimmedTo = Math.min(pos + node.nodeSize, to)
tr.addMark(trimmedFrom, trimmedTo, markType.create({
...mark.attrs,
...attributes,
}))