Skip to content

Improve media query sorting #1427

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

Open
ynamkit13 wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −2
Open

Improve media query sorting #1427

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
29 changes: 27 additions & 2 deletions packages/@stylexjs/babel-plugin/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,12 +468,37 @@ function processStylexRules(
return classname1.localeCompare(classname2);
} else {
if (rule1.startsWith('@') && !rule2.startsWith('@')) {
const query1 = rule1.slice(0, rule1.indexOf('{'));
const query2 = rule2.slice(0, rule2.indexOf('{'));
const query1 = rule1.slice(0, rule1.indexOf('{')).trim();
const query2 = rule2.slice(0, rule2.indexOf('{')).trim();

// Handle media query sorting
const maxWidthRegex = /max-width:\s*(\d+)px/;
const minWidthRegex = /min-width:\s*(\d+)px/;

const maxWidth1 = query1.match(maxWidthRegex);
const maxWidth2 = query2.match(maxWidthRegex);
const minWidth1 = query1.match(minWidthRegex);
const minWidth2 = query2.match(minWidthRegex);

if (maxWidth1 && maxWidth2) {
return parseInt(maxWidth1[1], 10) - parseInt(maxWidth2[1], 10);
}
if (minWidth1 && minWidth2) {
return parseInt(minWidth2[1], 10) - parseInt(minWidth1[1], 10);
}
if (maxWidth1 && minWidth2) {
return -1; // max-width should come before min-width
}
if (minWidth1 && maxWidth2) {
return 1; // min-width should come after max-width
}

// Fallback to alphanumeric comparison if no media query match
if (query1 !== query2) {
return query1.localeCompare(query2);
}
}

const property1 = rule1.slice(rule1.lastIndexOf('{'));
const property2 = rule2.slice(rule2.lastIndexOf('{'));
return property1.localeCompare(property2);
Expand Down