@vettvangur/design-system 2.0.64 → 2.0.66

package/dist/index.js

@@ -2303,7 +2303,9 @@ async function generateFile(variables, config) {
     if (mobile != null) {
       css += `  --${key}: ${mobile};\n`;
     }
-    if (desktop != null && desktop !== mobile) {
+
+    // Keep the -desktop key if a desktop mode exists, even if it matches mobile.
+    if (desktop != null) {
       css += `  --${key}-desktop: ${desktop};\n`;
     }
   }
@@ -3144,7 +3146,7 @@ function needsDesktopLine$1(values) {
   if (!values) {
     return false;
   }
-  return values.desktop !== values.mobile;
+  return values.desktop != null && values.desktop !== values.mobile;
 }
 
 /**
@@ -3169,8 +3171,17 @@ function blockForBody(b) {
   const lhBase = `leading-${key}`;
   let out = `@utility ${key} {\n`;
   out += `  @apply font-body ${fsBase} ${lhBase};\n`;
-  if (needsDesktopLine$1(fsValues) || needsDesktopLine$1(lhValues)) {
-    out += `  @apply desktop-xs:${fsBase}-desktop desktop-xs:${lhBase}-desktop;\n`;
+  const fsDesktop = needsDesktopLine$1(fsValues);
+  const lhDesktop = needsDesktopLine$1(lhValues);
+  if (fsDesktop || lhDesktop) {
+    const parts = [];
+    if (fsDesktop) {
+      parts.push(`desktop-xs:${fsBase}-desktop`);
+    }
+    if (lhDesktop) {
+      parts.push(`desktop-xs:${lhBase}-desktop`);
+    }
+    out += `  @apply ${parts.join(' ')};\n`;
   }
   out += `}\n`;
   return out;
@@ -3320,7 +3331,7 @@ function needsDesktopLine(values) {
   if (!values) {
     return false;
   }
-  return values.desktop !== values.mobile;
+  return values.desktop != null && values.desktop !== values.mobile;
 }
 
 /**
@@ -3345,8 +3356,17 @@ function blockForHeadline(h) {
   const lhBase = `leading-${key}`;
   let out = `@utility ${key} {\n`;
   out += `  @apply font-headline ${fsBase} ${lhBase};\n`;
-  if (needsDesktopLine(fsValues) || needsDesktopLine(lhValues)) {
-    out += `  @apply desktop-xs:${fsBase}-desktop desktop-xs:${lhBase}-desktop;\n`;
+  const fsDesktop = needsDesktopLine(fsValues);
+  const lhDesktop = needsDesktopLine(lhValues);
+  if (fsDesktop || lhDesktop) {
+    const parts = [];
+    if (fsDesktop) {
+      parts.push(`desktop-xs:${fsBase}-desktop`);
+    }
+    if (lhDesktop) {
+      parts.push(`desktop-xs:${lhBase}-desktop`);
+    }
+    out += `  @apply ${parts.join(' ')};\n`;
   }
   out += `}\n`;
   return out;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vettvangur/design-system",
-  "version": "2.0.64",
+  "version": "2.0.66",
   "description": "",
   "access": "public",
   "type": "module",