tamagui 2.0.0-1768263773228 → 2.0.0-1768427228811

package/dist/native.cjs

@@ -9550,7 +9550,7 @@ var defaultOffset = {
 };
 var normalizeColor = function(color, opacity) {
   if (color) {
-    if (color[0] === "$") return color;
+    if (typeof color != "string" || color[0] === "$") return color;
     if (color.startsWith("var(")) ;
     else {
       var rgba3 = getRgba(color);
@@ -9562,8 +9562,10 @@ var normalizeColor = function(color, opacity) {
     return color;
   }
 }, getRgba = function(color) {
-  var colorNum = normalizeCSSColor(color);
-  if (colorNum != null) return rgba(colorNum);
+  if (typeof color == "string") {
+    var colorNum = normalizeCSSColor(color);
+    if (colorNum != null) return rgba(colorNum);
+  }
 };
 function normalizeShadow(param) {
   var {
@@ -10903,14 +10905,14 @@ function createComponent(staticConfig) {
     var {
       context: context2,
       isReactNative
-    } = staticConfig, debugProp = propsIn.debug, styledContextValue = context2 ? React.useContext(context2) : void 0, overriddenContextProps = null;
+    } = staticConfig, debugProp = propsIn.debug, styledContextValue = context2 ? React.useContext(context2) : void 0, overriddenContextProps = null, componentContext = React.useContext(ComponentContext);
     var props = propsIn;
     if (styledContextValue || defaultProps2) {
-      var [nextProps, overrides] = mergeComponentProps(defaultProps2, styledContextValue, propsIn);
+      var effectiveDefaults = defaultProps2, [nextProps, overrides] = mergeComponentProps(effectiveDefaults, styledContextValue, propsIn);
       nextProps && (props = nextProps), overriddenContextProps = overrides;
     }
     var componentName2 = props.componentName || staticConfig.componentName;
-    var componentContext = React.useContext(ComponentContext), groupContextParent = React.useContext(GroupContext), animationDriver = componentContext.animationDriver, useAnimations = animationDriver == null ? void 0 : animationDriver.useAnimations, componentState = useComponentState(props, (animationDriver == null ? void 0 : animationDriver.isStub) ? null : animationDriver, staticConfig), {
+    var groupContextParent = React.useContext(GroupContext), animationDriver = componentContext.animationDriver, useAnimations = animationDriver == null ? void 0 : animationDriver.useAnimations, componentState = useComponentState(props, (animationDriver == null ? void 0 : animationDriver.isStub) ? null : animationDriver, staticConfig), {
       disabled,
       groupName,
       hasAnimationProp,
@@ -13969,7 +13971,7 @@ function PortalHostNonNative(props) {
     deregisterHost: deregisterHost2
   } = usePortal(props.name);
   return useIsomorphicLayoutEffect(function() {
-    if (!(typeof window > "u")) return registerHost2(), function() {
+    return registerHost2(), function() {
       deregisterHost2();
     };
   }, []), render(forwardProps ? state.map(function(item) {
@@ -19718,7 +19720,7 @@ function resisted(y, minY) {
 var hiddenSize = 10000.1, relativeDimensionTo = "screen", SheetImplementationCustom = /* @__PURE__ */ React.forwardRef(function(props, forwardedRef) {
   var parentSheet = React.useContext(ParentSheetContext), {
     transition,
-    animationConfig: animationConfigProp,
+    transitionConfig: transitionConfigProp,
     modal = false,
     zIndex = parentSheet.zIndex + 1,
     moveOnKeyboardChange = false,
@@ -19747,9 +19749,9 @@ var hiddenSize = 10000.1, relativeDimensionTo = "screen", SheetImplementationCus
     animationDriver
   } = useConfiguration();
   if (!animationDriver) throw new Error("Sheet reqiures an animation driver to be set");
-  var animationConfig = (function() {
+  var transitionConfig = (function() {
     var _animationDriver_animations;
-    if (animationConfigProp) return animationConfigProp;
+    if (transitionConfigProp) return transitionConfigProp;
     var [animationProp, animationPropConfig] = transition ? Array.isArray(transition) ? transition : [transition] : [];
     return animationProp && !((_animationDriver_animations = animationDriver.animations) === null || _animationDriver_animations === void 0) && _animationDriver_animations[animationProp] ? __spreadValues(__spreadValues({}, animationDriver.animations[animationProp]), animationPropConfig) : null;
   })(), [isShowingInnerSheet, setIsShowingInnerSheet] = React.useState(false), shouldHideParentSheet = modal && isShowingInnerSheet && // if not using weird portal limitation we dont need to hide parent sheet
@@ -19797,7 +19799,7 @@ var hiddenSize = 10000.1, relativeDimensionTo = "screen", SheetImplementationCus
       var toValue = isHidden || position2 === -1 ? screenSize : positions[position2];
       at.current !== toValue && (at.current = toValue, stopSpring(), animatedNumber.setValue(toValue, __spreadValues({
         type: "spring"
-      }, animationConfig)));
+      }, transitionConfig)));
     }
   });
   useIsomorphicLayoutEffect(function() {
@@ -19883,10 +19885,10 @@ var hiddenSize = 10000.1, relativeDimensionTo = "screen", SheetImplementationCus
   }, [disableDrag, isShowingInnerSheet, animateTo, frameSize, positions, setPosition]), handleAnimationViewLayout = React.useCallback(function(e2) {
     var _e_nativeEvent;
     if (!(!open2 && stableFrameSize.current !== 0)) {
-      var next = Math.min((_e_nativeEvent = e2.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.layout.height, Dimensions2.get(relativeDimensionTo).height);
+      var layoutHeight = (_e_nativeEvent = e2.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.layout.height, next = modal ? Math.min(layoutHeight, Dimensions2.get(relativeDimensionTo).height) : layoutHeight;
       next && setFrameSize(next);
     }
-  }, [open2]), handleMaxContentViewLayout = React.useCallback(function(e2) {
+  }, [open2, modal]), handleMaxContentViewLayout = React.useCallback(function(e2) {
     var _e_nativeEvent, next = Math.min((_e_nativeEvent = e2.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.layout.height, Dimensions2.get(relativeDimensionTo).height);
     next && setMaxContentSize(next);
   }, []), animatedStyle = useAnimatedNumberStyle(animatedNumber, function(val) {
@@ -19927,7 +19929,10 @@ var hiddenSize = 10000.1, relativeDimensionTo = "screen", SheetImplementationCus
       };
     }
   }, [open2]);
-  var forcedContentHeight = hasFit ? void 0 : snapPointsMode === "percent" ? `${maxSnapPoint}${"%"}` : maxSnapPoint, setHasScrollView = React.useCallback(function(val) {
+  var forcedContentHeight = hasFit ? void 0 : snapPointsMode === "percent" ? (
+    // Use dvh for modal (viewport-relative), % for inline (container-relative)
+    `${maxSnapPoint}${"%"}`
+  ) : maxSnapPoint, setHasScrollView = React.useCallback(function(val) {
     hasScrollView.current = val;
   }, []), contents = /* @__PURE__ */ jsxRuntimeExports.jsx(LayoutMeasurementController, {
     disable: !open2,

package/dist/test.cjs

@@ -9932,7 +9932,7 @@ var defaultOffset = {
 };
 var normalizeColor = function(color, opacity) {
   if (color) {
-    if (color[0] === "$") return color;
+    if (typeof color != "string" || color[0] === "$") return color;
     if (color.startsWith("var(")) ;
     else {
       var rgba3 = getRgba(color);
@@ -9944,8 +9944,10 @@ var normalizeColor = function(color, opacity) {
     return color;
   }
 }, getRgba = function(color) {
-  var colorNum = normalizeCSSColor(color);
-  if (colorNum != null) return rgba(colorNum);
+  if (typeof color == "string") {
+    var colorNum = normalizeCSSColor(color);
+    if (colorNum != null) return rgba(colorNum);
+  }
 };
 function normalizeShadow(param) {
   var {
@@ -11291,14 +11293,14 @@ function createComponent(staticConfig) {
     var {
       context: context2,
       isReactNative
-    } = staticConfig, debugProp = propsIn.debug, styledContextValue = context2 ? React.useContext(context2) : void 0, overriddenContextProps = null;
+    } = staticConfig, debugProp = propsIn.debug, styledContextValue = context2 ? React.useContext(context2) : void 0, overriddenContextProps = null, componentContext = React.useContext(ComponentContext);
     var props = propsIn;
     if (styledContextValue || defaultProps2) {
-      var [nextProps, overrides] = mergeComponentProps(defaultProps2, styledContextValue, propsIn);
+      var effectiveDefaults = defaultProps2, [nextProps, overrides] = mergeComponentProps(effectiveDefaults, styledContextValue, propsIn);
       nextProps && (props = nextProps), overriddenContextProps = overrides;
     }
     var componentName2 = props.componentName || staticConfig.componentName;
-    var componentContext = React.useContext(ComponentContext), groupContextParent = React.useContext(GroupContext), animationDriver = componentContext.animationDriver, useAnimations = animationDriver == null ? void 0 : animationDriver.useAnimations, componentState = useComponentState(props, (animationDriver == null ? void 0 : animationDriver.isStub) ? null : animationDriver, staticConfig), {
+    var groupContextParent = React.useContext(GroupContext), animationDriver = componentContext.animationDriver, useAnimations = animationDriver == null ? void 0 : animationDriver.useAnimations, componentState = useComponentState(props, (animationDriver == null ? void 0 : animationDriver.isStub) ? null : animationDriver, staticConfig), {
       disabled,
       groupName,
       hasAnimationProp,
@@ -14162,7 +14164,7 @@ function PortalHostNonNative(props) {
     deregisterHost: deregisterHost2
   } = usePortal(props.name);
   return useIsomorphicLayoutEffect(function() {
-    if (!(typeof window > "u")) return registerHost2(), function() {
+    return registerHost2(), function() {
       deregisterHost2();
     };
   }, []), render(forwardProps ? state.map(function(item) {
@@ -19911,7 +19913,7 @@ function resisted(y, minY) {
 var hiddenSize = 10000.1, relativeDimensionTo = "screen", SheetImplementationCustom = /* @__PURE__ */ React.forwardRef(function(props, forwardedRef) {
   var parentSheet = React.useContext(ParentSheetContext), {
     transition,
-    animationConfig: animationConfigProp,
+    transitionConfig: transitionConfigProp,
     modal = false,
     zIndex = parentSheet.zIndex + 1,
     moveOnKeyboardChange = false,
@@ -19940,9 +19942,9 @@ var hiddenSize = 10000.1, relativeDimensionTo = "screen", SheetImplementationCus
     animationDriver
   } = useConfiguration();
   if (!animationDriver) throw new Error("Sheet reqiures an animation driver to be set");
-  var animationConfig = (function() {
+  var transitionConfig = (function() {
     var _animationDriver_animations;
-    if (animationConfigProp) return animationConfigProp;
+    if (transitionConfigProp) return transitionConfigProp;
     var [animationProp, animationPropConfig] = transition ? Array.isArray(transition) ? transition : [transition] : [];
     return animationProp && !((_animationDriver_animations = animationDriver.animations) === null || _animationDriver_animations === void 0) && _animationDriver_animations[animationProp] ? __spreadValues(__spreadValues({}, animationDriver.animations[animationProp]), animationPropConfig) : null;
   })(), [isShowingInnerSheet, setIsShowingInnerSheet] = React.useState(false), shouldHideParentSheet = modal && isShowingInnerSheet && // if not using weird portal limitation we dont need to hide parent sheet
@@ -19990,7 +19992,7 @@ var hiddenSize = 10000.1, relativeDimensionTo = "screen", SheetImplementationCus
       var toValue = isHidden || position2 === -1 ? screenSize : positions[position2];
       at.current !== toValue && (at.current = toValue, stopSpring(), animatedNumber.setValue(toValue, __spreadValues({
         type: "spring"
-      }, animationConfig)));
+      }, transitionConfig)));
     }
   });
   useIsomorphicLayoutEffect(function() {
@@ -20076,10 +20078,10 @@ var hiddenSize = 10000.1, relativeDimensionTo = "screen", SheetImplementationCus
   }, [disableDrag, isShowingInnerSheet, animateTo, frameSize, positions, setPosition]), handleAnimationViewLayout = React.useCallback(function(e2) {
     var _e_nativeEvent;
     if (!(!open2 && stableFrameSize.current !== 0)) {
-      var next = Math.min((_e_nativeEvent = e2.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.layout.height, Dimensions2.get(relativeDimensionTo).height);
+      var layoutHeight = (_e_nativeEvent = e2.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.layout.height, next = modal ? Math.min(layoutHeight, Dimensions2.get(relativeDimensionTo).height) : layoutHeight;
       next && setFrameSize(next);
     }
-  }, [open2]), handleMaxContentViewLayout = React.useCallback(function(e2) {
+  }, [open2, modal]), handleMaxContentViewLayout = React.useCallback(function(e2) {
     var _e_nativeEvent, next = Math.min((_e_nativeEvent = e2.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.layout.height, Dimensions2.get(relativeDimensionTo).height);
     next && setMaxContentSize(next);
   }, []), animatedStyle = useAnimatedNumberStyle(animatedNumber, function(val) {
@@ -20120,7 +20122,10 @@ var hiddenSize = 10000.1, relativeDimensionTo = "screen", SheetImplementationCus
       };
     }
   }, [open2]);
-  var forcedContentHeight = hasFit ? void 0 : snapPointsMode === "percent" ? `${maxSnapPoint}${"%"}` : maxSnapPoint, setHasScrollView = React.useCallback(function(val) {
+  var forcedContentHeight = hasFit ? void 0 : snapPointsMode === "percent" ? (
+    // Use dvh for modal (viewport-relative), % for inline (container-relative)
+    `${maxSnapPoint}${"%"}`
+  ) : maxSnapPoint, setHasScrollView = React.useCallback(function(val) {
     hasScrollView.current = val;
   }, []), contents = /* @__PURE__ */ jsxRuntimeExports.jsx(LayoutMeasurementController, {
     disable: !open2,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tamagui",
-  "version": "2.0.0-1768263773228",
+  "version": "2.0.0-1768427228811",
   "type": "module",
   "description": "Style and UI for React (web and native) meet an optimizing compiler",
   "removeSideEffects": true,
@@ -88,64 +88,64 @@
     }
   },
   "dependencies": {
-    "@tamagui/accordion": "2.0.0-1768263773228",
-    "@tamagui/adapt": "2.0.0-1768263773228",
-    "@tamagui/alert-dialog": "2.0.0-1768263773228",
-    "@tamagui/animate-presence": "2.0.0-1768263773228",
-    "@tamagui/avatar": "2.0.0-1768263773228",
-    "@tamagui/button": "2.0.0-1768263773228",
-    "@tamagui/card": "2.0.0-1768263773228",
-    "@tamagui/checkbox": "2.0.0-1768263773228",
-    "@tamagui/compose-refs": "2.0.0-1768263773228",
-    "@tamagui/constants": "2.0.0-1768263773228",
-    "@tamagui/core": "2.0.0-1768263773228",
-    "@tamagui/create-context": "2.0.0-1768263773228",
-    "@tamagui/dialog": "2.0.0-1768263773228",
-    "@tamagui/elements": "2.0.0-1768263773228",
-    "@tamagui/fake-react-native": "2.0.0-1768263773228",
-    "@tamagui/focusable": "2.0.0-1768263773228",
-    "@tamagui/font-size": "2.0.0-1768263773228",
-    "@tamagui/form": "2.0.0-1768263773228",
-    "@tamagui/get-button-sized": "2.0.0-1768263773228",
-    "@tamagui/get-font-sized": "2.0.0-1768263773228",
-    "@tamagui/get-token": "2.0.0-1768263773228",
-    "@tamagui/group": "2.0.0-1768263773228",
-    "@tamagui/helpers-tamagui": "2.0.0-1768263773228",
-    "@tamagui/image": "2.0.0-1768263773228",
-    "@tamagui/input": "2.0.0-1768263773228",
-    "@tamagui/label": "2.0.0-1768263773228",
-    "@tamagui/linear-gradient": "2.0.0-1768263773228",
-    "@tamagui/list-item": "2.0.0-1768263773228",
-    "@tamagui/polyfill-dev": "2.0.0-1768263773228",
-    "@tamagui/popover": "2.0.0-1768263773228",
-    "@tamagui/popper": "2.0.0-1768263773228",
-    "@tamagui/portal": "2.0.0-1768263773228",
-    "@tamagui/progress": "2.0.0-1768263773228",
-    "@tamagui/radio-group": "2.0.0-1768263773228",
-    "@tamagui/react-native-media-driver": "2.0.0-1768263773228",
-    "@tamagui/scroll-view": "2.0.0-1768263773228",
-    "@tamagui/select": "2.0.0-1768263773228",
-    "@tamagui/separator": "2.0.0-1768263773228",
-    "@tamagui/shapes": "2.0.0-1768263773228",
-    "@tamagui/sheet": "2.0.0-1768263773228",
-    "@tamagui/slider": "2.0.0-1768263773228",
-    "@tamagui/spacer": "2.0.0-1768263773228",
-    "@tamagui/stacks": "2.0.0-1768263773228",
-    "@tamagui/switch": "2.0.0-1768263773228",
-    "@tamagui/tabs": "2.0.0-1768263773228",
-    "@tamagui/text": "2.0.0-1768263773228",
-    "@tamagui/theme": "2.0.0-1768263773228",
-    "@tamagui/toggle-group": "2.0.0-1768263773228",
-    "@tamagui/tooltip": "2.0.0-1768263773228",
-    "@tamagui/use-controllable-state": "2.0.0-1768263773228",
-    "@tamagui/use-debounce": "2.0.0-1768263773228",
-    "@tamagui/use-force-update": "2.0.0-1768263773228",
-    "@tamagui/use-window-dimensions": "2.0.0-1768263773228",
-    "@tamagui/visually-hidden": "2.0.0-1768263773228",
-    "@tamagui/z-index-stack": "2.0.0-1768263773228"
+    "@tamagui/accordion": "2.0.0-1768427228811",
+    "@tamagui/adapt": "2.0.0-1768427228811",
+    "@tamagui/alert-dialog": "2.0.0-1768427228811",
+    "@tamagui/animate-presence": "2.0.0-1768427228811",
+    "@tamagui/avatar": "2.0.0-1768427228811",
+    "@tamagui/button": "2.0.0-1768427228811",
+    "@tamagui/card": "2.0.0-1768427228811",
+    "@tamagui/checkbox": "2.0.0-1768427228811",
+    "@tamagui/compose-refs": "2.0.0-1768427228811",
+    "@tamagui/constants": "2.0.0-1768427228811",
+    "@tamagui/core": "2.0.0-1768427228811",
+    "@tamagui/create-context": "2.0.0-1768427228811",
+    "@tamagui/dialog": "2.0.0-1768427228811",
+    "@tamagui/elements": "2.0.0-1768427228811",
+    "@tamagui/fake-react-native": "2.0.0-1768427228811",
+    "@tamagui/focusable": "2.0.0-1768427228811",
+    "@tamagui/font-size": "2.0.0-1768427228811",
+    "@tamagui/form": "2.0.0-1768427228811",
+    "@tamagui/get-button-sized": "2.0.0-1768427228811",
+    "@tamagui/get-font-sized": "2.0.0-1768427228811",
+    "@tamagui/get-token": "2.0.0-1768427228811",
+    "@tamagui/group": "2.0.0-1768427228811",
+    "@tamagui/helpers-tamagui": "2.0.0-1768427228811",
+    "@tamagui/image": "2.0.0-1768427228811",
+    "@tamagui/input": "2.0.0-1768427228811",
+    "@tamagui/label": "2.0.0-1768427228811",
+    "@tamagui/linear-gradient": "2.0.0-1768427228811",
+    "@tamagui/list-item": "2.0.0-1768427228811",
+    "@tamagui/polyfill-dev": "2.0.0-1768427228811",
+    "@tamagui/popover": "2.0.0-1768427228811",
+    "@tamagui/popper": "2.0.0-1768427228811",
+    "@tamagui/portal": "2.0.0-1768427228811",
+    "@tamagui/progress": "2.0.0-1768427228811",
+    "@tamagui/radio-group": "2.0.0-1768427228811",
+    "@tamagui/react-native-media-driver": "2.0.0-1768427228811",
+    "@tamagui/scroll-view": "2.0.0-1768427228811",
+    "@tamagui/select": "2.0.0-1768427228811",
+    "@tamagui/separator": "2.0.0-1768427228811",
+    "@tamagui/shapes": "2.0.0-1768427228811",
+    "@tamagui/sheet": "2.0.0-1768427228811",
+    "@tamagui/slider": "2.0.0-1768427228811",
+    "@tamagui/spacer": "2.0.0-1768427228811",
+    "@tamagui/stacks": "2.0.0-1768427228811",
+    "@tamagui/switch": "2.0.0-1768427228811",
+    "@tamagui/tabs": "2.0.0-1768427228811",
+    "@tamagui/text": "2.0.0-1768427228811",
+    "@tamagui/theme": "2.0.0-1768427228811",
+    "@tamagui/toggle-group": "2.0.0-1768427228811",
+    "@tamagui/tooltip": "2.0.0-1768427228811",
+    "@tamagui/use-controllable-state": "2.0.0-1768427228811",
+    "@tamagui/use-debounce": "2.0.0-1768427228811",
+    "@tamagui/use-force-update": "2.0.0-1768427228811",
+    "@tamagui/use-window-dimensions": "2.0.0-1768427228811",
+    "@tamagui/visually-hidden": "2.0.0-1768427228811",
+    "@tamagui/z-index-stack": "2.0.0-1768427228811"
   },
   "devDependencies": {
-    "@tamagui/build": "2.0.0-1768263773228",
+    "@tamagui/build": "2.0.0-1768427228811",
     "react": "*",
     "react-native": "0.81.5",
     "react-native-web": "^0.21.0"