Skip to content

Fix Tailwind plugin group variant regression #5177

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
devongovett merged 2 commits into from
Oct 2, 2023
Merged

Fix Tailwind plugin group variant regression #5177

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
f0d7168
Fix Tailwind plugin group variant regression
devongovett Oct 1, 2023
72d5c88
lint
devongovett Oct 1, 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
24 changes: 16 additions & 8 deletions 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 @@ -70,26 +70,34 @@ let getSelector = (prefix, attributeName, attributeValue) => {
}
};

let mapSelector = (selector, fn) => {
if (Array.isArray(selector)) {
return selector.map(fn);
} else {
return fn(selector);
}
};

module.exports = plugin.withOptions((options) => (({addVariant}) => {
let prefix = options?.prefix ? `${options.prefix}-` : '';
attributes.boolean.forEach((attribute) => {
let variantName = Array.isArray(attribute) ? attribute[0] : attribute;
variantName = `${prefix}${variantName}`;
let attributeName = Array.isArray(attribute) ? attribute[1] : attribute;
let selector = getSelector(prefix, attributeName);
addVariant(variantName, selector);
addVariant(`group-${variantName}`, `:merge(.group)${selector.slice(1)} &`);
addVariant(`peer-${variantName}`, `:merge(.peer)${selector.slice(1)} ~ &`);
let selectors = getSelector(prefix, attributeName);
addVariant(variantName, selectors);
addVariant(`group-${variantName}`, mapSelector(selectors, selector => `:merge(.group)${selector.slice(1)} &`));
addVariant(`peer-${variantName}`, mapSelector(selectors, selector => `:merge(.peer)${selector.slice(1)} ~ &`));
});
Object.keys(attributes.enum).forEach((attributeName) => {
attributes.enum[attributeName].forEach(
(attributeValue) => {
let name = shortNames[attributeName] || attributeName;
let variantName = `${prefix}${name}-${attributeValue}`;
let selector = getSelector(prefix, attributeName, attributeValue);
addVariant(variantName, selector);
addVariant(`group-${variantName}`, `:merge(.group)${selector.slice(1)} &`);
addVariant(`peer-${variantName}`, `:merge(.peer)${selector.slice(1)} ~ &`);
let selectors = getSelector(prefix, attributeName, attributeValue);
addVariant(variantName, selectors);
addVariant(`group-${variantName}`, mapSelector(selectors, selector => `:merge(.group)${selector.slice(1)} &`));
addVariant(`peer-${variantName}`, mapSelector(selectors, selector => `:merge(.peer)${selector.slice(1)} ~ &`));
}
);
});
Expand Down
10 changes: 9 additions & 1 deletion 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 @@ -23,7 +23,7 @@ function run({options, content}) {
}

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>`;
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 group-hover:bg-red"></div>`;
return run({content}).then((result) => {
expect(result.css).toContain(css`
.hover\:bg-red:where([data-rac])[data-hovered] {
Expand All @@ -34,6 +34,14 @@ test('variants', async () => {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.group:where([data-rac])[data-hovered] .group-hover\:bg-red {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.group:where(:not([data-rac])):hover .group-hover\:bg-red {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
}
.focus\:bg-red:where([data-rac])[data-focused] {
--tw-bg-opacity: 1;
background-color: rgb(255 0 0 / var(--tw-bg-opacity))
Expand Down