@tamagui/get-font-sized 1.62.2 → 1.63.0

package/dist/cjs/index.js

@@ -27,8 +27,8 @@ const getFontSized = (sizeTokenIn = "$true", { font, fontFamily, props }) => {
     );
     return;
   }
-  const sizeToken = sizeTokenIn === "$true" ? getDefaultSizeToken(font) : sizeTokenIn, fontSize = font.size[sizeToken], lineHeight = font.lineHeight?.[sizeToken], fontWeight = font.weight?.[sizeToken], letterSpacing = font.letterSpacing?.[sizeToken], fontStyle = font.style?.[sizeToken], textTransform = font.transform?.[sizeToken], style = {
-    color: font.color?.[sizeToken],
+  const sizeToken = sizeTokenIn === "$true" ? getDefaultSizeToken(font) : sizeTokenIn, fontSize = font.size[sizeToken], lineHeight = font.lineHeight?.[sizeToken], fontWeight = font.weight?.[sizeToken], letterSpacing = font.letterSpacing?.[sizeToken], textTransform = font.transform?.[sizeToken], fontStyle = props.fontStyle ?? font.style?.[sizeToken], style = {
+    color: props.color ?? font.color?.[sizeToken],
     fontStyle,
     textTransform,
     fontFamily,

package/dist/cjs/index.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/index.ts"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,kBAA0B;AAEnB,MAAM,eAAiE,CAC5E,cAAc,SACd,EAAE,MAAM,YAAY,MAAM,MACvB;AACH,MAAI,CAAC,MAAM;AACT,IAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ;AAAA,MACN;AAAA,MACA,EAAE,GAAG,MAAM;AAAA,MACX;AAAA,IACF;AAEF;AAAA,EACF;AAEA,QAAM,YAAY,gBAAgB,UAAU,oBAAoB,IAAI,IAAI,aAClE,WAAW,KAAK,KAAK,SAAS,GAC9B,aAAa,KAAK,aAAa,SAAS,GACxC,aAAa,KAAK,SAAS,SAAS,GACpC,gBAAgB,KAAK,gBAAgB,SAAS,GAC9C,YAAY,KAAK,QAAQ,SAAS,GAClC,gBAAgB,KAAK,YAAY,SAAS,GAG1C,QAAQ;AAAA,IACZ,OAHY,KAAK,QAAQ,SAAS;AAAA,IAIlC;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAEA,SAAI,QAAQ,IAAI,aAAa,iBACvB,MAAM,SAAY,MAAM,UAAa,cACvC,QAAQ,eAAe,4BAAqB,aAAa,SAAS,GAElE,QAAQ,IAAI,EAAE,OAAO,OAAO,KAAK,CAAC,GAClC,QAAQ,SAAS,IAId;AACT,GAEM,QAAQ,oBAAI,QAA6B;AAE/C,SAAS,oBAAoB,MAAmB;AAC9C,MAAI,OAAO,QAAS,YAAY,MAAM,IAAI,IAAI;AAC5C,WAAO,MAAM,IAAI,IAAI;AAIvB,QAAM,aAAa,WAAW,KAAK,OAAO,KAAK,WAAO,uBAAU,EAAE,MAC5D,cAAc,WAAW,OACzB,sBAAsB,cACxB,OAAO,KAAK,UAAU,EAAE;AAAA,IACtB,CAAC,MAAM,MAAM,WAAW,WAAW,CAAC,EAAE,QAAW,YAAY;AAAA,EAC/D,IACA;AAEJ,SAAI,CAAC,eAAe,CAAC,uBACf,QAAQ,IAAI,aAAa,iBAC3B,QAAQ,KAAK;AAAA;AAAA;AAAA,sFAGmE,GAE3E,OAAO,KAAK,KAAK,IAAI,EAAE,CAAC,MAGjC,MAAM,IAAI,MAAM,mBAAqC,GAC9C;AACT;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,kBAA0B;AAEnB,MAAM,eAAiE,CAC5E,cAAc,SACd,EAAE,MAAM,YAAY,MAAM,MACvB;AACH,MAAI,CAAC,MAAM;AACT,IAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ;AAAA,MACN;AAAA,MACA,EAAE,GAAG,MAAM;AAAA,MACX;AAAA,IACF;AAEF;AAAA,EACF;AAEA,QAAM,YAAY,gBAAgB,UAAU,oBAAoB,IAAI,IAAI,aAGlE,WAAW,KAAK,KAAK,SAAS,GAC9B,aAAa,KAAK,aAAa,SAAS,GACxC,aAAa,KAAK,SAAS,SAAS,GACpC,gBAAgB,KAAK,gBAAgB,SAAS,GAC9C,gBAAgB,KAAK,YAAY,SAAS,GAG1C,YAAY,MAAM,aAAa,KAAK,QAAQ,SAAS,GAGrD,QAAQ;AAAA,IACZ,OAHY,MAAM,SAAS,KAAK,QAAQ,SAAS;AAAA,IAIjD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAEA,SAAI,QAAQ,IAAI,aAAa,iBACvB,MAAM,SAAY,MAAM,UAAa,cACvC,QAAQ,eAAe,4BAAqB,aAAa,SAAS,GAElE,QAAQ,IAAI,EAAE,OAAO,OAAO,KAAK,CAAC,GAClC,QAAQ,SAAS,IAId;AACT,GAEM,QAAQ,oBAAI,QAA6B;AAE/C,SAAS,oBAAoB,MAAmB;AAC9C,MAAI,OAAO,QAAS,YAAY,MAAM,IAAI,IAAI;AAC5C,WAAO,MAAM,IAAI,IAAI;AAIvB,QAAM,aAAa,WAAW,KAAK,OAAO,KAAK,WAAO,uBAAU,EAAE,MAC5D,cAAc,WAAW,OACzB,sBAAsB,cACxB,OAAO,KAAK,UAAU,EAAE;AAAA,IACtB,CAAC,MAAM,MAAM,WAAW,WAAW,CAAC,EAAE,QAAW,YAAY;AAAA,EAC/D,IACA;AAEJ,SAAI,CAAC,eAAe,CAAC,uBACf,QAAQ,IAAI,aAAa,iBAC3B,QAAQ,KAAK;AAAA;AAAA;AAAA,sFAGmE,GAE3E,OAAO,KAAK,KAAK,IAAI,EAAE,CAAC,MAGjC,MAAM,IAAI,MAAM,mBAAqC,GAC9C;AACT;",
   "names": []
 }

package/dist/cjs/index.native.js

@@ -28,8 +28,8 @@ const getFontSized = (sizeTokenIn = "$true", { font, fontFamily, props }) => {
     );
     return;
   }
