@tamagui/core 1.0.0-beta.200 → 1.0.0-beta.204

package/dist/jsx/helpers/proxyThemeVariables.js

@@ -0,0 +1,17 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+function proxyThemeVariables(obj) {
+  return new Proxy(obj, {
+    has(target, key) {
+      return Reflect.has(target, removeStarting$(key));
+    },
+    get(target, key) {
+      return Reflect.get(target, removeStarting$(key));
+    }
+  });
+}
+__name(proxyThemeVariables, "proxyThemeVariables");
+const removeStarting$ = /* @__PURE__ */ __name((str) => typeof str === "string" && str[0] === "$" ? str.slice(1) : str, "removeStarting$");
+export {
+  proxyThemeVariables
+};

package/dist/jsx/helpers/themeable.js

@@ -3,14 +3,14 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 import React, { forwardRef } from "react";
 import { Theme } from "../views/Theme";
 import { ThemeInverse } from "../views/ThemeInverse";
-function themeable(component) {
+function themeable(component, opts) {
   const withThemeComponent = forwardRef(/* @__PURE__ */ __name(function WithTheme({ themeInverse, theme, ...rest }, ref) {
     const element = React.createElement(component, { ...rest, ref });
     if (themeInverse) {
       return <ThemeInverse>{element}</ThemeInverse>;
     }
-    if (theme) {
-      return <Theme name={theme || null}>{element}</Theme>;
+    if (theme || opts) {
+      return <Theme componentName={opts == null ? void 0 : opts.componentName} name={theme || null}>{element}</Theme>;
     }
     return element;
   }, "WithTheme"));

package/dist/jsx/helpers/validate.js

@@ -3,7 +3,8 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 const { default: ow } = require("@tamagui/ow/dev-only");
 let Config;
 let Tokens;
-let Font;
+let FontRequired;
+let FontOptional;
 const validateConfig = /* @__PURE__ */ __name((conf) => {
   if (!conf) {
     console.warn("no conf?");
@@ -24,12 +25,26 @@ const validateTokens = /* @__PURE__ */ __name((tokens) => {
 }, "validateTokens");
 const validateFont = /* @__PURE__ */ __name((font) => {
   try {
-    ow(font, Font);
+    const { style, transform, color, ...required } = font;
+    ow(required, FontRequired);
+    ow({ style, transform, color }, FontOptional);
   } catch (err) {
     console.warn("Given font:\n", JSON.stringify(font, null, 2), err);
   }
 }, "validateFont");
 if (process.env.NODE_ENV === "development") {
+  const fontReq = {
+    family: ow.string,
+    size: ow.object.nonEmpty.valuesOfType(ow.number),
+    lineHeight: ow.object.nonEmpty.valuesOfType(ow.number),
+    weight: ow.object.nonEmpty.valuesOfType(ow.string),
+    letterSpacing: ow.object.nonEmpty.valuesOfType(ow.number)
+  };
+  const fontOpt = {
+    style: ow.optional.object.valuesOfType(ow.string),
+    transform: ow.optional.object.valuesOfType(ow.string),
+    color: ow.optional.object.valuesOfType(ow.string)
+  };
   Config = ow.object.exactShape({
     defaultTheme: ow.optional.string,
     disableRootThemeClass: ow.optional.boolean,
@@ -37,17 +52,15 @@ if (process.env.NODE_ENV === "development") {
     themes: ow.object.valuesOfType(ow.object),
     tokens: ow.object.valuesOfType(ow.object),
     media: ow.object.valuesOfType(ow.object),
-    animations: ow.object.valuesOfType(ow.object)
-  });
-  Font = ow.object.exactShape({
-    family: ow.string,
-    size: ow.object.nonEmpty.valuesOfType(ow.number),
-    lineHeight: ow.object.nonEmpty.valuesOfType(ow.number),
-    weight: ow.object.nonEmpty.valuesOfType(ow.string),
-    letterSpacing: ow.object.nonEmpty.valuesOfType(ow.number)
+    animations: ow.object.valuesOfType(ow.object),
+    fonts: ow.object.valuesOfType(ow.object.partialShape({
+      ...fontReq,
+      ...fontOpt
+    }))
   });
+  FontRequired = ow.object.exactShape(fontReq);
+  FontOptional = ow.object.partialShape(fontOpt);
   Tokens = ow.object.exactShape({
-    font: ow.object.valuesOfType(Font),
     size: ow.object.nonEmpty.valuesOfType(ow.number),
     space: ow.object.nonEmpty.valuesOfType(ow.number),
     zIndex: ow.object.nonEmpty.valuesOfType(ow.number),

package/dist/jsx/hooks/useFeatures.js

@@ -1,6 +1,7 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-import { isWeb, useIsomorphicLayoutEffect } from "../constants/platform";
+import { useIsomorphicLayoutEffect } from "../constants/platform";
+import { getSubStyle } from "../helpers/getSplitStyles";
 import { addMediaQueryListener, mediaState, removeMediaQueryListener } from "./useMedia";
 const createDefinition = /* @__PURE__ */ __name(({
   Component,
@@ -26,48 +27,125 @@ const useFeatures = /* @__PURE__ */ __name((props, utils) => {
 function loadFeatures() {
   return {
     animation: loadAnimationFeature(),
-    ...!isWeb && {
-      mediaQuery: loadMediaQueryFeature()
-    }
+    mediaQuery: loadMediaQueryFeature()
   };
 }
 __name(loadFeatures, "loadFeatures");
 function loadAnimationFeature() {
   return createDefinition({
     Component: ({ _utils, ...props }) => {
-      const { state, useAnimations, pseudos, style, setStateShallow } = _utils;
+      const {
+        state,
+        useAnimations,
+        pseudos,
+        style: inStyle,
+        setStateShallow,
+        staticConfig,
+        theme,
+        onDidAnimate
+      } = _utils;
       if (!useAnimations) {
         console.error("no useAnimations hook provided");
         return null;
       }
-      const animatedStyleIn = {
-        ...style,
-        ...state.hover && pseudos.hoverStyle,
-        ...state.focus && pseudos.focusStyle,
-        ...state.press && pseudos.pressStyle
-      };
-      const res = useAnimations(props, {
-        isMounted: state.mounted,
-        style: animatedStyleIn,
-        exitStyle: pseudos == null ? void 0 : pseudos.exitStyle
+      const propsWithAnimation = props;
+      const res = useAnimations(propsWithAnimation, {
+        state,
+        pseudos,
+        onDidAnimate,
+        staticConfig,
+        getStyle({ isEntering, exitVariant, enterVariant } = {}) {
+          var _a, _b, _c, _d;
+          const style = inStyle || {};
+          const enterStyle = isEntering === true || state.mounted === false ? enterVariant && ((_a = staticConfig.variants) == null ? void 0 : _a[enterVariant]["true"]) ? getSubStyle((_b = staticConfig.variants) == null ? void 0 : _b[enterVariant]["true"], staticConfig, theme, props, state) || pseudos.enterStyle : pseudos.enterStyle : null;
+          const exitStyle = isEntering === false ? exitVariant && ((_c = staticConfig.variants) == null ? void 0 : _c[exitVariant]["true"]) ? getSubStyle((_d = staticConfig.variants) == null ? void 0 : _d[exitVariant]["true"], staticConfig, theme, props, state) || pseudos.exitStyle : pseudos.exitStyle : null;
+          ensureBaseHasDefaults(style, enterStyle, pseudos.hoverStyle, pseudos.focusStyle, pseudos.pressStyle, pseudos.pressStyle);
+          enterStyle && merge(style, enterStyle);
+          state.hover && pseudos.hoverStyle && merge(style, pseudos.hoverStyle);
+          state.focus && pseudos.focusStyle && merge(style, pseudos.focusStyle);
+          state.press && pseudos.pressStyle && merge(style, pseudos.pressStyle);
+          exitStyle && merge(style, exitStyle);
+          return style;
+        }
       });
       useIsomorphicLayoutEffect(() => {
-        console.log("setting", res, JSON.stringify(style));
         setStateShallow({
           animation: res
         });
-      }, [JSON.stringify(style)]);
+      }, [res]);
       return null;
     },
     propNames: ["animation"]
   });
 }
 __name(loadAnimationFeature, "loadAnimationFeature");
+const defaults = {
+  left: 0,
+  right: 0,
+  top: 0,
+  bottom: 0,
+  opacity: 1,
+  translateX: 0,
+  translateY: 0,
+  skew: 0,
+  skewX: 0,
+  skewY: 0,
+  scale: 1,
+  rotate: "0deg",
+  rotateY: "0deg",
+  rotateX: "0deg"
+};
+function ensureBaseHasDefaults(base, ...pseudos) {
+  for (const pseudo of pseudos) {
+    if (!pseudo)
+      continue;
+    for (const key in pseudo) {
+      const val = pseudo[key];
+      if (key === "transform") {
+        for (const t of val) {
+          const tkey = Object.keys(t)[0];
+          const defaultVal = defaults[tkey];
+          const tDefaultVal = { [tkey]: defaultVal };
+          if (!base.transform) {
+            base.transform = [tDefaultVal];
+          } else {
+            if (!base.transform.find((x) => x[tkey])) {
+              base.transform.push(tDefaultVal);
+            }
+          }
+        }
+      } else {
+        if (!(key in base)) {
+          base[key] = defaults[key];
+        }
+      }
+    }
+  }
+}
+__name(ensureBaseHasDefaults, "ensureBaseHasDefaults");
+function merge(base, next) {
+  if (!next.transform || !base.transform) {
+    Object.assign(base, next);
+    return;
+  }
+  const { transform, ...rest } = next;
+  Object.assign(base, rest);
+  for (const t of transform) {
+    const key = Object.keys(t)[0];
+    const existing = base.transform.find((x) => key in x);
+    if (existing) {
+      existing[key] = t[key];
+    } else {
+      base.transform.push(t);
+    }
+  }
+}
+__name(merge, "merge");
 function loadMediaQueryFeature() {
   const mediaPropNames = Object.keys(mediaState);
   return createDefinition({
     Component: (props) => {
-      const keys = mediaPropNames.flatMap((x) => x in props ? x.slice(1) : []);
+      const keys = mediaPropNames.filter((x) => x in props);
       useIsomorphicLayoutEffect(() => {
         for (const key of keys) {
           addMediaQueryListener(key, props._utils.forceUpdate);

package/dist/jsx/hooks/useMedia.js

@@ -34,29 +34,33 @@ const configureMedia = /* @__PURE__ */ __name(({
   }
   for (const key in queries) {
     const str = mediaObjectToString(queries[key]);
+    const propKey = `$${key}`;
     try {
-      const getMatch = /* @__PURE__ */ __name(() => matchMedia(str), "getMatch");
-      const match = getMatch();
-      if (!match || typeof match.addListener !== "function") {
-        throw new Error("\u26A0\uFE0F No match (seeing this in RN sometimes)");
-      }
-      mediaState[key] = !!match.matches;
-      match.addListener(() => {
+      let update = function() {
         const next = !!getMatch().matches;
-        if (next === mediaState[key])
+        if (next === mediaState[propKey])
           return;
-        mediaState[key] = next;
-        const listeners = mediaQueryListeners[key];
+        mediaState[propKey] = next;
+        const listeners = mediaQueryListeners[propKey];
         if (listeners == null ? void 0 : listeners.size) {
           for (const cb of [...listeners]) {
             cb();
           }
         }
-      });
+      };
+      __name(update, "update");
+      const getMatch = /* @__PURE__ */ __name(() => matchMedia(str), "getMatch");
+      const match = getMatch();
+      if (!match || typeof match.addListener !== "function") {
+        throw new Error("\u26A0\uFE0F No match (seeing this in RN sometimes)");
+      }
+      mediaState[propKey] = !!match.matches;
+      match.addListener(update);
+      update();
     } catch (err) {
       console.error("Error running media query", str, err.message, err.stack);
       const isDefaultActive = (_a = defaultActive == null ? void 0 : defaultActive.includes(key)) != null ? _a : true;
-      mediaState[key] = isDefaultActive;
+      mediaState[propKey] = isDefaultActive;
     }
   }
 }, "configureMedia");
@@ -82,6 +86,7 @@ const useMedia = /* @__PURE__ */ __name(() => {
     }
     for (const key in st.nextSelections) {
       if (!(key in st.selections)) {
+        console.log("lsiten", key);
         addMediaQueryListener(key, forceUpdate);
       }
     }
@@ -103,6 +108,9 @@ const useMedia = /* @__PURE__ */ __name(() => {
     const st = state.current;
     return new Proxy(mediaState, {
       get(target, key) {
+        if (key[0] !== "$") {
+          key = `$${key}`;
+        }
         if (!(key in mediaState)) {
           return Reflect.get(target, key);
         }

package/dist/jsx/hooks/useTheme.js

@@ -49,14 +49,22 @@ const useTheme = /* @__PURE__ */ __name((themeName, componentName, props, forceU
         return Reflect.has(theme, key);
       },
       get(_, key) {
-        if (!name || key === "__proto__") {
+        if (!name || key === "__proto__" || typeof key === "symbol") {
+          if (key === GetThemeManager) {
+            if (process.env.NODE_ENV === "development") {
+              if (props["debug"]) {
+                console.log("did change", { themeName, didChangeTheme, name, componentName }, themeManager == null ? void 0 : themeManager.parentName);
+              }
+            }
+            if (!didChangeTheme) {
+              return null;
+            }
+            return themeManager;
+          }
           return Reflect.get(_, key);
         }
-        if (key === GetThemeManager) {
-          if (!didChangeTheme) {
-            return null;
-          }
-          return themeManager;
+        if (typeof key !== "string" || key === "$typeof") {
+          return Reflect.get(_, key);
         }
         if (process.env.NODE_ENV === "development") {
           if (key === "__state") {
@@ -73,26 +81,23 @@ const useTheme = /* @__PURE__ */ __name((themeName, componentName, props, forceU
           console.error("No themeManager");
           return;
         }
-        if (process.env.NODE_ENV === "development") {
-          if ((props == null ? void 0 : props["debug"]) === "verbose") {
-            console.log("  \xBB accessing theme val", key, { ...state.current });
-          }
+        if (key[0] === "$") {
+          key = key.slice(1);
         }
-        if (typeof key === "string") {
-          if (key[0] === "$") {
-            key = key.slice(1);
-          }
-          const val = themeManager.getValue(key);
-          if (val) {
-            if (state.current.isRendering) {
-              state.current.keys.add(key);
+        const val = themeManager.getValue(key);
+        if (val) {
+          if (state.current.isRendering) {
+            state.current.keys.add(key);
+            if (process.env.NODE_ENV === "development") {
+              if ((props == null ? void 0 : props["debug"]) === "verbose") {
+                console.log("  \xBB tracking theme key", key);
+              }
             }
-            return val;
-          }
-          if (process.env.NODE_ENV === "development") {
-            console.warn(`No theme value "${String(key)}" in ${name}`);
-            return null;
           }
+          return val;
+        }
+        if (process.env.NODE_ENV === "development") {
+          console.log(`No theme value "${String(key)}" in ${name}`);
         }
         return Reflect.get(_, key);
       }

package/dist/jsx/index.js

@@ -8,11 +8,13 @@ import { createTokens } from "./createTokens";
 export * from "./createVariable";
 export * from "./styled";
 export * from "./types";
+import { RNWTextProps, RNWViewProps } from "./types-rnw";
 import { getHasConfigured, getConfig, getThemes, getTokens, onConfiguredOnce } from "./conf";
 export * from "./constants/constants";
 export * from "./constants/platform";
 export * from "./constants/rnw";
 export * from "./helpers/getExpandedShorthands";
+export * from "./helpers/getSize";
 export * from "./helpers/getSplitStyles";
 export * from "./helpers/getStylesAtomic";
 export * from "./helpers/isObj";
@@ -38,6 +40,8 @@ export * from "./views/ThemeProvider";
 export * from "./views/TextAncestorContext";
 export * from "@tamagui/helpers";
 export {
+  RNWTextProps,
+  RNWViewProps,
   createTokens,
   getConfig,
   getHasConfigured,

package/dist/jsx/static.js

@@ -3,11 +3,14 @@ export * from "./createComponent";
 export * from "./createFont";
 export * from "./createTokens";
 export * from "./createTamagui";
+export * from "./createVariable";
 export * from "./constants/constants";
 export * from "./hooks/useMedia";
 export * from "./hooks/useTheme";
 export * from "./helpers/isObj";
 export * from "./helpers/getStylesAtomic";
+export * from "./helpers/proxyThemeVariables";
 export * from "./helpers/getSplitStyles";
 export * from "@tamagui/helpers";
 export * from "./constants/rnw";
+export * from "./types";

package/dist/jsx/styled.js

@@ -2,7 +2,6 @@ var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 import { Image, Text, TextInput } from "react-native";
 import { createComponent } from "./createComponent";
-import { extendStaticConfig } from "./helpers/extendStaticConfig";
 import { RNComponents } from "./helpers/RNComponents";
 function styled(Component, options, staticExtractionOptions) {
   const staticConfigProps = (() => {
@@ -11,7 +10,7 @@ function styled(Component, options, staticExtractionOptions) {
       if (defaultVariants) {
         Object.assign(defaultProps, defaultVariants);
       }
-      const isReactNativeWeb = RNComponents.has(Component);
+      const isReactNativeWeb = "staticConfig" in Component ? Component.staticConfig.isReactNativeWeb : RNComponents.has(Component);
       const isTamagui = !isReactNativeWeb && "staticConfig" in Component;
       const Comp = Component;
       const isImage = !!(defaultProps.isImage || (!isTamagui ? Comp === Image : false));
@@ -25,6 +24,7 @@ function styled(Component, options, staticExtractionOptions) {
         isTamagui,
         variants,
         defaultProps,
+        defaultVariants,
         componentName: name,
         isReactNativeWeb,
         isInput,
@@ -35,8 +35,7 @@ function styled(Component, options, staticExtractionOptions) {
     }
     return {};
   })();
-  const config = extendStaticConfig(Component, staticConfigProps);
-  const component = createComponent(config);
+  const component = createComponent(staticConfigProps, Component);
   return component;
 }
 __name(styled, "styled");

package/dist/jsx/views/Stack.js

@@ -1,6 +1,7 @@
 import { stackDefaultStyles } from "../constants/constants";
 import { createComponent } from "../createComponent";
 const Stack = createComponent({
+  componentName: "Stack",
   defaultProps: {
     ...stackDefaultStyles,
     flexDirection: "column"

package/dist/jsx/views/Text.js

@@ -8,6 +8,7 @@ const ellipseStyle = {
   whiteSpace: "nowrap"
 };
 const Text = createComponent({
+  componentName: "Text",
   isText: true,
   defaultProps: {
     display: isWeb ? "inline" : "flex",

package/dist/jsx/views/Theme.js

@@ -3,11 +3,11 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 import React, { memo, useMemo } from "react";
 import { isWeb } from "../constants/platform";
 import { wrapThemeManagerContext } from "../helpers/wrapThemeManagerContext";
-import { useChangeThemeEffect } from "../static";
+import { useChangeThemeEffect } from "../hooks/useTheme";
 React["createElement"];
 const Theme = memo(/* @__PURE__ */ __name(function Theme2(props) {
   var _a, _b;
-  const { name, theme, themeManager, themes, className } = useChangeThemeEffect(props.name, void 0, props);
+  const { name, theme, themeManager, themes, className } = useChangeThemeEffect(props.name, props.componentName, props);
   if (!themes || !name || !theme) {
     if (name && !theme && process.env.NODE_ENV === "development") {
       console.warn(`No theme found by name ${name}`);
@@ -16,10 +16,13 @@ const Theme = memo(/* @__PURE__ */ __name(function Theme2(props) {
   }
   const contents = useMemo(() => wrapThemeManagerContext(props.children, themeManager), [props.children, themeManager]);
   if (isWeb) {
-    return <div className={props.disableThemeClass ? "" : props.className ? `${className || ""} ${props.className || ""}` : className || ""} style={{
+    return <span className={[
+      `tui_Theme`,
+      ...!props.disableThemeClass ? [props.className, className].filter(Boolean) : []
+    ].join(" ")} style={{
       display: "contents",
       color: (_b = (_a = themes[name]) == null ? void 0 : _a.color) == null ? void 0 : _b.toString()
-    }}>{contents}</div>;
+    }}>{contents}</span>;
   }
   return contents;
 }, "Theme"));

package/dist/jsx/views/ThemeProvider.js

@@ -20,7 +20,7 @@ const ThemeProvider = /* @__PURE__ */ __name((props) => {
       return () => {
         document.body.classList.remove(cn);
       };
-    }, []);
+    }, [props.disableRootThemeClass]);
   }
   const themeContext = useMemo(() => {
     return {
@@ -28,7 +28,7 @@ const ThemeProvider = /* @__PURE__ */ __name((props) => {
       defaultTheme: props.defaultTheme
     };
   }, [props.themes]);
-  return <ThemeContext.Provider value={themeContext}><Theme name={props.defaultTheme} disableThemeClass={props.disableRootThemeClass}>{props.children}</Theme></ThemeContext.Provider>;
+  return <ThemeContext.Provider value={themeContext}><Theme className={props.className} name={props.defaultTheme} disableThemeClass={props.disableRootThemeClass}>{props.children}</Theme></ThemeContext.Provider>;
 }, "ThemeProvider");
 export {
   ThemeProvider

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "1.0.0-beta.200+9591831d",
+  "version": "1.0.0-beta.204+322b9fd1",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -19,10 +19,10 @@
     "dist"
   ],
   "dependencies": {
-    "@tamagui/helpers": "^1.0.0-beta.200+9591831d",
+    "@tamagui/helpers": "^1.0.0-beta.204+322b9fd1",
     "@tamagui/ow": "^0.28.1",
-    "@tamagui/use-debounce": "^1.0.0-beta.200+9591831d",
-    "@tamagui/use-force-update": "^1.0.0-beta.200+9591831d",
+    "@tamagui/use-debounce": "^1.0.0-beta.204+322b9fd1",
+    "@tamagui/use-force-update": "^1.0.0-beta.204+322b9fd1",
     "react": "*",
     "react-dom": "*"
   },
@@ -30,7 +30,7 @@
     "react-native-web": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.0.0-beta.200+9591831d",
+    "@tamagui/build": "^1.0.0-beta.204+322b9fd1",
     "@types/react": "^17.0.35",
     "csstype": "^3.0.10",
     "esbuild": "^0.14.36",
@@ -40,5 +40,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9591831d7d4a58cc4e01846e68a0d3324570b5c8"
+  "gitHead": "322b9fd15b9cfbe9b671390a3b4e2562addd57fd"
 }

package/types/Tamagui.d.ts

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

package/types/Tamagui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Tamagui.d.ts","sourceRoot":"","sources":["../src/Tamagui.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAI/C,cAAM,cAAc;IAClB,MAAM,EAAE,qBAAqB,GAAG,IAAI,CAAO;IAC3C,GAAG,sBAAM;IAET,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;AAK3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAI/C,cAAM,cAAc;IAClB,GAAG,sBAAM;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"}

package/types/ThemeManager.d.ts

@@ -9,14 +9,14 @@ export declare type SetActiveThemeProps = {
 };
 export declare class ThemeManager {
     #private;
-    name: string | null;
+    name: string;
     theme: ThemeObject | null;
     parentManager: ThemeManager | null;
     keys: Map<any, Set<string>>;
     listeners: Map<any, Function>;
     themeListeners: Set<ThemeListener>;
     className: string | null;
-    constructor(name?: string | null, theme?: ThemeObject | null, parentManager?: ThemeManager | null);
+    constructor(name?: string, theme?: ThemeObject | null, parentManager?: ThemeManager | null);
     get parentName(): string | null;
     get fullName(): string;
     getValue(key: string): import("./types").VariableVal | undefined;
@@ -32,7 +32,7 @@ export declare class ThemeManager {
         };
         className: string;
     } | {
-        name: string | null;
+        name: string;
         theme: (Partial<import("./types").TamaguiBaseTheme> & {
             [key: string]: import("./types").VariableVal;
         }) | null;

package/types/ThemeManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ThemeManager.d.ts","sourceRoot":"","sources":["../src/ThemeManager.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAE7C,aAAK,aAAa,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,YAAY,EAAE,YAAY,KAAK,IAAI,CAAA;AAE9E,oBAAY,mBAAmB,GAAG;IAChC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,aAAa,CAAC,EAAE,YAAY,GAAG,IAAI,CAAA;IACnC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,KAAK,CAAC,EAAE,GAAG,CAAA;CACZ,CAAA;AAED,qBAAa,YAAY;;IAOd,IAAI,EAAE,MAAM,GAAG,IAAI;IACnB,KAAK,EAAE,WAAW,GAAG,IAAI;IACzB,aAAa,EAAE,YAAY,GAAG,IAAI;IAR3C,IAAI,wBAA8B;IAClC,SAAS,qBAA2B;IACpC,cAAc,qBAA2B;IACzC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAO;gBAGtB,IAAI,GAAE,MAAM,GAAG,IAAW,EAC1B,KAAK,GAAE,WAAW,GAAG,IAAW,EAChC,aAAa,GAAE,YAAY,GAAG,IAAW;IAqBlD,IAAI,UAAU,kBAEb;IAED,IAAI,QAAQ,IAAI,MAAM,CAMrB;IAGD,QAAQ,CAAC,GAAG,EAAE,MAAM;IAmBpB,MAAM,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,GAAE,mBAAwB;IAgB3D,YAAY,CACV,IAAI,GAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAO,EACnF,KAAK,CAAC,EAAE,GAAG;;;;;;;;;;;;;IAiEb,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC;IAKlC,eAAe;IAYf,aAAa,CAAC,EAAE,EAAE,aAAa;IAO/B,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,QAAQ;CAOjC;AAED,eAAO,MAAM,mBAAmB,8CAA2C,CAAA;AAC3E,eAAO,MAAM,YAAY,cAAqB,CAAA"}
+{"version":3,"file":"ThemeManager.d.ts","sourceRoot":"","sources":["../src/ThemeManager.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAE7C,aAAK,aAAa,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,YAAY,EAAE,YAAY,KAAK,IAAI,CAAA;AAE9E,oBAAY,mBAAmB,GAAG;IAChC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,aAAa,CAAC,EAAE,YAAY,GAAG,IAAI,CAAA;IACnC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,KAAK,CAAC,EAAE,GAAG,CAAA;CACZ,CAAA;AAED,qBAAa,YAAY;;IAOd,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,WAAW,GAAG,IAAI;IACzB,aAAa,EAAE,YAAY,GAAG,IAAI;IAR3C,IAAI,wBAA8B;IAClC,SAAS,qBAA2B;IACpC,cAAc,qBAA2B;IACzC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAO;gBAGtB,IAAI,GAAE,MAAW,EACjB,KAAK,GAAE,WAAW,GAAG,IAAW,EAChC,aAAa,GAAE,YAAY,GAAG,IAAW;IAqBlD,IAAI,UAAU,kBAEb;IAED,IAAI,QAAQ,IAAI,MAAM,CAMrB;IAGD,QAAQ,CAAC,GAAG,EAAE,MAAM;IAmBpB,MAAM,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,GAAE,mBAAwB;IAgB3D,YAAY,CACV,IAAI,GAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAO,EACnF,KAAK,CAAC,EAAE,GAAG;;;;;;;;;;;;;IA4Eb,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC;IAKlC,eAAe;IAYf,aAAa,CAAC,EAAE,EAAE,aAAa;IAO/B,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,QAAQ;CAOjC;AAED,eAAO,MAAM,mBAAmB,8CAA2C,CAAA;AAC3E,eAAO,MAAM,YAAY,cAAqB,CAAA"}

package/types/conf.d.ts

@@ -13,6 +13,8 @@ export declare const getConfig: () => TamaguiInternalConfig<import("./types").Cr
     [key: string]: string | {
         [key: string]: any;
     };
+}, {
+    [key: string]: import("./types").GenericFont<string | number>;
 }>;
 export declare const getTokens: () => import("./types").CreateTokens<import("./createVariable").Variable>;
 export declare const getThemes: () => {

package/types/conf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conf.d.ts","sourceRoot":"","sources":["../src/conf.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAI/D,eAAO,MAAM,SAAS,SAAU,qBAAqB,SAMpD,CAAA;AAED,eAAO,MAAM,gBAAgB,eAAe,CAAA;AAC5C,eAAO,MAAM,SAAS;;;;;;;;;;;;EAAc,CAAA;AACpC,eAAO,MAAM,SAAS,2EAA2B,CAAA;AACjD,eAAO,MAAM,SAAS;;;;CAAqB,CAAA;AAE3C,eAAO,MAAM,eAAe,qBAA4B,CAAA;AAExD,eAAO,MAAM,gBAAgB,OAAQ,cAAc,SAWlD,CAAA"}
+{"version":3,"file":"conf.d.ts","sourceRoot":"","sources":["../src/conf.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAI/D,eAAO,MAAM,SAAS,SAAU,qBAAqB,SAMpD,CAAA;AAED,eAAO,MAAM,gBAAgB,eAAe,CAAA;AAC5C,eAAO,MAAM,SAAS;;;;;;;;;;;;;;EAAc,CAAA;AACpC,eAAO,MAAM,SAAS,2EAA2B,CAAA;AACjD,eAAO,MAAM,SAAS;;;;CAAqB,CAAA;AAE3C,eAAO,MAAM,eAAe,qBAA4B,CAAA;AAExD,eAAO,MAAM,gBAAgB,OAAQ,cAAc,SAUlD,CAAA"}

package/types/constants/platform.d.ts

@@ -3,6 +3,7 @@ export declare const isAndroid: boolean;
 export declare const isIOS: boolean;
 export declare const isWeb: boolean;
 export declare const isSSR: boolean;
+export declare const isClient: boolean;
 export declare const useIsomorphicLayoutEffect: typeof useEffect;
 export declare const isChrome: boolean;
 export declare const supportsTouchWeb: boolean;