tamagui 1.126.3 → 1.126.4-1746355141077

package/dist/native.js

@@ -6997,14 +6997,16 @@ var require_mergeProps_native = __commonJS({
     };
     function mergeProp(out, a, b, key, inverseShorthands) {
       var longhand = (inverseShorthands == null ? void 0 : inverseShorthands[key]) || null, val = a[key];
-      if (key in import_pseudoDescriptors.pseudoDescriptors || import_useMedia.mediaKeys.has(key)) {
-        out[key] = {
-          ...out[key],
-          ...val
-        };
-        return;
+      if (!(b && (key in b || longhand && longhand in b))) {
+        if (key in import_pseudoDescriptors.pseudoDescriptors || import_useMedia.mediaKeys.has(key)) {
+          out[key] = {
+            ...out[key],
+            ...val
+          };
+          return;
+        }
+        out[longhand || key] = val;
       }
-      b && (key in b || longhand && longhand in b) || (out[longhand || key] = val);
     }
   }
 });
@@ -16939,8 +16941,9 @@ var require_Adapt_native = __commonJS({
       }, [
         when,
         platform2,
-        context,
-        enabled
+        enabled,
+        context.setWhen,
+        context.setPlatform
       ]), (0, import_constants4.useIsomorphicLayoutEffect)(function() {
         return function() {
           var _context_setWhen, _context_setPlatform;
@@ -18398,9 +18401,9 @@ var require_SheetImplementationCustom_native = __commonJS({
           });
         }, previouslyScrolling = !1, onMoveShouldSet = function(e, param) {
           var { dy } = param;
-          if (e.target === providerProps.handleRef.current || !scrollEnabled.current || !hasScrollView.current) return !0;
+          if (e.target === providerProps.handleRef.current || !scrollEnabled.current) return !0;
           var isScrolled = scrollBridge.y !== 0, isDraggingUp = dy < 0, isNearTop = scrollBridge.paneY - 5 <= scrollBridge.paneMinY;
-          return isScrolled ? (previouslyScrolling = !0, !1) : isNearTop && scrollEnabled.current && isDraggingUp ? !1 : Math.abs(dy) > 5;
+          return isScrolled ? (previouslyScrolling = !0, !1) : isNearTop && scrollEnabled.current && hasScrollView.current && isDraggingUp ? !1 : Math.abs(dy) > 10;
         }, grant = function() {
           setScrollEnabled(!1), setPanning(!0), stopSpring(), startY = at.current;
         }, isExternalDrag = !1;
@@ -19569,48 +19572,44 @@ var require_Dialog_native = __commonJS({
       });
       return isAdapted ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_adapt.AdaptPortalContents, {
         children: content
-      }) : /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_portal2.PortalItem, {
-        hostName: context.adaptName,
+      }) : context.modal ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_portal2.PortalItem, {
+        hostName: context.modal ? "root" : context.adaptName,
         children: content
-      });
+      }) : content;
     }, DialogPortal = function(props) {
       var { __scopeDialog, forceMount, children, ...frameProps } = props, context = useDialogContext(PORTAL_NAME, __scopeDialog), isShowing = forceMount || context.open, [isFullyHidden, setIsFullyHidden] = React4.useState(!isShowing), isAdapted = (0, import_adapt.useAdaptIsActive)();
       isShowing && isFullyHidden && setIsFullyHidden(!1);
       var handleExitComplete = React4.useCallback(function() {
         setIsFullyHidden(!0);
-      }, []), zIndex = (0, import_core12.getExpandedShorthand)("zIndex", props);
-      if (context.modal) {
-        var contents = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_z_index_stack2.StackZIndexContext, {
-          zIndex: (0, import_portal2.resolveViewZIndex)(zIndex),
-          children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_animate_presence.AnimatePresence, {
-            onExitComplete: handleExitComplete,
-            children: isShowing || isAdapted ? children : null
-          })
-        });
-        if (isFullyHidden && !isAdapted) return null;
-        var framedContents = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PortalProvider2, {
-          scope: __scopeDialog,
-          forceMount,
-          children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(DialogPortalFrame, {
-            pointerEvents: isShowing ? "auto" : "none",
-            ...frameProps,
-            children: contents
-          })
-        });
-        return import_constants4.isWeb ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_portal2.Portal, {
-          zIndex,
-          // set to 1000 which "boosts" it 1000 above baseline for current context
-          // this makes sure its above (this first 1k) popovers on the same layer
-          stackZIndex: 1e3,
-          children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PassthroughTheme, {
-            children: framedContents
-          })
-        }) : isAdapted ? framedContents : /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(DialogPortalItem, {
-          __scopeDialog,
+      }, []), zIndex = (0, import_core12.getExpandedShorthand)("zIndex", props), contents = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_z_index_stack2.StackZIndexContext, {
+        zIndex: (0, import_portal2.resolveViewZIndex)(zIndex),
+        children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_animate_presence.AnimatePresence, {
+          onExitComplete: handleExitComplete,
+          children: isShowing || isAdapted ? children : null
+        })
+      });
+      if (isFullyHidden && !isAdapted) return null;
+      var framedContents = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PortalProvider2, {
+        scope: __scopeDialog,
+        forceMount,
+        children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(DialogPortalFrame, {
+          pointerEvents: isShowing ? "auto" : "none",
+          ...frameProps,
+          children: contents
+        })
+      });
+      return import_constants4.isWeb ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_portal2.Portal, {
+        zIndex,
+        // set to 1000 which "boosts" it 1000 above baseline for current context
+        // this makes sure its above (this first 1k) popovers on the same layer
+        stackZIndex: 1e3,
+        children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PassthroughTheme, {
           children: framedContents
-        });
-      }
-      return children;
+        })
+      }) : isAdapted ? framedContents : /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(DialogPortalItem, {
+        __scopeDialog,
+        children: framedContents
+      });
     }, PassthroughTheme = function(param) {
       var { children } = param, themeName = (0, import_core12.useThemeName)();
       return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_core12.Theme, {
@@ -19624,6 +19623,11 @@ var require_Dialog_native = __commonJS({
       var { __scopeDialog, ...props } = param, portalContext = usePortalContext(OVERLAY_NAME, __scopeDialog), { forceMount = portalContext.forceMount, ...overlayProps } = props, context = useDialogContext(OVERLAY_NAME, __scopeDialog), isAdapted = (0, import_adapt.useAdaptIsActive)();
       return !forceMount && (!context.modal || isAdapted) ? null : /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(DialogOverlayFrame, {
         "data-state": getState(context.open),
+        // TODO: this will be apply for v2
+        // onPress={() => {
+        //   // if the overlay is pressed, close the dialog
+        //   context.onOpenChange(false)
+        // }}
         // We re-enable pointer-events prevented by `Dialog.Content` to allow scrolling the overlay.
         pointerEvents: context.open ? "auto" : "none",
         ...overlayProps,