-  const sizeToken = sizeTokenIn === "$true" ? getDefaultSizeToken(font) : sizeTokenIn, fontSize = font.size[sizeToken], lineHeight = font.lineHeight?.[sizeToken], fontWeight = font.weight?.[sizeToken], letterSpacing = font.letterSpacing?.[sizeToken], fontStyle = font.style?.[sizeToken], textTransform = font.transform?.[sizeToken], style = {
-    color: font.color?.[sizeToken],
+  const sizeToken = sizeTokenIn === "$true" ? getDefaultSizeToken(font) : sizeTokenIn, fontSize = font.size[sizeToken], lineHeight = font.lineHeight?.[sizeToken], fontWeight = font.weight?.[sizeToken], letterSpacing = font.letterSpacing?.[sizeToken], textTransform = font.transform?.[sizeToken], fontStyle = props.fontStyle ?? font.style?.[sizeToken], style = {
+    color: props.color ?? font.color?.[sizeToken],
     fontStyle,
     textTransform,
     fontFamily,

package/dist/cjs/index.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/index.ts"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,kBAA0B;AAEnB,MAAM,eAAiE,CAC5E,cAAc,SACd,EAAE,MAAM,YAAY,MAAM,MACvB;AACH,MAAI,CAAC,MAAM;AACT,IAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ;AAAA,MACN;AAAA,MACA,EAAE,GAAG,MAAM;AAAA,MACX;AAAA,IACF;AAEF;AAAA,EACF;AAEA,QAAM,YAAY,gBAAgB,UAAU,oBAAoB,IAAI,IAAI,aAClE,WAAW,KAAK,KAAK,SAAS,GAC9B,aAAa,KAAK,aAAa,SAAS,GACxC,aAAa,KAAK,SAAS,SAAS,GACpC,gBAAgB,KAAK,gBAAgB,SAAS,GAC9C,YAAY,KAAK,QAAQ,SAAS,GAClC,gBAAgB,KAAK,YAAY,SAAS,GAG1C,QAAQ;AAAA,IACZ,OAHY,KAAK,QAAQ,SAAS;AAAA,IAIlC;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAEA,SAAI,QAAQ,IAAI,aAAa,iBACvB,MAAM,SAAY,MAAM,UAAa,cACvC,QAAQ,eAAe,4BAAqB,aAAa,SAAS,GAElE,QAAQ,IAAI,EAAE,OAAO,OAAO,KAAK,CAAC,GAClC,QAAQ,SAAS,IAId;AACT,GAEM,QAAQ,oBAAI,QAA6B;AAE/C,SAAS,oBAAoB,MAAmB;AAC9C,MAAI,OAAO,QAAS,YAAY,MAAM,IAAI,IAAI;AAC5C,WAAO,MAAM,IAAI,IAAI;AAIvB,QAAM,aAAa,WAAW,KAAK,OAAO,KAAK,WAAO,uBAAU,EAAE,MAC5D,cAAc,WAAW,OACzB,sBAAsB,cACxB,OAAO,KAAK,UAAU,EAAE;AAAA,IACtB,CAAC,MAAM,MAAM,WAAW,WAAW,CAAC,EAAE,QAAW,YAAY;AAAA,EAC/D,IACA;AAEJ,SAAI,CAAC,eAAe,CAAC,uBACf,QAAQ,IAAI,aAAa,iBAC3B,QAAQ,KAAK;AAAA;AAAA;AAAA,sFAGmE,GAE3E,OAAO,KAAK,KAAK,IAAI,EAAE,CAAC,MAGjC,MAAM,IAAI,MAAM,mBAAqC,GAC9C;AACT;",
+  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,kBAA0B;AAEnB,MAAM,eAAiE,CAC5E,cAAc,SACd,EAAE,MAAM,YAAY,MAAM,MACvB;AACH,MAAI,CAAC,MAAM;AACT,IAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ;AAAA,MACN;AAAA,MACA,EAAE,GAAG,MAAM;AAAA,MACX;AAAA,IACF;AAEF;AAAA,EACF;AAEA,QAAM,YAAY,gBAAgB,UAAU,oBAAoB,IAAI,IAAI,aAGlE,WAAW,KAAK,KAAK,SAAS,GAC9B,aAAa,KAAK,aAAa,SAAS,GACxC,aAAa,KAAK,SAAS,SAAS,GACpC,gBAAgB,KAAK,gBAAgB,SAAS,GAC9C,gBAAgB,KAAK,YAAY,SAAS,GAG1C,YAAY,MAAM,aAAa,KAAK,QAAQ,SAAS,GAGrD,QAAQ;AAAA,IACZ,OAHY,MAAM,SAAS,KAAK,QAAQ,SAAS;AAAA,IAIjD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAEA,SAAI,QAAQ,IAAI,aAAa,iBACvB,MAAM,SAAY,MAAM,UAAa,cACvC,QAAQ,eAAe,4BAAqB,aAAa,SAAS,GAElE,QAAQ,IAAI,EAAE,OAAO,OAAO,KAAK,CAAC,GAClC,QAAQ,SAAS,IAId;AACT,GAEM,QAAQ,oBAAI,QAA6B;AAE/C,SAAS,oBAAoB,MAAmB;AAC9C,MAAI,OAAO,QAAS,YAAY,MAAM,IAAI,IAAI;AAC5C,WAAO,MAAM,IAAI,IAAI;AAIvB,QAAM,aAAa,WAAW,KAAK,OAAO,KAAK,WAAO,uBAAU,EAAE,MAC5D,cAAc,WAAW,OACzB,sBAAsB,cACxB,OAAO,KAAK,UAAU,EAAE;AAAA,IACtB,CAAC,MAAM,MAAM,WAAW,WAAW,CAAC,EAAE,QAAW,YAAY;AAAA,EAC/D,IACA;AAEJ,SAAI,CAAC,eAAe,CAAC,uBACf,QAAQ,IAAI,aAAa,iBAC3B,QAAQ,KAAK;AAAA;AAAA;AAAA,sFAGmE,GAE3E,OAAO,KAAK,KAAK,IAAI,EAAE,CAAC,MAGjC,MAAM,IAAI,MAAM,mBAAqC,GAC9C;AACT;",
   "names": []
 }

package/dist/esm/index.js

@@ -8,8 +8,8 @@ const getFontSized = (sizeTokenIn = "$true", { font, fontFamily, props }) => {
     );
     return;
   }
