diff --git a/packages/preset-mini/src/_variants/aria.ts b/packages/preset-mini/src/_variants/aria.ts index 26caf67468..ee588cab4d 100644 --- a/packages/preset-mini/src/_variants/aria.ts +++ b/packages/preset-mini/src/_variants/aria.ts @@ -4,11 +4,11 @@ import { handler as h, variantGetParameter } from '../utils' export const variantAria: VariantObject = { name: 'aria', - match(matcher, { theme }: VariantContext) { - const variant = variantGetParameter('aria-', matcher, [':', '-']) + match(matcher, ctx: VariantContext) { + const variant = variantGetParameter('aria-', matcher, ctx.generator.config.separators) if (variant) { const [match, rest] = variant - const aria = h.bracket(match) ?? theme.aria?.[match] ?? '' + const aria = h.bracket(match) ?? ctx.theme.aria?.[match] ?? '' if (aria) { return { matcher: rest, diff --git a/packages/preset-mini/src/_variants/container.ts b/packages/preset-mini/src/_variants/container.ts index 8d7062810f..d63cb56670 100644 --- a/packages/preset-mini/src/_variants/container.ts +++ b/packages/preset-mini/src/_variants/container.ts @@ -5,11 +5,11 @@ import { handler as h, variantGetParameter } from '../utils' export const variantContainerQuery: VariantObject = { name: '@', - match(matcher, { theme }: VariantContext) { + match(matcher, ctx: VariantContext) { if (matcher.startsWith('@container')) return - const variant = variantGetParameter('@', matcher, [':', '-']) + const variant = variantGetParameter('@', matcher, ctx.generator.config.separators) if (variant) { const [match, rest, label] = variant const unbracket = h.bracket(match) @@ -20,7 +20,7 @@ export const variantContainerQuery: VariantObject = { container = `(min-width: ${minWidth})` } else { - container = theme.containers?.[match] ?? '' + container = ctx.theme.containers?.[match] ?? '' } if (container) { diff --git a/packages/preset-mini/src/_variants/data.ts b/packages/preset-mini/src/_variants/data.ts index 8bd9315920..08ca050e10 100644 --- a/packages/preset-mini/src/_variants/data.ts +++ b/packages/preset-mini/src/_variants/data.ts @@ -4,11 +4,11 @@ import { handler as h, variantGetParameter } from '../utils' export const variantDataAttribute: VariantObject = { name: 'data', - match(matcher, { theme }: VariantContext) { - const variant = variantGetParameter('data-', matcher, [':', '-']) + match(matcher, ctx: VariantContext) { + const variant = variantGetParameter('data-', matcher, ctx.generator.config.separators) if (variant) { const [match, rest] = variant - const dataAttribute = h.bracket(match) ?? theme.data?.[match] ?? '' + const dataAttribute = h.bracket(match) ?? ctx.theme.data?.[match] ?? '' if (dataAttribute) { return { matcher: rest,