@tamagui/core 1.0.1-beta.54 → 1.0.1-beta.57

package/dist/jsx/createTamagui.js

@@ -3,10 +3,17 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 import { configListeners, getHasConfigured, setConfig } from "./conf";
 import { THEME_CLASSNAME_PREFIX } from "./constants/constants";
 import { isWeb } from "./constants/platform";
-import { createCSSVariable, createVariable, isVariable } from "./createVariable";
+import { createVariable, isVariable } from "./createVariable";
+import { createVariables } from "./createVariables";
 import { createTamaguiProvider } from "./helpers/createTamaguiProvider";
 import { getInsertedRules } from "./helpers/insertStyleRule";
+import {
+  registerCSSVariable,
+  tokenRules,
+  tokensValueToVariable
+} from "./helpers/registerCSSVariable";
 import { configureMedia } from "./hooks/useMedia";
+import { parseFont, registerFontVariables } from "./insertFont";
 const createdConfigs = /* @__PURE__ */ new WeakMap();
 function createTamagui(config) {
   if (createdConfigs.has(config)) {
@@ -19,55 +26,52 @@ function createTamagui(config) {
     if (!config.themes) {
       throw new Error(`No themes provided to Tamagui config`);
     }
+    if (!config.fonts) {
+      throw new Error(`No fonts provided to Tamagui config`);
+    }
   }
   if (getHasConfigured()) {
-    console.warn("Called createTamagui twice! Should never do so");
+    console.warn(`Warning: createTamagui called twice (maybe HMR)`);
   }
   configureMedia({
     queries: config.media,
     defaultActive: config.mediaQueryDefaultActive
   });
+  const fontTokens = createVariables(config.fonts);
+  const fontsParsed = (() => {
+    const res = {};
+    for (const familyName in fontTokens) {
+      res[`$${familyName}`] = parseFont(fontTokens[familyName]);
+    }
+    return res;
+  })();
   const themeConfig = (() => {
-    var _a, _b, _c;
+    var _a, _b;
     const themes = { ...config.themes };
     let cssRules = [];
-    const varsByValue = /* @__PURE__ */ new Map();
     if (isWeb) {
-      const tokenRules = /* @__PURE__ */ new Set();
-      const addVar = /* @__PURE__ */ __name((v) => {
-        varsByValue[v.val] = v;
-        const rule = `--${createCSSVariable(v.name, false)}:${typeof v.val === "number" ? `${v.val}px` : v.val}`;
-        tokenRules.add(rule);
-      }, "addVar");
       for (const key in config.tokens) {
         for (const skey in config.tokens[key]) {
           const val = config.tokens[key][skey];
-          if (key === "font") {
-            for (const fkey in val) {
-              if (fkey === "family") {
-                addVar(val[fkey]);
-              } else {
-                for (const fskey in val[fkey]) {
-                  addVar(val[fkey][fskey]);
-                }
-              }
-            }
-          } else {
-            addVar(val);
-          }
+          registerCSSVariable(val);
         }
       }
+      for (const key in fontsParsed) {
+        const val = fontsParsed[key];
+        registerFontVariables(val);
+      }
       const sep = process.env.NODE_ENV === "development" ? config.cssStyleSeparator || " " : "";
       cssRules.push(`:root {${sep}${[...tokenRules].join(`;${sep}`)}${sep}}`);
     }
     const hasDarkLight = "light" in config.themes && "dark" in config.themes;
     const CNP = `.${THEME_CLASSNAME_PREFIX}`;
-    const existing = /* @__PURE__ */ new WeakMap();
     const dedupedThemes = {};
+    const existing = /* @__PURE__ */ new WeakMap();
     for (const themeName in themes) {
       const rawTheme = themes[themeName];
       if (existing.has(rawTheme)) {
         const e = existing.get(rawTheme);
+        themes[themeName] = e.theme;
         e.names.push(themeName);
         continue;
       }
@@ -80,33 +84,22 @@ function createTamagui(config) {
         names: [themeName],
         theme
       };
-      existing.set(theme, dedupedThemes[themeName]);
+      existing.set(config.themes[themeName], dedupedThemes[themeName]);
     }
-    for (const themeName in dedupedThemes) {
-      const { theme, names } = dedupedThemes[themeName];
-      let vars = "";
-      for (const themeKey in theme) {
-        if (isWeb) {
-          const val = theme[themeKey];
-          let varName;
-          let varVal;
-          if (isVariable(val)) {
-            varName = val.key;
-            varVal = val.isFloating ? val.val : createCSSVariable(varName);
+    if (isWeb) {
+      for (const themeName in dedupedThemes) {
+        const { theme, names } = dedupedThemes[themeName];
+        let vars = "";
+        for (const themeKey in theme) {
+          const variable = theme[themeKey];
+          let value = null;
+          if (variable.isFloating || !tokensValueToVariable.has(variable.val)) {
+            value = variable.val;
           } else {
-            varName = (_a = varsByValue[val]) == null ? void 0 : _a.key;
-            varVal = varName ? createCSSVariable(varName) : `${val}`;
+            value = tokensValueToVariable.get(variable.val).variable;
           }
-          if (process.env.NODE_ENV === "development") {
-            if (!varName) {
-              console.warn("no var name in theme", themeName, themeKey);
-              continue;
-            }
-          }
-          vars += `--${themeKey}:${varVal};`;
+          vars += `--${themeKey}:${value};`;
         }
-      }
-      if (isWeb) {
         const isDarkOrLightBase = themeName === "dark" || themeName === "light";
         const isDark = themeName.startsWith("dark");
         const selectors = names.map((name) => {
@@ -120,7 +113,7 @@ function createTamagui(config) {
               order.reverse();
             }
             const [stronger, weaker] = order;
-            const max = (_b = config.maxDarkLightNesting) != null ? _b : 3;
+            const max = (_a = config.maxDarkLightNesting) != null ? _a : 3;
             new Array(max * 2).fill(void 0).forEach((_, pi) => {
               if (pi % 2 === 1)
                 return;
@@ -133,17 +126,42 @@ function createTamagui(config) {
         }
         const rootSep = config.themeClassNameOnRoot ? "" : " ";
         cssRules.push(`${selectors.map((x) => `:root${rootSep}${x}`).join(", ")} {${vars}}`);
-        if ((_c = config.shouldAddPrefersColorThemes) != null ? _c : true) {
+        if ((_b = config.shouldAddPrefersColorThemes) != null ? _b : true) {
           if (isDarkOrLightBase) {
             cssRules.push(`@media(prefers-color-scheme: ${isDark ? "dark" : "light"}) {
-    body { background:${theme.background}; color: ${theme.color} }
-    :root {${vars} } 
-  }`);
+      body { background:${theme.background}; color: ${theme.color} }
+      :root {${vars} } 
+    }`);
           }
         }
       }
     }
-    varsByValue.clear();
+    for (const themeName in themes) {
+      const cur = [];
+      const parents = themeName.split("_").slice(0, -1).map((part) => {
+        cur.push(part);
+        return cur.join("_");
+      });
+      if (!parents.length)
+        continue;
+      themes[themeName] = new Proxy(themes[themeName], {
+        get(target, key) {
+          if (Reflect.has(target, key)) {
+            return Reflect.get(target, key);
+          }
+          for (let i = parents.length - 1; i >= 0; i--) {
+            const parent = themes[parents[i]];
+            if (!parent) {
+              continue;
+            }
+            if (Reflect.has(parent, key)) {
+              return Reflect.get(parent, key);
+            }
+          }
+        }
+      });
+    }
+    tokensValueToVariable.clear();
     Object.freeze(cssRules);
     const css = cssRules.join("\n");
     return {
@@ -153,29 +171,6 @@ function createTamagui(config) {
     };
   })();
   const tokensParsed = parseTokens(config.tokens);
-  const fontsParsed = (() => {
-    if (!config.fonts) {
-      throw new Error(`No fonts defined!`);
-    }
-    const res = {};
-    for (const familyName in config.fonts) {
-      const family = config.fonts[familyName];
-      const parsed = {};
-      for (const attrKey in family) {
-        const attr = family[attrKey];
-        if (attrKey === "family") {
-          parsed[attrKey] = attr;
-          continue;
-        }
-        parsed[attrKey] = Object.keys(attr).reduce((acc, cur) => {
-          acc[`$${cur}`] = attr[cur];
-          return acc;
-        }, {});
-      }
-      res[`$${familyName}`] = parsed;
-    }
-    return res;
-  })();
   const getCSS = /* @__PURE__ */ __name(() => {
     return `${themeConfig.css}
 ${getInsertedRules().join("\n")}`;
@@ -231,8 +226,7 @@ function ensureThemeVariable(theme, key) {
     theme[key] = createVariable({
       key: themeKey,
       name: themeKey,
-      val,
-      isFloating: true
+      val
     });
   } else {
     if (val.name !== themeKey) {

package/dist/jsx/createVariable.js

@@ -44,6 +44,12 @@ function getVariableName(v) {
   return v;
 }
 __name(getVariableName, "getVariableName");
+function getVariableVariable(v) {
+  if (isVariable(v))
+    return v.variable;
+  return v;
+}
+__name(getVariableVariable, "getVariableVariable");
 const createCSSVariable = /* @__PURE__ */ __name((nameProp, includeVar = true) => {
   if (process.env.NODE_ENV === "development") {
     if (!nameProp || typeof nameProp !== "string") {
@@ -60,5 +66,6 @@ export {
   createVariable,
   getVariableName,
   getVariableValue,
+  getVariableVariable,
   isVariable
 };

package/dist/jsx/createVariables.js

@@ -20,10 +20,10 @@ const createVariables = /* @__PURE__ */ __name((tokens, parentPath = "") => {
           });
         });
       } else {
-        res[key] = createVariables(tokens[key], name);
+        res[key] = createVariables(tokens[key], name === "color" ? "" : name);
       }
     } else {
-      res[key] = createVariable({ val, name, key });
+      res[key] = isVariable(val) ? val : createVariable({ val, name, key });
     }
   }
   return res;

package/dist/jsx/helpers/calc.js

@@ -0,0 +1,48 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { isWeb } from "../constants/platform";
+import { getVariableVariable } from "../createVariable";
+const operators = {
+  "+": (a, b) => a + b,
+  "-": (a, b) => a - b,
+  "/": (a, b) => a / b,
+  "*": (a, b) => a * b
+};
+const calc = /* @__PURE__ */ __name((...valuesAndOperators) => {
+  if (isWeb) {
+    let res2 = "calc(";
+    for (const cur of valuesAndOperators) {
+      if (operators[cur]) {
+        res2 += " " + cur + " ";
+      } else {
+        res2 += convertToVariableOrNumber(cur);
+      }
+    }
+    return res2 + ")";
+  }
+  let res = 0;
+  let nextOp = null;
+  for (const cur of valuesAndOperators) {
+    if (operators[cur]) {
+      nextOp = operators[cur];
+    } else {
+      if (nextOp) {
+        res = nextOp(res, cur);
+        nextOp = null;
+      } else {
+        res = +cur;
+      }
+    }
+  }
+  return res;
+}, "calc");
+const convertToVariableOrNumber = /* @__PURE__ */ __name((v) => {
+  const varOrVal = getVariableVariable(v);
+  if (typeof varOrVal === "number") {
+    return `${varOrVal}px`;
+  }
+  return varOrVal;
+}, "convertToVariableOrNumber");
+export {
+  calc
+};

package/dist/jsx/helpers/createPropMapper.js

@@ -132,7 +132,7 @@ const getToken = /* @__PURE__ */ __name((key, value, { tokensParsed, fontsParsed
   var _a, _b, _c;
   let valOrVar;
   let hasSet = false;
-  if (value in theme) {
+  if (theme[value]) {
     valOrVar = theme[value];
     hasSet = true;
   } else {
@@ -200,14 +200,7 @@ const tokenCategories = {
     minWidth: true,
     minHeight: true,
     maxWidth: true,
-    maxHeight: true,
-    padding: true,
-    paddingLeft: true,
-    paddingRight: true,
-    paddingTop: true,
-    paddingBottom: true,
-    paddingVertical: true,
-    paddingHorizontal: true
+    maxHeight: true
   },
   color: {
     color: true,

package/dist/jsx/helpers/getSize.js

@@ -1,12 +1,21 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 import { getTokens } from "../conf";
-const getSize = /* @__PURE__ */ __name((size, sizeUpOrDownBy = 0) => {
-  const sizes = getTokens().size;
-  const sizeNames = Object.keys(sizes);
-  const key = sizeNames[Math.max(0, sizeNames.indexOf(String(size || "$4")) + sizeUpOrDownBy)];
-  return sizes[key] || sizes["$4"];
+const getSize = /* @__PURE__ */ __name((size, shift = 0, bounds = [0]) => {
+  return stepTokenUpOrDown(getTokens().size, size, shift, bounds);
 }, "getSize");
+const stepTokenUpOrDown = /* @__PURE__ */ __name((tokens, current, shift = 0, bounds = [0]) => {
+  var _a, _b;
+  const sizeNames = Object.keys(tokens);
+  const currentKeyNum = (typeof current === "string" ? current.replace("$", "") : current) || "4";
+  const nextKeyName = `$${+currentKeyNum + shift}`;
+  const min = (_a = bounds[0]) != null ? _a : 0;
+  const max = (_b = bounds[1]) != null ? _b : sizeNames.length - 1;
+  const index = Math.min(max, Math.max(min, sizeNames.indexOf(nextKeyName)));
+  const key = sizeNames[index];
+  return tokens[key] || tokens["$4"];
+}, "stepTokenUpOrDown");
 export {
-  getSize
+  getSize,
+  stepTokenUpOrDown
 };

package/dist/jsx/helpers/getStackSize.js

@@ -1,43 +1,17 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-import { getVariableValue, isVariable } from "../createVariable";
-const getSizeScaledToFont = /* @__PURE__ */ __name((val, { sizeX = 1, sizeY = 1 }, { tokens, props, fonts }) => {
-  var _a, _b, _c, _d, _e, _f;
-  const size = (_c = (_b = (_a = tokens.size[val]) != null ? _a : val) != null ? _b : tokens.size["$4"]) != null ? _c : 14;
-  const radius = (_e = (_d = tokens.radius[val]) != null ? _d : tokens.radius["$4"]) != null ? _e : size;
-  const sizePx = +(isVariable(size) ? size.val : size);
-  const scaleSize = isVariable(size) ? 2 : 1;
-  const px = Math.round(sizePx * sizeX);
-  const py = Math.round(sizePx * sizeY);
-  const font = fonts[props.fontFamily] || fonts["$body"];
-  const lineHeights = font.lineHeight;
-  const lineHeight = (_f = lineHeights[val]) != null ? _f : lineHeights["$4"];
-  const minHeight = Math.round(getVariableValue(lineHeight) + py * scaleSize);
-  return {
-    px,
-    py,
-    radius,
-    size,
-    lineHeight,
-    minHeight
-  };
-}, "getSizeScaledToFont");
-const createGetStackSize = /* @__PURE__ */ __name((scale) => (val, extras) => {
+import { getSize, stepTokenUpOrDown } from "./getSize";
+const getButtonSize = /* @__PURE__ */ __name((val, { tokens }) => {
   var _a;
-  const { props } = extras;
-  const { radius, minHeight, px, py } = getSizeScaledToFont(val, scale, extras);
+  const ySize = getSize(val, 0);
+  const xSize = stepTokenUpOrDown(tokens.space, val);
+  const radiusToken = (_a = tokens.radius[val]) != null ? _a : tokens.radius["$4"];
   return {
-    minHeight,
-    borderRadius: props.circular ? 1e5 : (_a = props.borderRadius) != null ? _a : radius,
-    paddingHorizontal: props.circular ? 0 : px,
-    paddingVertical: props.circular ? 0 : py
+    paddingHorizontal: xSize,
+    height: ySize,
+    borderRadius: radiusToken
   };
-}, "createGetStackSize");
-const buttonScaling = { sizeX: 0.75, sizeY: 0.333 };
-const getButtonSize = createGetStackSize(buttonScaling);
+}, "getButtonSize");
 export {
-  buttonScaling,
-  createGetStackSize,
-  getButtonSize,
-  getSizeScaledToFont
+  getButtonSize
 };

package/dist/jsx/helpers/getTextSize.js

@@ -7,7 +7,7 @@ const getTextSize = /* @__PURE__ */ __name((val = "$4", { fonts, theme, props })
   const font = fonts[family] || fonts["$body"];
   if (!font) {
     console.warn("\u26A0\uFE0F no font found", { family, fontTokens: Object.keys(fonts), val });
-    return;
+    return {};
   }
   const fontFamily = font.family;
   const fontSize = props.fontSize || font.size[val];

package/dist/jsx/helpers/registerCSSVariable.js

@@ -0,0 +1,16 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { createCSSVariable } from "../createVariable";
+const registerCSSVariable = /* @__PURE__ */ __name((v) => {
+  tokensValueToVariable.set(v.val, v);
+  const val = `--${createCSSVariable(v.name, false)}:${typeof v.val === "number" ? `${v.val}px` : v.val}`;
+  tokenRules.add(val);
+  return val;
+}, "registerCSSVariable");
+const tokensValueToVariable = /* @__PURE__ */ new Map();
+const tokenRules = /* @__PURE__ */ new Set();
+export {
+  registerCSSVariable,
+  tokenRules,
+  tokensValueToVariable
+};

package/dist/jsx/hooks/useTheme.js

@@ -51,14 +51,11 @@ const useTheme = /* @__PURE__ */ __name((themeName, componentName, props, forceU
       get(_, key) {
         if (!name || key === "__proto__" || typeof key === "symbol") {
           if (key === GetThemeManager) {
-            if (process.env.NODE_ENV === "development") {
-              if (props == null ? void 0 : props.debug) {
-                console.log("did change", { themeName, didChangeTheme, name, componentName }, themeManager == null ? void 0 : themeManager.parentName);
-              }
+            if (process.env.NODE_ENV === "development" && (props == null ? void 0 : props.debug)) {
+              console.log(">>", { themeName, didChangeTheme, name, componentName }, themeManager);
             }
-            if (!didChangeTheme) {
+            if (!didChangeTheme)
               return null;
-            }
             return themeManager;
           }
           return Reflect.get(_, key);
@@ -66,11 +63,6 @@ const useTheme = /* @__PURE__ */ __name((themeName, componentName, props, forceU
         if (typeof key !== "string" || key === "$typeof") {
           return Reflect.get(_, key);
         }
-        if (process.env.NODE_ENV === "development") {
-          if (key === "__state") {
-            return state.current;
-          }
-        }
         if (key === "name") {
           return name;
         }
@@ -96,10 +88,6 @@ const useTheme = /* @__PURE__ */ __name((themeName, componentName, props, forceU
           }
           return val;
         }
-        if (process.env.NODE_ENV === "development") {
-          console.log(`No theme value "${String(key)}" in ${name}`);
-        }
-        return Reflect.get(_, key);
       }
     });
   }, [name, theme, className, didChangeTheme]);

package/dist/jsx/index.js

@@ -7,6 +7,7 @@ export * from "./createFont";
 export * from "./createTokens";
 export * from "./createVariable";
 export * from "./createVariables";
+export * from "./insertFont";
 export * from "./styled";
 export * from "./types";
 import { RNWTextProps, RNWViewProps } from "./types-rnw";
@@ -14,6 +15,7 @@ import { getHasConfigured, getConfig, getThemes, getTokens, onConfiguredOnce } f
 export * from "./constants/constants";
 export * from "./constants/platform";
 export * from "./constants/rnw";
+export * from "./helpers/calc";
 export * from "./helpers/createShallowUpdate";
 export * from "./helpers/getStackSize";
 export * from "./helpers/getVariantExtras";

package/dist/jsx/insertFont.js

@@ -0,0 +1,56 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { setConfigFont } from "./conf";
+import { createFont } from "./createFont";
+import { createVariables } from "./createVariables";
+import { registerCSSVariable } from "./helpers/registerCSSVariable";
+function insertFont(name, fontIn) {
+  const font = createFont(fontIn);
+  const tokened = createVariables(font, name);
+  const parsed = parseFont(tokened);
+  registerFontVariables(parsed);
+  setConfigFont(name, parsed);
+  return parsed;
+}
+__name(insertFont, "insertFont");
+function parseFont(definition) {
+  const parsed = {};
+  for (const attrKey in definition) {
+    const attr = definition[attrKey];
+    if (attrKey === "family") {
+      parsed[attrKey] = attr;
+      continue;
+    }
+    parsed[attrKey] = {};
+    for (const key in attr) {
+      let val = attr[key];
+      if (val.val[0] === "$") {
+        val = val.val;
+      }
+      parsed[attrKey][`$${key}`] = val;
+    }
+  }
+  return parsed;
+}
+__name(parseFont, "parseFont");
+function registerFontVariables(parsedFont) {
+  for (const fkey in parsedFont) {
+    if (fkey === "family") {
+      registerCSSVariable(parsedFont[fkey]);
+    } else {
+      for (const fskey in parsedFont[fkey]) {
+        const fval = parsedFont[fkey][fskey];
+        if (typeof fval === "string") {
+        } else {
+          registerCSSVariable(parsedFont[fkey][fskey]);
+        }
+      }
+    }
+  }
+}
+__name(registerFontVariables, "registerFontVariables");
+export {
+  insertFont,
+  parseFont,
+  registerFontVariables
+};

package/dist/jsx/registerCSSVariable.js

@@ -0,0 +1,16 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { createCSSVariable } from "./createVariable";
+const registerCSSVariable = /* @__PURE__ */ __name((v) => {
+  tokensValueToVariable.set(v.val, v);
+  const val = `--${createCSSVariable(v.name, false)}:${typeof v.val === "number" ? `${v.val}px` : v.val}`;
+  tokenRules.add(val);
+  return val;
+}, "registerCSSVariable");
+const tokensValueToVariable = /* @__PURE__ */ new Map();
+const tokenRules = /* @__PURE__ */ new Set();
+export {
+  registerCSSVariable,
+  tokenRules,
+  tokensValueToVariable
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "1.0.1-beta.54",
+  "version": "1.0.1-beta.57",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -21,10 +21,10 @@
   ],
   "dependencies": {
     "@expo/match-media": "^0.3.0",
-    "@tamagui/helpers": "^1.0.1-beta.54",
+    "@tamagui/helpers": "^1.0.1-beta.57",
     "@tamagui/ow": "^0.28.1",
-    "@tamagui/use-debounce": "^1.0.1-beta.54",
-    "@tamagui/use-force-update": "^1.0.1-beta.54",
+    "@tamagui/use-debounce": "^1.0.1-beta.57",
+    "@tamagui/use-force-update": "^1.0.1-beta.57",
     "expo-screen-orientation": "^4.2.0",
     "hyphenate-style-name": "^1.0.4",
     "inline-style-prefixer": "^6.0.0",
@@ -36,7 +36,7 @@
     "react-native-web": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.0.1-beta.54",
+    "@tamagui/build": "^1.0.1-beta.57",
     "@types/react": "^17.0.35",
     "csstype": "^3.0.10",
     "esbuild": "^0.14.36",

package/reset.css

@@ -1,3 +1,11 @@
+/* mimic the native viewport full width/height + flex */
+body {
+  display: flex;
+  flex-direction: column;
+  min-height: 100vh;
+  min-width: 100vw;
+}
+
 * {
   box-sizing: border-box;
 }

package/types/Tamagui.d.ts

@@ -1,9 +1,8 @@
 import * as Helpers from '@tamagui/helpers';
-import { TamaguiInternalConfig } from './types';
 declare class TamaguiManager {
     rnw: any;
     Helpers: typeof Helpers;
-    get config(): TamaguiInternalConfig<import("./types").CreateTokens<import("./types").VariableVal>, {
+    get config(): import("./types").TamaguiInternalConfig<import("./types").CreateTokens<import("./types").VariableVal>, {
         [key: string]: Partial<import("./types").TamaguiBaseTheme> & {
             [key: string]: import("./types").VariableVal;
         };
@@ -15,9 +14,7 @@ declare class TamaguiManager {
         [key: string]: string | {
             [key: string]: any;
         };
-    }, {
-        [key: string]: import("./types").GenericFont<string | number>;
-    }>;
+    }, import("./types").GenericFonts>;
     get insertedRules(): unknown[];
     get allSelectors(): {};
     get allTransforms(): {};

package/types/Tamagui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Tamagui.d.ts","sourceRoot":"","sources":["../src/Tamagui.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAA;AAK3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAI/C,cAAM,cAAc;IAClB,GAAG,MAAM;IACT,OAAO,iBAAU;IAEjB,IAAI,MAAM;;;;;;;;;;;;;;OAET;IAED,IAAI,aAAa,cAEhB;IAED,IAAI,YAAY,OAEf;IAED,IAAI,aAAa,OAEhB;IAED,IAAI,iBAAiB,qBAEpB;CACF;AAED,eAAO,MAAM,OAAO,gBAAuB,CAAA;AAI3C,eAAO,MAAM,sBAAsB,eAAgB,MAAM,QAExD,CAAA;AAED,eAAO,MAAM,kBAAkB,eAAgB,MAAM,SAAS,GAAG,SAEhE,CAAA"}
+{"version":3,"file":"Tamagui.d.ts","sourceRoot":"","sources":["../src/Tamagui.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAA;AAQ3C,cAAM,cAAc;IAClB,GAAG,MAAM;IACT,OAAO,iBAAU;IAEjB,IAAI,MAAM;;;;;;;;;;;;uCAET;IAED,IAAI,aAAa,cAEhB;IAED,IAAI,YAAY,OAEf;IAED,IAAI,aAAa,OAEhB;IAED,IAAI,iBAAiB,qBAEpB;CACF;AAED,eAAO,MAAM,OAAO,gBAAuB,CAAA;AAI3C,eAAO,MAAM,sBAAsB,eAAgB,MAAM,QAExD,CAAA;AAED,eAAO,MAAM,kBAAkB,eAAgB,MAAM,SAAS,GAAG,SAEhE,CAAA"}