@tamagui/core 1.0.1-beta.18 → 1.0.1-beta.181

package/dist/esm/createComponent.js

@@ -1,6 +1,16 @@
-var __defProp = Object.defineProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-import { stylePropsView } from "@tamagui/helpers";
+import { jsx } from "react/jsx-runtime";
+import {
+  composeEventHandlers,
+  stylePropsView,
+  validPseudoKeys,
+  validStyles
+} from "@tamagui/helpers";
+import {
+  useElementLayout,
+  useMergeRefs,
+  usePlatformMethods,
+  useResponderEvents
+} from "@tamagui/rnw";
 import { useForceUpdate } from "@tamagui/use-force-update";
 import React, {
   Children,
@@ -10,210 +20,281 @@ import React, {
   memo,
   useCallback,
   useContext,
-  useRef,
-  useState
+  useEffect
 } from "react";
-import { Pressable, StyleSheet, Text, View } from "react-native";
-import { onConfiguredOnce } from "./conf";
+import { Text, View } from "react-native";
+import { getConfig, onConfiguredOnce } from "./config";
 import { stackDefaultStyles } from "./constants/constants";
-import { isAndroid, isWeb, useIsomorphicLayoutEffect } from "./constants/platform";
-import { rnw } from "./constants/rnw";
-import { createShallowUpdate } from "./helpers/createShallowUpdate";
+import { isClient, isRSC, isWeb, useIsomorphicLayoutEffect } from "./constants/platform";
+import { FontLanguageContext } from "./contexts/FontLanguageContext";
+import { TextAncestorContext } from "./contexts/TextAncestorContext";
+import { assignNativePropsToWeb } from "./helpers/assignNativePropsToWeb";
+import { getReturnVariablesAs } from "./helpers/createPropMapper";
 import { extendStaticConfig, parseStaticConfig } from "./helpers/extendStaticConfig";
-import { insertSplitStyles, useSplitStyles } from "./helpers/getSplitStyles";
+import {
+  getSubStyle,
+  insertSplitStyles,
+  useSplitStyles
+} from "./helpers/getSplitStyles";
 import { getAllSelectors } from "./helpers/insertStyleRule";
-import { BaseButton } from "./helpers/nativeGestureHandler";
+import { mergeProps } from "./helpers/mergeProps";
 import { proxyThemeVariables } from "./helpers/proxyThemeVariables";
-import { wrapThemeManagerContext } from "./helpers/wrapThemeManagerContext";
-import { useFeatures } from "./hooks/useFeatures";
-import { useIsTouchDevice } from "./hooks/useIsTouchDevice";
+import { useShallowSetState } from "./helpers/useShallowSetState";
+import {
+  addMediaQueryListener,
+  getInitialMediaState
+} from "./hooks/useMedia";
 import { usePressable } from "./hooks/usePressable";
-import { getThemeManagerIfChanged, useTheme } from "./hooks/useTheme";
-import { Slot } from "./views/Slot";
-import { TextAncestorContext } from "./views/TextAncestorContext";
+import { useServerRef, useServerState } from "./hooks/useServerHooks";
+import { getThemeManager, useTheme } from "./hooks/useTheme";
+import { usePressability } from "./vendor/Pressability";
+import { Slot, mergeEvent } from "./views/Slot";
+import { wrapThemeManagerContext } from "./views/Theme";
 React["keep"];
-const defaultComponentState = {
-  hover: false,
-  press: false,
-  pressIn: false,
-  focus: false,
-  mounted: false,
-  animation: null
-};
+let defaultComponentState = null;
 const mouseUps = /* @__PURE__ */ new Set();
 if (typeof document !== "undefined") {
-  document.addEventListener("mouseup", () => {
-    mouseUps.forEach((x) => x());
-    mouseUps.clear();
-  });
-  document.addEventListener("touchend", () => {
+  const cancelTouches = () => {
     mouseUps.forEach((x) => x());
     mouseUps.clear();
-  });
-  document.addEventListener("touchcancel", () => {
-    mouseUps.forEach((x) => x());
-    mouseUps.clear();
-  });
+  };
+  document.addEventListener("mouseup", cancelTouches);
+  document.addEventListener("touchend", cancelTouches);
+  document.addEventListener("touchcancel", cancelTouches);
 }
 function mergeShorthands({ defaultProps }, { shorthands }) {
-  for (const key in defaultProps) {
+  for (const key of Object.keys(defaultProps)) {
     defaultProps[shorthands[key] || key] = defaultProps[key];
   }
 }
-__name(mergeShorthands, "mergeShorthands");
 let initialTheme;
+let config;
 function createComponent(configIn, ParentComponent) {
   const staticConfig = (() => {
-    const config = extendStaticConfig(configIn, ParentComponent);
-    if ("parsed" in config) {
-      return config;
+    const next = extendStaticConfig(configIn, ParentComponent);
+    if ("parsed" in next) {
+      return next;
     } else {
-      return parseStaticConfig(config);
+      return parseStaticConfig(next);
     }
   })();
-  const componentClassName = `is_${staticConfig.componentName}`;
+  const defaultComponentClassName = `is_${staticConfig.componentName}`;
   let tamaguiConfig;
   let AnimatedText;
   let AnimatedView;
   let avoidClasses = true;
   let defaultNativeStyle;
-  let defaultNativeStyleSheet;
   let tamaguiDefaultProps;
   let initialSplitStyles;
-  function addPseudoToStyles(styles, name, pseudos) {
-    const pseudoStyle = pseudos[name];
-    const shouldNestObject = isWeb && name !== "enterStyle" && name !== "exitStyle";
-    const defaultPseudoStyle = initialSplitStyles.pseudos[name];
-    if (defaultPseudoStyle) {
-      styles.push(shouldNestObject ? { [name]: defaultPseudoStyle } : defaultPseudoStyle);
-    }
-    if (pseudoStyle) {
-      styles.push(shouldNestObject ? { [name]: pseudoStyle } : pseudoStyle);
+  const component = forwardRef((propsIn, forwardedRef) => {
+    var _a, _b, _c, _d, _e, _f, _g;
+    let props;
+    if (tamaguiDefaultProps && !propsIn.asChild) {
+      props = mergeProps(tamaguiDefaultProps, propsIn)[0];
+    } else {
+      props = propsIn;
     }
-  }
-  __name(addPseudoToStyles, "addPseudoToStyles");
-  const component = forwardRef((props, forwardedRef) => {
-    var _a, _b, _c, _d;
-    props = tamaguiDefaultProps && !props.asChild ? { ...tamaguiDefaultProps, ...props } : props;
-    const { Component, componentName, isText, isZStack } = staticConfig;
+    const debugProp = props["debug"];
+    const { Component, isText, isZStack } = staticConfig;
+    const componentName = props.componentName || staticConfig.componentName;
+    const componentClassName = props.asChild ? "" : props.componentName ? `is_${props.componentName}` : defaultComponentClassName;
+    const forceUpdate = useForceUpdate();
+    config = config || getConfig();
+    const theme = useTheme(props.theme, componentName, props, forceUpdate);
+    const states = useServerState(defaultComponentState);
+    const state = propsIn.forceStyle ? { ...states[0], [propsIn.forceStyle]: true } : states[0];
+    const shouldAvoidClasses = !!(props.animation && avoidClasses) || !staticConfig.acceptsClassName;
+    const shouldForcePseudo = !!propsIn.forceStyle;
+    const hasTextAncestor = !!(isWeb && isText ? useContext(TextAncestorContext) : false);
+    const splitStyleState = !shouldAvoidClasses && !shouldForcePseudo ? {
+      ...state,
+      hasTextAncestor,
+      dynamicStylesInline: true
+    } : {
+      ...state,
+      noClassNames: true,
+      dynamicStylesInline: true,
+      hasTextAncestor,
+      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,
+      debugProp
+    );
+    const hostRef = useServerRef(null);
+    const setState = states[1];
+    const setStateShallow = useShallowSetState(setState);
     if (process.env.NODE_ENV === "development") {
-      if (props["debug"]) {
-        console.log("\u26A0\uFE0F", staticConfig.componentName || (Component == null ? void 0 : Component.displayName) || (Component == null ? void 0 : Component.name) || "[Unnamed Component]", "debug on");
-        console.log("props in:", props, Object.keys(props));
-        if (props["debug"] === "break")
+      if (!process.env.TAMAGUI_TARGET) {
+        console.error(`No process.env.TAMAGUI_TARGET set, please set it to "native" or "web".`);
+      }
+      if (debugProp) {
+        const name = `${componentName || (Component == null ? void 0 : Component.displayName) || (Component == null ? void 0 : Component.name) || "[Unnamed Component]"}`;
+        const type = staticConfig.isReactNativeWeb ? "rnw" : "tamagui";
+        const banner = `${name} ${propsIn["data-is"] || ""} ${type}`;
+        console.group(`%c \u{1F41B} ${banner}`, "background: yellow;");
+        console.groupCollapsed("initial props/state");
+        console.log("props", propsIn);
+        console.log("splitStyles", splitStyles);
+        console.log("className", Object.values(splitStyles.classNames));
+        if (typeof window !== "undefined") {
+          console.log("ref", hostRef, "(click to view)");
+        }
+        console.groupEnd();
+        if (debugProp === "break") {
           debugger;
+        }
       }
     }
-    const forceUpdate = useForceUpdate();
-    const theme = useTheme(props.theme, staticConfig.componentName, props, forceUpdate);
-    const [state, set_] = useState(defaultComponentState);
-    const setStateShallow = createShallowUpdate(set_);
-    const shouldAvoidClasses = !!(props.animation && avoidClasses);
-    const splitStyles = useSplitStyles(props, staticConfig, theme, shouldAvoidClasses ? { ...state, noClassNames: true, resolveVariablesAs: "value" } : state, shouldAvoidClasses || props.asChild ? null : initialSplitStyles.classNames);
-    const { viewProps: viewPropsIn, pseudos, medias, style, classNames } = splitStyles;
-    const useAnimations = (_a = tamaguiConfig.animations) == null ? void 0 : _a.useAnimations;
-    const isAnimated = !!(useAnimations && props.animation);
-    const hasEnterStyle = !!props.enterStyle;
-    const features = useFeatures(props, {
-      forceUpdate,
-      setStateShallow,
-      useAnimations,
-      state,
-      style: props.animation ? { ...defaultNativeStyle, ...style } : null,
+    const {
+      viewProps: viewPropsIn,
       pseudos,
-      staticConfig,
-      theme,
-      onDidAnimate: props.onDidAnimate
-    });
+      medias,
+      style: splitStylesStyle,
+      classNames,
+      mediaKeys
+    } = splitStyles;
+    useIsomorphicLayoutEffect(() => {
+      if (!mediaKeys.length) {
+        return;
+      }
+      const disposers = [];
+      for (const key of mediaKeys) {
+        disposers.push(
+          addMediaQueryListener(key, (next) => {
+            setState((prev) => {
+              if (prev.mediaState[key] !== next) {
+                return {
+                  ...prev,
+                  mediaState: {
+                    ...prev.mediaState,
+                    [key]: next
+                  }
+                };
+              }
+              return prev;
+            });
+          })
+        );
+      }
+      return () => {
+      };
+    }, [mediaKeys.join(",")]);
+    const useAnimations = (_a = tamaguiConfig == null ? void 0 : tamaguiConfig.animations) == null ? void 0 : _a.useAnimations;
+    const isAnimated = !!(useAnimations && props.animation);
+    const animationFeatureStylesIn = props.animation ? { ...defaultNativeStyle, ...splitStylesStyle } : null;
+    const propsWithAnimation = props;
+    if (!isRSC && isAnimated) {
+      const animationState = useAnimations(propsWithAnimation, {
+        state,
+        pseudos,
+        onDidAnimate: props.onDidAnimate,
+        hostRef,
+        staticConfig,
+        getStyle({ isExiting, isEntering, exitVariant, enterVariant } = {}) {
+          var _a2, _b2, _c2, _d2;
+          const style = 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(
+            style,
+            pseudos.hoverStyle,
+            pseudos.focusStyle,
+            pseudos.pressStyle,
+            pseudos.pressStyle
+          );
+          enterStyle && isEntering && 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 && isExiting && merge(style, exitStyle);
+          if (process.env.NODE_ENV === "development") {
+            if (debugProp) {
+              console.log("animation style", style);
+            }
+          }
+          return style;
+        }
+      });
+      if (animationState !== state.animation) {
+        setStateShallow({
+          animation: animationState
+        });
+      }
+    }
     const {
       tag,
       hitSlop,
       asChild,
       children,
-      pointerEvents,
       onPress,
       onPressIn,
       onPressOut,
       onHoverIn,
       onHoverOut,
-      space,
-      disabled,
+      themeShallow,
+      space: spaceProp,
+      spaceDirection: _spaceDirection,
+      disabled: disabledProp,
+      onMouseUp,
+      onMouseDown,
       onMouseEnter,
       onMouseLeave,
       hrefAttrs,
-      onMoveShouldSetResponder,
-      onMoveShouldSetResponderCapture,
-      onResponderEnd,
-      onResponderGrant,
-      onResponderMove,
-      onResponderReject,
-      onResponderRelease,
-      onResponderStart,
-      onResponderTerminate,
-      onResponderTerminationRequest,
-      onScrollShouldSetResponder,
-      onScrollShouldSetResponderCapture,
-      onSelectionChangeShouldSetResponder,
-      onSelectionChangeShouldSetResponderCapture,
-      onStartShouldSetResponder,
-      onStartShouldSetResponderCapture,
-      onMouseDown,
-      nativeID,
-      accessible,
-      accessibilityRole,
-      collapsable,
-      focusable,
+      separator,
+      forceStyle: _forceStyle,
       onClick,
       theme: _themeProp,
       defaultVariants,
-      onLayout,
-      ...viewPropsRest
+      ...nonTamaguiProps
     } = viewPropsIn;
-    let viewProps = viewPropsRest;
-    if (process.env.NODE_ENV === "development" && !isText && isWeb) {
-      Children.toArray(props.children).forEach((item) => {
-        if (typeof item === "string") {
-          console.error(`Unexpected text node: ${item}. A text node cannot be a child of a <View>.`);
-        }
-      });
-    }
-    const hasTextAncestor = isWeb ? useContext(TextAncestorContext) : false;
-    const hostRef = useRef(null);
-    const internal = useRef();
-    if (!internal.current) {
-      internal.current = {
-        isMounted: true
-      };
-    }
-    useIsomorphicLayoutEffect(() => {
-      if (typeof window !== "undefined" && (hasEnterStyle || props.animation)) {
-        setStateShallow({
-          mounted: true
-        });
-      }
-      internal.current.isMounted = true;
-      return () => {
-        mouseUps.delete(unPress);
-        internal.current.isMounted = false;
-      };
-    }, [hasEnterStyle, props.animation]);
-    if (nativeID) {
-      viewProps.id = nativeID;
-    }
-    if (isAndroid) {
-      if (collapsable)
-        viewProps.collapsable = collapsable;
-      if (focusable)
-        viewProps.focusable = focusable;
-    }
-    if (!isWeb) {
-      if (accessible)
-        viewProps.accessible = accessible;
-      if (accessibilityRole)
-        viewProps.accessibilityRole = accessibilityRole;
-    }
-    if (isWeb && !asChild) {
-      rnw.useResponderEvents(hostRef, {
+    const isTaggable = !Component || typeof Component === "string";
+    const element = isWeb ? isTaggable ? tag || Component : Component : Component;
+    const BaseTextComponent = !isWeb ? Text : element || "span";
+    const BaseViewComponent = !isWeb ? View : element || (hasTextAncestor ? "span" : "div");
+    let elementType = isText ? (isAnimated ? AnimatedText || Text : null) || BaseTextComponent : (isAnimated ? AnimatedView || View : null) || BaseViewComponent;
+    elementType = Component || elementType;
+    const isStringElement = typeof elementType === "string";
+    const disabled = props.accessibilityState != null && props.accessibilityState.disabled === true || props.accessibilityDisabled;
+    let viewProps;
+    const hasEnterStyle = !!props.enterStyle;
+    const shouldSetMounted = Boolean(
+      (isWeb ? isClient : true) && (hasEnterStyle || props.animation) && !state.mounted
+    );
+    const setMounted = shouldSetMounted ? () => {
+      setTimeout(
+        () => {
+          setStateShallow({
+            mounted: true
+          });
+        },
+        isWeb ? 10 : 0
+      );
+    } : void 0;
+    if (process.env.TAMAGUI_TARGET === "web" && !staticConfig.isReactNativeWeb) {
+      const {
         onMoveShouldSetResponder,
         onMoveShouldSetResponderCapture,
         onResponderEnd,
@@ -229,117 +310,262 @@ function createComponent(configIn, ParentComponent) {
         onSelectionChangeShouldSetResponder,
         onSelectionChangeShouldSetResponderCapture,
         onStartShouldSetResponder,
-        onStartShouldSetResponderCapture
+        onStartShouldSetResponderCapture,
+        nativeID,
+        accessibilityActiveDescendant,
+        accessibilityAtomic,
+        accessibilityAutoComplete,
+        accessibilityBusy,
+        accessibilityChecked,
+        accessibilityColumnCount,
+        accessibilityColumnIndex,
+        accessibilityColumnSpan,
+        accessibilityControls,
+        accessibilityCurrent,
+        accessibilityDescribedBy,
+        accessibilityDetails,
+        accessibilityDisabled,
+        accessibilityErrorMessage,
+        accessibilityExpanded,
+        accessibilityFlowTo,
+        accessibilityHasPopup,
+        accessibilityHidden,
+        accessibilityInvalid,
+        accessibilityKeyShortcuts,
+        accessibilityLabel,
+        accessibilityLabelledBy,
+        accessibilityLevel,
+        accessibilityLiveRegion,
+        accessibilityModal,
+        accessibilityMultiline,
+        accessibilityMultiSelectable,
+        accessibilityOrientation,
+        accessibilityOwns,
+        accessibilityPlaceholder,
+        accessibilityPosInSet,
+        accessibilityPressed,
+        accessibilityReadOnly,
+        accessibilityRequired,
+        accessibilityRole,
+        accessibilityRoleDescription,
+        accessibilityRowCount,
+        accessibilityRowIndex,
+        accessibilityRowSpan,
+        accessibilitySelected,
+        accessibilitySetSize,
+        accessibilitySort,
+        accessibilityValueMax,
+        accessibilityValueMin,
+        accessibilityValueNow,
+        accessibilityValueText,
+        accessible,
+        accessibilityState,
+        accessibilityValue,
+        collapsable,
+        focusable,
+        onLayout,
+        ...webProps
+      } = nonTamaguiProps;
+      viewProps = webProps;
+      assignNativePropsToWeb(elementType, viewProps, nonTamaguiProps);
+      if (!isRSC) {
+        useElementLayout(hostRef, onLayout);
+        useResponderEvents(hostRef, {
+          onMoveShouldSetResponder,
+          onMoveShouldSetResponderCapture,
+          onResponderEnd,
+          onResponderGrant,
+          onResponderMove,
+          onResponderReject,
+          onResponderRelease,
+          onResponderStart,
+          onResponderTerminate,
+          onResponderTerminationRequest,
+          onScrollShouldSetResponder,
+          onScrollShouldSetResponderCapture,
+          onSelectionChangeShouldSetResponder,
+          onSelectionChangeShouldSetResponderCapture,
+          onStartShouldSetResponder,
+          onStartShouldSetResponderCapture
+        });
+        const platformMethodsRef = usePlatformMethods(viewProps);
+        const setRef = useMergeRefs(hostRef, platformMethodsRef, forwardedRef, setMounted);
+        viewProps.ref = setRef;
+      }
+      if (props.href != void 0 && hrefAttrs != void 0) {
+        const { download, rel, target } = hrefAttrs;
+        if (download != null) {
+          viewProps.download = download;
+        }
+        if (rel != null) {
+          viewProps.rel = rel;
+        }
+        if (typeof target === "string") {
+          viewProps.target = target.charAt(0) !== "_" ? "_" + target : target;
+        }
+      }
+      const _focusable = focusable != void 0 ? focusable : accessible;
+      const role = viewProps.role;
+      if (_focusable === false) {
+        viewProps.tabIndex = "-1";
+      }
+      if (elementType === "a" || elementType === "button" || elementType === "input" || elementType === "select" || elementType === "textarea") {
+        if (_focusable === false || accessibilityDisabled === true) {
+          viewProps.tabIndex = "-1";
+        }
+      } else if (role === "button" || role === "checkbox" || role === "link" || role === "radio" || role === "textbox" || role === "switch") {
+        if (_focusable !== false) {
+          viewProps.tabIndex = "0";
+        }
+      }
+      if (_focusable === true) {
+        viewProps.tabIndex = "0";
+      }
+    } else {
+      viewProps = nonTamaguiProps;
+      if (forwardedRef) {
+        viewProps.ref = forwardedRef;
+      }
+    }
+    if (process.env.NODE_ENV === "development" && !isText && isWeb && !staticConfig.isHOC) {
+      Children.toArray(props.children).forEach((item) => {
+        if (typeof item === "string") {
+          console.error(`Unexpected text node: ${item}. A text node cannot be a child of a <View>.`);
+        }
       });
     }
-    const isTaggable = !Component || typeof Component === "string";
-    const element = isWeb ? isTaggable ? tag || Component : Component : Component;
-    const BaseTextComponent = !isWeb ? Text : element || "span";
-    const BaseViewComponent = !isWeb ? View : element || (hasTextAncestor ? "span" : "div");
-    let ViewComponent = isText ? (isAnimated ? AnimatedText || Text : null) || BaseTextComponent : (isAnimated ? AnimatedView || View : null) || BaseViewComponent;
-    ViewComponent = Component || ViewComponent;
+    const unPress = useCallback(() => {
+      setStateShallow({
+        press: false,
+        pressIn: false
+      });
+    }, [setStateShallow]);
+    if (!isRSC) {
+      useEffect(() => {
+        return () => {
+          mouseUps.delete(unPress);
+        };
+      }, [unPress]);
+    }
     let styles;
-    const isStringElement = typeof ViewComponent === "string";
     const animationStyles = state.animation ? state.animation.style : null;
-    if (isStringElement && shouldAvoidClasses) {
+    if (isStringElement && shouldAvoidClasses && !shouldForcePseudo) {
       styles = {
         ...defaultNativeStyle,
-        ...animationStyles,
+        ...animationStyles ?? splitStylesStyle,
         ...medias
       };
     } else {
-      styles = [
-        isWeb ? null : defaultNativeStyleSheet ? defaultNativeStyleSheet.base : null,
-        animationStyles ? animationStyles : style,
-        medias
-      ];
-      if (!animationStyles) {
-        !state.mounted && addPseudoToStyles(styles, "enterStyle", pseudos);
-        state.hover && addPseudoToStyles(styles, "hoverStyle", pseudos);
-        state.focus && addPseudoToStyles(styles, "focusStyle", pseudos);
-        state.press && addPseudoToStyles(styles, "pressStyle", pseudos);
-      }
-    }
-    if (isWeb) {
-      if (!shouldAvoidClasses) {
-        const fontFamilyName = isText ? props.fontFamily || staticConfig.defaultProps.fontFamily : null;
-        const fontFamily = fontFamilyName && fontFamilyName[0] === "$" ? fontFamilyName.slice(1) : null;
-        const classList = [
-          componentName ? componentClassName : "",
-          fontFamily ? `font_${fontFamily}` : "",
-          theme.className,
-          classNames ? Object.values(classNames).join(" ") : ""
-        ];
-        const className = classList.join(" ");
-        if (process.env.NODE_ENV === "development") {
-          if (props["debug"]) {
-            console.log("  \xBB className", { isStringElement, pseudos, state, classNames, propsClassName: props.className, style, classList, className: className.trim().split(" "), themeClassName: theme.className, values: Object.fromEntries(Object.entries(classNames).map(([k, v]) => [v, getAllSelectors()[v]])) });
+      styles = [isWeb ? null : defaultNativeStyle, animationStyles ?? splitStylesStyle, medias];
+      if (!animationStyles && initialSplitStyles) {
+        const initPseudos = initialSplitStyles.pseudos;
+        !state.mounted && addPseudoToStyles(styles, initPseudos, pseudos, "enterStyle");
+        state.hover && addPseudoToStyles(styles, initPseudos, pseudos, "hoverStyle", shouldForcePseudo);
+        state.focus && addPseudoToStyles(styles, initPseudos, pseudos, "focusStyle", shouldForcePseudo);
+        state.press && addPseudoToStyles(styles, initPseudos, pseudos, "pressStyle", shouldForcePseudo);
+      }
+      if (shouldForcePseudo) {
+        const next = {};
+        for (const style of styles) {
+          if (style) {
+            Object.assign(next, style);
           }
         }
-        viewProps.className = className;
-        viewProps.style = animationStyles;
-      } else {
-        viewProps.style = styles;
+        Object.assign(splitStyles.style, next);
       }
-    } else {
-      viewProps.style = styles;
-    }
-    if (pointerEvents) {
-      viewProps.pointerEvents = pointerEvents;
     }
-    if (isWeb) {
-      const platformMethodsRef = rnw.usePlatformMethods(viewProps);
-      const setRef = rnw.useMergeRefs(hostRef, platformMethodsRef, forwardedRef);
-      if (!isAnimated) {
-        viewProps.ref = setRef;
-      } else {
-        if (forwardedRef) {
-          viewProps.ref = forwardedRef;
-        }
+    if (process.env.TAMAGUI_TARGET === "web") {
+      let fontFamily = isText ? splitStyles.fontFamily || staticConfig.defaultProps.fontFamily : null;
+      if (fontFamily && fontFamily[0] === "$") {
+        fontFamily = fontFamily.slice(1);
       }
-      if (props.href != null && hrefAttrs != null) {
-        const { download, rel, target } = hrefAttrs;
-        if (download != null) {
-          viewProps.download = download;
-        }
-        if (rel != null) {
-          viewProps.rel = rel;
+      if (process.env.NODE_ENV === "development") {
+        if (fontFamily == null ? void 0 : fontFamily.startsWith(`var(`)) {
+          console.warn(
+            `Received variable instead of resolved name of font, this is a bug. Please report on Github.`,
+            {
+              fontFamily,
+              props,
+              splitStyles,
+              staticConfig
+            }
+          );
         }
-        if (typeof target === "string") {
-          viewProps.target = target.charAt(0) !== "_" ? "_" + target : target;
+      }
+      const classList = [
+        componentName ? componentClassName : "",
+        fontFamily ? `font_${fontFamily}` : "",
+        theme.className,
+        classNames ? Object.values(classNames).join(" ") : ""
+      ];
+      const className = classList.join(" ");
+      const style = animationStyles ?? splitStyles.style;
+      const isAnimatedReactNativeWeb = props.animation && avoidClasses;
+      if (staticConfig.isReactNativeWeb || isAnimatedReactNativeWeb) {
+        viewProps.dataSet = {
+          ...viewProps.dataSet,
+          className,
+          id: props.id
+        };
+        if (process.env.NODE_ENV === "development") {
+          Object.keys(viewProps).forEach((key) => {
+            if (key.startsWith("data-")) {
+              viewProps.dataSet[key.replace("data-", "")] = viewProps[key];
+              delete viewProps[key];
+            }
+          });
         }
+      } else {
+        viewProps.className = className;
       }
-    } else {
-      if (forwardedRef) {
-        viewProps.ref = forwardedRef;
+      viewProps.style = style;
+    }
+    if (process.env.TAMAGUI_TARGET === "native") {
+      const mergedRef = useMergeRefs(forwardedRef, hostRef, setMounted);
+      viewProps.ref = mergedRef;
+      if (splitStyles.fontFamily) {
+        const faceInfo = (_b = config.fontsParsed[splitStyles.fontFamily]) == null ? void 0 : _b.face;
+        if (faceInfo) {
+          const [weight, style] = (() => {
+            var _a2, _b2;
+            let weight2;
+            let style2;
+            for (let i = styles.length; i >= 0; i--) {
+              weight2 ??= (_a2 = styles[i]) == null ? void 0 : _a2.fontWeight;
+              style2 ??= (_b2 = styles[i]) == null ? void 0 : _b2.fontStyle;
+            }
+            return [weight2 || "400", style2 || "normal"];
+          })();
+          const overrideFace = (_d = (_c = faceInfo[weight]) == null ? void 0 : _c[style]) == null ? void 0 : _d.val;
+          if (overrideFace) {
+            for (const style2 of styles) {
+              if (style2 == null ? void 0 : style2.fontFamily) {
+                style2.fontFamily = overrideFace;
+              }
+            }
+          }
+        }
       }
+      viewProps.style = styles;
     }
-    const initialPseudos = initialSplitStyles.pseudos;
-    const attachPress = !!(pseudos && pseudos.pressStyle || initialPseudos && initialPseudos.pressStyle || onPress || onPressOut || onPressIn || onClick);
-    const isTouch = useIsTouchDevice();
-    const isHoverable = isWeb && !isTouch;
+    const initialPseudos = initialSplitStyles == null ? void 0 : initialSplitStyles.pseudos;
+    const attachPress = !!((pseudos == null ? void 0 : pseudos.pressStyle) || (initialPseudos == null ? void 0 : initialPseudos.pressStyle) || onPress || onPressOut || onPressIn || onClick);
+    const isHoverable = isWeb;
     const attachHover = isHoverable && !!(pseudos && pseudos.hoverStyle || onHoverIn || onHoverOut || onMouseEnter || onMouseLeave);
     const handlesPressEvents = !isStringElement && !asChild;
     const pressKey = handlesPressEvents ? "onPress" : "onClick";
     const pressInKey = handlesPressEvents ? "onPressIn" : "onMouseDown";
     const pressOutKey = handlesPressEvents ? "onPressOut" : "onMouseUp";
     const shouldAttach = !asChild && (attachPress || attachHover || "pressStyle" in props || "onPress" in props || "onPressIn" in props || "onPressOut" in props || isWeb && ("hoverStyle" in props || "onHoverIn" in props || "onHoverOut" in props || "onMouseEnter" in props || "onMouseLeave" in props));
-    const unPress = useCallback(() => {
-      if (!internal.current.isMounted)
-        return;
-      setStateShallow({
-        press: false,
-        pressIn: false
-      });
-    }, []);
-    const events = shouldAttach ? {
+    const events = shouldAttach && !isRSC ? {
       [pressOutKey]: attachPress ? (e) => {
         unPress();
         onPressOut == null ? void 0 : onPressOut(e);
+        onMouseUp == null ? void 0 : onMouseUp(e);
       } : void 0,
       ...isHoverable && {
         onMouseEnter: attachHover ? (e) => {
-          let next = {};
+          const next = {};
           if (attachHover) {
             next.hover = true;
           }
@@ -353,7 +579,7 @@ function createComponent(configIn, ParentComponent) {
           onMouseEnter == null ? void 0 : onMouseEnter(e);
         } : void 0,
         onMouseLeave: attachHover ? (e) => {
-          let next = {};
+          const next = {};
           mouseUps.add(unPress);
           if (attachHover) {
             next.hover = false;
@@ -372,7 +598,8 @@ function createComponent(configIn, ParentComponent) {
       [pressInKey]: attachPress ? (e) => {
         setStateShallow({
           press: true,
-          pressIn: true
+          pressIn: true,
+          hover: false
         });
         onPressIn == null ? void 0 : onPressIn(e);
         onMouseDown == null ? void 0 : onMouseDown(e);
@@ -384,47 +611,68 @@ function createComponent(configIn, ParentComponent) {
         unPress();
         onClick == null ? void 0 : onClick(e);
         onPress == null ? void 0 : onPress(e);
-      } : null
+      } : null,
+      ...!isWeb && {
+        cancelable: !props.rejectResponderTermination,
+        disabled: props.disabled !== null ? props.disabled : (_e = props.accessibilityState) == null ? void 0 : _e.disabled,
+        hitSlop: props.hitSlop,
+        delayLongPress: props.delayLongPress,
+        delayPressIn: props.delayPressIn,
+        delayPressOut: props.delayPressOut,
+        focusable: viewProps.focusable ?? true,
+        minPressDuration: 0
+      }
     } : null;
-    const childEls = !children || asChild ? children : wrapThemeManagerContext(spacedChildren({
-      children,
-      space,
-      flexDirection: props.flexDirection || ((_b = staticConfig.defaultProps) == null ? void 0 : _b.flexDirection),
-      isZStack
-    }), getThemeManagerIfChanged(theme));
-    let content;
-    if (isWeb) {
-      if (staticConfig.isReactNativeWeb) {
-        viewProps.dataSet = {
-          ...viewProps.dataSet,
-          className: viewProps.className
-        };
-      } else {
-        const rnProps = rnw.createDOMProps(viewProps);
-        const className = rnProps.className && rnProps.className !== viewProps.className ? `${rnProps.className} ${viewProps.className}` : viewProps.className;
-        Object.assign(viewProps, rnProps);
-        if (className) {
-          viewProps.className = className;
+    let space = spaceProp;
+    if (state.mediaState && mediaKeys.length) {
+      for (const key in state.mediaState) {
+        if (!state.mediaState[key])
+          continue;
+        if (props[key] && props[key].space !== void 0) {
+          space = props[key].space;
         }
       }
     }
+    const themeManager = getThemeManager(theme);
+    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
+    );
+    let content;
     if (asChild) {
-      ViewComponent = Slot;
-      const onlyChild = React.Children.only(children);
-      Object.assign(viewProps, onlyChild.props);
-    }
-    if (isWeb) {
-      const [pressableProps] = usePressable(events ? {
-        disabled,
-        ...hitSlop && {
-          hitSlop
-        },
-        onPressOut: events[pressOutKey],
-        onPressIn: events[pressInKey],
-        onPress: events[pressKey]
-      } : {
-        disabled: true
-      });
+      elementType = Slot;
+      viewProps = {
+        ...viewProps,
+        onPress,
+        onPressIn,
+        onPressOut
+      };
+    }
+    if (!isRSC && isWeb) {
+      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);
@@ -433,90 +681,171 @@ function createComponent(configIn, ParentComponent) {
         }
       }
     }
-    content = createElement(ViewComponent, viewProps, childEls);
-    if (!isWeb) {
+    if (process.env.TAMAGUI_TARGET === "native") {
+      const attachFocus = !!(pseudos && pseudos.focusStyle || initialPseudos && initialPseudos.focusStyle);
+      if (attachFocus) {
+        viewProps.onFocus = mergeEvent(viewProps.onFocus, () => {
+          setStateShallow({ focus: true });
+        });
+        viewProps.onBlur = mergeEvent(viewProps.onBlur, () => {
+          setStateShallow({ focus: false });
+        });
+      }
+      const pressability = usePressability(events);
       if (attachPress && events) {
-        content = /* @__PURE__ */ React.createElement(Pressable, {
-          onPressIn: events[pressInKey],
-          onPress: events[pressKey]
-        }, /* @__PURE__ */ React.createElement(BaseButton, {
-          onActiveStateChange: (isActive) => {
-            if (!isActive) {
-              unPress();
-            }
-          }
-        }, content));
+        const dontComposePressabilityKeys = {
+          onClick: true
+        };
+        if (hitSlop) {
+          viewProps.hitSlop = hitSlop;
+        }
+        for (const key in pressability) {
+          const og = props[key];
+          const val = pressability[key];
+          viewProps[key] = og && !dontComposePressabilityKeys[key] ? composeEventHandlers(og, val) : val;
+        }
       }
     }
-    if (isWeb && events && attachHover) {
-      content = /* @__PURE__ */ React.createElement("span", {
-        className: "tui_Hoverable",
-        style: {
-          display: "contents"
-        },
-        onMouseEnter: events.onMouseEnter,
-        onMouseLeave: events.onMouseLeave
-      }, content);
+    content = createElement(elementType, viewProps, childEls);
+    if (process.env.TAMAGUI_TARGET === "web") {
+      const isAnimatedRNWView = isAnimated && typeof elementType !== "string";
+      const shouldWrapWithComponentTheme = !!theme.className && isAnimatedRNWView && getReturnVariablesAs(props, splitStyleState) === "non-color-value";
+      const shouldWrapWithHover = Boolean(events || isRSC) && attachHover;
+      if (shouldWrapWithHover || shouldWrapWithComponentTheme) {
+        const themeClassName = shouldWrapWithComponentTheme ? `${theme.className}` : "";
+        const hoverClassName = shouldWrapWithHover ? "t_Hoverable" : "";
+        content = /* @__PURE__ */ jsx("span", {
+          className: `${hoverClassName} ${themeClassName}`,
+          style: {
+            display: "contents"
+          },
+          ...events && shouldWrapWithHover && {
+            onMouseEnter: events.onMouseEnter,
+            onMouseLeave: events.onMouseLeave
+          },
+          children: content
+        });
+      }
     }
     if (process.env.NODE_ENV === "development") {
-      if (props["debug"]) {
-        console.log("  \xBB ", { propsIn: { ...props }, propsOut: { ...viewProps }, state, splitStyles, animationStyles, isStringElement, classNamesIn: (_c = props.className) == null ? void 0 : _c.split(" "), classNamesOut: (_d = viewProps.className) == null ? void 0 : _d.split(" "), events, shouldAttach, ViewComponent, viewProps, styles, pseudos, content, childEls, shouldAvoidClasses, avoidClasses, animation: props.animation, style, defaultNativeStyle, initialSplitStyles, ...typeof window !== "undefined" ? { theme, themeState: theme.__state, themeClassName: theme.className, staticConfig, tamaguiConfig } : null });
+      if (debugProp) {
+        const element2 = typeof elementType === "string" ? elementType : "Component";
+        console.groupCollapsed(`render <${element2} /> with props`, viewProps);
+        for (const key in viewProps) {
+          console.log(key, viewProps[key]);
+        }
+        console.log("children", content);
+        console.groupEnd();
+        if (typeof window !== "undefined") {
+          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: splitStylesStyle, 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();
       }
     }
-    if (features.length) {
-      return /* @__PURE__ */ React.createElement(React.Fragment, null, features, content);
-    }
     return content;
   });
-  component.displayName = staticConfig.componentName;
+  if (staticConfig.componentName) {
+    component.displayName = staticConfig.componentName;
+  }
   onConfiguredOnce((conf) => {
-    var _a, _b, _c, _d;
-    if (process.env.IS_STATIC === "is_static") {
-      return;
+    if (!defaultComponentState) {
+      defaultComponentState = Object.freeze({
+        hover: false,
+        press: false,
+        pressIn: false,
+        focus: false,
+        mounted: false,
+        animation: null,
+        mediaState: getInitialMediaState()
+      });
     }
+    if (process.env.IS_STATIC === "is_static")
+      return;
     tamaguiConfig = conf;
     mergeShorthands(staticConfig, tamaguiConfig);
-    avoidClasses = !!((_a = tamaguiConfig.animations) == null ? void 0 : _a.avoidClasses);
-    AnimatedText = (_b = tamaguiConfig.animations) == null ? void 0 : _b.Text;
-    AnimatedView = (_c = tamaguiConfig == null ? void 0 : tamaguiConfig.animations) == null ? void 0 : _c.View;
-    initialTheme = initialTheme || proxyThemeVariables(conf.themes[conf.defaultTheme || Object.keys(conf.themes)[0]]);
-    initialSplitStyles = insertSplitStyles(staticConfig.defaultProps, staticConfig, initialTheme, {
-      mounted: true,
-      hover: false,
-      press: false,
-      pressIn: false,
-      focus: false,
-      resolveVariablesAs: "both",
-      keepVariantsAsProps: true
-    });
-    const defaults = {
-      ...component.defaultProps,
-      ...initialSplitStyles.viewProps
+    if (tamaguiConfig.animations) {
+      avoidClasses = !!tamaguiConfig.animations.avoidClasses;
+      AnimatedText = tamaguiConfig.animations.Text;
+      AnimatedView = tamaguiConfig.animations.View;
+    }
+    if (!initialTheme) {
+      const next = conf.themes[conf.defaultTheme || Object.keys(conf.themes)[0]];
+      initialTheme = proxyThemeVariables(next);
+      if (!initialTheme && process.env.NODE_ENV === "development") {
+        console.log(`Warning: Missing theme`);
+      }
+    }
+    config = getConfig();
+    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
+      );
+    }
+    const debug = defaultPropsIn["debug"];
+    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",
+        noClassNames: !staticConfig.acceptsClassName,
+        keepVariantsAsProps: true
+      },
+      void 0,
+      void 0,
+      debug
+    );
+    const [defaults2, defaultsClassnames] = mergeProps(
+      component.defaultProps,
+      initialSplitStyles.viewProps,
+      true
+    );
+    initialSplitStyles.classNames = {
+      ...parentClassNames,
+      ...defaultsClassnames,
+      ...initialSplitStyles.classNames
     };
     defaultNativeStyle = {};
-    const validStyles = staticConfig.validStyles || stylePropsView;
-    for (const key in staticConfig.defaultProps) {
-      const val = staticConfig.defaultProps[key];
-      if (typeof val === "string" && val[0] === "$" || !validStyles[key]) {
-        defaults[key] = val;
-      } else {
-        defaultNativeStyle[key] = val;
+    const validStyles2 = staticConfig.validStyles || stylePropsView;
+    if (!isWeb) {
+      for (const key in staticConfig.defaultProps) {
+        const val = staticConfig.defaultProps[key];
+        if (validPseudoKeys[key])
+          continue;
+        if (typeof val === "string" && val[0] === "$" || !validStyles2[key]) {
+          defaults2[key] = val;
+        } else {
+          defaultNativeStyle[key] = val;
+        }
       }
     }
-    defaultNativeStyleSheet = StyleSheet.create({
-      base: defaultNativeStyle
-    });
-    if (Object.keys(defaults).length) {
-      tamaguiDefaultProps = defaults;
+    if (Object.keys(defaults2).length) {
+      tamaguiDefaultProps = defaults2;
     }
-    if (process.env.NODE_ENV === "development" && ((_d = staticConfig.defaultProps) == null ? void 0 : _d.debug)) {
+    if (process.env.NODE_ENV === "development" && debug) {
       if (process.env.IS_STATIC !== "is_static") {
         console.log(`\u{1F41B} [${staticConfig.componentName || "Component"}]`, {
           staticConfig,
           initialSplitStyles,
           tamaguiDefaultProps,
           defaultNativeStyle,
-          defaults
+          defaults: defaults2,
+          defaultPropsIn
         });
       }
     }
@@ -525,41 +854,46 @@ function createComponent(configIn, ParentComponent) {
   if (configIn.memo) {
     res = memo(res);
   }
-  res["staticConfig"] = {
+  res.staticConfig = {
     validStyles: staticConfig.validStyles || stylePropsView,
     ...staticConfig
   };
-  if (process.env.NODE_ENV === "development") {
-    res["whyDidYouRender"] = true;
-  }
-  res["extractable"] = (Component, conf) => {
-    Component["staticConfig"] = extendStaticConfig({
-      Component,
-      ...conf,
-      neverFlatten: true,
-      defaultProps: {
-        ...Component.defaultProps,
-        ...conf == null ? void 0 : conf.defaultProps
-      }
-    }, res);
+  res.extractable = (Component, conf) => {
+    Component.staticConfig = extendStaticConfig(
+      {
+        Component,
+        ...conf,
+        neverFlatten: true,
+        isHOC: true,
+        defaultProps: {
+          ...Component.defaultProps,
+          ...conf == null ? void 0 : conf.defaultProps
+        }
+      },
+      res
+    );
     return Component;
   };
   return res;
 }
-__name(createComponent, "createComponent");
+const Unspaced = (props) => {
+  return props.children;
+};
+Unspaced["isUnspaced"] = true;
 const Spacer = createComponent({
   memo: true,
   componentName: "Spacer",
+  validStyles,
   defaultProps: {
     ...stackDefaultStyles,
+    tag: "span",
     size: true
   },
   variants: {
     size: {
       "...size": (size, { tokens }) => {
-        var _a;
         size = size == true ? "$true" : size;
-        const sizePx = (_a = tokens.size[size]) != null ? _a : size;
+        const sizePx = tokens.space[size] ?? size;
         return {
           width: sizePx,
           height: sizePx,
@@ -570,7 +904,7 @@ const Spacer = createComponent({
     },
     flex: {
       true: {
-        flex: 1
+        flexGrow: 1
       }
     },
     direction: {
@@ -581,75 +915,242 @@ const Spacer = createComponent({
       vertical: {
         width: 0,
         minWidth: 0
-      }
+      },
+      both: {}
     }
   },
   defaultVariants: {
-    direction: "horizontal"
+    direction: "both"
   }
 });
 function spacedChildren({
   isZStack,
   children,
   space,
-  flexDirection,
-  spaceFlex
+  direction,
+  spaceFlex,
+  separator
 }) {
-  var _a;
-  const childrenList = Array.isArray(children) ? children : Children.toArray(children);
-  const len = childrenList.length;
-  if (len <= 1) {
+  const hasSpace = !!(space || spaceFlex);
+  const hasSeparator = !(separator === void 0 || separator === null);
+  if (!hasSpace && !hasSeparator && !isZStack) {
+    return children;
+  }
+  const childrenList = Children.toArray(children);
+  if (childrenList.length <= 1 && !isZStack) {
     return childrenList;
   }
   const final = [];
   for (const [index, child] of childrenList.entries()) {
-    if (child === null || child === void 0 || child === false || Array.isArray(child) && child.length === 0) {
-      continue;
-    }
-    if (!child || child["key"] && !isZStack) {
+    const isEmpty = child === null || child === void 0 || Array.isArray(child) && child.length === 0;
+    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;
     }
-    if ((_a = child["type"]) == null ? void 0 : _a["isVisuallyHidden"]) {
+    if (isZStack) {
       continue;
     }
     const next = childrenList[index + 1];
-    if (next && space) {
-      final.push(/* @__PURE__ */ React.createElement(Spacer, {
-        key: `_${index}_spacer`,
-        direction: flexDirection === "row" || flexDirection === "row-reverse" ? "horizontal" : "vertical",
-        size: space,
-        ...spaceFlex && {
-          flex: spaceFlex
+    if (next && !isUnspaced(next)) {
+      if (separator) {
+        if (hasSpace) {
+          final.push(
+            createSpacer({
+              key: `_${index}_before_sep_spacer`,
+              direction,
+              space,
+              spaceFlex
+            })
+          );
         }
-      }));
+        final.push(
+          React.isValidElement(separator) ? React.cloneElement(separator, { key: `sep_${index}` }) : separator
+        );
+        if (hasSpace) {
+          final.push(
+            createSpacer({
+              key: `_${index}_after_sep_spacer`,
+              direction,
+              space,
+              spaceFlex
+            })
+          );
+        }
+      } else {
+        final.push(
+          createSpacer({
+            key: `_${index}_spacer`,
+            direction,
+            space,
+            spaceFlex
+          })
+        );
+      }
     }
   }
   return final;
 }
-__name(spacedChildren, "spacedChildren");
+function createSpacer({ key, direction, space, spaceFlex }) {
+  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 isWeb ? /* @__PURE__ */ React.createElement("div", {
-    style: {
-      position: "absolute",
-      top: 0,
-      left: 0,
-      right: 0,
-      bottom: 0
-    }
-  }, props.children) : /* @__PURE__ */ React.createElement(View, {
-    style: StyleSheet.absoluteFill
-  }, props.child);
+  return /* @__PURE__ */ jsx(View, {
+    pointerEvents: "box-none",
+    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;
+}
+const accessibilityRoleToWebRole = {
+  adjustable: "slider",
+  button: "button",
+  header: "heading",
+  image: "img",
+  imagebutton: null,
+  keyboardkey: null,
+  label: null,
+  link: "link",
+  none: "presentation",
+  search: "search",
+  summary: "region",
+  text: null
+};
+function addPseudoToStyles(styles, initialPseudos, pseudos, name, force = false) {
+  const pseudoStyle = pseudos[name];
+  const shouldNestObject = isWeb && name !== "enterStyle" && name !== "exitStyle";
+  const defaultPseudoStyle = initialPseudos[name];
+  const style = defaultPseudoStyle ? { ...defaultPseudoStyle, ...pseudoStyle } : pseudoStyle;
+  if (style) {
+    styles.push(shouldNestObject && !force ? { [name]: style } : style);
+  }
+}
+const DefaultProps = /* @__PURE__ */ new Map();
+function mergeConfigDefaultProps(name, props, configDefaults, parentNames, conf) {
+  const len = parentNames.length;
+  let prev;
+  for (let i = 0; i < len; i++) {
+    const n = parentNames[i];
+    if (!n)
+      continue;
+    if (DefaultProps.has(n)) {
+      prev = DefaultProps.get(n);
+      continue;
+    }
+    const props2 = configDefaults[n];
+    if (!props2) {
+      if (prev) {
+        DefaultProps.set(n, prev);
+      }
+      continue;
+    }
+    prev = mergeProps(prev || {}, props2, false, conf.inverseShorthands)[0];
+    DefaultProps.set(n, prev);
+  }
+  const ourDefaultsMerged = DefaultProps.get(name);
+  if (ourDefaultsMerged) {
+    return mergeProps(props, ourDefaultsMerged, false, conf.inverseShorthands)[0];
+  }
+  return props;
+}
+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") {
+        if (typeof val === "string") {
+          continue;
+        }
+        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];
+        }
+      }
+    }
+  }
+}
+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(AbsoluteFill, "AbsoluteFill");
 export {
-  AbsoluteFill,
   Spacer,
+  Unspaced,
+  accessibilityRoleToWebRole,
   createComponent,
   mouseUps,
+  processIDRefList,
   spacedChildren
 };
 //# sourceMappingURL=createComponent.js.map