tamagui 1.116.4 → 1.116.6

package/dist/native.js

@@ -3132,21 +3132,18 @@ var require_useMedia_native = __commonJS({
         listeners.delete(subscriber);
       };
     }
+    var CurrentKeysMap = /* @__PURE__ */ new WeakMap();
     function useMedia3(cc, debug) {
-      var disableSSR = (0, import_config.getSetting)("disableSSR") || (0, import_useDisableSSR.getDisableSSR)(cc), initialState = disableSSR || !import_constants4.isWeb ? mediaState3 : initState, [state, setState] = import_react3.default.useState(initialState), currentKeys, getCurrentKeys = function() {
-        return currentKeys;
-      };
+      var disableSSR = (0, import_config.getSetting)("disableSSR") || (0, import_useDisableSSR.getDisableSSR)(cc), initialState = disableSSR || !import_constants4.isWeb ? mediaState3 : initState, [state, setState] = import_react3.default.useState(initialState);
+      CurrentKeysMap.get(setState) || CurrentKeysMap.set(setState, /* @__PURE__ */ new Set());
+      var currentKeys = CurrentKeysMap.get(setState);
       function getSnapshot(cur) {
-        var keys = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : cur.lastKeys;
-        if (!keys) return cur;
+        if (!currentKeys) return cur;
         var _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
         try {
-          for (var _iterator = keys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
+          for (var _iterator = currentKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
             var key = _step.value;
-            if (mediaState3[key] !== cur[key]) return process.env.NODE_ENV === "development" && debug && console.warn("useMedia()\u270D\uFE0F", key, cur[key], ">", mediaState3[key]), {
-              ...mediaState3,
-              lastKeys: new Set(keys)
-            };
+            if (mediaState3[key] !== cur[key]) return process.env.NODE_ENV === "development" && debug && console.warn("useMedia()\u270D\uFE0F", key, cur[key], ">", mediaState3[key]), mediaState3;
           }
         } catch (err) {
           _didIteratorError = !0, _iteratorError = err;
@@ -3165,22 +3162,26 @@ var require_useMedia_native = __commonJS({
       }), (0, import_constants4.useIsomorphicLayoutEffect)(function() {
         var update = function() {
           return setState(function(prev) {
-            return getSnapshot(
-              prev,
-              // because the !didHydrateOnce logic we can't update as we render
-              // we need to get the current keys in case we added
-              // these only ever add keys so likely ok?
-              getCurrentKeys()
-            );
+            var next = getSnapshot(prev);
+            return next;
           });
         };
-        return update(), subscribe(update);
-      }, []), new Proxy(state, {
+        update();
+        var tm = setTimeout(function() {
+          currentKeys.size && update();
+        }), dispose2 = subscribe(update);
+        return function() {
+          dispose2(), clearTimeout(tm);
+        };
+      }, [
+        setState
+      ]), new Proxy(state, {
         get(_, key) {
           if (isRendering && !disableMediaTouch && typeof key == "string") {
-            var needsUpdateKeys = !state.lastKeys || !state.lastKeys.has(key);
-            if ((needsUpdateKeys || state[key] !== mediaState3[key]) && (process.env.NODE_ENV === "development" && debug && console.info("useMedia() TOUCH", key), currentKeys || (currentKeys = /* @__PURE__ */ new Set()), currentKeys.add(key), !isInitialState)) {
-              var next = getSnapshot(state, currentKeys);
+            currentKeys.add(key);
+            var shouldUpdate = state[key] !== mediaState3[key];
+            if (shouldUpdate && (process.env.NODE_ENV === "development" && debug && console.info("useMedia() TOUCH", key), !isInitialState)) {
+              var next = getSnapshot(state);
               next !== state && setState(next);
             }
           }
@@ -15715,14 +15716,19 @@ var require_GorhomPortal_native = __commonJS({
       }) : /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PortalHostNonNative, {
         ...props
       });
-    }), allPortalHosts = /* @__PURE__ */ new Map();
+    }), allPortalHosts = /* @__PURE__ */ new Map(), listeners = {};
     function PortalHostWeb(props) {
       return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("div", {
         style: {
           display: "contents"
         },
         ref: function(node) {
-          node ? allPortalHosts.set(props.name, node) : allPortalHosts.delete(props.name);
+          if (node) {
+            var _listeners_props_name;
+            allPortalHosts.set(props.name, node), (_listeners_props_name = listeners[props.name]) === null || _listeners_props_name === void 0 || _listeners_props_name.forEach(function(x) {
+              return x(node);
+            });
+          } else allPortalHosts.delete(props.name);
         }
       });
     }
@@ -15752,8 +15758,21 @@ var require_GorhomPortal_native = __commonJS({
       });
     }), PortalItemWeb = function(props) {
       if (!props.hostName) throw new Error("No name");
-      var hostNode = allPortalHosts.get(props.hostName);
-      return hostNode ? /* @__PURE__ */ (0, import_react_dom.createPortal)(props.children, hostNode) : null;
+      var cur = allPortalHosts.get(props.hostName), [node, setNode] = (0, import_react3.useState)(cur);
+      return cur && !node && setNode(cur), (0, import_react3.useEffect)(function() {
+        var _listeners, _props_hostName;
+        if (props.hostName && !node) {
+          var listener = function(node2) {
+            setNode(node2);
+          };
+          return (_listeners = listeners)[_props_hostName = props.hostName] || (_listeners[_props_hostName] = /* @__PURE__ */ new Set()), listeners[props.hostName].add(listener), function() {
+            var _listeners_props_hostName;
+            (_listeners_props_hostName = listeners[props.hostName]) === null || _listeners_props_hostName === void 0 || _listeners_props_hostName.delete(listener);
+          };
+        }
+      }, [
+        node
+      ]), node ? /* @__PURE__ */ (0, import_react_dom.createPortal)(props.children, node) : null;
     }, NonNativePortalComponent = function(props) {
       var { name: _providedName, hostName, handleOnMount: _providedHandleOnMount, handleOnUnmount: _providedHandleOnUnmount, handleOnUpdate: _providedHandleOnUpdate, children, passthrough } = props, { addPortal: addUpdatePortal2, removePortal: removePortal2 } = usePortal(hostName), id = (0, import_react3.useId)(), name = _providedName || id, handleOnMount = (0, import_core12.useEvent)(function() {
         _providedHandleOnMount ? _providedHandleOnMount(function() {
@@ -16161,8 +16180,10 @@ var require_Adapt_native = __commonJS({
         children: props.children
       });
     }, useAdaptIsActiveGiven = function(param) {
-      var { when, platform: platform2 } = param, media = (0, import_core12.useMedia)(), enabled = !platform2;
-      return platform2 === "touch" && (enabled = import_constants4.isTouchable), platform2 === "native" && (enabled = !import_constants4.isWeb), platform2 === "web" && (enabled = import_constants4.isWeb), platform2 === "ios" && (enabled = import_constants4.isIos), platform2 === "android" && (enabled = import_constants4.isAndroid), when && typeof when == "string" && !media[when] && (enabled = !1), enabled;
+      var { when, platform: platform2 } = param, media = (0, import_core12.useMedia)();
+      if (when == null && platform2 == null) return !1;
+      var enabled = !1;
+      return platform2 === "touch" ? enabled = import_constants4.isTouchable : platform2 === "native" ? enabled = !import_constants4.isWeb : platform2 === "web" ? enabled = import_constants4.isWeb : platform2 === "ios" ? enabled = import_constants4.isIos : platform2 === "android" && (enabled = import_constants4.isAndroid), platform2 && enabled == !1 ? !1 : (when && typeof when == "string" && (enabled = media[when]), enabled);
     }, useAdaptIsActive = function(scope) {
       var props = useAdaptContext(scope);
       return useAdaptIsActiveGiven(props);
@@ -18734,17 +18755,17 @@ var require_Dialog_native = __commonJS({
         })
       });
     }, DialogPortal = function(props) {
-      var { __scopeDialog, forceMount, children, ...frameProps } = props, context = useDialogContext(PORTAL_NAME, __scopeDialog), isShowing = forceMount || context.open, [isFullyHidden, setIsFullyHidden] = React4.useState(!isShowing);
+      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);
-      }, []), contents = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_animate_presence.AnimatePresence, {
-        onExitComplete: handleExitComplete,
-        children: isShowing ? children : null
-      }), isAdapted = (0, import_adapt.useAdaptIsActive)();
-      if (isAdapted) return children;
+      }, []);
       if (context.modal) {
-        if (isFullyHidden) return null;
+        var contents = /* @__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,
@@ -18765,7 +18786,7 @@ var require_Dialog_native = __commonJS({
         }
         return framedContents;
       }
-      return contents;
+      return children;
     }, PassthroughTheme = function(param) {
       var { children } = param, themeName = (0, import_core12.useThemeName)();
       return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_core12.Theme, {