fix(css): merge media query rules

swordev · Mar 12, 2023 · 51c5ade · 51c5ade
1 parent f0aac7a
commit 51c5ade
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/.changeset/dirty-hotels-explode.md b/.changeset/dirty-hotels-explode.md
@@ -0,0 +1,5 @@
+---
+"@suid/css": patch
+---
+
+Merge media query rules
diff --git a/packages/css/src/resolve.ts b/packages/css/src/resolve.ts
@@ -26,7 +26,11 @@ function resolve(
     } else {
       const result = onProp(name, value);
       if (result) {
-        Object.assign(cssTarget, result);
+        for (const key in result) {
+          cssTarget[key] = isMediaQuery(key)
+            ? { ...cssTarget[key], ...result[key] }
+            : result[key];
+        }
       } else {
         cssTarget[name] = value;
       }