Skip to content

Fix specificity of tailwind generated selectors #5147

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

Merged
merged 1 commit into from
Sep 27, 2023
Merged

Fix specificity of tailwind generated selectors #5147

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion packages/tailwindcss-react-aria-components/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const nativeVariantSelectors = new Map([
let getSelector = (prefix, attributeName, attributeValue) => {
let baseSelector = attributeValue ? `[data-${attributeName}="${attributeValue}"]` : `[data-${attributeName}]`;
if (prefix === '' && nativeVariantSelectors.has(attributeName)) {
return `&:is([data-rac]${baseSelector}, :not([data-rac])${nativeVariantSelectors.get(attributeName)})`;
return [`&:where([data-rac])${baseSelector}`, `&:where(:not([data-rac]))${nativeVariantSelectors.get(attributeName)}`];
} else {
return `&${baseSelector}`;
}
Expand Down
72 changes: 60 additions & 12 deletions packages/tailwindcss-react-aria-components/src/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,35 @@ test('variants', async () => {
let content = html`<div data-rac className="hover:bg-red focus:bg-red focus-visible:bg-red focus-within:bg-red pressed:bg-red disabled:bg-red drop-target:bg-red dragging:bg-red empty:bg-red allows-dragging:bg-red allows-removing:bg-red allows-sorting:bg-red placeholder-shown:bg-red selected:bg-red indeterminate:bg-red read-only:bg-red required:bg-red entering:bg-red exiting:bg-red open:bg-red unavailable:bg-red outside-month:bg-red outside-visible-range:bg-red selection-start:bg-red selection-end:bg-red current:bg-red invalid:bg-red resizing:bg-red placement-left:bg-red placement-right:bg-red placement-top:bg-red placement-bottom:bg-red type-literal:bg-red type-year:bg-red type-month:bg-red type-day:bg-red layout-grid:bg-red layout-stack:bg-red orientation-horizontal:bg-red orientation-vertical:bg-red selection-single:bg-red selection-multiple:bg-red resizable-right:bg-red resizable-left:bg-red resizable-both:bg-red sort-ascending:bg-red sort-descending:bg-red group-pressed:bg-red peer-pressed:bg-red"></div>`;
return run({content}).then((result) => {
expect(result.css).toContain(css`
.hover\:bg-red:is([data-rac][data-hovered], :not([data-rac]):hover) {
.hover\:bg-red:where([data-rac])[data-hovered] {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.focus\:bg-red:is([data-rac][data-focused], :not([data-rac]):focus) {
.hover\:bg-red:where(:not([data-rac])):hover {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.focus-visible\:bg-red:is([data-rac][data-focus-visible], :not([data-rac]):focus-visible) {
.focus\:bg-red:where([data-rac])[data-focused] {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.focus-within\:bg-red:is([data-rac][data-focus-within], :not([data-rac]):focus-within) {
.focus\:bg-red:where(:not([data-rac])):focus {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.focus-visible\:bg-red:where([data-rac])[data-focus-visible] {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.focus-visible\:bg-red:where(:not([data-rac])):focus-visible {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.focus-within\:bg-red:where([data-rac])[data-focus-within] {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.focus-within\:bg-red:where(:not([data-rac])):focus-within {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
Expand All @@ -54,7 +70,11 @@ test('variants', async () => {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.disabled\:bg-red:is([data-rac][data-disabled], :not([data-rac]):disabled) {
.disabled\:bg-red:where([data-rac])[data-disabled] {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.disabled\:bg-red:where(:not([data-rac])):disabled {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
Expand All @@ -66,7 +86,11 @@ test('variants', async () => {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.empty\:bg-red:is([data-rac][data-empty], :not([data-rac]):empty) {
.empty\:bg-red:where([data-rac])[data-empty] {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.empty\:bg-red:where(:not([data-rac])):empty {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
Expand All @@ -82,23 +106,39 @@ test('variants', async () => {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.placeholder-shown\:bg-red:is([data-rac][data-placeholder], :not([data-rac]):placeholder-shown) {
.placeholder-shown\:bg-red:where([data-rac])[data-placeholder] {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.placeholder-shown\:bg-red:where(:not([data-rac])):placeholder-shown {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.selected\:bg-red[data-selected] {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.indeterminate\:bg-red:is([data-rac][data-indeterminate], :not([data-rac]):indeterminate) {
.indeterminate\:bg-red:where([data-rac])[data-indeterminate] {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.indeterminate\:bg-red:where(:not([data-rac])):indeterminate {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.read-only\:bg-red:where([data-rac])[data-readonly] {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.read-only\:bg-red:is([data-rac][data-readonly], :not([data-rac]):read-only) {
.read-only\:bg-red:where(:not([data-rac])):read-only {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.required\:bg-red:is([data-rac][data-required], :not([data-rac]):required) {
.required\:bg-red:where([data-rac])[data-required] {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.required\:bg-red:where(:not([data-rac])):required {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
Expand All @@ -110,7 +150,11 @@ test('variants', async () => {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.open\:bg-red:is([data-rac][data-open], :not([data-rac])[open]) {
.open\:bg-red:where([data-rac])[data-open] {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.open\:bg-red:where(:not([data-rac]))[open] {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
Expand Down Expand Up @@ -138,7 +182,11 @@ test('variants', async () => {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.invalid\:bg-red:is([data-rac][data-invalid], :not([data-rac]):invalid) {
.invalid\:bg-red:where([data-rac])[data-invalid] {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.invalid\:bg-red:where(:not([data-rac])):invalid {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
Expand Down