Split box shadows on top-level commas only (#7479)
* Split box shadows on top-level commas only * Update changelog
This commit is contained in:
parent
b94d565eb6
commit
04686b8a05
3 changed files with 79 additions and 2 deletions
|
|
@ -1,10 +1,58 @@
|
|||
let KEYWORDS = new Set(['inset', 'inherit', 'initial', 'revert', 'unset'])
|
||||
let COMMA = /\,(?![^(]*\))/g // Comma separator that is not located between brackets. E.g.: `cubiz-bezier(a, b, c)` these don't count.
|
||||
let SPACE = /\ +(?![^(]*\))/g // Similar to the one above, but with spaces instead.
|
||||
let LENGTH = /^-?(\d+|\.\d+)(.*?)$/g
|
||||
|
||||
let SPECIALS = /[(),]/g
|
||||
|
||||
/**
|
||||
* This splits a string on top-level commas.
|
||||
*
|
||||
* Regex doesn't support recursion (at least not the JS-flavored version).
|
||||
* So we have to use a tiny state machine to keep track of paren vs comma
|
||||
* placement. Before we'd only exclude commas from the inner-most nested
|
||||
* set of parens rather than any commas that were not contained in parens
|
||||
* at all which is the intended behavior here.
|
||||
*
|
||||
* Expected behavior:
|
||||
* var(--a, 0 0 1px rgb(0, 0, 0)), 0 0 1px rgb(0, 0, 0)
|
||||
* ─┬─ ┬ ┬ ┬
|
||||
* x x x ╰──────── Split because top-level
|
||||
* ╰──────────────┴──┴───────────── Ignored b/c inside >= 1 levels of parens
|
||||
*
|
||||
* @param {string} input
|
||||
*/
|
||||
function* splitByTopLevelCommas(input) {
|
||||
SPECIALS.lastIndex = -1
|
||||
|
||||
let depth = 0
|
||||
let lastIndex = 0
|
||||
let found = false
|
||||
|
||||
// Find all parens & commas
|
||||
// And only split on commas if they're top-level
|
||||
for (let match of input.matchAll(SPECIALS)) {
|
||||
if (match[0] === '(') depth++
|
||||
if (match[0] === ')') depth--
|
||||
if (match[0] === ',' && depth === 0) {
|
||||
found = true
|
||||
|
||||
yield input.substring(lastIndex, match.index)
|
||||
lastIndex = match.index + match[0].length
|
||||
}
|
||||
}
|
||||
|
||||
// Provide the last segment of the string if available
|
||||
// Otherwise the whole string since no commas were found
|
||||
// This mirrors the behavior of string.split()
|
||||
if (found) {
|
||||
yield input.substring(lastIndex)
|
||||
} else {
|
||||
yield input
|
||||
}
|
||||
}
|
||||
|
||||
export function parseBoxShadowValue(input) {
|
||||
let shadows = input.split(COMMA)
|
||||
let shadows = Array.from(splitByTopLevelCommas(input))
|
||||
return shadows.map((shadow) => {
|
||||
let value = shadow.trim()
|
||||
let result = { raw: value }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue