@tamagui/core 1.0.0-beta.207 → 1.0.0-beta.208

package/dist/jsx/helpers/createPropMapper.js

@@ -4,8 +4,8 @@ import { getConfig } from "../conf";
 import { isWeb } from "../constants/platform";
 import { isVariable } from "../createVariable";
 import { isObj } from "./isObj";
-const createPropMapper = /* @__PURE__ */ __name((c) => {
-  const variants = c.variants || {};
+const createPropMapper = /* @__PURE__ */ __name((staticConfig) => {
+  const variants = staticConfig.variants || {};
   function getVariantFunction(variant, key, value) {
     for (const cat in tokenCategories) {
       if (key in tokenCategories[cat]) {
@@ -27,8 +27,8 @@ const createPropMapper = /* @__PURE__ */ __name((c) => {
     return fn || variant["..."] || variant["...size"];
   }
   __name(getVariantFunction, "getVariantFunction");
-  const defaultProps = c.defaultProps || {};
-  return (key, value, theme, props, staticConfig, returnVariablesAs = !!props.animation ? "value" : "auto", avoidDefaultProps = false) => {
+  const defaultProps = staticConfig.defaultProps || {};
+  return (key, value, theme, props, returnVariablesAs = !!props.animation ? "value" : "auto", avoidDefaultProps = false) => {
     const conf = getConfig();
     if (!conf) {
       console.trace("no conf! err");
@@ -38,29 +38,28 @@ const createPropMapper = /* @__PURE__ */ __name((c) => {
     const variant = variants && variants[key];
     if (variant && value !== void 0) {
       let variantValue = getVariantFunction(variant, key, value);
-      if (!variantValue) {
-        return value;
-      }
-      if (typeof variantValue === "function") {
-        variantValue = variantValue(value, {
-          tokens: conf.tokensParsed,
-          theme,
-          props: avoidDefaultProps ? props : new Proxy(props, {
-            get(target, key2) {
-              if (Reflect.has(target, key2)) {
-                return Reflect.get(target, key2);
-              }
-              if (staticConfig.defaultProps) {
-                return Reflect.get(staticConfig.defaultProps, key2);
+      if (variantValue) {
+        if (typeof variantValue === "function") {
+          variantValue = variantValue(value, {
+            tokens: conf.tokensParsed,
+            theme,
+            props: avoidDefaultProps ? props : new Proxy(props, {
+              get(target, key2) {
+                if (Reflect.has(target, key2)) {
+                  return Reflect.get(target, key2);
+                }
+                if (staticConfig.defaultProps) {
+                  return Reflect.get(staticConfig.defaultProps, key2);
+                }
               }
-            }
-          })
-        });
-      }
-      if (isObj(variantValue)) {
-        variantValue = resolveTokens(variantValue, conf, theme, fontFamily, returnVariablesAs);
+            })
+          });
+        }
+        if (isObj(variantValue)) {
+          variantValue = resolveTokens(variantValue, conf, theme, fontFamily, returnVariablesAs);
+        }
+        return variantValue;
       }
-      return variantValue;
     }
     let shouldReturn = false;
     if (conf.shorthands[key]) {
@@ -161,7 +160,7 @@ const getToken = /* @__PURE__ */ __name((key, value, { tokensParsed }, theme, fo
   }
   if (process.env.NODE_ENV === "development") {
     if (value && value[0] === "$") {
-      console.warn(`\u26A0\uFE0F Missing token in theme:`, value, theme);
+      console.warn(`\u26A0\uFE0F Missing token in theme ${theme.name}:`, value);
       return null;
     }
   }

package/dist/jsx/helpers/getSplitStyles.js

@@ -50,12 +50,16 @@ const getSplitStyles = /* @__PURE__ */ __name((props, staticConfig, theme, state
     if (val.startsWith("_transform-")) {
       const isMediaOrPseudo = key !== "transform";
       const isMedia = isMediaOrPseudo && key[11] === "_";
-      const isPsuedo = isMediaOrPseudo && !isMedia;
+      const isPsuedo = isMediaOrPseudo && key[11] === "0";
       const namespace = isMedia ? key.split("_")[2] : isPsuedo ? key.split("-")[1] : "transform";
       if (!insertedTransforms[val]) {
         updateInserted();
       }
       const transform = insertedTransforms[val];
+      if (!transform || transform === "undefined") {
+        console.trace("NO TRANSFORM", { key, val }, state);
+        return;
+      }
       transforms[namespace] = transforms[namespace] || ["", ""];
       transforms[namespace][0] += val.replace("_transform", "");
       transforms[namespace][1] += transform;
@@ -79,7 +83,7 @@ const getSplitStyles = /* @__PURE__ */ __name((props, staticConfig, theme, state
         }
       }
     }
-    if (state.noClassNames || state.resolveVariablesAs === "value" || state.resolveVariablesAs === "both") {
+    if (!isWeb || state.noClassNames || state.resolveVariablesAs === "value" || state.resolveVariablesAs === "both") {
       for (const key in cur) {
         if (key in stylePropsTransform) {
           mergeTransform(style, key, cur[key]);
@@ -88,6 +92,9 @@ const getSplitStyles = /* @__PURE__ */ __name((props, staticConfig, theme, state
         }
       }
     }
+    if (process.env.NODE_ENV === "development" && props["debug"] === "verbose") {
+      console.log("getSplitStyles.push", { state, cur });
+    }
     cur = null;
   }
   __name(push, "push");
@@ -109,7 +116,7 @@ const getSplitStyles = /* @__PURE__ */ __name((props, staticConfig, theme, state
     }
     let isMedia = keyInit[0] === "$";
     let isPseudo = validPseudoKeys[keyInit];
-    const out = isMedia || isPseudo ? true : staticConfig.propMapper(keyInit, valInit, theme, props, staticConfig, state.resolveVariablesAs);
+    const out = isMedia || isPseudo ? true : staticConfig.propMapper(keyInit, valInit, theme, state.fallbackProps || props, state.resolveVariablesAs);
     const expanded = out === true || !out ? [[keyInit, valInit]] : Object.entries(out);
     if (process.env.NODE_ENV === "development" && props["debug"] === "verbose") {
       console.log("split style", keyInit, expanded);
@@ -118,7 +125,7 @@ const getSplitStyles = /* @__PURE__ */ __name((props, staticConfig, theme, state
       if (val === void 0) {
         continue;
       }
-      if (val && val[0] === "_") {
+      if (key !== "target" && val && val[0] === "_") {
         mergeClassName(key, val);
         continue;
       }
@@ -134,7 +141,7 @@ const getSplitStyles = /* @__PURE__ */ __name((props, staticConfig, theme, state
           continue;
         }
         pseudos[key] = pseudos[key] || {};
-        pseudos[key] = getSubStyle(val, staticConfig, theme, props, state.resolveVariablesAs, true);
+        pseudos[key] = getSubStyle(val, staticConfig, theme, props, state, true);
         if (isWeb && !state.noClassNames) {
           const pseudoStyles = getStylesAtomic({ [key]: pseudos[key] });
           for (const style2 of pseudoStyles) {
@@ -150,7 +157,7 @@ const getSplitStyles = /* @__PURE__ */ __name((props, staticConfig, theme, state
           viewProps[key] = val;
           continue;
         }
-        const mediaStyle = getSubStyle(val, staticConfig, theme, props, state.resolveVariablesAs, true);
+        const mediaStyle = getSubStyle(val, staticConfig, theme, props, state, true);
         if (isWeb) {
           const mediaStyles = getStylesAtomic(mediaStyle);
           for (const style2 of mediaStyles) {
@@ -202,6 +209,9 @@ const getSplitStyles = /* @__PURE__ */ __name((props, staticConfig, theme, state
       classNames[namespace] = identifier;
     }
   }
+  if (process.env.NODE_ENV === "development" && props["debug"] === "verbose") {
+    console.log("out", { style, pseudos, medias, classNames, viewProps });
+  }
   return {
     viewProps,
     style,
@@ -210,11 +220,11 @@ const getSplitStyles = /* @__PURE__ */ __name((props, staticConfig, theme, state
     classNames
   };
 }, "getSplitStyles");
-const getSubStyle = /* @__PURE__ */ __name((styleIn, staticConfig, theme, props, resolveVariablesAs, avoidDefaultProps) => {
+const getSubStyle = /* @__PURE__ */ __name((styleIn, staticConfig, theme, props, state, avoidDefaultProps) => {
   const styleOut = {};
   for (const key in styleIn) {
     const val = styleIn[key];
-    const out = staticConfig.propMapper(key, val, theme, props, staticConfig, resolveVariablesAs, avoidDefaultProps);
+    const out = staticConfig.propMapper(key, val, theme, state.fallbackProps || props, state.resolveVariablesAs, avoidDefaultProps);
     const expanded = out === true || !out ? [[key, val]] : Object.entries(out);
     for (const [skey, sval] of expanded) {
       if (skey in stylePropsTransform) {
@@ -228,5 +238,6 @@ const getSubStyle = /* @__PURE__ */ __name((styleIn, staticConfig, theme, props,
   return styleOut;
 }, "getSubStyle");
 export {
-  getSplitStyles
+  getSplitStyles,
+  getSubStyle
 };

package/dist/jsx/helpers/getStylesAtomic.js

@@ -56,6 +56,7 @@ function getAtomicStyle(style, pseudo, options) {
         ...out[key],
         transformProperty
       };
+      console.log("got", JSON.stringify({ t, tKey, out, key, atomicStyles }, null, 2));
     }
   } else {
     atomicStyles = generateAtomicStyles(style);

package/dist/jsx/helpers/insertStyleRule.js

@@ -19,8 +19,9 @@ function addTransform(identifier, rule) {
 }
 __name(addTransform, "addTransform");
 let hasInsertedSinceUpdate = true;
+const isClient = typeof document !== "undefined";
 function updateInserted() {
-  if (typeof document === "undefined") {
+  if (!isClient) {
     return;
   }
   if (!hasInsertedSinceUpdate) {
@@ -61,6 +62,9 @@ function insertStyleRule(identifier, rule) {
     return;
   }
   hasInsertedSinceUpdate = true;
+  if (identifier === "_transform-1abwpjw") {
+    console.trace("inserting", identifier, rule);
+  }
   insertedSelectors[identifier] = rule;
   allSelectors[identifier] = process.env.NODE_ENV === "development" ? rule : true;
   if (identifier.startsWith("_transform")) {

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 { getSubStyle } from "../helpers/getSplitStyles";
 import { addMediaQueryListener, mediaState, removeMediaQueryListener } from "./useMedia";
 const createDefinition = /* @__PURE__ */ __name(({
   Component,
@@ -35,39 +36,113 @@ __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 propsWithAnimation = props;
-      const styleKey = JSON.stringify(style);
       const res = useAnimations(propsWithAnimation, {
-        styleKey,
-        style: style || {},
         state,
         pseudos,
-        mergedStyles(props2) {
-          return {
-            ...style,
-            ...state.hover && pseudos.hoverStyle,
-            ...state.focus && pseudos.focusStyle,
-            ...state.press && pseudos.pressStyle,
-            ...(props2 == null ? void 0 : props2.isExiting) && pseudos.exitStyle
-          };
+        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(() => {
         setStateShallow({
           animation: res
         });
-      }, [styleKey]);
+      }, [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({

package/dist/jsx/hooks/useTheme.js

@@ -49,14 +49,14 @@ const useTheme = /* @__PURE__ */ __name((themeName, componentName, props, forceU
         return Reflect.has(theme, key);
       },
       get(_, key) {
-        if (!name || key === "__proto__") {
-          return Reflect.get(_, key);
-        }
-        if (key === GetThemeManager) {
-          if (!didChangeTheme) {
-            return null;
+        if (!name || key === "__proto__" || typeof key === "symbol") {
+          if (key === GetThemeManager) {
+            if (!didChangeTheme) {
+              return null;
+            }
+            return themeManager;
           }
-          return themeManager;
+          return Reflect.get(_, key);
         }
         if (process.env.NODE_ENV === "development") {
           if (key === "__state") {
@@ -73,11 +73,6 @@ 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 (typeof key === "string") {
           if (key[0] === "$") {
             key = key.slice(1);
@@ -86,12 +81,16 @@ const useTheme = /* @__PURE__ */ __name((themeName, componentName, props, forceU
           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;
+            console.log(`No theme value "${String(key)}" in ${name}`);
           }
         }
         return Reflect.get(_, key);

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/package.json

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

package/types/Tamagui.d.ts

@@ -1,7 +1,9 @@
+import * as Helpers from '@tamagui/helpers';
 import { TamaguiInternalConfig } from './types';
 declare class TamaguiManager {
     config: TamaguiInternalConfig | null;
     rnw: Record<string, any>;
+    Helpers: typeof Helpers;
     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;AAI3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAI/C,cAAM,cAAc;IAClB,MAAM,EAAE,qBAAqB,GAAG,IAAI,CAAO;IAC3C,GAAG,sBAAM;IACT,OAAO,iBAAU;IAEjB,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/createComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":";AAcA,OAAO,EAAoB,IAAI,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAoBhE,OAAO,EACL,WAAW,EACX,UAAU,EACV,YAAY,EACZ,kBAAkB,EAClB,gBAAgB,EAChB,qBAAqB,EAGtB,MAAM,SAAS,CAAA;AAKhB,eAAO,MAAM,qBAAqB,EAAE,qBAQnC,CAAA;AAED,eAAO,MAAM,QAAQ,eAAsB,CAAA;AAQ3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,GAAG,EAAE,EACtC,GAAG,GAAG,IAAI,EACV,SAAS,GAAG,KAAK,EACjB,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,kBAAkB,4DAmmBrD;AAKD,eAAO,MAAM,MAAM;;;;mBA2CjB,CAAA;AAEF,wBAAgB,cAAc,CAAC,EAC7B,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,aAAa,EACb,SAAS,GACV,EAAE;IACD,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,EAAE,GAAG,CAAA;IACb,KAAK,CAAC,EAAE,GAAG,CAAA;IACX,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,aAAa,CAAC,EAAE,SAAS,CAAC,eAAe,CAAC,CAAA;CAC3C,SA2CA;AA4CD,eAAO,MAAM,YAAY,UAAW,GAAG,gBAiBpC,CAAA"}
+{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":";AAaA,OAAO,EAAoB,IAAI,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAehE,OAAO,EAEL,WAAW,EACX,UAAU,EACV,YAAY,EACZ,kBAAkB,EAClB,gBAAgB,EAChB,qBAAqB,EAGtB,MAAM,SAAS,CAAA;AAKhB,eAAO,MAAM,qBAAqB,EAAE,qBAQnC,CAAA;AAED,eAAO,MAAM,QAAQ,eAAsB,CAAA;AAQ3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,GAAG,EAAE,EACtC,GAAG,GAAG,IAAI,EACV,SAAS,GAAG,KAAK,EACjB,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,kBAAkB,4DA4mBrD;AAKD,eAAO,MAAM,MAAM;;;;mBA4CjB,CAAA;AAEF,wBAAgB,cAAc,CAAC,EAC7B,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,aAAa,EACb,SAAS,GACV,EAAE;IACD,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,EAAE,GAAG,CAAA;IACb,KAAK,CAAC,EAAE,GAAG,CAAA;IACX,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,aAAa,CAAC,EAAE,SAAS,CAAC,eAAe,CAAC,CAAA;CAC3C,SA2CA;AAED,eAAO,MAAM,YAAY,UAAW,GAAG,gBAiBpC,CAAA"}

package/types/createFont.d.ts

@@ -1,3 +1,3 @@
 import { GenericFont } from './types';
-export declare const createFont: <A extends GenericFont>(font: A) => A;
+export declare const createFont: <A extends GenericFont<string | number>>(font: A) => A;
 //# sourceMappingURL=createFont.d.ts.map

package/types/createFont.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createFont.d.ts","sourceRoot":"","sources":["../src/createFont.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAErC,eAAO,MAAM,UAAU,uCA2BtB,CAAA"}
+{"version":3,"file":"createFont.d.ts","sourceRoot":"","sources":["../src/createFont.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAErC,eAAO,MAAM,UAAU,wDA2BtB,CAAA"}

package/types/helpers/createPropMapper.d.ts

@@ -1,4 +1,4 @@
 import { StaticConfig } from '../types';
 export declare type ResolveVariableTypes = 'auto' | 'value' | 'variable' | 'both';
-export declare const createPropMapper: (c: StaticConfig) => (key: string, value: any, theme: any, props: any, staticConfig: StaticConfig, returnVariablesAs?: ResolveVariableTypes, avoidDefaultProps?: boolean) => any;
+export declare const createPropMapper: (staticConfig: StaticConfig) => (key: string, value: any, theme: any, props: any, returnVariablesAs?: ResolveVariableTypes, avoidDefaultProps?: boolean) => any;
 //# sourceMappingURL=createPropMapper.d.ts.map

package/types/helpers/createPropMapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createPropMapper.d.ts","sourceRoot":"","sources":["../../src/helpers/createPropMapper.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAyB,MAAM,UAAU,CAAA;AAG9D,oBAAY,oBAAoB,GAAG,MAAM,GAAG,OAAO,GAAG,UAAU,GAAG,MAAM,CAAA;AAEzE,eAAO,MAAM,gBAAgB,MAAO,YAAY,WA6BvC,MAAM,SACJ,GAAG,SACH,GAAG,SACH,GAAG,gBACI,YAAY,sBACP,oBAAoB,qCAiF1C,CAAA"}
+{"version":3,"file":"createPropMapper.d.ts","sourceRoot":"","sources":["../../src/helpers/createPropMapper.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAyB,MAAM,UAAU,CAAA;AAG9D,oBAAY,oBAAoB,GAAG,MAAM,GAAG,OAAO,GAAG,UAAU,GAAG,MAAM,CAAA;AAEzE,eAAO,MAAM,gBAAgB,iBAAkB,YAAY,WA6BlD,MAAM,SACJ,GAAG,SACH,GAAG,SACH,GAAG,sBACS,oBAAoB,qCAwE1C,CAAA"}

package/types/helpers/getSplitStyles.d.ts

@@ -1,26 +1,16 @@
 import { ViewStyle } from 'react-native';
-import { StackProps, StaticConfigParsed, TamaguiComponentState, ThemeObject } from '../types';
-import { ResolveVariableTypes } from './createPropMapper';
+import { PseudoStyles, SplitStyleState, StackProps, StaticConfigParsed, ThemeObject } from '../types';
 export declare type SplitStyles = ReturnType<typeof getSplitStyles>;
-export declare type PseudoStyles = {
-    hoverStyle?: ViewStyle;
-    pressStyle?: ViewStyle;
-    focusStyle?: ViewStyle;
-    enterStyle?: ViewStyle;
-    exitStyle?: ViewStyle;
-};
 export declare type ClassNamesObject = Record<string, string>;
 export declare type SplitStyleResult = ReturnType<typeof getSplitStyles>;
 export declare const getSplitStyles: (props: {
     [key: string]: any;
-}, staticConfig: StaticConfigParsed, theme: ThemeObject, state: Partial<TamaguiComponentState> & {
-    noClassNames?: boolean;
-    resolveVariablesAs?: ResolveVariableTypes;
-}, defaultClassNames?: ClassNamesObject | null | undefined) => {
+}, staticConfig: StaticConfigParsed, theme: ThemeObject, state: SplitStyleState, defaultClassNames?: ClassNamesObject | null | undefined) => {
     viewProps: StackProps;
     style: ViewStyle;
     medias: Record<string, ViewStyle>;
     pseudos: PseudoStyles;
     classNames: ClassNamesObject;
 };
+export declare const getSubStyle: (styleIn: Object, staticConfig: StaticConfigParsed, theme: ThemeObject, props: any, state: SplitStyleState, avoidDefaultProps?: boolean | undefined) => ViewStyle;
 //# sourceMappingURL=getSplitStyles.d.ts.map

package/types/helpers/getSplitStyles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAIxC,OAAO,EAIL,UAAU,EACV,kBAAkB,EAClB,qBAAqB,EACrB,WAAW,EACZ,MAAM,UAAU,CAAA;AAEjB,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AAKzD,oBAAY,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAW3D,oBAAY,YAAY,GAAG;IACzB,UAAU,CAAC,EAAE,SAAS,CAAA;IACtB,UAAU,CAAC,EAAE,SAAS,CAAA;IACtB,UAAU,CAAC,EAAE,SAAS,CAAA;IACtB,UAAU,CAAC,EAAE,SAAS,CAAA;IACtB,SAAS,CAAC,EAAE,SAAS,CAAA;CACtB,CAAA;AAED,oBAAY,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AAErD,oBAAY,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAqBhE,eAAO,MAAM,cAAc;;iBAEX,kBAAkB,SACzB,WAAW,SACX,QAAQ,qBAAqB,CAAC,GAAG;IACtC,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,kBAAkB,CAAC,EAAE,oBAAoB,CAAA;CAC1C;;;;;;CA8PF,CAAA"}
+{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAIxC,OAAO,EAGL,YAAY,EAEZ,eAAe,EACf,UAAU,EACV,kBAAkB,EAClB,WAAW,EACZ,MAAM,UAAU,CAAA;AAOjB,oBAAY,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAW3D,oBAAY,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AAErD,oBAAY,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAqBhE,eAAO,MAAM,cAAc;;iBAEX,kBAAkB,SACzB,WAAW,SACX,eAAe;;;;;;CAgQvB,CAAA;AAED,eAAO,MAAM,WAAW,YACb,MAAM,gBACD,kBAAkB,SACzB,WAAW,SACX,GAAG,SACH,eAAe,8CAErB,SAuBF,CAAA"}

package/types/helpers/getStylesAtomic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getStylesAtomic.d.ts","sourceRoot":"","sources":["../../src/helpers/getStylesAtomic.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EAIZ,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAUxC,oBAAY,oBAAoB,GAAG,SAAS,GAAG;IAC7C,UAAU,CAAC,EAAE,SAAS,CAAA;IACtB,UAAU,CAAC,EAAE,SAAS,CAAA;IACtB,UAAU,CAAC,EAAE,SAAS,CAAA;CACvB,CAAA;AAED,aAAK,kBAAkB,GAAG;IACxB,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,oBAAoB,EAAE,OAAO,GAAE,kBAAuB,iBAwB/F;AAgGD,eAAO,MAAM,OAAO;;;;;;;;;;;;;CAanB,CAAA"}
+{"version":3,"file":"getStylesAtomic.d.ts","sourceRoot":"","sources":["../../src/helpers/getStylesAtomic.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EAIZ,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAUxC,oBAAY,oBAAoB,GAAG,SAAS,GAAG;IAC7C,UAAU,CAAC,EAAE,SAAS,CAAA;IACtB,UAAU,CAAC,EAAE,SAAS,CAAA;IACtB,UAAU,CAAC,EAAE,SAAS,CAAA;CACvB,CAAA;AAED,aAAK,kBAAkB,GAAG;IACxB,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,oBAAoB,EAAE,OAAO,GAAE,kBAAuB,iBAwB/F;AAiGD,eAAO,MAAM,OAAO;;;;;;;;;;;;;CAanB,CAAA"}

package/types/helpers/insertStyleRule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insertStyleRule.d.ts","sourceRoot":"","sources":["../../src/helpers/insertStyleRule.tsx"],"names":[],"mappings":"AAMA,eAAO,MAAM,kBAAkB,IAAK,CAAA;AAEpC,eAAO,MAAM,eAAe,UAAqB,CAAA;AACjD,eAAO,MAAM,gBAAgB,iBAAyC,CAAA;AACtE,eAAO,MAAM,gBAAgB,UAA2B,CAAA;AAsBxD,wBAAgB,cAAc,SA6B7B;AASD,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,sBAgB/D"}
+{"version":3,"file":"insertStyleRule.d.ts","sourceRoot":"","sources":["../../src/helpers/insertStyleRule.tsx"],"names":[],"mappings":"AAMA,eAAO,MAAM,kBAAkB,IAAK,CAAA;AAEpC,eAAO,MAAM,eAAe,UAAqB,CAAA;AACjD,eAAO,MAAM,gBAAgB,iBAAyC,CAAA;AACtE,eAAO,MAAM,gBAAgB,UAA2B,CAAA;AAuBxD,wBAAgB,cAAc,SA6B7B;AASD,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,sBAmB/D"}

package/types/hooks/useFeatures.d.ts

@@ -1,14 +1,17 @@
 /// <reference types="react" />
 import { ViewStyle } from 'react-native';
-import { PseudoStyles } from '../static';
-import { TamaguiComponentState, UseAnimationHook } from '../types';
+import { PseudoStyles, SplitStyleState } from '../types';
+import { StaticConfigParsed, TamaguiComponentState, UseAnimationHook } from '../types';
 declare type FeatureUtils = {
     forceUpdate: Function;
-    state: TamaguiComponentState;
+    state: SplitStyleState;
     setStateShallow: (next: Partial<TamaguiComponentState>) => void;
     useAnimations?: UseAnimationHook;
     pseudos: PseudoStyles;
     style: ViewStyle | null | undefined;
+    staticConfig: StaticConfigParsed;
+    theme: any;
+    onDidAnimate?: () => void;
 };
 export declare const useFeatures: (props: any, utils?: FeatureUtils | undefined) => JSX.Element[];
 export {};

package/types/hooks/useFeatures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useFeatures.d.ts","sourceRoot":"","sources":["../../src/hooks/useFeatures.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAGxC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAqB,MAAM,UAAU,CAAA;AAQrF,aAAK,YAAY,GAAG;IAClB,WAAW,EAAE,QAAQ,CAAA;IACrB,KAAK,EAAE,qBAAqB,CAAA;IAC5B,eAAe,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,qBAAqB,CAAC,KAAK,IAAI,CAAA;IAC/D,aAAa,CAAC,EAAE,gBAAgB,CAAA;IAChC,OAAO,EAAE,YAAY,CAAA;IACrB,KAAK,EAAE,SAAS,GAAG,IAAI,GAAG,SAAS,CAAA;CACpC,CAAA;AAeD,eAAO,MAAM,WAAW,UAAW,GAAG,oDAYrC,CAAA"}
+{"version":3,"file":"useFeatures.d.ts","sourceRoot":"","sources":["../../src/hooks/useFeatures.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAIxC,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AACxD,OAAO,EAEL,kBAAkB,EAClB,qBAAqB,EACrB,gBAAgB,EAEjB,MAAM,UAAU,CAAA;AAQjB,aAAK,YAAY,GAAG;IAClB,WAAW,EAAE,QAAQ,CAAA;IACrB,KAAK,EAAE,eAAe,CAAA;IACtB,eAAe,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,qBAAqB,CAAC,KAAK,IAAI,CAAA;IAC/D,aAAa,CAAC,EAAE,gBAAgB,CAAA;IAChC,OAAO,EAAE,YAAY,CAAA;IACrB,KAAK,EAAE,SAAS,GAAG,IAAI,GAAG,SAAS,CAAA;IACnC,YAAY,EAAE,kBAAkB,CAAA;IAChC,KAAK,EAAE,GAAG,CAAA;IACV,YAAY,CAAC,EAAE,MAAM,IAAI,CAAA;CAC1B,CAAA;AAeD,eAAO,MAAM,WAAW,UAAW,GAAG,oDAYrC,CAAA"}

package/types/styled.d.ts

@@ -1,7 +1,7 @@
 import { GetProps, GetVariantProps, GetVariantValues, MediaProps, PseudoProps, StaticConfig, StylableComponent, TamaguiComponent, VariantDefinitions } from './types';
-export declare function styled<ParentComponent extends StylableComponent, Variants extends VariantDefinitions<{}> = {}>(Component: ParentComponent, options?: GetProps<ParentComponent> & {
+export declare function styled<ParentComponent extends StylableComponent, Variants extends VariantDefinitions<ParentComponent> | symbol = VariantDefinitions<ParentComponent> | symbol>(Component: ParentComponent, options?: GetProps<ParentComponent> & {
     name?: string;
     variants?: Variants | undefined;
     defaultVariants?: Variants extends Object ? GetVariantProps<Variants> : never;
-}, staticExtractionOptions?: StaticConfig): TamaguiComponent<Variants extends symbol | void ? GetProps<ParentComponent> : (ParentComponent extends TamaguiComponent<any, any, infer P, {}> ? P : GetProps<ParentComponent>) & (ParentComponent extends TamaguiComponent<any, any, any, infer V> ? V : Object) & (Variants extends Object ? { [Key in keyof Variants]?: GetVariantValues<keyof Variants[Key]> | undefined; } : {}) & MediaProps<(ParentComponent extends TamaguiComponent<any, any, infer P, {}> ? P : GetProps<ParentComponent>) & (ParentComponent extends TamaguiComponent<any, any, any, infer V> ? V : Object) & (Variants extends Object ? { [Key in keyof Variants]?: GetVariantValues<keyof Variants[Key]> | undefined; } : {})> & PseudoProps<(ParentComponent extends TamaguiComponent<any, any, infer P, {}> ? P : GetProps<ParentComponent>) & (ParentComponent extends TamaguiComponent<any, any, any, infer V> ? V : Object) & (Variants extends Object ? { [Key in keyof Variants]?: GetVariantValues<keyof Variants[Key]> | undefined; } : {})>, any, ParentComponent extends TamaguiComponent<any, any, infer P, {}> ? P : GetProps<ParentComponent>, (ParentComponent extends TamaguiComponent<any, any, any, infer V> ? V : Object) & (Variants extends Object ? { [Key in keyof Variants]?: GetVariantValues<keyof Variants[Key]> | undefined; } : {})>;
+}, staticExtractionOptions?: StaticConfig): TamaguiComponent<Variants extends symbol | void ? GetProps<ParentComponent> : (ParentComponent extends TamaguiComponent<any, any, infer P, {}> ? P : GetProps<ParentComponent>) & Omit<ParentComponent extends TamaguiComponent<any, any, any, infer V> ? V : Object, keyof (Variants extends symbol ? {} : { [Key in keyof Variants]?: GetVariantValues<keyof Variants[Key]> | undefined; })> & (Variants extends symbol ? {} : { [Key in keyof Variants]?: GetVariantValues<keyof Variants[Key]> | undefined; }) & MediaProps<Partial<(ParentComponent extends TamaguiComponent<any, any, infer P, {}> ? P : GetProps<ParentComponent>) & Omit<ParentComponent extends TamaguiComponent<any, any, any, infer V> ? V : Object, keyof (Variants extends symbol ? {} : { [Key in keyof Variants]?: GetVariantValues<keyof Variants[Key]> | undefined; })> & (Variants extends symbol ? {} : { [Key in keyof Variants]?: GetVariantValues<keyof Variants[Key]> | undefined; })>> & PseudoProps<Partial<(ParentComponent extends TamaguiComponent<any, any, infer P, {}> ? P : GetProps<ParentComponent>) & Omit<ParentComponent extends TamaguiComponent<any, any, any, infer V> ? V : Object, keyof (Variants extends symbol ? {} : { [Key in keyof Variants]?: GetVariantValues<keyof Variants[Key]> | undefined; })> & (Variants extends symbol ? {} : { [Key in keyof Variants]?: GetVariantValues<keyof Variants[Key]> | undefined; })>>, any, ParentComponent extends TamaguiComponent<any, any, infer P, {}> ? P : GetProps<ParentComponent>, (ParentComponent extends TamaguiComponent<any, any, any, infer V> ? V : Object) & (Variants extends symbol ? {} : { [Key in keyof Variants]?: GetVariantValues<keyof Variants[Key]> | undefined; })>;
 //# sourceMappingURL=styled.d.ts.map

package/types/styled.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"styled.d.ts","sourceRoot":"","sources":["../src/styled.tsx"],"names":[],"mappings":"AAKA,OAAO,EACL,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,UAAU,EACV,WAAW,EACX,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,SAAS,CAAA;AAEhB,wBAAgB,MAAM,CACpB,eAAe,SAAS,iBAAiB,EAGzC,QAAQ,SAAS,kBAAkB,CAAC,EAAE,CAAC,GAAG,EAAE,EAE5C,SAAS,EAAE,eAAe,EAE1B,OAAO,CAAC,EAAE,QAAQ,CAAC,eAAe,CAAC,GAAG;IACpC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;IAC/B,eAAe,CAAC,EAAE,QAAQ,SAAS,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAA;CAC9E,EACD,uBAAuB,CAAC,EAAE,YAAY,kxCAuEvC"}
+{"version":3,"file":"styled.d.ts","sourceRoot":"","sources":["../src/styled.tsx"],"names":[],"mappings":"AAKA,OAAO,EACL,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,UAAU,EACV,WAAW,EACX,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,SAAS,CAAA;AAEhB,wBAAgB,MAAM,CACpB,eAAe,SAAS,iBAAiB,EAGzC,QAAQ,SAAS,kBAAkB,CAAC,eAAe,CAAC,GAAG,MAAM,GACzD,kBAAkB,CAAC,eAAe,CAAC,GACnC,MAAM,EAEV,SAAS,EAAE,eAAe,EAE1B,OAAO,CAAC,EAAE,QAAQ,CAAC,eAAe,CAAC,GAAG;IACpC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;IAC/B,eAAe,CAAC,EAAE,QAAQ,SAAS,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAA;CAC9E,EACD,uBAAuB,CAAC,EAAE,YAAY,2pDAuEvC"}