Skip to content
This repository was archived by the owner on Jan 30, 2025. It is now read-only.

Commit 735bb83

Browse files
committed
fix(sheet-compiler.ts): Fix mediaQuery order
1 parent 11d977c commit 735bb83

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

src/_internal/utils/sheet-compiler.ts

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import type { PropertyType, ClassesObjectType, CustomCSSProperties, CustomHTMLTy
44
export function sheetCompiler(object: ClassesObjectType | CustomHTMLType, base62Hash?: string, core?: string) {
55
let styleSheet = '';
66
let bigIndent = false;
7-
const mediaQueries: Record<string, string> = {};
7+
const mediaQueries: { media: string; css: string }[] = [];
88

99
const classNameType = (property: string) => {
1010
if (core === '--global') return property;
@@ -103,10 +103,15 @@ export function sheetCompiler(object: ClassesObjectType | CustomHTMLType, base62
103103
}
104104
}
105105
if (regularRules) {
106-
mediaQueries[mediaRule] =
107-
(mediaQueries[mediaRule] || '') + `\n${mediaRule} {\n${indent} ${className} {\n${regularRules} }\n${nestedRules}${indent}}\n${indent}\n`;
106+
mediaQueries.push({
107+
media: mediaRule,
108+
css: `\n${mediaRule} {\n${indent} ${className} {\n${regularRules} }\n${nestedRules}${indent}}\n${indent}\n`,
109+
});
108110
} else {
109-
mediaQueries[mediaRule] = (mediaQueries[mediaRule] || '') + `\n${mediaRule} {\n${nestedRules}${indent}}\n`;
111+
mediaQueries.push({
112+
media: mediaRule,
113+
css: `\n${mediaRule} {\n${nestedRules}${indent}}\n`,
114+
});
110115
}
111116
}
112117
}
@@ -152,11 +157,9 @@ export function sheetCompiler(object: ClassesObjectType | CustomHTMLType, base62
152157

153158
styleSheet = createStyles(object);
154159

155-
for (const media in mediaQueries) {
156-
if (Object.prototype.hasOwnProperty.call(mediaQueries, media)) {
157-
styleSheet += mediaQueries[media];
158-
}
159-
}
160+
mediaQueries.forEach(({ css }) => {
161+
styleSheet += css;
162+
});
160163

161164
return { styleSheet };
162165
}

0 commit comments

Comments
 (0)