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

feat: allow wildcards when checking attributes in isActive, fix #1752

Browse Source
This commit is contained in:
Philipp Kühn
2021-08-20 10:51:46 +02:00
parent c473f550c7
commit 64409cad66
5 changed files with 149 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/src/helpers/isMarkActive.ts
View File

@@ -23,7 +23,7 @@ export default function isMarkActive(
return type.name === mark.type.name
})
.find(mark => objectIncludes(mark.attrs, attributes))
.find(mark => objectIncludes(mark.attrs, attributes, { strict: false }))
}
let selectionRange = 0
@@ -58,7 +58,7 @@ export default function isMarkActive(
return type.name === markRange.mark.type.name
})
.filter(markRange => objectIncludes(markRange.mark.attrs, attributes))
.filter(markRange => objectIncludes(markRange.mark.attrs, attributes, { strict: false }))
.reduce((sum, markRange) => {
const size = markRange.to - markRange.from

4
packages/core/src/helpers/isNodeActive.ts
View File

@@ -38,7 +38,7 @@ export default function isNodeActive(
return type.name === nodeRange.node.type.name
})
.find(nodeRange => objectIncludes(nodeRange.node.attrs, attributes))
.find(nodeRange => objectIncludes(nodeRange.node.attrs, attributes, { strict: false }))
}
const selectionRange = to - from
@@ -51,7 +51,7 @@ export default function isNodeActive(
return type.name === nodeRange.node.type.name
})
.filter(nodeRange => objectIncludes(nodeRange.node.attrs, attributes))
.filter(nodeRange => objectIncludes(nodeRange.node.attrs, attributes, { strict: false }))
.reduce((sum, nodeRange) => {
const size = nodeRange.to - nodeRange.from
return sum + size