Skip to content
Open
Changes from all commits
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
10 changes: 10 additions & 0 deletions packages/tailwindcss/src/design-system.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ export function buildDesignSystem(
let variants = createVariants(theme)

let parsedVariants = new DefaultMap((variant) => parseVariant(variant, designSystem))
let cachedVariantOrder: Map<Variant, number> | null = null
let cachedVariantOrderSize = -1
let parsedCandidates = new DefaultMap((candidate) =>
Array.from(parseCandidate(candidate, designSystem)),
)
Expand Down Expand Up @@ -188,6 +190,11 @@ export function buildDesignSystem(
},

getVariantOrder() {
// parsedVariants only grows, so the cache should be reset only when the size changes
if (cachedVariantOrder !== null && cachedVariantOrderSize === parsedVariants.size) {
return cachedVariantOrder
}

let variants = Array.from(parsedVariants.values())
variants.sort((a, z) => this.variants.compare(a, z))

Expand All @@ -209,6 +216,9 @@ export function buildDesignSystem(
prevVariant = variant
}

cachedVariantOrder = order
cachedVariantOrderSize = parsedVariants.size

return order
},

Expand Down