Skip to content

Fix stacking variant order when variants inside a group are treated as equal #14431

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
philipp-spiess merged 13 commits into from
Sep 17, 2024
Merged

Fix stacking variant order when variants inside a group are treated as equal #14431

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d2870dc
Add failing test
philipp-spiess Sep 16, 2024
ec6edc4
Create a datastrucutre that groups equal entries so the bitmap can ra…
philipp-spiess Sep 16, 2024
00af756
Sort by modifier if compound groups are equal
philipp-spiess Sep 16, 2024
f111b4b
Use array-of-sets
philipp-spiess Sep 16, 2024
1f397ec
Avoid generating an iterator by retaining the last value
philipp-spiess Sep 16, 2024
bdf18ba
Make plugin-api test clearer
philipp-spiess Sep 16, 2024
d85cb2b
Add change log
philipp-spiess Sep 16, 2024
7d77561
Update CHANGELOG.md
philipp-spiess Sep 17, 2024
20885f0
Update comment
philipp-spiess Sep 17, 2024
05d9ee7
Move sorting into DesignSystem
philipp-spiess Sep 17, 2024
9700a1d
Fix changelog
philipp-spiess Sep 17, 2024
00735aa
Use Map<Variant, number> instead (h/t @thecrypticace)
philipp-spiess Sep 17, 2024
962590b
Variants inside variantOrderMap are exhaustive
philipp-spiess Sep 17, 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
Prev Previous commit
Next Next commit
Make plugin-api test clearer
  • Loading branch information
@philipp-spiess
philipp-spiess committed Sep 17, 2024
commit bdf18bafd0c7261732fe3200f736ac1158b09c99
16 changes: 8 additions & 8 deletions packages/tailwindcss/src/compat/plugin-api.test.ts
View file
Open in desktop
Copy link
Member Author

@philipp-spiess philipp-spiess Sep 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These were actually unordered before. If no custom order is provided, we now follow back to ordering the argument if everything else is the same, This will make baked appear before yellow now.

Original file line number Diff line number Diff line change
Expand Up @@ -1541,10 +1541,10 @@ describe('matchVariant', () => {
return ({ matchVariant }: PluginAPI) => {
matchVariant('alphabet', (side) => `&${side}`, {
values: {
a: '[data-value="a"]',
b: '[data-value="b"]',
c: '[data-value="c"]',
d: '[data-value="d"]',
d: '[data-order="1"]',
a: '[data-order="2"]',
c: '[data-order="3"]',
b: '[data-order="4"]',
},
})
}
Expand All @@ -1560,19 +1560,19 @@ describe('matchVariant', () => {

expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
"@layer utilities {
.alphabet-a\\:underline[data-value="a"] {
.alphabet-d\\:underline[data-order="1"] {
text-decoration-line: underline;
}

.alphabet-b\\:underline[data-value="b"] {
.alphabet-a\\:underline[data-order="2"] {
text-decoration-line: underline;
}

.alphabet-c\\:underline[data-value="c"] {
.alphabet-c\\:underline[data-order="3"] {
text-decoration-line: underline;
}

.alphabet-d\\:underline[data-value="d"] {
.alphabet-b\\:underline[data-order="4"] {
text-decoration-line: underline;
}
}"
Expand Down