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

Jump to bottom

Improve relative precedence of rtl, ltr, forced-colors and dark variants #12584

Merged
merged 2 commits into from
Dec 16, 2023
Merged

Improve relative precedence of rtl, ltr, forced-colors and dark variants #12584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b68e7cf
Reduce specificity of `rtl`, `ltr`, and `dark` variants
adamwathan Dec 13, 2023
ee3cdf2
Update changelog
adamwathan Dec 16, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Simplify the `sans` font-family stack ([#11748](https://github.com/tailwindlabs/tailwindcss/pull/11748))
- Disable the tap highlight overlay on iOS ([#12299](https://github.com/tailwindlabs/tailwindcss/pull/12299))
- Improve relative precedence of `rtl`, `ltr`, `forced-colors`, and `dark` variants ([#12584](https://github.com/tailwindlabs/tailwindcss/pull/12584))
- [Oxide] Deprecate `--no-autoprefixer` flag in the CLI ([#11280](https://github.com/tailwindlabs/tailwindcss/pull/11280))
- [Oxide] Make the Rust based parser the default ([#11394](https://github.com/tailwindlabs/tailwindcss/pull/11394))

Expand Down
6 changes: 3 additions & 3 deletions src/corePlugins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ export let variantPlugins = {
},

directionVariants: ({ addVariant }) => {
addVariant('ltr', ':is([dir="ltr"] &)')
addVariant('rtl', ':is([dir="rtl"] &)')
addVariant('ltr', ':is(:where([dir="ltr"]) &)')
addVariant('rtl', ':is(:where([dir="rtl"]) &)')
},

reducedMotionVariants: ({ addVariant }) => {
Expand All @@ -228,7 +228,7 @@ export let variantPlugins = {
}

if (mode === 'class') {
addVariant('dark', `:is(${className} &)`)
addVariant('dark', `:is(:where(${className}) &)`)
} else if (mode === 'media') {
addVariant('dark', '@media (prefers-color-scheme: dark)')
}
Expand Down
6 changes: 3 additions & 3 deletions src/lib/setupContextUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,14 +755,14 @@ function resolvePlugins(context, root) {
]
let afterVariants = [
variantPlugins['supportsVariants'],
variantPlugins['directionVariants'],
variantPlugins['reducedMotionVariants'],
variantPlugins['prefersContrastVariants'],
variantPlugins['darkVariants'],
variantPlugins['forcedColorsVariants'],
variantPlugins['printVariant'],
variantPlugins['screenVariants'],
variantPlugins['orientationVariants'],
variantPlugins['directionVariants'],
variantPlugins['darkVariants'],
variantPlugins['forcedColorsVariants'],
]

return [...corePluginList, ...beforeVariants, ...userPlugins, ...afterVariants, ...layerPlugins]
Expand Down
38 changes: 19 additions & 19 deletions tests/apply-important-selector.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
import { applyImportantSelector } from '../src/util/applyImportantSelector'

it.each`
before | after
${'.foo'} | ${'#app :is(.foo)'}
${'.foo .bar'} | ${'#app :is(.foo .bar)'}
${'.foo:hover'} | ${'#app :is(.foo:hover)'}
${'.foo .bar:hover'} | ${'#app :is(.foo .bar:hover)'}
${'.foo::before'} | ${'#app :is(.foo)::before'}
${'.foo::before'} | ${'#app :is(.foo)::before'}
${'.foo::file-selector-button'} | ${'#app :is(.foo)::file-selector-button'}
${'.foo::-webkit-progress-bar'} | ${'#app :is(.foo)::-webkit-progress-bar'}
${'.foo:hover::before'} | ${'#app :is(.foo:hover)::before'}
${':is(.dark :is([dir="rtl"] .foo::before))'} | ${'#app :is(.dark :is([dir="rtl"] .foo))::before'}
${':is(.dark .foo) .bar'} | ${'#app :is(:is(.dark .foo) .bar)'}
${':is(.foo) :is(.bar)'} | ${'#app :is(:is(.foo) :is(.bar))'}
${':is(.foo)::before'} | ${'#app :is(.foo)::before'}
${'.foo:before'} | ${'#app :is(.foo):before'}
${'.foo::some-unknown-pseudo'} | ${'#app :is(.foo)::some-unknown-pseudo'}
${'.foo::some-unknown-pseudo:hover'} | ${'#app :is(.foo)::some-unknown-pseudo:hover'}
${'.foo:focus::some-unknown-pseudo:hover'} | ${'#app :is(.foo:focus)::some-unknown-pseudo:hover'}
${'.foo:hover::some-unknown-pseudo:focus'} | ${'#app :is(.foo:hover)::some-unknown-pseudo:focus'}
before | after
${'.foo'} | ${'#app :is(.foo)'}
${'.foo .bar'} | ${'#app :is(.foo .bar)'}
${'.foo:hover'} | ${'#app :is(.foo:hover)'}
${'.foo .bar:hover'} | ${'#app :is(.foo .bar:hover)'}
${'.foo::before'} | ${'#app :is(.foo)::before'}
${'.foo::before'} | ${'#app :is(.foo)::before'}
${'.foo::file-selector-button'} | ${'#app :is(.foo)::file-selector-button'}
${'.foo::-webkit-progress-bar'} | ${'#app :is(.foo)::-webkit-progress-bar'}
${'.foo:hover::before'} | ${'#app :is(.foo:hover)::before'}
${':is(:where(.dark) :is(:where([dir="rtl"]) .foo::before))'} | ${'#app :is(:where(.dark) :is(:where([dir="rtl"]) .foo))::before'}
${':is(:where(.dark) .foo) .bar'} | ${'#app :is(:is(:where(.dark) .foo) .bar)'}
${':is(.foo) :is(.bar)'} | ${'#app :is(:is(.foo) :is(.bar))'}
${':is(.foo)::before'} | ${'#app :is(.foo)::before'}
${'.foo:before'} | ${'#app :is(.foo):before'}
${'.foo::some-unknown-pseudo'} | ${'#app :is(.foo)::some-unknown-pseudo'}
${'.foo::some-unknown-pseudo:hover'} | ${'#app :is(.foo)::some-unknown-pseudo:hover'}
${'.foo:focus::some-unknown-pseudo:hover'} | ${'#app :is(.foo:focus)::some-unknown-pseudo:hover'}
${'.foo:hover::some-unknown-pseudo:focus'} | ${'#app :is(.foo:hover)::some-unknown-pseudo:focus'}
`('should generate "$after" from "$before"', ({ before, after }) => {
expect(applyImportantSelector(before, '#app')).toEqual(after)
})
26 changes: 15 additions & 11 deletions tests/apply.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,14 +215,14 @@ test('@apply', () => {
text-align: left;
}
}
:is(.dark .apply-dark-variant) {
:is(:where(.dark) .apply-dark-variant) {
text-align: center;
}
:is(.dark .apply-dark-variant:hover) {
:is(:where(.dark) .apply-dark-variant:hover) {
text-align: right;
}
@media (min-width: 1024px) {
:is(.dark .apply-dark-variant) {
:is(:where(.dark) .apply-dark-variant) {
text-align: left;
}
}
Expand Down Expand Up @@ -2016,24 +2016,28 @@ it('pseudo elements inside apply are moved outside of :is() or :has()', () => {

return run(input, config).then((result) => {
expect(result.css).toMatchFormattedCss(css`
:is(.dark .foo):before,
:is([dir='rtl'] :is(.dark .bar)):before,
:is([dir='rtl'] :is(.dark .baz:hover)):before {
:is(:where(.dark) .foo):before,
:is(:where([dir='rtl']) :is(:where(.dark) .bar)):before,
:is(:where([dir='rtl']) :is(:where(.dark) .baz:hover)):before {
background-color: #000;
}
:-webkit-any([dir='rtl'] :-webkit-any(.dark .qux))::-webkit-file-upload-button:hover {
:-webkit-any(
:where([dir='rtl']) :-webkit-any(:where(.dark) .qux)
)::-webkit-file-upload-button:hover {
background-color: #000;
}
:is([dir='rtl'] :is(.dark .qux))::file-selector-button:hover {
:is(:where([dir='rtl']) :is(:where(.dark) .qux))::file-selector-button:hover {
background-color: #000;
}
:is([dir='rtl'] :is(.dark .steve):hover):before {
:is(:where([dir='rtl']) :is(:where(.dark) .steve):hover):before {
background-color: #000;
}
:-webkit-any([dir='rtl'] :-webkit-any(.dark .bob))::-webkit-file-upload-button:hover {
:-webkit-any(
:where([dir='rtl']) :-webkit-any(:where(.dark) .bob)
)::-webkit-file-upload-button:hover {
background-color: #000;
}
:is([dir='rtl'] :is(.dark .bob))::file-selector-button:hover {
:is(:where([dir='rtl']) :is(:where(.dark) .bob))::file-selector-button:hover {
background-color: #000;
}
:has([dir='rtl'] .foo:hover):before {
Expand Down
12 changes: 6 additions & 6 deletions tests/custom-separator.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,22 @@ test('custom separator', () => {
.group:hover .group-hover_focus-within_text-left:focus-within {
text-align: left;
}
:is([dir='rtl'] .rtl_active_text-center:active) {
text-align: center;
}
@media (prefers-reduced-motion: no-preference) {
.motion-safe_hover_text-center:hover {
text-align: center;
}
}
:is(.dark .dark_focus_text-left:focus) {
text-align: left;
}
@media (min-width: 768px) {
.md_hover_text-right:hover {
text-align: right;
}
}
:is(:where([dir='rtl']) .rtl_active_text-center:active) {
text-align: center;
}
:is(:where(.dark) .dark_focus_text-left:focus) {
text-align: left;
}
`)
})
})
Expand Down
4 changes: 2 additions & 2 deletions tests/dark-mode.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ it('should be possible to use the darkMode "class" mode', () => {
return run(input, config).then((result) => {
expect(result.css).toMatchFormattedCss(css`
${defaults}
:is(.dark .dark\:font-bold) {
:is(:where(.dark) .dark\:font-bold) {
font-weight: 700;
}
`)
Expand All @@ -39,7 +39,7 @@ it('should be possible to change the class name', () => {
return run(input, config).then((result) => {
expect(result.css).toMatchFormattedCss(css`
${defaults}
:is(.test-dark .dark\:font-bold) {
:is(:where(.test-dark) .dark\:font-bold) {
font-weight: 700;
}
`)
Expand Down
4 changes: 2 additions & 2 deletions tests/format-variant-selector.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,8 @@ describe('pseudo elements', () => {
${'.parent::before &:hover'} | ${'.parent &:hover::before'}
${':where(&::before) :is(h1, h2, h3, h4)'} | ${':where(&) :is(h1, h2, h3, h4)::before'}
${':where(&::file-selector-button) :is(h1, h2, h3, h4)'} | ${':where(&::file-selector-button) :is(h1, h2, h3, h4)'}
${'#app :is(.dark &::before)'} | ${'#app :is(.dark &)::before'}
${'#app :is(:is(.dark &)::before)'} | ${'#app :is(:is(.dark &))::before'}
${'#app :is(:where(.dark) &::before)'} | ${'#app :is(:where(.dark) &)::before'}
${'#app :is(:is(:where(.dark) &)::before)'} | ${'#app :is(:is(:where(.dark) &))::before'}
${'#app :is(.foo::file-selector-button)'} | ${'#app :is(.foo)::file-selector-button'}
${'#app :is(.foo::-webkit-progress-bar)'} | ${'#app :is(.foo)::-webkit-progress-bar'}
${'.parent::marker li'} | ${'.parent li::marker'}
Expand Down
12 changes: 6 additions & 6 deletions tests/important-boolean.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,22 +137,22 @@ test('important boolean', () => {
.group:hover .group-hover\:focus-within\:text-left:focus-within {
text-align: left !important;
}
:is([dir='rtl'] .rtl\:active\:text-center:active) {
text-align: center !important;
}
@media (prefers-reduced-motion: no-preference) {
.motion-safe\:hover\:text-center:hover {
text-align: center !important;
}
}
:is(.dark .dark\:focus\:text-left:focus) {
text-align: left !important;
}
@media (min-width: 768px) {
.md\:hover\:text-right:hover {
text-align: right !important;
}
}
:is(:where([dir='rtl']) .rtl\:active\:text-center:active) {
text-align: center !important;
}
:is(:where(.dark) .dark\:focus\:text-left:focus) {
text-align: left !important;
}
`)
})
})
Expand Down
31 changes: 17 additions & 14 deletions tests/important-selector.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,36 +135,39 @@ test('important selector', () => {
#app :is(.group:hover .group-hover\:focus-within\:text-left:focus-within) {
text-align: left;
}
#app :is([dir='rtl'] .rtl\:active\:text-center:active) {
text-align: center;
}
@media (prefers-reduced-motion: no-preference) {
#app .motion-safe\:hover\:text-center:hover {
text-align: center;
}
}
#app :is(.dark .dark\:before\:underline):before {
content: var(--tw-content);
text-decoration-line: underline;
}
#app :is(.dark .dark\:focus\:text-left:focus) {
text-align: left;
}
@media (min-width: 768px) {
#app .md\:hover\:text-right:hover {
text-align: right;
}
}
#app :is(:where([dir='rtl']) .rtl\:active\:text-center:active) {
text-align: center;
}
#app :is(:where(.dark) .dark\:before\:underline):before {
content: var(--tw-content);
text-decoration-line: underline;
}
#app :is(:where(.dark) .dark\:focus\:text-left:focus) {
text-align: left;
}
#app
:-webkit-any(
[dir='rtl']
:-webkit-any(.dark .hover\:\[\&\:\:file-selector-button\]\:rtl\:dark\:bg-black\/100)
:where([dir='rtl'])
:-webkit-any(
:where(.dark) .hover\:\[\&\:\:file-selector-button\]\:rtl\:dark\:bg-black\/100
)
)::-webkit-file-upload-button:hover {
background-color: #000;
}
#app
:is(
[dir='rtl'] :is(.dark .hover\:\[\&\:\:file-selector-button\]\:rtl\:dark\:bg-black\/100)
:where([dir='rtl'])
:is(:where(.dark) .hover\:\[\&\:\:file-selector-button\]\:rtl\:dark\:bg-black\/100)
)::file-selector-button:hover {
background-color: #000;
}
Expand Down Expand Up @@ -193,7 +196,7 @@ test('pseudo-elements are appended after the `:-webkit-any()`', () => {
return run(input, config).then((result) => {
expect(result.css).toMatchFormattedCss(css`
${defaults}
#app :is(.dark .dark\:before\:flex):before {
#app :is(:where(.dark) .dark\:before\:flex):before {
content: var(--tw-content);
display: flex;
}
Expand Down
20 changes: 12 additions & 8 deletions tests/kitchen-sink.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ test('it works', () => {
}
.drop-empty-rules:hover,
.group:hover .apply-group,
:is(.dark .apply-dark-mode) {
:is(:where(.dark) .apply-dark-mode) {
font-weight: 700;
}
.apply-with-existing:hover {
Expand Down Expand Up @@ -339,7 +339,7 @@ test('it works', () => {
.apply-order-b {
margin: 1.5rem 1.25rem 1.25rem;
}
:is(.dark .group:hover .apply-dark-group-example-a) {
:is(:where(.dark) .group:hover .apply-dark-group-example-a) {
--tw-bg-opacity: 1;
background-color: rgb(34 197 94 / var(--tw-bg-opacity));
}
Expand Down Expand Up @@ -744,9 +744,6 @@ test('it works', () => {
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
}
}
:is(.dark .dark\:custom-util) {
background: #abcdef;
}
@media (min-width: 640px) {
.sm\:text-center {
text-align: center;
Expand Down Expand Up @@ -792,9 +789,6 @@ test('it works', () => {
transition-duration: 0.15s;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
}
:is(.dark .md\:dark\:motion-safe\:foo\:active\:custom-util:active) {
background: #abcdef !important;
}
}
@media (min-width: 640px) {
.md\:sm\:text-center {
Expand All @@ -812,6 +806,16 @@ test('it works', () => {
text-align: left;
}
}
:is(:where(.dark) .dark\:custom-util) {
background: #abcdef;
}
@media (min-width: 768px) {
@media (prefers-reduced-motion: no-preference) {
:is(:where(.dark) .md\:dark\:motion-safe\:foo\:active\:custom-util:active) {
background: #abcdef !important;
}
}
}
`)
})
})
4 changes: 2 additions & 2 deletions tests/plugins/variants/__snapshots__/darkVariants.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ exports[`should test the 'darkVariants' plugin 1`] = `

exports[`should test the 'darkVariants' plugin 2`] = `
"
:is(.dark .dark\\:flex) {
:is(:where(.dark) .dark\\:flex) {
display: flex;
}
"
`;

exports[`should test the 'darkVariants' plugin 3`] = `
"
:is(.my-dark-mode .dark\\:flex) {
:is(:where(.my-dark-mode) .dark\\:flex) {
display: flex;
}
"
Expand Down
2 changes: 1 addition & 1 deletion tests/plugins/variants/__snapshots__/directionVariants.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

exports[`should test the 'directionVariants' plugin 1`] = `
"
:is([dir="ltr"] .ltr\\:flex), :is([dir="rtl"] .rtl\\:flex) {
:is(:where([dir="ltr"]) .ltr\\:flex), :is(:where([dir="rtl"]) .rtl\\:flex) {
display: flex;
}
"
Expand Down
Loading
Loading