Add lh/lhPx as well.

homebound-team · Jun 18, 2024 · a5618c4 · a5618c4
1 parent 5864cb3
commit a5618c4
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 21 deletions.
diff --git a/packages/template-tachyons/src/Css.ts b/packages/template-tachyons/src/Css.ts
@@ -2200,14 +2200,6 @@ class CssBuilder<T extends Properties> {
   get tiny() {
     return this.add("fontWeight", 400).add("fontSize", "10px").add("lineHeight", "14px");
   }
-  /** Sets `fontSize: value`. */
-  fs(value: Properties["fontSize"]) {
-    return this.add("fontSize", value);
-  }
-  /** Sets `fontSize: px`. */
-  fsPx(px: number) {
-    return this.fs(`${px}px`);
-  }
 
   // typography
   /** Sets `maxWidth: "30em"`. */
@@ -2234,10 +2226,22 @@ class CssBuilder<T extends Properties> {
   get truncate() {
     return this.add("whiteSpace", "nowrap").add("overflow", "hidden").add("textOverflow", "ellipsis");
   }
+  /** Sets `fontSize: value`. */
+  fs(value: Properties["fontSize"]) {
+    return this.add("fontSize", value);
+  }
+  /** Sets `fontSize: px`. */
+  fsPx(px: number) {
+    return this.fs(`${px}px`);
+  }
   /** Sets `lineHeight: value`. */
   lh(value: Properties["lineHeight"]) {
     return this.add("lineHeight", value);
   }
+  /** Sets `lineHeight: px`. */
+  lhPx(px: number) {
+    return this.lh(`${px}px`);
+  }
 
   // userSelect
   /** Sets `userSelect: "none"`. */

diff --git a/packages/testing-tachyons/src/Css.ts b/packages/testing-tachyons/src/Css.ts
@@ -1906,14 +1906,6 @@ class CssBuilder<T extends Properties> {
   get f10() {
     return this.add("fontSize", "10px").add("fontWeight", 500);
   }
-  /** Sets `fontSize: value`. */
-  fs(value: Properties["fontSize"]) {
-    return this.add("fontSize", value);
-  }
-  /** Sets `fontSize: px`. */
-  fsPx(px: number) {
-    return this.fs(`${px}px`);
-  }
 
   // typography
   /** Sets `maxWidth: "30em"`. */
@@ -1940,10 +1932,22 @@ class CssBuilder<T extends Properties> {
   get truncate() {
     return this.add("whiteSpace", "nowrap").add("overflow", "hidden").add("textOverflow", "ellipsis");
   }
+  /** Sets `fontSize: value`. */
+  fs(value: Properties["fontSize"]) {
+    return this.add("fontSize", value);
+  }
+  /** Sets `fontSize: px`. */
+  fsPx(px: number) {
+    return this.fs(`${px}px`);
+  }
   /** Sets `lineHeight: value`. */
   lh(value: Properties["lineHeight"]) {
     return this.add("lineHeight", value);
   }
+  /** Sets `lineHeight: px`. */
+  lhPx(px: number) {
+    return this.lh(`${px}px`);
+  }
 
   // userSelect
   /** Sets `userSelect: "none"`. */

diff --git a/packages/truss/src/sections/tachyons/typeScale.ts b/packages/truss/src/sections/tachyons/typeScale.ts
@@ -9,7 +9,4 @@ export const typeScale: CreateMethodsFn = ({ fonts }) => [
     }
     return newMethod(abbr, defs);
   }),
-  // Include `fs(...)` & `fsPx(...)` for one-off font-sizes. We technically also have
-  // `fs0` and `fs1` for `flexShrink`, but this seems fine.
-  ...newMethodsForProp("fontSize", {}, "fs", true),
 ];
diff --git a/packages/truss/src/sections/tachyons/typography.ts b/packages/truss/src/sections/tachyons/typography.ts
@@ -1,4 +1,4 @@
-import { newMethod, newParamMethod } from "src/methods";
+import { newMethod, newMethodsForProp, newParamMethod } from "src/methods";
 import { CreateMethodsFn } from "src/config";
 
 // See typeScale for the FontConfig.fonts handling
@@ -18,5 +18,8 @@ export const typography: CreateMethodsFn = () => [
     overflow: "hidden",
     textOverflow: "ellipsis",
   }),
-  newParamMethod("lh", "lineHeight"),
+  // Include `fs(...)` & `fsPx(...)` for one-off font-sizes. We technically also have
+  // `fs0` and `fs1` for `flexShrink`, but this seems fine.
+  ...newMethodsForProp("fontSize", {}, "fs", true),
+  ...newMethodsForProp("lineHeight", {}, "lh", true),
 ];