@tamagui/core 1.0.0-beta.4 → 1.0.0-beta.7

package/dist/jsx/helpers/addStylesUsingClassname.js

@@ -1,24 +1,29 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-import { useInsertionEffect, useLayoutEffect } from "react";
+import { useInsertionEffect } from "react";
 import { getStylesAtomic } from "./getStylesAtomic";
 import { insertStyleRule, updateInsertedCache } from "./insertStyleRule";
 let added = /* @__PURE__ */ new Set();
-const effect = useInsertionEffect || useLayoutEffect;
 function useStylesAsClassname(styles, disable = false, debug = false) {
-  const insertions = [];
-  const className = addStylesUsingClassname(disable ? [] : styles, debug, (identifier, rules) => {
-    for (const rule of rules) {
-      insertions.push({ identifier, rule });
-      updateInsertedCache(identifier, rule);
-    }
-  });
-  effect(() => {
+  if (!useInsertionEffect) {
+    return addStylesUsingClassname(disable ? styles : [], debug);
+  } else {
+    const insertions = [];
+    const className = addStylesUsingClassname(disable ? [] : styles, debug, (identifier, rules) => {
+      for (const rule of rules) {
+        insertions.push({ identifier, rule });
+      }
+    });
     for (const { identifier, rule } of insertions) {
-      insertStyleRule(identifier, rule);
+      updateInsertedCache(identifier, rule);
     }
-  }, [className]);
-  return className;
+    useInsertionEffect(() => {
+      for (const { identifier, rule } of insertions) {
+        insertStyleRule(identifier, rule);
+      }
+    });
+    return className;
+  }
 }
 __name(useStylesAsClassname, "useStylesAsClassname");
 function addStylesUsingClassname(styles, debug = false, onAdd) {

package/dist/jsx/helpers/createPropMapper.js

@@ -63,7 +63,7 @@ const createPropMapper = /* @__PURE__ */ __name((staticConfig) => {
         if (isObj(variantValue)) {
           variantValue = resolveTokens(variantValue, conf, theme, fontFamily, returnVariablesAs);
         }
-        return variantValue;
+        return expansions(variantValue);
       }
     }
     let shouldReturn = false;
@@ -80,9 +80,9 @@ const createPropMapper = /* @__PURE__ */ __name((staticConfig) => {
       }
     }
     if (shouldReturn) {
-      return {
+      return expansions({
         [key]: value
-      };
+      });
     }
   };
 }, "createPropMapper");
@@ -200,6 +200,37 @@ const tokenCategories = {
     borderRightColor: true
   }
 };
+const sidesX = ["Left", "Right"];
+const sidesY = ["Top", "Bottom"];
+const sidesXY = [...sidesX, ...sidesY];
+const expand = {
+  padding: sidesXY.map((x) => `padding${x}`),
+  paddingHorizontal: sidesX.map((x) => `padding${x}`),
+  paddingVertical: sidesY.map((x) => `padding${x}`),
+  margin: sidesXY.map((x) => `margin${x}`),
+  marginHorizontal: sidesX.map((x) => `margin${x}`),
+  marginVertical: sidesY.map((x) => `margin${x}`)
+};
+function expansions(styleObj) {
+  var _a, _b;
+  for (const key in expand) {
+    if (key in styleObj) {
+      for (const expandKey of expand[key]) {
+        styleObj[expandKey] = styleObj[key];
+      }
+      delete styleObj[key];
+    }
+  }
+  if ("flex" in styleObj) {
+    if (typeof styleObj.flex === "number") {
+      styleObj.flexGrow = (_a = styleObj.flexGrow) != null ? _a : styleObj.flex;
+      styleObj.flexShrink = (_b = styleObj.flexShrink) != null ? _b : 1;
+      delete styleObj.flex;
+    }
+  }
+  return styleObj;
+}
+__name(expansions, "expansions");
 export {
   createPropMapper
 };

package/dist/jsx/helpers/fixNativeShadow.native.js

