Skip to content

Sort … class to end of list #334

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
Dec 9, 2024
Merged

Sort … class to end of list #334

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
6 changes: 5 additions & 1 deletion src/sorting.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ function reorderClasses(classList: string[], { env }: { env: TransformerEnv }) {
? env.context.getClassOrder(classList)
: getClassOrderPolyfill(classList, { env })

return orderedClasses.sort(([, a], [, z]) => {
return orderedClasses.sort(([nameA, a], [nameZ, z]) => {
// Move `...` to the end of the list
if (nameA === '...' || nameA === '…') return 1
if (nameZ === '...' || nameZ === '…') return -1

if (a === z) return 0
if (a === null) return -1
if (z === null) return 1
Expand Down
8 changes: 8 additions & 0 deletions tests/format.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@ let html: TestEntry[] = [
tailwindPreserveDuplicates: true,
},
],

// … is moved to the end of the list
['<div class="... sm:p-0 p-0"></div>', '<div class="p-0 sm:p-0 ..."></div>'],
['<div class="… sm:p-0 p-0"></div>', '<div class="p-0 sm:p-0 …"></div>'],
['<div class="sm:p-0 ... p-0"></div>', '<div class="p-0 sm:p-0 ..."></div>'],
['<div class="sm:p-0 … p-0"></div>', '<div class="p-0 sm:p-0 …"></div>'],
['<div class="sm:p-0 p-0 ..."></div>', '<div class="p-0 sm:p-0 ..."></div>'],
['<div class="sm:p-0 p-0 …"></div>', '<div class="p-0 sm:p-0 …"></div>'],
]

let css: TestEntry[] = [
Expand Down
Loading