Skip to content
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

Parent state modifier without explicit parent (in-*) #13912

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Parent state modifier without explicit parent (in-*) #13912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0b8de8
Add simplified any parent variant (in-{modifier})
eloyesp Jun 28, 2024
ecd67db
Add support for in-data
eloyesp Jun 28, 2024
b3fc234
Add in-aria support
eloyesp Jun 28, 2024
266ba40
Add in-has support
eloyesp Jun 28, 2024
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
14 changes: 14 additions & 0 deletions src/corePlugins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ export let variantPlugins = {
}

let variants = {
in: (_) => ['', ' &'],
group: (_, { modifier }) =>
modifier
? [`:merge(${prefix('.group')}\\/${escapeClassName(modifier)})`, ' &']
Expand Down Expand Up @@ -442,6 +443,13 @@ export let variantPlugins = {
},
})

matchVariant('in-has', (value) => `:has(${normalize(value)}) &`, {
values: {},
[INTERNAL_FEATURES]: {
respectPrefix: false,
},
})

matchVariant(
'group-has',
(value, { modifier }) =>
Expand Down Expand Up @@ -473,6 +481,9 @@ export let variantPlugins = {

ariaVariants: ({ matchVariant, theme }) => {
matchVariant('aria', (value) => `&[aria-${normalize(value)}]`, { values: theme('aria') ?? {} })
matchVariant('in-aria', (value) => `[aria-${normalize(value)}] &`, {
values: theme('aria') ?? {},
})
matchVariant(
'group-aria',
(value, { modifier }) =>
Expand All @@ -493,6 +504,9 @@ export let variantPlugins = {

dataVariants: ({ matchVariant, theme }) => {
matchVariant('data', (value) => `&[data-${normalize(value)}]`, { values: theme('data') ?? {} })
matchVariant('in-data', (value) => `[data-${normalize(value)}] &`, {
values: theme('data') ?? {},
})
matchVariant(
'group-data',
(value, { modifier }) =>
Expand Down
86 changes: 86 additions & 0 deletions tests/arbitrary-variants.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,12 +602,15 @@ it('should support aria variants', () => {
<div class="aria-checked:underline"></div>
<div class="aria-[sort=ascending]:underline"></div>
<div class="aria-[labelledby='a_b']:underline"></div>
<div class="in-aria-checked:underline"></div>
<div class="group-aria-checked:underline"></div>
<div class="peer-aria-checked:underline"></div>
<div class="group-aria-checked/foo:underline"></div>
<div class="peer-aria-checked/foo:underline"></div>
<div class="in-aria-[sort=ascending]:underline"></div>
<div class="group-aria-[sort=ascending]:underline"></div>
<div class="peer-aria-[sort=ascending]:underline"></div>
<div class="in-aria-[labelledby='a_b']:underline"></div>
<div class="group-aria-[labelledby='a_b']:underline"></div>
<div class="peer-aria-[labelledby='a_b']:underline"></div>
<div class="group-aria-[sort=ascending]/foo:underline"></div>
Expand All @@ -629,6 +632,9 @@ it('should support aria variants', () => {
.aria-checked\:underline[aria-checked='true'],
.aria-\[labelledby\=\'a_b\'\]\:underline[aria-labelledby='a b'],
.aria-\[sort\=ascending\]\:underline[aria-sort='ascending'],
[aria-checked='true'] .in-aria-checked\:underline,
[aria-labelledby='a b'] .in-aria-\[labelledby\=\'a_b\'\]\:underline,
[aria-sort='ascending'] .in-aria-\[sort\=ascending\]\:underline,
.group\/foo[aria-checked='true'] .group-aria-checked\/foo\:underline,
.group[aria-checked='true'] .group-aria-checked\:underline,
.group[aria-labelledby='a b'] .group-aria-\[labelledby\=\'a_b\'\]\:underline,
Expand Down Expand Up @@ -659,10 +665,12 @@ it('should support data variants', () => {
<div class="data-checked:underline"></div>
<div class="data-[position=top]:underline"></div>
<div class="data-[foo='bar_baz']:underline"></div>
<div class="in-data-checked:underline"></div>
<div class="group-data-checked:underline"></div>
<div class="peer-data-checked:underline"></div>
<div class="group-data-checked/foo:underline"></div>
<div class="peer-data-checked/foo:underline"></div>
<div class="in-data-[position=top]:underline"></div>
<div class="group-data-[position=top]:underline"></div>
<div class="peer-data-[position=top]:underline"></div>
<div class="group-data-[foo='bar_baz']:underline"></div>
Expand All @@ -686,6 +694,8 @@ it('should support data variants', () => {
.data-checked\:underline[data-ui~='checked'],
.data-\[foo\=\'bar_baz\'\]\:underline[data-foo='bar baz'],
.data-\[position\=top\]\:underline[data-position='top'],
[data-ui~='checked'] .in-data-checked\:underline,
[data-position='top'] .in-data-\[position\=top\]\:underline,
.group\/foo[data-ui~='checked'] .group-data-checked\/foo\:underline,
.group[data-ui~='checked'] .group-data-checked\:underline,
.group[data-foo='bar baz'] .group-data-\[foo\=\'bar_baz\'\]\:underline,
Expand Down Expand Up @@ -840,6 +850,30 @@ test('has-* variants with arbitrary values', () => {
})
})

test('in-has-* variants with arbitrary values', () => {
let config = {
theme: {},
content: [
{
raw: html`<div class="in-has-[>_h1_+_.foo]:block"></div>`,
},
],
corePlugins: { preflight: false },
}

let input = css`
@tailwind utilities;
`

return run(input, config).then((result) => {
expect(result.css).toMatchFormattedCss(css`
:has(> h1 + .foo) .in-has-\[\>_h1_\+_\.foo\]\:block {
display: block;
}
`)
})
})

test('group-has-* variants with arbitrary values', () => {
let config = {
theme: {},
Expand Down Expand Up @@ -910,6 +944,58 @@ test('peer-has-* variants with arbitrary values', () => {
})
})

it('should be possible to use modifiers with in', () => {
let config = {
content: [
{
raw: html`
<div>
<!-- Default in usage -->
<div class="in-hover:underline"></div>

<!-- Arbitrary variants with pseudo class for in -->
<!-- With & -->
<div class="in-[&:focus]:underline"></div>
<!-- Without & -->
<div class="in-[:hover]:underline"></div>

<!-- Arbitrary variants with attributes selectors for in -->
<!-- With & -->
<div class="in-[&[data-open]]:underline"></div>
<!-- Without & -->
<div class="in-[[data-open]]:underline"></div>

<!-- Arbitrary variants with other selectors -->
<!-- With & -->
<div class="in-[.foo_&]:underline"></div>
<!-- Without & -->
<div class="in-[.foo]:underline"></div>
</div>
`,
},
],
corePlugins: { preflight: false },
}

let input = css`
@tailwind utilities;
`

return run(input, config).then((result) => {
expect(result.css).toMatchFormattedCss(css`
:hover .in-hover\:underline,
:focus .in-\[\&\:focus\]\:underline,
[data-open] .in-\[\&\[data-open\]\]\:underline,
.foo .in-\[\.foo\]\:underline,
.foo .in-\[\.foo_\&\]\:underline,
:hover .in-\[\:hover\]\:underline,
[data-open] .in-\[\[data-open\]\]\:underline {
text-decoration-line: underline;
}
`)
})
})

it('should be possible to use modifiers and arbitrary groups', () => {
let config = {
content: [
Expand Down