@@ -1,30 +1,34 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 const matchRgbaHsla = /(rgba|hsla)\(\s*([\d\.]{1,}%?)\s*,\s*([\d\.]{1,}%?)\s*,\s*([\d\.]{1,}%?)\s*,\s*([\d\.]{1,})\s*\)$/;
-function fixNativeShadow(props) {
-  if (!props.shadowColor) {
+function fixNativeShadow(styles) {
+  const color = styles.find((x) => x[0] === "shadowColor");
+  if (!color) {
     return;
   }
-  if (!props.shadowOffset) {
-    props.shadowOffset = {
-      width: 0,
-      height: 0
-    };
+  if (!styles.find((x) => x[0] === "shadowOffset")) {
+    styles.push([
+      "shadowOffset",
+      {
+        width: 0,
+        height: 0
+      }
+    ]);
   }
-  if ("shadowOpacity" in props) {
+  if (styles.find((x) => x[0] === "shadowOpacity")) {
     return;
   }
-  const c = `${props.shadowColor}`;
+  const c = `${color[1]}`;
   if ((c[0] === "r" || c[0] === "h") && c[3] === "a") {
     const [_, type, _1, _2, _3, a] = c.match(matchRgbaHsla) || [];
     if (typeof a !== "string") {
       console.trace("invalid", c, type);
       throw new Error(`invalid style`);
     }
-    props.shadowColor = `${type.replace("a", "")}(${_1},${_2},${_3})`;
-    props.shadowOpacity = +a;
+    styles.push(["shadowColor", `${type.replace("a", "")}(${_1},${_2},${_3})`]);
+    styles.push(["shadowOpacity", +a]);
   } else {
-    props.shadowOpacity = 1;
+    styles.push(["shadowOpacity", 1]);
   }
 }
 __name(fixNativeShadow, "fixNativeShadow");

package/dist/jsx/helpers/getButtonSize.js

@@ -0,0 +1,26 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { getVariableValue, isVariable } from "@tamagui/core";
+const getButtonSize = /* @__PURE__ */ __name((sizeX = 0.9, sizeY = 0.333) => (val, { tokens, props, fonts }) => {
+  var _a, _b, _c, _d, _e, _f, _g;
+  const size = (_c = (_b = (_a = tokens.size[val]) != null ? _a : tokens.size["$4"]) != null ? _b : val) != null ? _c : 14;
+  const radius = (_e = (_d = tokens.radius[val]) != null ? _d : tokens.radius["$4"]) != null ? _e : size;
+  const px = Math.round(+(isVariable(size) ? size.val : size) * sizeX);
+  const py = Math.round(+(isVariable(size) ? size.val : size) * 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 * 2);
+  if (process.env.NODE_ENV === "development" && props["debug"]) {
+    console.log("getButtonSize", props.fontFamily, { size, py, val, lineHeight, minHeight });
+  }
+  return {
+    minHeight,
+    paddingHorizontal: props.circular ? 0 : px,
+    paddingVertical: props.circular ? 0 : py,
+    borderRadius: props.circular ? 1e5 : (_g = props.borderRadius) != null ? _g : radius
+  };
+}, "getButtonSize");
+export {
+  getButtonSize
+};

package/dist/jsx/helpers/getSplitStyles.js

@@ -288,47 +288,6 @@ const getSubStyle = /* @__PURE__ */ __name((styleIn, staticConfig, theme, props,
   return styleOut;
 }, "getSubStyle");
 function normalizeStyleObject(style) {
-  var _a, _b;
-  if (style.padding) {
-    style.paddingLeft = style.padding;
-    style.paddingTop = style.padding;
-    style.paddingRight = style.padding;
-    style.paddingBottom = style.padding;
-    delete style.padding;
-  }
-  if (style.paddingHorizontal) {
-    style.paddingLeft = style.paddingHorizontal;
-    style.paddingRight = style.paddingHorizontal;
-    delete style.paddingHorizontal;
-  }
-  if (style.paddingVertical) {
-    style.paddingLeft = style.paddingVertical;
-    style.paddingRight = style.paddingVertical;
-    delete style.paddingVertical;
-  }
-  if (style.margin) {
-    style.marginLeft = style.margin;
-    style.marginTop = style.margin;
-    style.marginRight = style.margin;
-    style.marginBottom = style.margin;
-    delete style.margin;
-  }
-  if (style.marginHorizontal) {
-    style.marginLeft = style.marginHorizontal;
-    style.marginRight = style.marginHorizontal;
-    delete style.marginHorizontal;
-  }
-  if (style.marginVertical) {
-    style.marginLeft = style.marginVertical;
-    style.marginRight = style.marginVertical;
-    delete style.marginVertical;
-  }
-  if (typeof style.flex === "number") {
-    const val = style.flex;
-    delete style.flex;
-    style.flexGrow = (_a = style.flexGrow) != null ? _a : val;
-    style.flexShrink = (_b = style.flexShrink) != null ? _b : 1;
-  }
   if (!isWeb) {
     fixNativeShadow(style);
   }

package/dist/jsx/helpers/getTextSize.js

@@ -0,0 +1,33 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { getVariableValue } from "../createVariable";
+const getTextSize = /* @__PURE__ */ __name((val = "$4", { fonts, theme, props }) => {
+  var _a, _b, _c;
+  const family = getVariableValue(props.fontFamily) || "$body";
+  const font = fonts[family] || fonts["$body"];
+  if (!font) {
+    console.warn("\u26A0\uFE0F no font found", { family, fontTokens: Object.keys(fonts), val });
+    return;
+  }
+  const fontFamily = font.family;
+  const fontSize = props.fontSize || font.size[val];
+  const lineHeight = props.lineHeight || font.lineHeight[val];
+  const fontWeight = props.fontWeight || font.weight[val];
+  const letterSpacing = props.letterSpacing || font.letterSpacing[val];
+  const fontStyle = props.fontStyle || ((_a = font.style) == null ? void 0 : _a[val]);
+  const textTransform = props.textTransform || ((_b = font.transform) == null ? void 0 : _b[val]);
+  const color = props.color || ((_c = font.color) == null ? void 0 : _c[val]) || theme.color;
+  return {
+    color,
+    fontStyle,
+    textTransform,
+    fontFamily,
+    fontWeight,
+    letterSpacing,
+    fontSize,
+    lineHeight
+  };
+}, "getTextSize");
+export {
+  getTextSize
+};

package/dist/jsx/helpers/insertStyleRule.js

@@ -79,6 +79,7 @@ function insertStyleRule(identifier, rule) {
     return;
   hasInsertedSinceUpdate = true;
   updateInsertedCache(identifier, rule);
+  allSelectors[identifier] = process.env.NODE_ENV === "development" ? rule : true;
   sheet == null ? void 0 : sheet.insertRule(rule, sheet.cssRules.length);
 }
 __name(insertStyleRule, "insertStyleRule");

package/dist/jsx/hooks/useId.js

@@ -0,0 +1,34 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import * as React from "react";
+import { useIsomorphicLayoutEffect } from "../constants/platform";
+let serverHandoffComplete = false;
+let id = 0;
+function genId() {
+  return ++id;
+}
+__name(genId, "genId");
+function useId(providedId) {
+  var _a;
+  if (typeof React.useId === "function") {
+    let id3 = React.useId(providedId);
+    return providedId != null ? providedId : id3;
+  }
+  let initialId = providedId != null ? providedId : serverHandoffComplete ? genId() : null;
+  let [id2, setId] = React.useState(initialId);
+  useIsomorphicLayoutEffect(() => {
+    if (id2 === null) {
+      setId(genId());
+    }
+  }, []);
+  React.useEffect(() => {
+    if (serverHandoffComplete === false) {
+      serverHandoffComplete = true;
+    }
+  }, []);
+  return (_a = providedId != null ? providedId : id2) != null ? _a : void 0;
+}
+__name(useId, "useId");
+export {
+  useId
+};

package/dist/jsx/index.js

@@ -13,31 +13,34 @@ import { getHasConfigured, getConfig, getThemes, getTokens, onConfiguredOnce } f
 export * from "./constants/constants";
 export * from "./constants/platform";
 export * from "./constants/rnw";
+export * from "./helpers/getButtonSize";
 export * from "./helpers/getExpandedShorthands";
 export * from "./helpers/getSize";
 export * from "./helpers/getSplitStyles";
 export * from "./helpers/getStylesAtomic";
+export * from "./helpers/getTextSize";
 export * from "./helpers/isObj";
 export * from "./helpers/isTamaguiElement";
 export * from "./helpers/matchMedia";
 export * from "./helpers/themeable";
 export * from "./helpers/withStaticProperties";
 export * from "./contexts/ButtonInsideButtonContext";
-export * from "./hooks/useIsTouchDevice";
 export * from "./hooks/useConstant";
-export * from "./hooks/usePressable";
+export * from "./hooks/useId";
+export * from "./hooks/useIsMounted";
+export * from "./hooks/useIsTouchDevice";
 export * from "./hooks/useMedia";
+export * from "./hooks/usePressable";
 export * from "./hooks/useTheme";
-export * from "./hooks/useIsMounted";
 export * from "./hooks/useUnmountEffect";
-export * from "@tamagui/use-force-update";
 export * from "./views/Stack";
 export * from "./views/Text";
+export * from "./views/TextAncestorContext";
 export * from "./views/Theme";
-export * from "./views/ThemeReset";
 export * from "./views/ThemeInverse";
 export * from "./views/ThemeProvider";
-export * from "./views/TextAncestorContext";
+export * from "./views/ThemeReset";
+export * from "@tamagui/use-force-update";
 export * from "@tamagui/helpers";
 export {
   RNWTextProps,

package/dist/jsx/views/Slot.js

@@ -0,0 +1,56 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { composeRefs } from "@tamagui/compose-refs";
+import * as React from "react";
+const Slot = React.forwardRef((props, forwardedRef) => {
+  const { children, ...slotProps } = props;
+  if (React.Children.toArray(children).some(isSlottable)) {
+    return <>{React.Children.map(children, (child) => {
+      return isSlottable(child) ? <SlotClone {...slotProps} ref={forwardedRef}>{child.props.children}</SlotClone> : child;
+    })}</>;
+  }
+  return <SlotClone {...slotProps} ref={forwardedRef}>{children}</SlotClone>;
+});
+Slot.displayName = "Slot";
+const SlotClone = React.forwardRef((props, forwardedRef) => {
+  const { children, ...slotProps } = props;
+  if (React.isValidElement(children)) {
+    return React.cloneElement(children, {
+      ...mergeProps(slotProps, children.props),
+      ref: composeRefs(forwardedRef, children.ref)
+    });
+  }
+  return React.Children.count(children) > 1 ? React.Children.only(null) : null;
+});
+SlotClone.displayName = "SlotClone";
+const Slottable = /* @__PURE__ */ __name(({ children }) => {
+  return <>{children}</>;
+}, "Slottable");
+function isSlottable(child) {
+  return React.isValidElement(child);
+}
+__name(isSlottable, "isSlottable");
+function mergeProps(slotProps, childProps) {
+  const overrideProps = { ...childProps };
+  for (const propName in childProps) {
+    const slotPropValue = slotProps[propName];
+    const childPropValue = childProps[propName];
+    const isHandler = /^on[A-Z]/.test(propName);
+    if (isHandler) {
+      overrideProps[propName] = (...args) => {
+        childPropValue == null ? void 0 : childPropValue(...args);
+        slotPropValue == null ? void 0 : slotPropValue(...args);
+      };
+    } else if (propName === "style") {
+      overrideProps[propName] = { ...slotPropValue, ...childPropValue };
+    } else if (propName === "className") {
+      overrideProps[propName] = [slotPropValue, childPropValue].filter(Boolean).join(" ");
+    }
+  }
+  return { ...slotProps, ...overrideProps };
+}
+__name(mergeProps, "mergeProps");
+export {
+  Slot,
+  Slottable
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.7",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -19,10 +19,10 @@
     "dist"
   ],
   "dependencies": {
-    "@tamagui/helpers": "^1.0.0-beta.4",
+    "@tamagui/helpers": "^1.0.0-beta.7",
     "@tamagui/ow": "^0.28.1",
-    "@tamagui/use-debounce": "^1.0.0-beta.4",
-    "@tamagui/use-force-update": "^1.0.0-beta.4",
+    "@tamagui/use-debounce": "^1.0.0-beta.7",
+    "@tamagui/use-force-update": "^1.0.0-beta.7",
     "react": "*",
     "react-dom": "*"
   },
@@ -30,7 +30,7 @@
     "react-native-web": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.0.0-beta.4",
+    "@tamagui/build": "^1.0.0-beta.7",
     "@types/react": "^17.0.35",
     "csstype": "^3.0.10",
     "esbuild": "^0.14.36",

package/types/createComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":";AAaA,OAAO,EAAoB,IAAI,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAiBhE,OAAO,EACL,WAAW,EACX,UAAU,EACV,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAKjB,MAAM,SAAS,CAAA;AAehB,eAAO,MAAM,QAAQ,eAAsB,CAAA;AA0B3C,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,EAAE,eAAe,CAAC,EAAE,iBAAiB,4DA6nB1F;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,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,eAkBtC"}
+{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":";AAaA,OAAO,EAAoB,IAAI,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAiBhE,OAAO,EACL,WAAW,EACX,UAAU,EACV,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAKjB,MAAM,SAAS,CAAA;AAgBhB,eAAO,MAAM,QAAQ,eAAsB,CAAA;AA0B3C,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,EAAE,eAAe,CAAC,EAAE,iBAAiB,4DAsoB1F;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,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,eAkBtC"}

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

@@ -1 +1 @@
-{"version":3,"file":"addStylesUsingClassname.d.ts","sourceRoot":"","sources":["../../src/helpers/addStylesUsingClassname.tsx"],"names":[],"mappings":"AAWA,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,OAAO,UAAQ,EAAE,KAAK,UAAQ,UAcjF;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,GAAG,EAAE,EACb,KAAK,GAAE,OAAO,GAAG,SAAiB,EAClC,KAAK,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,GAAG,UA6BrD"}
+{"version":3,"file":"addStylesUsingClassname.d.ts","sourceRoot":"","sources":["../../src/helpers/addStylesUsingClassname.tsx"],"names":[],"mappings":"AAYA,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,OAAO,UAAQ,EAAE,KAAK,UAAQ,UAqBjF;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,GAAG,EAAE,EACb,KAAK,GAAE,OAAO,GAAG,SAAiB,EAClC,KAAK,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,GAAG,UA6BrD"}

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: (staticConfig: Partial<StaticConfig>) => (key: string, value: any, theme: any, props: any, returnVariablesAs?: ResolveVariableTypes, avoidDefaultProps?: boolean) => any;
+export declare const createPropMapper: (staticConfig: Partial<StaticConfig>) => (key: string, value: any, theme: any, props: any, returnVariablesAs?: ResolveVariableTypes, avoidDefaultProps?: boolean) => Record<string, any> | undefined;
 //# 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,EAAgD,MAAM,UAAU,CAAA;AAGrF,oBAAY,oBAAoB,GAAG,MAAM,GAAG,OAAO,GAAG,UAAU,GAAG,MAAM,CAAA;AA4BzE,eAAO,MAAM,gBAAgB,iBAAkB,QAAQ,YAAY,CAAC,WAK3D,MAAM,SACJ,GAAG,SACH,GAAG,SACH,GAAG,sBACS,oBAAoB,qCAyE1C,CAAA"}
+{"version":3,"file":"createPropMapper.d.ts","sourceRoot":"","sources":["../../src/helpers/createPropMapper.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAgD,MAAM,UAAU,CAAA;AAGrF,oBAAY,oBAAoB,GAAG,MAAM,GAAG,OAAO,GAAG,UAAU,GAAG,MAAM,CAAA;AA4BzE,eAAO,MAAM,gBAAgB,iBAAkB,QAAQ,YAAY,CAAC,WAK3D,MAAM,SACJ,GAAG,SACH,GAAG,SACH,GAAG,sBACS,oBAAoB,iEAyE1C,CAAA"}

package/types/helpers/fixNativeShadow.native.d.ts

@@ -1,2 +1,2 @@
-export declare function fixNativeShadow(props: any): void;
+export declare function fixNativeShadow(styles: [string, any][]): void;
 //# sourceMappingURL=fixNativeShadow.native.d.ts.map

package/types/helpers/fixNativeShadow.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fixNativeShadow.native.d.ts","sourceRoot":"","sources":["../../src/helpers/fixNativeShadow.native.tsx"],"names":[],"mappings":"AAGA,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,QA4BzC"}
+{"version":3,"file":"fixNativeShadow.native.d.ts","sourceRoot":"","sources":["../../src/helpers/fixNativeShadow.native.tsx"],"names":[],"mappings":"AAGA,wBAAgB,eAAe,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,QAgCtD"}

package/types/helpers/getButtonSize.d.ts

@@ -0,0 +1,8 @@
+import { VariantSpreadExtras } from '@tamagui/core';
+export declare const getButtonSize: (sizeX?: number, sizeY?: number) => (val: any, { tokens, props, fonts }: VariantSpreadExtras<any>) => {
+    minHeight: number;
+    paddingHorizontal: number;
+    paddingVertical: number;
+    borderRadius: any;
+};
+//# sourceMappingURL=getButtonSize.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getButtonSize.d.ts","sourceRoot":"","sources":["../../src/helpers/getButtonSize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAgC,MAAM,eAAe,CAAA;AAIjF,eAAO,MAAM,aAAa,4CAElB,GAAG,4BAA4B,oBAAoB,GAAG,CAAC;;;;;CAmB5D,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAKxC,OAAO,EACL,SAAS,EAET,YAAY,EAEZ,eAAe,EACf,UAAU,EACV,kBAAkB,EAElB,WAAW,EACZ,MAAM,UAAU,CAAA;AAWjB,oBAAY,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAC3D,oBAAY,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AACrD,oBAAY,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAchE,aAAK,aAAa,GAAG,CACnB,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,kBAAkB,EAChC,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,eAAe,GAAG;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B,EACD,iBAAiB,CAAC,EAAE,GAAG,KACpB;IACH,OAAO,EAAE,YAAY,CAAA;IACrB,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;IACpC,KAAK,EAAE,SAAS,CAAA;IAChB,UAAU,EAAE,gBAAgB,CAAA;IAC5B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;IACjC,SAAS,EAAE,UAAU,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,cAAc,EAAE,aA2T5B,CAAA;AAED,eAAO,MAAM,iBAAiB,EAAE,aAM/B,CAAA;AAGD,eAAO,MAAM,cAAc,EAAE,aAQ5B,CAAA;AAED,eAAO,MAAM,WAAW,YACb,MAAM,gBACD,kBAAkB,SACzB,WAAW,SACX,GAAG,SACH,eAAe,8CAErB,SAuBF,CAAA;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,GAAG,QAuB9C"}
+{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAKxC,OAAO,EACL,SAAS,EAET,YAAY,EAEZ,eAAe,EACf,UAAU,EACV,kBAAkB,EAElB,WAAW,EACZ,MAAM,UAAU,CAAA;AAWjB,oBAAY,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAC3D,oBAAY,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AACrD,oBAAY,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAchE,aAAK,aAAa,GAAG,CACnB,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,kBAAkB,EAChC,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,eAAe,GAAG;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B,EACD,iBAAiB,CAAC,EAAE,GAAG,KACpB;IACH,OAAO,EAAE,YAAY,CAAA;IACrB,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;IACpC,KAAK,EAAE,SAAS,CAAA;IAChB,UAAU,EAAE,gBAAgB,CAAA;IAC5B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;IACjC,SAAS,EAAE,UAAU,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,cAAc,EAAE,aA2T5B,CAAA;AAED,eAAO,MAAM,iBAAiB,EAAE,aAM/B,CAAA;AAGD,eAAO,MAAM,cAAc,EAAE,aAQ5B,CAAA;AAED,eAAO,MAAM,WAAW,YACb,MAAM,gBACD,kBAAkB,SACzB,WAAW,SACX,GAAG,SACH,eAAe,8CAErB,SAuBF,CAAA;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,GAAG,QAI9C"}

package/types/helpers/getTextSize.d.ts

@@ -0,0 +1,3 @@
+import { FontSizeTokens, TextProps, VariantSpreadFunction } from '../types';
+export declare const getTextSize: VariantSpreadFunction<TextProps, FontSizeTokens>;
+//# sourceMappingURL=getTextSize.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getTextSize.d.ts","sourceRoot":"","sources":["../../src/helpers/getTextSize.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAA;AAE3E,eAAO,MAAM,WAAW,EAAE,qBAAqB,CAAC,SAAS,EAAE,cAAc,CA4BxE,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;AAgCxD,wBAAgB,cAAc,SA6B7B;AAMD,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAMnE;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAK/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;AAgCxD,wBAAgB,cAAc,SA6B7B;AAMD,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAMnE;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAM/D"}

package/types/hooks/useId.d.ts

@@ -0,0 +1,9 @@
+declare function useId(idFromProps: string): string;
+declare function useId(idFromProps: number): number;
+declare function useId(idFromProps: string | number): string | number;
+declare function useId(idFromProps: string | undefined | null): string | undefined;
+declare function useId(idFromProps: number | undefined | null): number | undefined;
+declare function useId(idFromProps: string | number | undefined | null): string | number | undefined;
+declare function useId(): string | undefined;
+export { useId };
+//# sourceMappingURL=useId.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useId.d.ts","sourceRoot":"","sources":["../../src/hooks/useId.tsx"],"names":[],"mappings":"AA+EA,iBAAS,KAAK,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAA;AAC3C,iBAAS,KAAK,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAA;AAC3C,iBAAS,KAAK,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;AAC7D,iBAAS,KAAK,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,MAAM,GAAG,SAAS,CAAA;AAC1E,iBAAS,KAAK,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,MAAM,GAAG,SAAS,CAAA;AAC1E,iBAAS,KAAK,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;AAC5F,iBAAS,KAAK,IAAI,MAAM,GAAG,SAAS,CAAA;AAwCpC,OAAO,EAAE,KAAK,EAAE,CAAA"}

package/types/index.d.ts

@@ -13,30 +13,33 @@ export { getHasConfigured, getConfig, getThemes, getTokens, onConfiguredOnce } f
 export * from './constants/constants';
 export * from './constants/platform';
 export * from './constants/rnw';
+export * from './helpers/getButtonSize';
 export * from './helpers/getExpandedShorthands';
 export * from './helpers/getSize';
 export * from './helpers/getSplitStyles';
 export * from './helpers/getStylesAtomic';
+export * from './helpers/getTextSize';
 export * from './helpers/isObj';
 export * from './helpers/isTamaguiElement';
 export * from './helpers/matchMedia';
 export * from './helpers/themeable';
 export * from './helpers/withStaticProperties';
 export * from './contexts/ButtonInsideButtonContext';
-export * from './hooks/useIsTouchDevice';
 export * from './hooks/useConstant';
-export * from './hooks/usePressable';
+export * from './hooks/useId';
+export * from './hooks/useIsMounted';
+export * from './hooks/useIsTouchDevice';
 export * from './hooks/useMedia';
+export * from './hooks/usePressable';
 export * from './hooks/useTheme';
-export * from './hooks/useIsMounted';
 export * from './hooks/useUnmountEffect';
-export * from '@tamagui/use-force-update';
 export * from './views/Stack';
 export * from './views/Text';
+export * from './views/TextAncestorContext';
 export * from './views/Theme';
-export * from './views/ThemeReset';
 export * from './views/ThemeInverse';
 export * from './views/ThemeProvider';
-export * from './views/TextAncestorContext';
+export * from './views/ThemeReset';
+export * from '@tamagui/use-force-update';
 export * from '@tamagui/helpers';
 //# sourceMappingURL=index.d.ts.map

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,cAAc,CAAA;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,cAAc,kBAAkB,CAAA;AAChC,cAAc,UAAU,CAAA;AACxB,cAAc,SAAS,CAAA;AAEvB,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAA;AAE5F,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,iBAAiB,CAAA;AAE/B,cAAc,iCAAiC,CAAA;AAC/C,cAAc,mBAAmB,CAAA;AACjC,cAAc,0BAA0B,CAAA;AACxC,cAAc,2BAA2B,CAAA;AACzC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,4BAA4B,CAAA;AAC1C,cAAc,sBAAsB,CAAA;AACpC,cAAc,qBAAqB,CAAA;AACnC,cAAc,gCAAgC,CAAA;AAE9C,cAAc,sCAAsC,CAAA;AAEpD,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,kBAAkB,CAAA;AAChC,cAAc,kBAAkB,CAAA;AAChC,cAAc,sBAAsB,CAAA;AACpC,cAAc,0BAA0B,CAAA;AACxC,cAAc,2BAA2B,CAAA;AAEzC,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA;AAC7B,cAAc,oBAAoB,CAAA;AAClC,cAAc,sBAAsB,CAAA;AACpC,cAAc,uBAAuB,CAAA;AACrC,cAAc,6BAA6B,CAAA;AAE3C,cAAc,kBAAkB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,cAAc,CAAA;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,cAAc,kBAAkB,CAAA;AAChC,cAAc,UAAU,CAAA;AACxB,cAAc,SAAS,CAAA;AAEvB,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAA;AAE5F,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,iBAAiB,CAAA;AAE/B,cAAc,yBAAyB,CAAA;AACvC,cAAc,iCAAiC,CAAA;AAC/C,cAAc,mBAAmB,CAAA;AACjC,cAAc,0BAA0B,CAAA;AACxC,cAAc,2BAA2B,CAAA;AACzC,cAAc,uBAAuB,CAAA;AACrC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,4BAA4B,CAAA;AAC1C,cAAc,sBAAsB,CAAA;AACpC,cAAc,qBAAqB,CAAA;AACnC,cAAc,gCAAgC,CAAA;AAE9C,cAAc,sCAAsC,CAAA;AAEpD,cAAc,qBAAqB,CAAA;AACnC,cAAc,eAAe,CAAA;AAC7B,cAAc,sBAAsB,CAAA;AACpC,cAAc,0BAA0B,CAAA;AACxC,cAAc,kBAAkB,CAAA;AAChC,cAAc,sBAAsB,CAAA;AACpC,cAAc,kBAAkB,CAAA;AAChC,cAAc,0BAA0B,CAAA;AAExC,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,6BAA6B,CAAA;AAC3C,cAAc,eAAe,CAAA;AAC7B,cAAc,sBAAsB,CAAA;AACpC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAElC,cAAc,2BAA2B,CAAA;AACzC,cAAc,kBAAkB,CAAA"}

package/types/types.d.ts

@@ -86,7 +86,7 @@ export declare type Themes = TamaguiConfig['themes'];
 export declare type ThemeName = GetAltThemeNames<keyof Themes>;
 export declare type ThemeKeys = keyof ThemeObject;
 export declare type ThemeTokens = `$${ThemeKeys}`;
-export declare type AnimationKeys = GetAnimationKeys<TamaguiConfig>;
+export declare type AnimationKeys = Omit<GetAnimationKeys<TamaguiConfig>, number>;
 declare type GetAltThemeNames<S> = (S extends `${string}_${infer Alt}` ? GetAltThemeNames<Alt> : S) | S;
 export declare type TamaguiInternalConfig<A extends GenericTokens = GenericTokens, B extends GenericThemes = GenericThemes, C extends GenericShorthands = GenericShorthands, D extends GenericMedia = GenericMedia, E extends GenericAnimations = GenericAnimations, F extends GenericFonts = GenericFonts> = CreateTamaguiConfig<A, B, C, D, E, F> & {
     Provider: (props: TamaguiProviderProps) => any;
@@ -158,12 +158,28 @@ export declare type TransformStyleProps = {
     rotateX?: string;
     rotateZ?: string;
 };
+export declare type AnimationConfigType = any;
+export declare type AnimationProp = AnimationKeys | {
+    [key: string]: AnimationKeys | {
+        type: AnimationKeys;
+        [key: string]: any;
+    };
+} | [
+    AnimationKeys,
+    {
+        [key: string]: AnimationKeys | {
+            type?: AnimationKeys;
+            [key: string]: any;
+        };
+    }
+];
 export declare type TamaguiComponentPropsBase = {
+    asChild?: boolean;
     space?: SpaceTokens;
     dangerouslySetInnerHTML?: {
         __html: string;
     };
-    animation?: AnimationKeys;
+    animation?: AnimationProp;
     animateOnly?: string[];
     children?: any | any[];
     debug?: boolean | 'break' | 'verbose';
@@ -383,9 +399,7 @@ export declare type AnimationDriver<A extends AnimationConfig = AnimationConfig>
     View?: any;
     Text?: any;
 };
-export declare type UseAnimationProps = TamaguiComponentPropsBase & Record<string, any> & {
-    animation: string;
-};
+export declare type UseAnimationProps = TamaguiComponentPropsBase & Record<string, any>;
 export declare type UseAnimationHelpers = {
     staticConfig: StaticConfigParsed;
     getStyle: (props?: {