@tamagui/core 1.0.1-beta.150 → 1.0.1-beta.153

package/dist/esm/constants/platform.native.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/constants/platform.native.ts"],
   "sourcesContent": ["import { useLayoutEffect } from 'react'\nimport { Platform } from 'react-native'\n\nexport const isAndroid = Platform?.OS === 'android'\nexport const isIOS = Platform?.OS === 'ios'\nexport const isWeb = false\nexport const isWindowDefined = false\nexport const isSSR = false\nexport const isClient = false\nexport const isRSC = false\nexport const useIsomorphicLayoutEffect = useLayoutEffect\nexport const isChrome = false\nexport const isWebTouchable = false\nexport const isTouchable = true\n"],
-  "mappings": "AAAA;AAAA;AACA;AAEO,MAAM,YAAY,uCAAU,QAAO;AACnC,MAAM,QAAQ,uCAAU,QAAO;AAC/B,MAAM,QAAQ;AACd,MAAM,kBAAkB;AACxB,MAAM,QAAQ;AACd,MAAM,WAAW;AACjB,MAAM,QAAQ;AACd,MAAM,4BAA4B;AAClC,MAAM,WAAW;AACjB,MAAM,iBAAiB;AACvB,MAAM,cAAc;",
+  "mappings": "AAAA;AAAA,SAAS,uBAAuB;AAChC,SAAS,gBAAgB;AAElB,MAAM,cAAY,qCAAU,QAAO;AACnC,MAAM,UAAQ,qCAAU,QAAO;AAC/B,MAAM,QAAQ;AACd,MAAM,kBAAkB;AACxB,MAAM,QAAQ;AACd,MAAM,WAAW;AACjB,MAAM,QAAQ;AACd,MAAM,4BAA4B;AAClC,MAAM,WAAW;AACjB,MAAM,iBAAiB;AACvB,MAAM,cAAc;",
   "names": []
 }

package/dist/esm/contexts/ButtonInsideButtonContext.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/contexts/ButtonInsideButtonContext.tsx"],
   "sourcesContent": ["import { createContext } from 'react'\n\nexport const ButtonInsideButtonContext = createContext(false)\n"],
-  "mappings": "AAAA;AAEO,MAAM,4BAA4B,cAAc,KAAK;",
+  "mappings": "AAAA,SAAS,qBAAqB;AAEvB,MAAM,4BAA4B,cAAc,KAAK;",
   "names": []
 }

package/dist/esm/contexts/FontLanguageContext.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/contexts/FontLanguageContext.tsx"],
   "sourcesContent": ["import { createContext } from 'react'\n\nimport { LanguageContextType } from '../views/FontLanguage.types'\n\nexport const FontLanguageContext = createContext<LanguageContextType | null>(null)\n"],
-  "mappings": "AAAA;AAIO,MAAM,sBAAsB,cAA0C,IAAI;",
+  "mappings": "AAAA,SAAS,qBAAqB;AAIvB,MAAM,sBAAsB,cAA0C,IAAI;",
   "names": []
 }

package/dist/esm/contexts/TextAncestorContext.js

@@ -1,11 +1,13 @@
+import { jsx } from "react/jsx-runtime";
 import { TextAncestorContext as RNWTextAncestorContext } from "@tamagui/rnw";
