Skip to content

Make decodeArbitraryValue overridable #14717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
RobinMalfait wants to merge 1 commit into from
Closed

Make decodeArbitraryValue overridable #14717

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 24 additions & 9 deletions packages/tailwindcss/src/candidate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { DesignSystem } from './design-system'
import { decodeArbitraryValue } from './utils/decode-arbitrary-value'
import { decodeArbitraryValue as defaultDecodeArbitraryValue } from './utils/decode-arbitrary-value'
import { segment } from './utils/segment'

const COLON = 0x3a
Expand Down Expand Up @@ -220,7 +220,11 @@ export type Candidate =
raw: string
}

export function* parseCandidate(input: string, designSystem: DesignSystem): Iterable<Candidate> {
export function* parseCandidate(
input: string,
designSystem: DesignSystem,
{ decodeArbitraryValue = defaultDecodeArbitraryValue } = {},
): Iterable<Candidate> {
// hover:focus:underline
// ^^^^^ ^^^^^^ -> Variants
// ^^^^^^^^^ -> Base
Expand Down Expand Up @@ -339,7 +343,8 @@ export function* parseCandidate(input: string, designSystem: DesignSystem): Iter
kind: 'arbitrary',
property,
value,
modifier: modifierSegment === null ? null : parseModifier(modifierSegment),
modifier:
modifierSegment === null ? null : parseModifier(modifierSegment, { decodeArbitraryValue }),
variants: parsedCandidateVariants,
important,
raw: input,
Expand Down Expand Up @@ -393,7 +398,8 @@ export function* parseCandidate(input: string, designSystem: DesignSystem): Iter
let candidate: Candidate = {
kind: 'functional',
root,
modifier: modifierSegment === null ? null : parseModifier(modifierSegment),
modifier:
modifierSegment === null ? null : parseModifier(modifierSegment, { decodeArbitraryValue }),
value: null,
variants: parsedCandidateVariants,
negative,
Expand Down Expand Up @@ -460,7 +466,10 @@ export function* parseCandidate(input: string, designSystem: DesignSystem): Iter
}
}

function parseModifier(modifier: string): CandidateModifier {
function parseModifier(
modifier: string,
{ decodeArbitraryValue }: { decodeArbitraryValue: (input: string) => string },
): CandidateModifier {
if (modifier[0] === '[' && modifier[modifier.length - 1] === ']') {
let arbitraryValue = modifier.slice(1, -1)

Expand All @@ -476,7 +485,11 @@ function parseModifier(modifier: string): CandidateModifier {
}
}

export function parseVariant(variant: string, designSystem: DesignSystem): Variant | null {
export function parseVariant(
variant: string,
designSystem: DesignSystem,
{ decodeArbitraryValue = defaultDecodeArbitraryValue } = {},
): Variant | null {
// Arbitrary variants
if (variant[0] === '[' && variant[variant.length - 1] === ']') {
/**
Expand Down Expand Up @@ -555,7 +568,8 @@ export function parseVariant(variant: string, designSystem: DesignSystem): Varia
return {
kind: 'functional',
root,
modifier: modifier === null ? null : parseModifier(modifier),
modifier:
modifier === null ? null : parseModifier(modifier, { decodeArbitraryValue }),
value: null,
compounds: designSystem.variants.compounds(root),
}
Expand All @@ -565,7 +579,8 @@ export function parseVariant(variant: string, designSystem: DesignSystem): Varia
return {
kind: 'functional',
root,
modifier: modifier === null ? null : parseModifier(modifier),
modifier:
modifier === null ? null : parseModifier(modifier, { decodeArbitraryValue }),
value: {
kind: 'arbitrary',
value: decodeArbitraryValue(value.slice(1, -1)),
Expand All @@ -577,7 +592,7 @@ export function parseVariant(variant: string, designSystem: DesignSystem): Varia
return {
kind: 'functional',
root,
modifier: modifier === null ? null : parseModifier(modifier),
modifier: modifier === null ? null : parseModifier(modifier, { decodeArbitraryValue }),
value: { kind: 'named', value },
compounds: designSystem.variants.compounds(root),
}
Expand Down