-  const sizeToken = sizeTokenIn === "$true" ? getDefaultSizeToken(font) : sizeTokenIn, fontSize = font.size[sizeToken], lineHeight = font.lineHeight?.[sizeToken], fontWeight = font.weight?.[sizeToken], letterSpacing = font.letterSpacing?.[sizeToken], fontStyle = font.style?.[sizeToken], textTransform = font.transform?.[sizeToken], style = {
-    color: font.color?.[sizeToken],
+  const sizeToken = sizeTokenIn === "$true" ? getDefaultSizeToken(font) : sizeTokenIn, fontSize = font.size[sizeToken], lineHeight = font.lineHeight?.[sizeToken], fontWeight = font.weight?.[sizeToken], letterSpacing = font.letterSpacing?.[sizeToken], textTransform = font.transform?.[sizeToken], fontStyle = props.fontStyle ?? font.style?.[sizeToken], style = {
+    color: props.color ?? font.color?.[sizeToken],
     fontStyle,
     textTransform,
     fontFamily,

package/dist/esm/index.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/index.ts"],
-  "mappings": "AAMA,SAAS,iBAAiB;AAEnB,MAAM,eAAiE,CAC5E,cAAc,SACd,EAAE,MAAM,YAAY,MAAM,MACvB;AACH,MAAI,CAAC,MAAM;AACT,IAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ;AAAA,MACN;AAAA,MACA,EAAE,GAAG,MAAM;AAAA,MACX;AAAA,IACF;AAEF;AAAA,EACF;AAEA,QAAM,YAAY,gBAAgB,UAAU,oBAAoB,IAAI,IAAI,aAClE,WAAW,KAAK,KAAK,SAAS,GAC9B,aAAa,KAAK,aAAa,SAAS,GACxC,aAAa,KAAK,SAAS,SAAS,GACpC,gBAAgB,KAAK,gBAAgB,SAAS,GAC9C,YAAY,KAAK,QAAQ,SAAS,GAClC,gBAAgB,KAAK,YAAY,SAAS,GAG1C,QAAQ;AAAA,IACZ,OAHY,KAAK,QAAQ,SAAS;AAAA,IAIlC;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAEA,SAAI,QAAQ,IAAI,aAAa,iBACvB,MAAM,SAAY,MAAM,UAAa,cACvC,QAAQ,eAAe,4BAAqB,aAAa,SAAS,GAElE,QAAQ,IAAI,EAAE,OAAO,OAAO,KAAK,CAAC,GAClC,QAAQ,SAAS,IAId;AACT,GAEM,QAAQ,oBAAI,QAA6B;AAE/C,SAAS,oBAAoB,MAAmB;AAC9C,MAAI,OAAO,QAAS,YAAY,MAAM,IAAI,IAAI;AAC5C,WAAO,MAAM,IAAI,IAAI;AAIvB,QAAM,aAAa,WAAW,KAAK,OAAO,KAAK,OAAO,UAAU,EAAE,MAC5D,cAAc,WAAW,OACzB,sBAAsB,cACxB,OAAO,KAAK,UAAU,EAAE;AAAA,IACtB,CAAC,MAAM,MAAM,WAAW,WAAW,CAAC,EAAE,QAAW,YAAY;AAAA,EAC/D,IACA;AAEJ,SAAI,CAAC,eAAe,CAAC,uBACf,QAAQ,IAAI,aAAa,iBAC3B,QAAQ,KAAK;AAAA;AAAA;AAAA,sFAGmE,GAE3E,OAAO,KAAK,KAAK,IAAI,EAAE,CAAC,MAGjC,MAAM,IAAI,MAAM,mBAAqC,GAC9C;AACT;",
+  "mappings": "AAMA,SAAS,iBAAiB;AAEnB,MAAM,eAAiE,CAC5E,cAAc,SACd,EAAE,MAAM,YAAY,MAAM,MACvB;AACH,MAAI,CAAC,MAAM;AACT,IAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ;AAAA,MACN;AAAA,MACA,EAAE,GAAG,MAAM;AAAA,MACX;AAAA,IACF;AAEF;AAAA,EACF;AAEA,QAAM,YAAY,gBAAgB,UAAU,oBAAoB,IAAI,IAAI,aAGlE,WAAW,KAAK,KAAK,SAAS,GAC9B,aAAa,KAAK,aAAa,SAAS,GACxC,aAAa,KAAK,SAAS,SAAS,GACpC,gBAAgB,KAAK,gBAAgB,SAAS,GAC9C,gBAAgB,KAAK,YAAY,SAAS,GAG1C,YAAY,MAAM,aAAa,KAAK,QAAQ,SAAS,GAGrD,QAAQ;AAAA,IACZ,OAHY,MAAM,SAAS,KAAK,QAAQ,SAAS;AAAA,IAIjD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAEA,SAAI,QAAQ,IAAI,aAAa,iBACvB,MAAM,SAAY,MAAM,UAAa,cACvC,QAAQ,eAAe,4BAAqB,aAAa,SAAS,GAElE,QAAQ,IAAI,EAAE,OAAO,OAAO,KAAK,CAAC,GAClC,QAAQ,SAAS,IAId;AACT,GAEM,QAAQ,oBAAI,QAA6B;AAE/C,SAAS,oBAAoB,MAAmB;AAC9C,MAAI,OAAO,QAAS,YAAY,MAAM,IAAI,IAAI;AAC5C,WAAO,MAAM,IAAI,IAAI;AAIvB,QAAM,aAAa,WAAW,KAAK,OAAO,KAAK,OAAO,UAAU,EAAE,MAC5D,cAAc,WAAW,OACzB,sBAAsB,cACxB,OAAO,KAAK,UAAU,EAAE;AAAA,IACtB,CAAC,MAAM,MAAM,WAAW,WAAW,CAAC,EAAE,QAAW,YAAY;AAAA,EAC/D,IACA;AAEJ,SAAI,CAAC,eAAe,CAAC,uBACf,QAAQ,IAAI,aAAa,iBAC3B,QAAQ,KAAK;AAAA;AAAA;AAAA,sFAGmE,GAE3E,OAAO,KAAK,KAAK,IAAI,EAAE,CAAC,MAGjC,MAAM,IAAI,MAAM,mBAAqC,GAC9C;AACT;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/get-font-sized",
-  "version": "1.62.2",
+  "version": "1.63.0",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -18,10 +18,10 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/core": "1.62.2"
+    "@tamagui/core": "1.63.0"
   },
   "devDependencies": {
-    "@tamagui/build": "1.62.2",
+    "@tamagui/build": "1.63.0",
     "react": "^18.2.0"
   },
   "peerDependencies": {

package/src/index.ts

@@ -22,13 +22,17 @@ export const getFontSized: VariantSpreadFunction<TextProps, FontSizeTokens> = (
   }
 
   const sizeToken = sizeTokenIn === '$true' ? getDefaultSizeToken(font) : sizeTokenIn
+
+  // size related, treat them as overrides
   const fontSize = font.size[sizeToken]
   const lineHeight = font.lineHeight?.[sizeToken]
   const fontWeight = font.weight?.[sizeToken]
   const letterSpacing = font.letterSpacing?.[sizeToken]
-  const fontStyle = font.style?.[sizeToken]
   const textTransform = font.transform?.[sizeToken]
-  const color = font.color?.[sizeToken]
+
+  // not technically size related, treat them as fallbacks
+  const fontStyle = props.fontStyle ?? font.style?.[sizeToken]
+  const color = props.color ?? font.color?.[sizeToken]
 
   const style = {
     color,

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EAEd,SAAS,EACT,qBAAqB,EACtB,MAAM,eAAe,CAAA;AAGtB,eAAO,MAAM,YAAY,EAAE,qBAAqB,CAAC,SAAS,EAAE,cAAc,CA6CzE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EAEd,SAAS,EACT,qBAAqB,EACtB,MAAM,eAAe,CAAA;AAGtB,eAAO,MAAM,YAAY,EAAE,qBAAqB,CAAC,SAAS,EAAE,cAAc,CAiDzE,CAAA"}