-import React, { createContext } from "react";
+import { createContext } from "react";
 const FallbackNativeContext = createContext(false);
 const TextAncestorContext = RNWTextAncestorContext ?? FallbackNativeContext;
 const TextAncestorProvider = (props) => {
-  return /* @__PURE__ */ React.createElement(TextAncestorContext.Provider, {
-    value: false
-  }, props.children);
+  return /* @__PURE__ */ jsx(TextAncestorContext.Provider, {
+    value: false,
+    children: props.children
+  });
 };
 export {
   FallbackNativeContext,

package/dist/esm/contexts/TextAncestorContext.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/contexts/TextAncestorContext.tsx"],
   "sourcesContent": ["import { TextAncestorContext as RNWTextAncestorContext } from '@tamagui/rnw'\nimport React, { createContext } from 'react'\n\nexport const FallbackNativeContext = createContext(false)\n\nexport const TextAncestorContext = RNWTextAncestorContext ?? FallbackNativeContext\n\nexport const TextAncestorProvider = (props) => {\n  return <TextAncestorContext.Provider value={false}>{props.children}</TextAncestorContext.Provider>\n}\n"],
-  "mappings": "AAAA;AACA;AAEO,MAAM,wBAAwB,cAAc,KAAK;AAEjD,MAAM,sBAAsB,0BAA0B;AAEtD,MAAM,uBAAuB,CAAC,UAAU;AAC7C,SAAO,oCAAC,oBAAoB,UAApB;AAAA,IAA6B,OAAO;AAAA,KAAQ,MAAM,QAAS;AACrE;",
+  "mappings": "AAQS;AART,SAAS,uBAAuB,8BAA8B;AAC9D,SAAgB,qBAAqB;AAE9B,MAAM,wBAAwB,cAAc,KAAK;AAEjD,MAAM,sBAAsB,0BAA0B;AAEtD,MAAM,uBAAuB,CAAC,UAAU;AAC7C,SAAO,oBAAC,oBAAoB,UAApB;AAAA,IAA6B,OAAO;AAAA,IAAQ,gBAAM;AAAA,GAAS;AACrE;",
   "names": []
 }

package/dist/esm/contexts/ThemeContext.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/contexts/ThemeContext.tsx"],
   "sourcesContent": ["import { createContext } from 'react'\n\nimport { ThemeName, Themes } from '../types'\n\nexport const ThemeContext = createContext<{ themes: Themes; defaultTheme: ThemeName } | null>(null)\n"],
-  "mappings": "AAAA;AAIO,MAAM,eAAe,cAAkE,IAAI;",
+  "mappings": "AAAA,SAAS,qBAAqB;AAIvB,MAAM,eAAe,cAAkE,IAAI;",
   "names": []
 }

package/dist/esm/createComponent.js

