@tamagui/theme-base 1.0.0-beta.189 → 1.0.0-beta.205

package/dist/esm/tokens.js

@@ -1,8 +1,4 @@
-import { createTokens } from "@tamagui/core";
 import { allLightColors, darkColorsPostfixed } from "./colors";
-import { firaFont } from "./firaFont";
-import { interFont } from "./interFont";
-import { silkscreenFont } from "./silkscreenFont";
 const size = {
   true: 20,
   0: 0,
@@ -24,41 +20,35 @@ const space = {
   ...size,
   ...Object.fromEntries(Object.entries(size).map(([k, v]) => [`-${k}`, -v]))
 };
-const tokens = createTokens({
+const zIndex = {
+  0: 0,
+  1: 100,
+  2: 200,
+  3: 300,
+  4: 400,
+  5: 500
+};
+const color = {
+  ...allLightColors,
+  ...darkColorsPostfixed
+};
+const radius = {
+  0: 0,
+  1: 3,
+  2: 5,
+  3: 7,
+  4: 9,
+  5: 10,
+  6: 12,
+  7: 16,
+  8: 20,
+  9: 30
+};
+export {
+  color,
+  radius,
   size,
   space,
-  font: {
-    title: interFont,
-    body: interFont,
-    mono: firaFont,
-    silkscreen: silkscreenFont
-  },
-  zIndex: {
-    0: 0,
-    1: 100,
-    2: 200,
-    3: 300,
-    4: 400,
-    5: 500
-  },
-  color: {
-    ...allLightColors,
-    ...darkColorsPostfixed
-  },
-  radius: {
-    0: 0,
-    1: 3,
-    2: 5,
-    3: 7,
-    4: 9,
-    5: 10,
-    6: 12,
-    7: 16,
-    8: 20,
-    9: 30
-  }
-});
-export {
-  tokens
+  zIndex
 };
 //# sourceMappingURL=tokens.js.map

package/dist/esm/tokens.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/tokens.tsx"],
-  "sourcesContent": ["import { createTokens } from '@tamagui/core'\n\nimport { allLightColors, darkColorsPostfixed } from './colors'\nimport { firaFont } from './firaFont'\nimport { interFont } from './interFont'\nimport { silkscreenFont } from './silkscreenFont'\n\nconst size = {\n  true: 20, // for space boolean true\n  0: 0,\n  '0.5': 2,\n  1: 6,\n  2: 10,\n  3: 15,\n  4: 20,\n  5: 25,\n  6: 30,\n  7: 40,\n  8: 50,\n  9: 65,\n  10: 75,\n  11: 85,\n  12: 100,\n} as const\n\ntype Sizes = typeof size\ntype SizeKeys = keyof Sizes\n\nconst space: {\n  [Key in `-${SizeKeys}` | SizeKeys]: Key extends keyof Sizes ? Sizes[Key] : number\n} = {\n  ...size,\n  ...Object.fromEntries(Object.entries(size).map(([k, v]) => [`-${k}`, -v])),\n} as any\n\nexport const tokens = createTokens({\n  size,\n  space,\n  font: {\n    title: interFont,\n    body: interFont,\n    mono: firaFont,\n    silkscreen: silkscreenFont,\n  },\n  zIndex: {\n    0: 0,\n    1: 100,\n    2: 200,\n    3: 300,\n    4: 400,\n    5: 500,\n  },\n  color: {\n    ...allLightColors,\n    ...darkColorsPostfixed,\n  },\n  radius: {\n    0: 0,\n    1: 3,\n    2: 5,\n    3: 7,\n    4: 9,\n    5: 10,\n    6: 12,\n    7: 16,\n    8: 20,\n    9: 30,\n  },\n})\n"],
-  "mappings": "AAAA;AAEA;AACA;AACA;AACA;AAEA,MAAM,OAAO;AAAA,EACX,MAAM;AAAA,EACN,GAAG;AAAA,EACH,OAAO;AAAA,EACP,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AACN;AAKA,MAAM,QAEF;AAAA,KACC;AAAA,KACA,OAAO,YAAY,OAAO,QAAQ,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;AAC3E;AAEO,MAAM,SAAS,aAAa;AAAA,EACjC;AAAA,EACA;AAAA,EACA,MAAM;AAAA,IACJ,OAAO;AAAA,IACP,MAAM;AAAA,IACN,MAAM;AAAA,IACN,YAAY;AAAA,EACd;AAAA,EACA,QAAQ;AAAA,IACN,GAAG;AAAA,IACH,GAAG;AAAA,IACH,GAAG;AAAA,IACH,GAAG;AAAA,IACH,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AAAA,EACA,OAAO;AAAA,OACF;AAAA,OACA;AAAA,EACL;AAAA,EACA,QAAQ;AAAA,IACN,GAAG;AAAA,IACH,GAAG;AAAA,IACH,GAAG;AAAA,IACH,GAAG;AAAA,IACH,GAAG;AAAA,IACH,GAAG;AAAA,IACH,GAAG;AAAA,IACH,GAAG;AAAA,IACH,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AACF,CAAC;",
+  "sourcesContent": ["import { allLightColors, darkColorsPostfixed } from './colors'\n\nexport const size = {\n  true: 20, // for space boolean true\n  0: 0,\n  '0.5': 2,\n  1: 6,\n  2: 10,\n  3: 15,\n  4: 20,\n  5: 25,\n  6: 30,\n  7: 40,\n  8: 50,\n  9: 65,\n  10: 75,\n  11: 85,\n  12: 100,\n} as const\n\ntype Sizes = typeof size\ntype SizeKeys = keyof Sizes\n\nexport const space: {\n  [Key in `-${SizeKeys}` | SizeKeys]: Key extends keyof Sizes ? Sizes[Key] : number\n} = {\n  ...size,\n  ...Object.fromEntries(Object.entries(size).map(([k, v]) => [`-${k}`, -v])),\n} as any\n\nexport const zIndex = {\n  0: 0,\n  1: 100,\n  2: 200,\n  3: 300,\n  4: 400,\n  5: 500,\n}\n\nexport const color = {\n  ...allLightColors,\n  ...darkColorsPostfixed,\n}\n\nexport const radius = {\n  0: 0,\n  1: 3,\n  2: 5,\n  3: 7,\n  4: 9,\n  5: 10,\n  6: 12,\n  7: 16,\n  8: 20,\n  9: 30,\n}\n"],
+  "mappings": "AAAA;AAEO,MAAM,OAAO;AAAA,EAClB,MAAM;AAAA,EACN,GAAG;AAAA,EACH,OAAO;AAAA,EACP,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AACN;AAKO,MAAM,QAET;AAAA,KACC;AAAA,KACA,OAAO,YAAY,OAAO,QAAQ,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;AAC3E;AAEO,MAAM,SAAS;AAAA,EACpB,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AACL;AAEO,MAAM,QAAQ;AAAA,KAChB;AAAA,KACA;AACL;AAEO,MAAM,SAAS;AAAA,EACpB,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AACL;",
   "names": []
 }

package/dist/jsx/firaFont.js

@@ -1,23 +1,26 @@
 import { createFont } from "@tamagui/core";
+const size = {
+  1: 10,
+  2: 11,
+  3: 12,
+  4: 13,
+  5: 14,
+  6: 16,
+  7: 20,
+  8: 22,
+  9: 30,
+  10: 42,
+  11: 52,
+  12: 62,
+  13: 72,
+  14: 92,
+  15: 114,
+  16: 124
+};
 const firaFont = createFont({
   family: "Fira Code, Monaco, Consolas, Ubuntu Mono, monospace",
-  size: {
-    1: 10,
-    2: 11,
-    3: 12,
-    4: 13,
-    5: 15,
-    6: 16,
-    7: 17
-  },
-  lineHeight: {
-    1: 15,
-    2: 18,
-    3: 19,
-    4: 20,
-    5: 22,
-    6: 24
-  },
+  size,
+  lineHeight: Object.fromEntries(Object.entries(size).map(([k, v]) => [k, v * 1.75])),
   weight: {
     4: "300",
     6: "700"

package/dist/jsx/silkscreenFont.js

@@ -26,7 +26,7 @@ const silkscreenFont = createFont({
   },
   letterSpacing: {
     4: 1,
-    6: 0
+    6: 3
   }
 });
 export {

package/dist/jsx/themes.js

@@ -4,7 +4,7 @@ import * as Colors from "@tamagui/colors";
 import { getVariableValue } from "@tamagui/core";
 import { allDarkColors, allLightColors } from "./colors";
 import { setColorAlpha } from "./colorUtils";
-import { tokens } from "./tokens";
+import { color } from "./tokens";
 const alternates = [1, 2, 3, 4];
 function createThemesFrom(name, getTheme, props) {
   const { shift = 0 } = props;
@@ -59,7 +59,7 @@ const createTheme = /* @__PURE__ */ __name((str = 1, {
     backgroundHover: get(backgrounds, str + lighterDir),
     backgroundPress: get(backgrounds, str + darkerDir * 1),
     backgroundFocus: get(backgrounds, str + darkerDir * 2),
-    backgroundTransparent: tokens.color.grayA1,
+    backgroundTransparent: color.grayA1,
     borderColor: isLight ? get(colors, 8 - str, "borderColor") : get(backgrounds, 2 + str, "borderColor"),
     borderColorHover: isLight ? get(colors, 6 - str, "borderColor") : get(backgrounds, 3 + str, "borderColor"),
     borderColorPress: isLight ? get(colors, 5 - str, "borderColor") : get(backgrounds, 1 + str, "borderColor"),
@@ -70,7 +70,7 @@ const createTheme = /* @__PURE__ */ __name((str = 1, {
     colorFocus: get(colors, 3 + str, "color"),
     colorTranslucent,
     colorMid: colors[Math.floor(colors.length / 2)],
-    shadowColor: isLight ? tokens.color.grayA3 : tokens.color.grayA8,
+    shadowColor: isLight ? color.grayA3 : color.grayA8,
     shadowColorHover: darkColors[!isLight ? 1 : 8],
     shadowColorPress: darkColors[!isLight ? 1 : 8],
     shadowColorFocus: darkColors[!isLight ? 1 : 8]
@@ -94,32 +94,32 @@ const colorSchemes = [
 const lightGradient = [
   "#fff",
   "#f4f4f4",
-  tokens.color.gray1,
-  tokens.color.gray2,
-  tokens.color.gray3,
-  tokens.color.gray4,
-  tokens.color.gray5,
-  tokens.color.gray6,
-  tokens.color.gray7,
-  tokens.color.gray8,
-  tokens.color.gray9,
-  tokens.color.gray10,
-  tokens.color.gray11,
-  tokens.color.gray12
+  color.gray1,
+  color.gray2,
+  color.gray3,
+  color.gray4,
+  color.gray5,
+  color.gray6,
+  color.gray7,
+  color.gray8,
+  color.gray9,
+  color.gray10,
+  color.gray11,
+  color.gray12
 ];
 const darkGradient = [
-  "#0f0f0f",
   "#111111",
-  "#141414",
+  "#151515",
   "#191919",
-  "#242424",
-  "#292929",
+  "#232323",
+  "#282828",
   "#323232",
   "#383838",
   "#424242",
   "#494949",
   "#545454",
-  "#626262"
+  "#626262",
+  "#777777"
 ];
 const lightThemes = createThemesFrom("light", createTheme, {
   backgrounds: lightGradient,

package/dist/jsx/tokens.js

@@ -1,8 +1,4 @@
-import { createTokens } from "@tamagui/core";
 import { allLightColors, darkColorsPostfixed } from "./colors";
-import { firaFont } from "./firaFont";
-import { interFont } from "./interFont";
-import { silkscreenFont } from "./silkscreenFont";
 const size = {
   true: 20,
   0: 0,
@@ -24,40 +20,34 @@ const space = {
   ...size,
   ...Object.fromEntries(Object.entries(size).map(([k, v]) => [`-${k}`, -v]))
 };
-const tokens = createTokens({
+const zIndex = {
+  0: 0,
+  1: 100,
+  2: 200,
+  3: 300,
+  4: 400,
+  5: 500
+};
+const color = {
+  ...allLightColors,
+  ...darkColorsPostfixed
+};
+const radius = {
+  0: 0,
+  1: 3,
+  2: 5,
+  3: 7,
+  4: 9,
+  5: 10,
+  6: 12,
+  7: 16,
+  8: 20,
+  9: 30
+};
+export {
+  color,
+  radius,
   size,
   space,
-  font: {
-    title: interFont,
-    body: interFont,
-    mono: firaFont,
-    silkscreen: silkscreenFont
-  },
-  zIndex: {
-    0: 0,
-    1: 100,
-    2: 200,
-    3: 300,
-    4: 400,
-    5: 500
-  },
-  color: {
-    ...allLightColors,
-    ...darkColorsPostfixed
-  },
-  radius: {
-    0: 0,
-    1: 3,
-    2: 5,
-    3: 7,
-    4: 9,
-    5: 10,
-    6: 12,
-    7: 16,
-    8: 20,
-    9: 30
-  }
-});
-export {
-  tokens
+  zIndex
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/theme-base",
-  "version": "1.0.0-beta.189+64107267",
+  "version": "1.0.0-beta.205+6a67c74d",
   "typings": "types",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -16,12 +16,12 @@
     "clean:build": "tamagui-build clean:build"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.0.0-beta.189+64107267",
-    "@tamagui/colors": "^1.0.0-beta.189+64107267",
-    "@tamagui/core": "^1.0.0-beta.189+64107267"
+    "@tamagui/build": "^1.0.0-beta.205+6a67c74d",
+    "@tamagui/colors": "^1.0.0-beta.205+6a67c74d",
+    "@tamagui/core": "^1.0.0-beta.205+6a67c74d"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6410726774260b4de48c270c81a17b168995a3b7"
+  "gitHead": "6a67c74d67416b6c81169e1cc25e239ab935f651"
 }

package/types/firaFont.d.ts

@@ -8,6 +8,15 @@ export declare const firaFont: {
         5: number;
         6: number;
         7: number;
+        8: number;
+        9: number;
+        10: number;
+        11: number;
+        12: number;
+        13: number;
+        14: number;
+        15: number;
+        16: number;
     };
     lineHeight: {
         1: number;
@@ -16,6 +25,16 @@ export declare const firaFont: {
         4: number;
         5: number;
         6: number;
+        7: number;
+        8: number;
+        9: number;
+        10: number;
+        11: number;
+        12: number;
+        13: number;
+        14: number;
+        15: number;
+        16: number;
     };
     weight: {
         4: string;

package/types/firaFont.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firaFont.d.ts","sourceRoot":"","sources":["../src/firaFont.tsx"],"names":[],"mappings":"AAEA,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;CA0BnB,CAAA"}
+{"version":3,"file":"firaFont.d.ts","sourceRoot":"","sources":["../src/firaFont.tsx"],"names":[],"mappings":"AAqBA,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAanB,CAAA"}

package/types/silkscreenFont.d.ts

@@ -19,13 +19,29 @@ export declare const silkscreenFont: {
         16: number;
     };
     lineHeight: {
-        [k: string]: number;
+        1: number;
+        2: number;
+        3: number;
+        4: number;
+        5: number;
+        6: number;
+        7: number;
+        8: number;
+        9: number;
+        10: number;
+        11: number;
+        12: number;
+        13: number;
+        14: number;
+        15: number;
+        16: number;
     };
     weight: {
         4: string;
     };
     letterSpacing: {
         4: number;
+        5: number;
         6: number;
     };
 };

package/types/silkscreenFont.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"silkscreenFont.d.ts","sourceRoot":"","sources":["../src/silkscreenFont.tsx"],"names":[],"mappings":"AAqBA,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAWzB,CAAA"}
+{"version":3,"file":"silkscreenFont.d.ts","sourceRoot":"","sources":["../src/silkscreenFont.tsx"],"names":[],"mappings":"AAqBA,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAazB,CAAA"}

package/types/themes.d.ts

@@ -1,4 +1,3 @@
-import { Variable } from '@tamagui/core';
 export declare const colorSchemes: readonly [{
     readonly name: "blue";
     readonly colors: {
@@ -391,7 +390,7 @@ export declare const colorSchemes: readonly [{
     };
 }];
 export declare type ColorNames = typeof colorSchemes[number]['name'];
-export declare const lightGradient: (string | Variable)[];
+export declare const lightGradient: string[];
 export declare const darkGradient: string[];
 declare const baseThemes: {
     dark: any;