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

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

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

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

View File

@@ -0,0 +1,3 @@
export default function isRegExp(value: any): boolean {
return Object.prototype.toString.call(value) === '[object RegExp]'
}

View File

@@ -1,16 +1,30 @@
import isRegExp from './isRegExp'
/**
* Check if object1 includes object2
* @param object1 Object
* @param object2 Object
*/
export default function objectIncludes(object1: Record<string, any>, object2: Record<string, any>): boolean {
export default function objectIncludes(
object1: Record<string, any>,
object2: Record<string, any>,
options: { strict: boolean } = { strict: true },
): boolean {
const keys = Object.keys(object2)
if (!keys.length) {
return true
}
return !!keys
.filter(key => object2[key] === object1[key])
.length
return keys.every(key => {
if (options.strict) {
return object2[key] === object1[key]
}
if (isRegExp(object2[key])) {
return object2[key].test(object1[key])
}
return object2[key] === object1[key]
})
}