@@ -1,3 +1,4 @@
+import { jsx } from "react/jsx-runtime";
 import {
   composeEventHandlers,
   stylePropsView,
@@ -92,7 +93,7 @@ function createComponent(configIn, ParentComponent) {
   let tamaguiDefaultProps;
   let initialSplitStyles;
   const component = forwardRef((propsIn, forwardedRef) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g;
     let props;
     if (tamaguiDefaultProps && !propsIn.asChild) {
       props = mergeProps(tamaguiDefaultProps, propsIn)[0];
@@ -122,7 +123,15 @@ function createComponent(configIn, ParentComponent) {
       resolveVariablesAs: "value"
     };
     const languageContext = isRSC ? null : useContext(FontLanguageContext);
-    const splitStyles = useSplitStyles(props, staticConfig, theme, splitStyleState, props.asChild ? null : initialSplitStyles == null ? void 0 : initialSplitStyles.classNames, languageContext || void 0, props["debug"]);
+    const splitStyles = useSplitStyles(
+      props,
+      staticConfig,
+      theme,
+      splitStyleState,
+      props.asChild ? null : initialSplitStyles == null ? void 0 : initialSplitStyles.classNames,
+      languageContext || void 0,
+      props["debug"]
+    );
     const hostRef = useServerRef(null);
     const setState = states[1];
     const setStateShallow = createShallowUpdate(setState);
@@ -167,9 +176,31 @@ function createComponent(configIn, ParentComponent) {
         getStyle({ isExiting, isEntering, exitVariant, enterVariant } = {}) {
           var _a2, _b2, _c2, _d2;
           const style2 = animationFeatureStylesIn;
-          const enterStyle = isEntering ? enterVariant && ((_a2 = staticConfig.variants) == null ? void 0 : _a2[enterVariant]["true"]) ? getSubStyle("", (_b2 = staticConfig.variants) == null ? void 0 : _b2[enterVariant]["true"], staticConfig, theme, props, state, tamaguiConfig) || pseudos.enterStyle : pseudos.enterStyle : null;
-          const exitStyle = isExiting ? exitVariant && ((_c2 = staticConfig.variants) == null ? void 0 : _c2[exitVariant]["true"]) ? getSubStyle("", (_d2 = staticConfig.variants) == null ? void 0 : _d2[exitVariant]["true"], staticConfig, theme, props, state, tamaguiConfig) || pseudos.exitStyle : pseudos.exitStyle : null;
-          ensureBaseHasDefaults(style2, pseudos.hoverStyle, pseudos.focusStyle, pseudos.pressStyle, pseudos.pressStyle);
+          const enterStyle = isEntering ? enterVariant && ((_a2 = staticConfig.variants) == null ? void 0 : _a2[enterVariant]["true"]) ? getSubStyle(
+            "",
+            (_b2 = staticConfig.variants) == null ? void 0 : _b2[enterVariant]["true"],
+            staticConfig,
+            theme,
+            props,
+            state,
+            tamaguiConfig
+          ) || pseudos.enterStyle : pseudos.enterStyle : null;
+          const exitStyle = isExiting ? exitVariant && ((_c2 = staticConfig.variants) == null ? void 0 : _c2[exitVariant]["true"]) ? getSubStyle(
+            "",
+            (_d2 = staticConfig.variants) == null ? void 0 : _d2[exitVariant]["true"],
+            staticConfig,
+            theme,
+            props,
+            state,
+            tamaguiConfig
+          ) || pseudos.exitStyle : pseudos.exitStyle : null;
+          ensureBaseHasDefaults(
+            style2,
+            pseudos.hoverStyle,
+            pseudos.focusStyle,
+            pseudos.pressStyle,
+            pseudos.pressStyle
+          );
           enterStyle && isEntering && merge(style2, enterStyle);
           state.hover && pseudos.hoverStyle && merge(style2, pseudos.hoverStyle);
           state.focus && pseudos.focusStyle && merge(style2, pseudos.focusStyle);
@@ -320,14 +351,21 @@ function createComponent(configIn, ParentComponent) {
           onStartShouldSetResponderCapture
         });
         const platformMethodsRef = usePlatformMethods(viewProps);
-        const shouldSetMounted = Boolean(isClient && (hasEnterStyle || props.animation) && !state.mounted);
-        const setRef = useMergeRefs(hostRef, platformMethodsRef, forwardedRef, shouldSetMounted ? () => {
-          setTimeout(() => {
-            setStateShallow({
-              mounted: true
-            });
-          }, 10);
-        } : void 0);
+        const shouldSetMounted = Boolean(
+          isClient && (hasEnterStyle || props.animation) && !state.mounted
+        );
+        const setRef = useMergeRefs(
+          hostRef,
+          platformMethodsRef,
+          forwardedRef,
+          shouldSetMounted ? () => {
+            setTimeout(() => {
+              setStateShallow({
+                mounted: true
+              });
+            }, 10);
+          } : void 0
+        );
         viewProps.ref = setRef;
       }
       if (props.href != void 0 && hrefAttrs != void 0) {
@@ -442,7 +480,31 @@ function createComponent(configIn, ParentComponent) {
         viewProps.className = className;
       }
       viewProps.style = style2;
-    } else {
+    }
+    if (process.env.TAMAGUI_TARGET === "native") {
+      if (splitStyles.fontFamily) {
+        const faceInfo = (_b = config.fontsParsed[splitStyles.fontFamily]) == null ? void 0 : _b.face;
+        if (faceInfo) {
+          const [weight, style2] = (() => {
+            var _a2, _b2;
+            let weight2;
+            let style3;
+            for (let i = styles.length; i >= 0; i--) {
+              weight2 ??= (_a2 = styles[i]) == null ? void 0 : _a2.fontWeight;
+              style3 ??= (_b2 = styles[i]) == null ? void 0 : _b2.fontStyle;
+            }
+            return [weight2 || "400", style3 || "normal"];
+          })();
+          const overrideFace = (_d = (_c = faceInfo[weight]) == null ? void 0 : _c[style2]) == null ? void 0 : _d.val;
+          if (overrideFace) {
+            for (const style3 of styles) {
+              if (style3 == null ? void 0 : style3.fontFamily) {
+                style3.fontFamily = overrideFace;
+              }
+            }
+          }
+        }
+      }
       viewProps.style = styles;
     }
     const initialPseudos = initialSplitStyles == null ? void 0 : initialSplitStyles.pseudos;
@@ -517,7 +579,7 @@ function createComponent(configIn, ParentComponent) {
       } : null,
       ...!isWeb && {
         cancelable: !props.rejectResponderTermination,
-        disabled: props.disabled !== null ? props.disabled : (_b = props.accessibilityState) == null ? void 0 : _b.disabled,
+        disabled: props.disabled !== null ? props.disabled : (_e = props.accessibilityState) == null ? void 0 : _e.disabled,
         hitSlop: props.hitSlop,
         delayLongPress: props.delayLongPress,
         delayPressIn: props.delayPressIn,
@@ -537,15 +599,21 @@ function createComponent(configIn, ParentComponent) {
       }
     }
     const themeManager = getThemeManager(theme);
-    const shouldSetChildrenThemeToParent = Boolean(themeShallow && themeManager && themeManager.didChangeTheme);
+    const shouldSetChildrenThemeToParent = Boolean(
+      themeShallow && themeManager && themeManager.didChangeTheme
+    );
     const shouldProvideThemeManager = shouldSetChildrenThemeToParent || themeManager && themeManager.didChangeTheme;
-    const childEls = !children || asChild ? children : wrapThemeManagerContext(spacedChildren({
-      separator,
-      children,
-      space,
-      direction: props.spaceDirection || "both",
-      isZStack
-    }), shouldProvideThemeManager ? themeManager : void 0, shouldSetChildrenThemeToParent);
+    const childEls = !children || asChild ? children : wrapThemeManagerContext(
+      spacedChildren({
+        separator,
+        children,
+        space,
+        direction: props.spaceDirection || "both",
+        isZStack
+      }),
+      shouldProvideThemeManager ? themeManager : void 0,
+      shouldSetChildrenThemeToParent
+    );
     let content;
     if (asChild) {
       elementType = Slot;
@@ -557,17 +625,19 @@ function createComponent(configIn, ParentComponent) {
       };
     }
     if (!isRSC && isWeb) {
-      const [pressableProps] = usePressable(events ? {
-        disabled,
-        ...hitSlop && {
-          hitSlop
-        },
-        onPressOut: events[pressOutKey],
-        onPressIn: events[pressInKey],
-        onPress: events[pressKey]
-      } : {
-        disabled: true
-      });
+      const [pressableProps] = usePressable(
+        events ? {
+          disabled,
+          ...hitSlop && {
+            hitSlop
+          },
+          onPressOut: events[pressOutKey],
+          onPressIn: events[pressInKey],
+          onPress: events[pressKey]
+        } : {
+          disabled: true
+        }
+      );
       if (events) {
         if (handlesPressEvents) {
           Object.assign(viewProps, pressableProps);
@@ -609,7 +679,7 @@ function createComponent(configIn, ParentComponent) {
       if (shouldWrapWithHover || shouldWrapWithComponentTheme) {
         const themeClassName = shouldWrapWithComponentTheme ? `${theme.className}` : "";
         const hoverClassName = shouldWrapWithHover ? "t_Hoverable" : "";
-        content = /* @__PURE__ */ React.createElement("span", {
+        content = /* @__PURE__ */ jsx("span", {
           className: `${hoverClassName} ${themeClassName}`,
           style: {
             display: "contents"
@@ -617,8 +687,9 @@ function createComponent(configIn, ParentComponent) {
           ...events && shouldWrapWithHover && {
             onMouseEnter: events.onMouseEnter,
             onMouseLeave: events.onMouseLeave
-          }
-        }, content);
+          },
+          children: content
+        });
       }
     }
     if (process.env.NODE_ENV === "development") {
@@ -631,7 +702,7 @@ function createComponent(configIn, ParentComponent) {
         console.log("children", content);
         console.groupEnd();
         if (typeof window !== "undefined") {
-          console.log({ state, shouldProvideThemeManager, tamaguiDefaultProps, viewProps, splitStyles, animationStyles, handlesPressEvents, isStringElement, classNamesIn: (_c = props.className) == null ? void 0 : _c.split(" "), classNamesOut: (_d = viewProps.className) == null ? void 0 : _d.split(" "), events, shouldAttach, styles, pseudos, content, childEls, shouldAvoidClasses, avoidClasses, animation: props.animation, style, defaultNativeStyle, initialSplitStyles, ...typeof window !== "undefined" ? { theme, themeClassName: theme.className, staticConfig, tamaguiConfig, events, shouldAvoidClasses, shouldForcePseudo, classNames: Object.fromEntries(Object.entries(classNames).map(([k, v]) => [v, getAllSelectors()[v]])) } : null });
+          console.log({ state, shouldProvideThemeManager, tamaguiDefaultProps, viewProps, splitStyles, animationStyles, handlesPressEvents, isStringElement, classNamesIn: (_f = props.className) == null ? void 0 : _f.split(" "), classNamesOut: (_g = viewProps.className) == null ? void 0 : _g.split(" "), events, shouldAttach, styles, pseudos, content, childEls, shouldAvoidClasses, avoidClasses, animation: props.animation, style, defaultNativeStyle, initialSplitStyles, ...typeof window !== "undefined" ? { theme, themeClassName: theme.className, staticConfig, tamaguiConfig, events, shouldAvoidClasses, shouldForcePseudo, classNames: Object.fromEntries(Object.entries(classNames).map(([k, v]) => [v, getAllSelectors()[v]])) } : null });
         }
         console.groupEnd();
       }
@@ -656,23 +727,41 @@ function createComponent(configIn, ParentComponent) {
     let defaultPropsIn = staticConfig.defaultProps || {};
     const parentNames = [...staticConfig.parentNames || [], staticConfig.componentName];
     if (config.defaultProps && parentNames && staticConfig.componentName) {
-      defaultPropsIn = mergeConfigDefaultProps(staticConfig.componentName, defaultPropsIn, config.defaultProps, parentNames, conf);
+      defaultPropsIn = mergeConfigDefaultProps(
+        staticConfig.componentName,
+        defaultPropsIn,
+        config.defaultProps,
+        parentNames,
+        conf
+      );
     }
     const debug = true ? defaultPropsIn["debug"] : false;
     if (process.env.NODE_ENV === "development" && debug === "break") {
       debugger;
     }
     const [parentProps, parentClassNames] = mergeProps(defaultPropsIn, {}, true);
-    initialSplitStyles = insertSplitStyles(parentProps, staticConfig, initialTheme, {
-      mounted: true,
-      hover: false,
-      press: false,
-      pressIn: false,
-      focus: false,
-      resolveVariablesAs: "both",
-      keepVariantsAsProps: true
-    }, void 0, void 0, debug);
-    const [defaults2, defaultsClassnames] = mergeProps(component.defaultProps, initialSplitStyles.viewProps, true);
+    initialSplitStyles = insertSplitStyles(
+      parentProps,
+      staticConfig,
+      initialTheme,
+      {
+        mounted: true,
+        hover: false,
+        press: false,
+        pressIn: false,
+        focus: false,
+        resolveVariablesAs: "both",
+        keepVariantsAsProps: true
+      },
+      void 0,
+      void 0,
+      debug
+    );
+    const [defaults2, defaultsClassnames] = mergeProps(
+      component.defaultProps,
+      initialSplitStyles.viewProps,
+      true
+    );
     initialSplitStyles.classNames = {
       ...parentClassNames,
       ...defaultsClassnames,
@@ -720,16 +809,19 @@ function createComponent(configIn, ParentComponent) {
     ...staticConfig
   };
   res.extractable = (Component, conf) => {
-    Component.staticConfig = extendStaticConfig({
-      Component,
-      ...conf,
-      neverFlatten: true,
-      isExtractable: true,
-      defaultProps: {
-        ...Component.defaultProps,
-        ...conf == null ? void 0 : conf.defaultProps
-      }
-    }, res);
+    Component.staticConfig = extendStaticConfig(
+      {
+        Component,
+        ...conf,
+        neverFlatten: true,
+        isExtractable: true,
+        defaultProps: {
+          ...Component.defaultProps,
+          ...conf == null ? void 0 : conf.defaultProps
+        }
+      },
+      res
+    );
     return Component;
   };
   return res;
@@ -804,9 +896,13 @@ function spacedChildren({
     if (isEmpty || !child || child["key"] && !isZStack) {
       final.push(child);
     } else {
-      final.push(/* @__PURE__ */ React.createElement(Fragment, {
-        key: index
-      }, isZStack ? /* @__PURE__ */ React.createElement(AbsoluteFill, null, child) : child));
+      final.push(
+        /* @__PURE__ */ jsx(Fragment, {
+          children: isZStack ? /* @__PURE__ */ jsx(AbsoluteFill, {
+            children: child
+          }) : child
+        }, index)
+      );
     }
     if (isUnspaced(child) && index === 0) {
       continue;
@@ -818,53 +914,61 @@ function spacedChildren({
     if (next && !isUnspaced(next)) {
       if (separator) {
         if (hasSpace) {
-          final.push(createSpacer({
-            key: `_${index}_before_sep_spacer`,
-            direction,
-            space,
-            spaceFlex
-          }));
+          final.push(
+            createSpacer({
+              key: `_${index}_before_sep_spacer`,
+              direction,
+              space,
+              spaceFlex
+            })
+          );
         }
-        final.push(React.isValidElement(separator) ? React.cloneElement(separator, { key: `sep_${index}` }) : separator);
+        final.push(
+          React.isValidElement(separator) ? React.cloneElement(separator, { key: `sep_${index}` }) : separator
+        );
         if (hasSpace) {
-          final.push(createSpacer({
-            key: `_${index}_after_sep_spacer`,
+          final.push(
+            createSpacer({
+              key: `_${index}_after_sep_spacer`,
+              direction,
+              space,
+              spaceFlex
+            })
+          );
+        }
+      } else {
+        final.push(
+          createSpacer({
+            key: `_${index}_spacer`,
             direction,
             space,
             spaceFlex
-          }));
-        }
-      } else {
-        final.push(createSpacer({
-          key: `_${index}_spacer`,
-          direction,
-          space,
-          spaceFlex
-        }));
+          })
+        );
       }
     }
   }
   return final;
 }
 function createSpacer({ key, direction, space, spaceFlex }) {
-  return /* @__PURE__ */ React.createElement(Spacer, {
-    key,
+  return /* @__PURE__ */ jsx(Spacer, {
     size: space,
     direction,
     ...spaceFlex && {
       flex: spaceFlex
     }
-  });
+  }, key);
 }
 function isUnspaced(child) {
   var _a, _b;
   return ((_a = child == null ? void 0 : child["type"]) == null ? void 0 : _a["isVisuallyHidden"]) || ((_b = child == null ? void 0 : child["type"]) == null ? void 0 : _b["isUnspaced"]);
 }
 function AbsoluteFill(props) {
-  return /* @__PURE__ */ React.createElement(View, {
+  return /* @__PURE__ */ jsx(View, {
     pointerEvents: "box-none",
-    style: StyleSheet.absoluteFill
-  }, props.children);
+    style: StyleSheet.absoluteFill,
+    children: props.children
+  });
 }
 function processIDRefList(idRefList) {
   return Array.isArray(idRefList) ? idRefList.join(" ") : idRefList;