@tamagui/core 1.0.1-beta.151 → 1.0.1-beta.154

package/dist/esm/createComponent.js

@@ -1,3 +1,4 @@
+import { jsx } from "react/jsx-runtime";
 import {
   composeEventHandlers,
   stylePropsView,
@@ -21,7 +22,7 @@ import React, {
   useContext,
   useEffect
 } from "react";
-import { StyleSheet, Text, View } from "react-native";
+import { Text, View } from "react-native";
 import { getConfig, onConfiguredOnce } from "./config";
 import { stackDefaultStyles } from "./constants/constants";
 import { isClient, isRSC, isWeb, useIsomorphicLayoutEffect } from "./constants/platform";
@@ -72,7 +73,7 @@ function mergeShorthands({ defaultProps }, { shorthands }) {
 }
 let initialTheme;
 let config;
-let mediaPropNames = [];
+const mediaPropNames = [];
 function createComponent(configIn, ParentComponent) {
   const staticConfig = (() => {
     const next = extendStaticConfig(configIn, ParentComponent);
@@ -88,7 +89,6 @@ function createComponent(configIn, ParentComponent) {
   let AnimatedView;
   let avoidClasses = true;
   let defaultNativeStyle;
-  let defaultNativeStyleSheet;
   let tamaguiDefaultProps;
   let initialSplitStyles;
   const component = forwardRef((propsIn, forwardedRef) => {
@@ -122,7 +122,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 +175,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 +350,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) {
@@ -388,11 +425,7 @@ function createComponent(configIn, ParentComponent) {
         ...medias
       };
     } else {
-      styles = [
-        isWeb ? null : defaultNativeStyleSheet ? defaultNativeStyleSheet.base : null,
-        animationStyles ?? style,
-        medias
-      ];
+      styles = [isWeb ? null : defaultNativeStyle, animationStyles ?? style, medias];
       if (!animationStyles && initialSplitStyles) {
         const initPseudos = initialSplitStyles.pseudos;
         !state.mounted && addPseudoToStyles(styles, initPseudos, pseudos, "enterStyle");
@@ -415,6 +448,9 @@ function createComponent(configIn, ParentComponent) {
       if (fontFamily && fontFamily[0] === "$") {
         fontFamily = fontFamily.slice(1);
       }
+      if (props["debug"]) {
+        console.log("???", fontFamily, isText);
+      }
       const classList = [
         componentName ? componentClassName : "",
         fontFamily ? `font_${fontFamily}` : "",
@@ -561,15 +597,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;
@@ -581,17 +623,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);
@@ -633,7 +677,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"
@@ -641,8 +685,9 @@ function createComponent(configIn, ParentComponent) {
           ...events && shouldWrapWithHover && {
             onMouseEnter: events.onMouseEnter,
             onMouseLeave: events.onMouseLeave
-          }
-        }, content);
+          },
+          children: content
+        });
       }
     }
     if (process.env.NODE_ENV === "development") {
@@ -680,23 +725,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,
@@ -716,9 +779,6 @@ function createComponent(configIn, ParentComponent) {
         }
       }
     }
-    defaultNativeStyleSheet = StyleSheet.create({
-      base: defaultNativeStyle
-    });
     if (Object.keys(defaults2).length) {
       tamaguiDefaultProps = defaults2;
     }
@@ -744,16 +804,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;
@@ -828,9 +891,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;
@@ -842,54 +909,69 @@ 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: absoluteFill,
+    children: props.children
+  });
 }
+const absoluteFill = {
+  position: "absolute",
+  top: 0,
+  left: 0,
+  right: 0,
+  bottom: 0
+};
 function processIDRefList(idRefList) {
   return Array.isArray(idRefList) ? idRefList.join(" ") : idRefList;
 }