Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
find first matching type when coercing the value
  • Loading branch information
RobinMalfait committed Sep 24, 2021
commit 355371f0cb8c3665b7e346784667e807f82b8406
12 changes: 7 additions & 5 deletions src/util/pluginUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -292,9 +292,7 @@ function splitAtFirst(input, delim) {
return [input.slice(0, idx), input.slice(idx + 1)]
}

export function coerceValue(type, modifier, values, tailwindConfig) {
let [scaleType, arbitraryType = scaleType] = [].concat(type)

export function coerceValue(types, modifier, values, tailwindConfig) {
if (isArbitraryValue(modifier)) {
let [explicitType, value] = splitAtFirst(modifier.slice(1, -1), ':')

Expand All @@ -305,9 +303,13 @@ export function coerceValue(type, modifier, values, tailwindConfig) {
if (value.length > 0 && supportedTypes.includes(explicitType)) {
return [asValue(`[${value}]`, values, tailwindConfig), explicitType]
}
}

return [typeMap[arbitraryType](modifier, values, tailwindConfig), arbitraryType]
// Find first matching type
for (let type of [].concat(types)) {
let result = typeMap[type](modifier, values, tailwindConfig)
if (result) return [result, type]
}

return [typeMap[scaleType](modifier, values, tailwindConfig), scaleType]
return []
}