@tamagui/adapt 1.130.8 → 1.131.1

package/dist/cjs/Adapt.cjs

@@ -41,15 +41,14 @@ __export(Adapt_exports, {
   useAdaptIsActive: () => useAdaptIsActive
 });
 module.exports = __toCommonJS(Adapt_exports);
-var import_z_index_stack = require("@tamagui/z-index-stack"),
-  import_constants = require("@tamagui/constants"),
+var import_constants = require("@tamagui/constants"),
   import_core = require("@tamagui/core"),
   import_helpers = require("@tamagui/helpers"),
   import_portal = require("@tamagui/portal"),
+  import_z_index_stack = require("@tamagui/z-index-stack"),
   import_react = __toESM(require("react")),
   import_jsx_runtime = require("react/jsx-runtime");
-const CurrentAdaptContextScope = (0, import_react.createContext)(""),
-  AdaptContext = (0, import_core.createStyledContext)({
+const AdaptContext = (0, import_core.createStyledContext)({
     Contents: null,
     scopeName: "",
     portalName: "",
@@ -59,23 +58,27 @@ const CurrentAdaptContextScope = (0, import_react.createContext)(""),
     setChildren: null,
     setWhen: () => {}
   }),
+  LastAdaptContextScope = (0, import_react.createContext)(""),
   ProvideAdaptContext = ({
     children,
     ...context
   }) => {
-    const scope = context.scopeName || "";
-    return /* @__PURE__ */(0, import_jsx_runtime.jsx)(CurrentAdaptContextScope.Provider, {
-      value: scope,
+    const scope = context.scopeName || "",
+      lastScope = (0, import_react.useContext)(LastAdaptContextScope);
+    return /* @__PURE__ */(0, import_jsx_runtime.jsx)(LastAdaptContextScope.Provider, {
+      value: lastScope || context.lastScope || "",
       children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(AdaptContext.Provider, {
         scope,
+        lastScope: lastScope || context.lastScope,
         ...context,
         children
       })
     });
   },
-  useAdaptContext = (scope = "") => {
-    const contextScope = (0, import_react.useContext)(CurrentAdaptContextScope);
-    return AdaptContext.useStyledContext(scope === "" && contextScope || scope);
+  useAdaptContext = scope => {
+    const lastScope = (0, import_react.useContext)(LastAdaptContextScope),
+      adaptScope = scope ?? lastScope;
+    return AdaptContext.useStyledContext(adaptScope);
   },
   AdaptPortals = /* @__PURE__ */new Map(),
   AdaptParent = ({
@@ -84,28 +87,36 @@ const CurrentAdaptContextScope = (0, import_react.createContext)(""),
     scope,
     portal
   }) => {
-    const portalName = `AdaptPortal${scope}`,
-      id = (0, import_react.useId)();
-    let FinalContents = Contents || AdaptPortals.get(id);
-    FinalContents || (FinalContents = () => /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_portal.PortalHost, {
-      name: portalName,
-      forwardProps: typeof portal == "boolean" ? void 0 : portal?.forwardProps
-    }), AdaptPortals.set(id, FinalContents)), (0, import_react.useEffect)(() => () => {
-      AdaptPortals.delete(id);
-    }, []);
+    const id = (0, import_react.useId)(),
+      portalName = `AdaptPortal${scope}${id}`,
+      FinalContents = (0, import_react.useMemo)(() => {
+        if (Contents) return Contents;
+        if (AdaptPortals.has(portalName)) return AdaptPortals.get(portalName);
+        const element = () => /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_portal.PortalHost, {
+          name: portalName,
+          forwardProps: typeof portal == "boolean" ? void 0 : portal?.forwardProps
+        }, id);
+        return AdaptPortals.set(portalName, element), element;
+      }, [portalName, Contents]);
+    (0, import_constants.useIsomorphicLayoutEffect)(() => (AdaptPortals.set(portalName, FinalContents), () => {
+      AdaptPortals.delete(portalName);
+    }), [portalName]);
     const [when, setWhen] = import_react.default.useState(null),
       [platform, setPlatform] = import_react.default.useState(null),
       [children2, setChildren] = import_react.default.useState(null);
-    return /* @__PURE__ */(0, import_jsx_runtime.jsx)(ProvideAdaptContext, {
-      Contents: FinalContents,
-      when,
-      platform,
-      setPlatform,
-      setWhen,
-      setChildren,
-      portalName,
-      scopeName: scope,
-      children
+    return /* @__PURE__ */(0, import_jsx_runtime.jsx)(LastAdaptContextScope, {
+      value: scope,
+      children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(ProvideAdaptContext, {
+        Contents: FinalContents,
+        when,
+        platform,
+        setPlatform,
+        setWhen,
+        setChildren,
+        portalName,
+        scopeName: scope,
+        children
+      })
     });
   },
   AdaptContents = ({
@@ -128,7 +139,6 @@ const Adapt = (0, import_helpers.withStaticProperties)(function (props) {
         scope
       } = props,
       context = useAdaptContext(scope),
-      scopeName = scope ?? context.scopeName,
       enabled = useAdaptIsActiveGiven(props);
     (0, import_constants.useIsomorphicLayoutEffect)(() => {
       context?.setWhen?.(when || enabled), context?.setPlatform?.(platform || null);
@@ -143,10 +153,7 @@ const Adapt = (0, import_helpers.withStaticProperties)(function (props) {
     return (0, import_constants.useIsomorphicLayoutEffect)(() => {
       typeof children == "function" && output !== void 0 && context?.setChildren(output);
     }, [output]), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_z_index_stack.StackZIndexContext, {
-      children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(CurrentAdaptContextScope.Provider, {
-        value: scopeName,
-        children: enabled ? output : null
-      })
+      children: enabled ? output : null
     });
   }, {
     Contents: AdaptContents
@@ -168,6 +175,7 @@ const Adapt = (0, import_helpers.withStaticProperties)(function (props) {
   }) => {
     const media = (0, import_core.useMedia)();
     if (when == null && platform == null) return !1;
+    if (when === !0) return !0;
     let enabled = !1;
     return platform === "touch" ? enabled = import_constants.isTouchable : platform === "native" ? enabled = !import_constants.isWeb : platform === "web" ? enabled = import_constants.isWeb : platform === "ios" ? enabled = import_constants.isIos : platform === "android" && (enabled = import_constants.isAndroid), platform && enabled == !1 ? !1 : (when && typeof when == "string" && (enabled = media[when]), enabled);
   },

package/dist/cjs/Adapt.js

@@ -32,8 +32,8 @@ __export(Adapt_exports, {
   useAdaptIsActive: () => useAdaptIsActive
 });
 module.exports = __toCommonJS(Adapt_exports);
-var import_z_index_stack = require("@tamagui/z-index-stack"), import_constants = require("@tamagui/constants"), import_core = require("@tamagui/core"), import_helpers = require("@tamagui/helpers"), import_portal = require("@tamagui/portal"), import_react = __toESM(require("react")), import_jsx_runtime = require("react/jsx-runtime");
-const CurrentAdaptContextScope = (0, import_react.createContext)(""), AdaptContext = (0, import_core.createStyledContext)({
+var import_constants = require("@tamagui/constants"), import_core = require("@tamagui/core"), import_helpers = require("@tamagui/helpers"), import_portal = require("@tamagui/portal"), import_z_index_stack = require("@tamagui/z-index-stack"), import_react = __toESM(require("react")), import_jsx_runtime = require("react/jsx-runtime");
+const AdaptContext = (0, import_core.createStyledContext)({
   Contents: null,
   scopeName: "",
   portalName: "",
@@ -44,31 +44,44 @@ const CurrentAdaptContextScope = (0, import_react.createContext)(""), AdaptConte
   setChildren: null,
   setWhen: () => {
   }
-}), ProvideAdaptContext = ({
+}), LastAdaptContextScope = (0, import_react.createContext)(""), ProvideAdaptContext = ({
   children,
   ...context
 }) => {
-  const scope = context.scopeName || "";
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CurrentAdaptContextScope.Provider, { value: scope, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AdaptContext.Provider, { scope, ...context, children }) });
-}, useAdaptContext = (scope = "") => {
-  const contextScope = (0, import_react.useContext)(CurrentAdaptContextScope);
-  return AdaptContext.useStyledContext(
-    scope === "" && contextScope || scope
-  );
-}, AdaptPortals = /* @__PURE__ */ new Map(), AdaptParent = ({ children, Contents, scope, portal }) => {
-  const portalName = `AdaptPortal${scope}`, id = (0, import_react.useId)();
-  let FinalContents = Contents || AdaptPortals.get(id);
-  FinalContents || (FinalContents = () => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-    import_portal.PortalHost,
+  const scope = context.scopeName || "", lastScope = (0, import_react.useContext)(LastAdaptContextScope);
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LastAdaptContextScope.Provider, { value: lastScope || context.lastScope || "", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+    AdaptContext.Provider,
     {
-      name: portalName,
-      forwardProps: typeof portal == "boolean" ? void 0 : portal?.forwardProps
+      scope,
+      lastScope: lastScope || context.lastScope,
+      ...context,
+      children
     }
-  ), AdaptPortals.set(id, FinalContents)), (0, import_react.useEffect)(() => () => {
-    AdaptPortals.delete(id);
-  }, []);
+  ) });
+}, useAdaptContext = (scope) => {
+  const lastScope = (0, import_react.useContext)(LastAdaptContextScope), adaptScope = scope ?? lastScope;
+  return AdaptContext.useStyledContext(adaptScope);
+}, AdaptPortals = /* @__PURE__ */ new Map(), AdaptParent = ({ children, Contents, scope, portal }) => {
+  const id = (0, import_react.useId)(), portalName = `AdaptPortal${scope}${id}`, FinalContents = (0, import_react.useMemo)(() => {
+    if (Contents)
+      return Contents;
+    if (AdaptPortals.has(portalName))
+      return AdaptPortals.get(portalName);
+    const element = () => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+      import_portal.PortalHost,
+      {
+        name: portalName,
+        forwardProps: typeof portal == "boolean" ? void 0 : portal?.forwardProps
+      },
+      id
+    );
+    return AdaptPortals.set(portalName, element), element;
+  }, [portalName, Contents]);
+  (0, import_constants.useIsomorphicLayoutEffect)(() => (AdaptPortals.set(portalName, FinalContents), () => {
+    AdaptPortals.delete(portalName);
+  }), [portalName]);
   const [when, setWhen] = import_react.default.useState(null), [platform, setPlatform] = import_react.default.useState(null), [children2, setChildren] = import_react.default.useState(null);
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LastAdaptContextScope, { value: scope, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
     ProvideAdaptContext,
     {
       Contents: FinalContents,
@@ -81,7 +94,7 @@ const CurrentAdaptContextScope = (0, import_react.createContext)(""), AdaptConte
       scopeName: scope,
       children
     }
-  );
+  ) });
 }, AdaptContents = ({ scope, ...rest }) => {
   const context = useAdaptContext(scope);
   if (!context?.Contents)
@@ -93,7 +106,7 @@ const CurrentAdaptContextScope = (0, import_react.createContext)(""), AdaptConte
 AdaptContents.shouldForwardSpace = !0;
 const Adapt = (0, import_helpers.withStaticProperties)(
   function(props) {
-    const { platform, when, children, scope } = props, context = useAdaptContext(scope), scopeName = scope ?? context.scopeName, enabled = useAdaptIsActiveGiven(props);
+    const { platform, when, children, scope } = props, context = useAdaptContext(scope), enabled = useAdaptIsActiveGiven(props);
     (0, import_constants.useIsomorphicLayoutEffect)(() => {
       context?.setWhen?.(when || enabled), context?.setPlatform?.(platform || null);
     }, [when, platform, enabled, context.setWhen, context.setPlatform]), (0, import_constants.useIsomorphicLayoutEffect)(() => () => {
@@ -107,7 +120,7 @@ const Adapt = (0, import_helpers.withStaticProperties)(
       output = children;
     return (0, import_constants.useIsomorphicLayoutEffect)(() => {
       typeof children == "function" && output !== void 0 && context?.setChildren(output);
-    }, [output]), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_z_index_stack.StackZIndexContext, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CurrentAdaptContextScope.Provider, { value: scopeName, children: enabled ? output : null }) });
+    }, [output]), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_z_index_stack.StackZIndexContext, { children: enabled ? output : null });
   },
   {
     Contents: AdaptContents
@@ -122,6 +135,8 @@ const Adapt = (0, import_helpers.withStaticProperties)(
   const media = (0, import_core.useMedia)();
   if (when == null && platform == null)
     return !1;
+  if (when === !0)
+    return !0;
   let enabled = !1;
   return platform === "touch" ? enabled = import_constants.isTouchable : platform === "native" ? enabled = !import_constants.isWeb : platform === "web" ? enabled = import_constants.isWeb : platform === "ios" ? enabled = import_constants.isIos : platform === "android" && (enabled = import_constants.isAndroid), platform && enabled == !1 ? !1 : (when && typeof when == "string" && (enabled = media[when]), enabled);
 }, useAdaptIsActive = (scope) => {

package/dist/cjs/Adapt.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Adapt.tsx"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["React"]
 }

package/dist/cjs/Adapt.native.js

@@ -33,7 +33,7 @@ __export(Adapt_exports, {
   useAdaptIsActive: () => useAdaptIsActive
 });
 module.exports = __toCommonJS(Adapt_exports);
-var import_jsx_runtime = require("react/jsx-runtime"), import_z_index_stack = require("@tamagui/z-index-stack"), import_constants = require("@tamagui/constants"), import_core = require("@tamagui/core"), import_helpers = require("@tamagui/helpers"), import_portal = require("@tamagui/portal"), import_react = __toESM(require("react")), CurrentAdaptContextScope = /* @__PURE__ */ (0, import_react.createContext)(""), AdaptContext = (0, import_core.createStyledContext)({
+var import_jsx_runtime = require("react/jsx-runtime"), import_constants = require("@tamagui/constants"), import_core = require("@tamagui/core"), import_helpers = require("@tamagui/helpers"), import_portal = require("@tamagui/portal"), import_z_index_stack = require("@tamagui/z-index-stack"), import_react = __toESM(require("react")), AdaptContext = (0, import_core.createStyledContext)({
   Contents: null,
   scopeName: "",
   portalName: "",
@@ -44,42 +44,58 @@ var import_jsx_runtime = require("react/jsx-runtime"), import_z_index_stack = re
   setChildren: null,
   setWhen: function() {
   }
-}), ProvideAdaptContext = function(param) {
-  var { children, ...context } = param, scope = context.scopeName || "";
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CurrentAdaptContextScope.Provider, {
-    value: scope,
+}), LastAdaptContextScope = /* @__PURE__ */ (0, import_react.createContext)(""), ProvideAdaptContext = function(param) {
+  var { children, ...context } = param, scope = context.scopeName || "", lastScope = (0, import_react.useContext)(LastAdaptContextScope);
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LastAdaptContextScope.Provider, {
+    value: lastScope || context.lastScope || "",
     children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AdaptContext.Provider, {
       scope,
+      lastScope: lastScope || context.lastScope,
       ...context,
       children
     })
   });
-}, useAdaptContext = function() {
-  var scope = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "", contextScope = (0, import_react.useContext)(CurrentAdaptContextScope), context = AdaptContext.useStyledContext(scope === "" && contextScope || scope);
-  return context;
+}, useAdaptContext = function(scope) {
+  var lastScope = (0, import_react.useContext)(LastAdaptContextScope), adaptScope = scope ?? lastScope;
+  return AdaptContext.useStyledContext(adaptScope);
 }, AdaptPortals = /* @__PURE__ */ new Map(), AdaptParent = function(param) {
-  var { children, Contents, scope, portal } = param, portalName = `AdaptPortal${scope}`, id = (0, import_react.useId)(), FinalContents = Contents || AdaptPortals.get(id);
-  FinalContents || (FinalContents = function() {
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_portal.PortalHost, {
-      name: portalName,
-      forwardProps: typeof portal == "boolean" || portal == null ? void 0 : portal.forwardProps
-    });
-  }, AdaptPortals.set(id, FinalContents)), (0, import_react.useEffect)(function() {
-    return function() {
-      AdaptPortals.delete(id);
+  var { children, Contents, scope, portal } = param, id = (0, import_react.useId)(), portalName = `AdaptPortal${scope}${id}`, FinalContents = (0, import_react.useMemo)(function() {
+    if (Contents)
+      return Contents;
+    if (AdaptPortals.has(portalName))
+      return AdaptPortals.get(portalName);
+    var element = function() {
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_portal.PortalHost, {
+        name: portalName,
+        forwardProps: typeof portal == "boolean" || portal == null ? void 0 : portal.forwardProps
+      }, id);
     };
-  }, []);
-  var [when, setWhen] = import_react.default.useState(null), [platform, setPlatform] = import_react.default.useState(null), [children2, setChildren] = import_react.default.useState(null);
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProvideAdaptContext, {
-    Contents: FinalContents,
-    when,
-    platform,
-    setPlatform,
-    setWhen,
-    setChildren,
+    return AdaptPortals.set(portalName, element), element;
+  }, [
     portalName,
-    scopeName: scope,
-    children
+    Contents
+  ]);
+  (0, import_constants.useIsomorphicLayoutEffect)(function() {
+    return AdaptPortals.set(portalName, FinalContents), function() {
+      AdaptPortals.delete(portalName);
+    };
+  }, [
+    portalName
+  ]);
+  var [when, setWhen] = import_react.default.useState(null), [platform, setPlatform] = import_react.default.useState(null), [children2, setChildren] = import_react.default.useState(null);
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LastAdaptContextScope, {
+    value: scope,
+    children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProvideAdaptContext, {
+      Contents: FinalContents,
+      when,
+      platform,
+      setPlatform,
+      setWhen,
+      setChildren,
+      portalName,
+      scopeName: scope,
+      children
+    })
   });
 }, AdaptContents = function(param) {
   var { scope, ...rest } = param, context = useAdaptContext(scope);
@@ -92,7 +108,7 @@ var import_jsx_runtime = require("react/jsx-runtime"), import_z_index_stack = re
 };
 AdaptContents.shouldForwardSpace = !0;
 var Adapt = (0, import_helpers.withStaticProperties)(function(props) {
-  var { platform, when, children, scope } = props, context = useAdaptContext(scope), scopeName = scope ?? context.scopeName, enabled = useAdaptIsActiveGiven(props);
+  var { platform, when, children, scope } = props, context = useAdaptContext(scope), enabled = useAdaptIsActiveGiven(props);
   (0, import_constants.useIsomorphicLayoutEffect)(function() {
     var _context_setWhen, _context_setPlatform;
     context == null || (_context_setWhen = context.setWhen) === null || _context_setWhen === void 0 || _context_setWhen.call(context, when || enabled), context == null || (_context_setPlatform = context.setPlatform) === null || _context_setPlatform === void 0 || _context_setPlatform.call(context, platform || null);
@@ -119,10 +135,7 @@ var Adapt = (0, import_helpers.withStaticProperties)(function(props) {
   }, [
     output
   ]), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_z_index_stack.StackZIndexContext, {
-    children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CurrentAdaptContextScope.Provider, {
-      value: scopeName,
-      children: enabled ? output : null
-    })
+    children: enabled ? output : null
   });
 }, {
   Contents: AdaptContents
@@ -137,6 +150,8 @@ var Adapt = (0, import_helpers.withStaticProperties)(function(props) {
   var { when, platform } = param, media = (0, import_core.useMedia)();
   if (when == null && platform == null)
     return !1;
+  if (when === !0)
+    return !0;
   var enabled = !1;
   return platform === "touch" ? enabled = import_constants.isTouchable : platform === "native" ? enabled = !import_constants.isWeb : platform === "web" ? enabled = import_constants.isWeb : platform === "ios" ? enabled = import_constants.isIos : platform === "android" && (enabled = import_constants.isAndroid), platform && enabled == !1 ? !1 : (when && typeof when == "string" && (enabled = media[when]), enabled);
 }, useAdaptIsActive = function(scope) {

package/dist/cjs/Adapt.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Adapt.tsx"],
-  "mappings": "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",
-  "names": ["CurrentAdaptContextScope", "createContext", "AdaptContext", "createStyledContext", "Contents", "scopeName", "portalName", "platform", "setPlatform", "x", "when", "setChildren", "setWhen", "ProvideAdaptContext", "children", "context", "scope", "_jsx", "Provider", "value", "useAdaptContext", "contextScope", "useContext", "useStyledContext", "AdaptPortals", "Map", "AdaptParent", "portal", "id", "useId", "FinalContents", "get", "PortalHost", "name", "forwardProps", "undefined", "set", "useEffect", "delete", "React", "useState", "children2", "AdaptContents", "rest", "Error", "process", "env", "NODE_ENV", "createElement", "key", "shouldForwardSpace", "Adapt", "withStaticProperties", "props", "enabled", "useAdaptIsActiveGiven", "useIsomorphicLayoutEffect", "output", "Component", "StackZIndexContext", "AdaptPortalContents", "isActive", "useAdaptIsActive", "PortalItem", "passThrough", "hostName", "media", "useMedia", "isTouchable", "isWeb", "isIos", "isAndroid"]
+  "mappings": "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",
+  "names": ["AdaptContext", "createStyledContext", "Contents", "scopeName", "portalName", "platform", "setPlatform", "x", "when", "setChildren", "setWhen", "LastAdaptContextScope", "createContext", "ProvideAdaptContext", "children", "context", "scope", "lastScope", "useContext", "_jsx", "Provider", "value", "useAdaptContext", "adaptScope", "useStyledContext", "AdaptPortals", "Map", "AdaptParent", "portal", "id", "useId", "FinalContents", "useMemo", "has", "get", "element", "PortalHost", "name", "forwardProps", "undefined", "set", "useIsomorphicLayoutEffect", "delete", "React", "useState", "children2", "AdaptContents", "rest", "Error", "process", "env", "NODE_ENV", "createElement", "key", "shouldForwardSpace", "Adapt", "withStaticProperties", "props", "enabled", "useAdaptIsActiveGiven", "output", "Component", "StackZIndexContext", "AdaptPortalContents", "isActive", "useAdaptIsActive", "PortalItem", "passThrough", "hostName", "media", "useMedia", "isTouchable", "isWeb", "isIos", "isAndroid"]
 }

package/dist/cjs/index.cjs

@@ -15,4 +15,4 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
 }), mod);
 var index_exports = {};
 module.exports = __toCommonJS(index_exports);
-__reExport(index_exports, require("./Adapt"), module.exports);
+__reExport(index_exports, require("./Adapt.cjs"), module.exports);

package/dist/esm/Adapt.js

@@ -1,4 +1,3 @@
-import { StackZIndexContext } from "@tamagui/z-index-stack";
 import {
   isAndroid,
   isIos,
@@ -9,9 +8,10 @@ import {
 import { createStyledContext, useMedia } from "@tamagui/core";
 import { withStaticProperties } from "@tamagui/helpers";
 import { PortalHost, PortalItem } from "@tamagui/portal";
-import React, { createContext, useContext, useEffect, useId } from "react";
+import { StackZIndexContext } from "@tamagui/z-index-stack";
+import React, { createContext, useContext, useId, useMemo } from "react";
 import { jsx } from "react/jsx-runtime";
-const CurrentAdaptContextScope = createContext(""), AdaptContext = createStyledContext({
+const AdaptContext = createStyledContext({
   Contents: null,
   scopeName: "",
   portalName: "",
@@ -22,31 +22,44 @@ const CurrentAdaptContextScope = createContext(""), AdaptContext = createStyledC
   setChildren: null,
   setWhen: () => {
   }
-}), ProvideAdaptContext = ({
+}), LastAdaptContextScope = createContext(""), ProvideAdaptContext = ({
   children,
   ...context
 }) => {
-  const scope = context.scopeName || "";
-  return /* @__PURE__ */ jsx(CurrentAdaptContextScope.Provider, { value: scope, children: /* @__PURE__ */ jsx(AdaptContext.Provider, { scope, ...context, children }) });
-}, useAdaptContext = (scope = "") => {
-  const contextScope = useContext(CurrentAdaptContextScope);
-  return AdaptContext.useStyledContext(
-    scope === "" && contextScope || scope
-  );
-}, AdaptPortals = /* @__PURE__ */ new Map(), AdaptParent = ({ children, Contents, scope, portal }) => {
-  const portalName = `AdaptPortal${scope}`, id = useId();
-  let FinalContents = Contents || AdaptPortals.get(id);
-  FinalContents || (FinalContents = () => /* @__PURE__ */ jsx(
-    PortalHost,
+  const scope = context.scopeName || "", lastScope = useContext(LastAdaptContextScope);
+  return /* @__PURE__ */ jsx(LastAdaptContextScope.Provider, { value: lastScope || context.lastScope || "", children: /* @__PURE__ */ jsx(
+    AdaptContext.Provider,
     {
-      name: portalName,
-      forwardProps: typeof portal == "boolean" ? void 0 : portal?.forwardProps
+      scope,
+      lastScope: lastScope || context.lastScope,
+      ...context,
+      children
     }
-  ), AdaptPortals.set(id, FinalContents)), useEffect(() => () => {
-    AdaptPortals.delete(id);
-  }, []);
+  ) });
+}, useAdaptContext = (scope) => {
+  const lastScope = useContext(LastAdaptContextScope), adaptScope = scope ?? lastScope;
+  return AdaptContext.useStyledContext(adaptScope);
+}, AdaptPortals = /* @__PURE__ */ new Map(), AdaptParent = ({ children, Contents, scope, portal }) => {
+  const id = useId(), portalName = `AdaptPortal${scope}${id}`, FinalContents = useMemo(() => {
+    if (Contents)
+      return Contents;
+    if (AdaptPortals.has(portalName))
+      return AdaptPortals.get(portalName);
+    const element = () => /* @__PURE__ */ jsx(
+      PortalHost,
+      {
+        name: portalName,
+        forwardProps: typeof portal == "boolean" ? void 0 : portal?.forwardProps
+      },
+      id
+    );
+    return AdaptPortals.set(portalName, element), element;
+  }, [portalName, Contents]);
+  useIsomorphicLayoutEffect(() => (AdaptPortals.set(portalName, FinalContents), () => {
+    AdaptPortals.delete(portalName);
+  }), [portalName]);
   const [when, setWhen] = React.useState(null), [platform, setPlatform] = React.useState(null), [children2, setChildren] = React.useState(null);
-  return /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsx(LastAdaptContextScope, { value: scope, children: /* @__PURE__ */ jsx(
     ProvideAdaptContext,
     {
       Contents: FinalContents,
@@ -59,7 +72,7 @@ const CurrentAdaptContextScope = createContext(""), AdaptContext = createStyledC
       scopeName: scope,
       children
     }
-  );
+  ) });
 }, AdaptContents = ({ scope, ...rest }) => {
   const context = useAdaptContext(scope);
   if (!context?.Contents)
@@ -71,7 +84,7 @@ const CurrentAdaptContextScope = createContext(""), AdaptContext = createStyledC
 AdaptContents.shouldForwardSpace = !0;
 const Adapt = withStaticProperties(
   function(props) {
-    const { platform, when, children, scope } = props, context = useAdaptContext(scope), scopeName = scope ?? context.scopeName, enabled = useAdaptIsActiveGiven(props);
+    const { platform, when, children, scope } = props, context = useAdaptContext(scope), enabled = useAdaptIsActiveGiven(props);
     useIsomorphicLayoutEffect(() => {
       context?.setWhen?.(when || enabled), context?.setPlatform?.(platform || null);
     }, [when, platform, enabled, context.setWhen, context.setPlatform]), useIsomorphicLayoutEffect(() => () => {
@@ -85,7 +98,7 @@ const Adapt = withStaticProperties(
       output = children;
     return useIsomorphicLayoutEffect(() => {
       typeof children == "function" && output !== void 0 && context?.setChildren(output);
-    }, [output]), /* @__PURE__ */ jsx(StackZIndexContext, { children: /* @__PURE__ */ jsx(CurrentAdaptContextScope.Provider, { value: scopeName, children: enabled ? output : null }) });
+    }, [output]), /* @__PURE__ */ jsx(StackZIndexContext, { children: enabled ? output : null });
   },
   {
     Contents: AdaptContents
@@ -100,6 +113,8 @@ const Adapt = withStaticProperties(
   const media = useMedia();
   if (when == null && platform == null)
     return !1;
+  if (when === !0)
+    return !0;
   let enabled = !1;
   return platform === "touch" ? enabled = isTouchable : platform === "native" ? enabled = !isWeb : platform === "web" ? enabled = isWeb : platform === "ios" ? enabled = isIos : platform === "android" && (enabled = isAndroid), platform && enabled == !1 ? !1 : (when && typeof when == "string" && (enabled = media[when]), enabled);
 }, useAdaptIsActive = (scope) => {

package/dist/esm/Adapt.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Adapt.tsx"],
-  "mappings": "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",
+  "mappings": "AAAA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,SAAS,qBAAqB,gBAAgB;AAC9C,SAAS,4BAA4B;AACrC,SAAS,YAAY,kBAAkB;AACvC,SAAS,0BAA0B;AACnC,OAAO,SAAS,eAAe,YAAY,OAAO,eAAe;AAsD3D;AAtBC,MAAM,eAAe,oBAAyC;AAAA,EACnE,UAAU;AAAA,EACV,WAAW;AAAA,EACX,YAAY;AAAA,EACZ,UAAU;AAAA,EACV,aAAa,CAAC,MAAqB;AAAA,EAAC;AAAA,EACpC,MAAM;AAAA,EACN,aAAa;AAAA,EACb,SAAS,MAAM;AAAA,EAAC;AAClB,CAAC,GAEK,wBAAwB,cAAc,EAAE,GAEjC,sBAAsB,CAAC;AAAA,EAClC;AAAA,EACA,GAAG;AACL,MAA+C;AAC7C,QAAM,QAAQ,QAAQ,aAAa,IAC7B,YAAY,WAAW,qBAAqB;AAElD,SACE,oBAAC,sBAAsB,UAAtB,EAA+B,OAAO,aAAa,QAAQ,aAAa,IACvE;AAAA,IAAC,aAAa;AAAA,IAAb;AAAA,MACC;AAAA,MACA,WAAW,aAAa,QAAQ;AAAA,MAC/B,GAAG;AAAA,MAEH;AAAA;AAAA,EACH,GACF;AAEJ,GAEa,kBAAkB,CAAC,UAAmB;AACjD,QAAM,YAAY,WAAW,qBAAqB,GAC5C,aAAa,SAAS;AAC5B,SAAO,aAAa,iBAAiB,UAAU;AACjD,GAiBM,eAAe,oBAAI,IAAI,GAEhB,cAAc,CAAC,EAAE,UAAU,UAAU,OAAO,OAAO,MAAwB;AACtF,QAAM,KAAK,MAAM,GACX,aAAa,cAAc,KAAK,GAAG,EAAE,IAErC,gBAAgB,QAAQ,MAAM;AAClC,QAAI;AACF,aAAO;AAET,QAAI,aAAa,IAAI,UAAU;AAC7B,aAAO,aAAa,IAAI,UAAU;AAEpC,UAAM,UAAU,MAEZ;AAAA,MAAC;AAAA;AAAA,QAEC,MAAM;AAAA,QACN,cAAc,OAAO,UAAW,YAAY,SAAY,QAAQ;AAAA;AAAA,MAF3D;AAAA,IAGP;AAGJ,wBAAa,IAAI,YAAY,OAAO,GAC7B;AAAA,EACT,GAAG,CAAC,YAAY,QAAQ,CAAC;AAEzB,4BAA0B,OACxB,aAAa,IAAI,YAAY,aAAa,GACnC,MAAM;AACX,iBAAa,OAAO,UAAU;AAAA,EAChC,IACC,CAAC,UAAU,CAAC;AAEf,QAAM,CAAC,MAAM,OAAO,IAAI,MAAM,SAAoB,IAAI,GAChD,CAAC,UAAU,WAAW,IAAI,MAAM,SAAwB,IAAI,GAG5D,CAAC,WAAW,WAAW,IAAI,MAAM,SAAS,IAAI;AAEpD,SACE,oBAAC,yBAAsB,OAAO,OAC5B;AAAA,IAAC;AAAA;AAAA,MACC,UAAU;AAAA,MACV;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,WAAW;AAAA,MAEV;AAAA;AAAA,EACH,GACF;AAEJ,GAMa,gBAAgB,CAAC,EAAE,OAAO,GAAG,KAAK,MAA0B;AACvE,QAAM,UAAU,gBAAgB,KAAK;AAErC,MAAI,CAAC,SAAS;AACZ,UAAM,IAAI;AAAA,MACR,QAAQ,IAAI,aAAa,eACrB,8CACA;AAAA,IACN;AAIF,SAAO,MAAM,cAAc,QAAQ,UAAU,EAAE,GAAG,MAAM,KAAK,SAAS,CAAC;AACzE;AAEA,cAAc,qBAAqB;AAE5B,MAAM,QAAQ;AAAA,EACnB,SAAe,OAAmB;AAChC,UAAM,EAAE,UAAU,MAAM,UAAU,MAAM,IAAI,OACtC,UAAU,gBAAgB,KAAK,GAC/B,UAAU,sBAAsB,KAAK;AAE3C,8BAA0B,MAAM;AAC9B,eAAS,UAAW,QAAQ,OAAqB,GACjD,SAAS,cAAc,YAAY,IAAI;AAAA,IACzC,GAAG,CAAC,MAAM,UAAU,SAAS,QAAQ,SAAS,QAAQ,WAAW,CAAC,GAElE,0BAA0B,MACjB,MAAM;AACX,eAAS,UAAU,IAAI,GACvB,SAAS,cAAc,IAAI;AAAA,IAC7B,GACC,CAAC,CAAC;AAEL,QAAI;AAEJ,QAAI,OAAO,YAAa,YAAY;AAClC,YAAM,YAAY,SAAS;AAC3B,eAAS,SAAS,YAAY,oBAAC,aAAU,IAAK,IAAI;AAAA,IACpD;AACE,eAAS;AAKX,qCAA0B,MAAM;AAC9B,MAAI,OAAO,YAAa,cAAc,WAAW,UAC/C,SAAS,YAAY,MAAM;AAAA,IAE/B,GAAG,CAAC,MAAM,CAAC,GAEJ,oBAAC,sBAAoB,UAAC,UAAiB,SAAP,MAAc;AAAA,EACvD;AAAA,EACA;AAAA,IACE,UAAU;AAAA,EACZ;AACF,GAEa,sBAAsB,CAAC,UAI9B;AACJ,QAAM,WAAW,iBAAiB,MAAM,KAAK,GACvC,EAAE,WAAW,IAAI,gBAAgB,MAAM,KAAK;AAElD,SACE,oBAAC,cAAW,aAAa,CAAC,UAAU,UAAU,YAC3C,gBAAM,UACT;AAEJ,GAEM,wBAAwB,CAAC;AAAA,EAC7B;AAAA,EACA;AACF,MAA6C;AAC3C,QAAM,QAAQ,SAAS;AAEvB,MAAI,QAAQ,QAAQ,YAAY;AAC9B,WAAO;AAGT,MAAI,SAAS;AACX,WAAO;AAGT,MAAI,UAAU;AAQd,SANI,aAAa,UAAS,UAAU,cAC3B,aAAa,WAAU,UAAU,CAAC,QAClC,aAAa,QAAO,UAAU,QAC9B,aAAa,QAAO,UAAU,QAC9B,aAAa,cAAW,UAAU,YAEvC,YAAY,WAAW,KAClB,MAGL,QAAQ,OAAO,QAAS,aAC1B,UAAU,MAAM,IAAI,IAGf;AACT,GAEa,mBAAmB,CAAC,UAAmB;AAClD,QAAM,QAAQ,gBAAgB,KAAK;AACnC,SAAO,sBAAsB,KAAK;AACpC;",
   "names": []
 }

package/dist/esm/Adapt.mjs

@@ -1,12 +1,11 @@
-import { StackZIndexContext } from "@tamagui/z-index-stack";
 import { isAndroid, isIos, isTouchable, isWeb, useIsomorphicLayoutEffect } from "@tamagui/constants";
 import { createStyledContext, useMedia } from "@tamagui/core";
 import { withStaticProperties } from "@tamagui/helpers";
 import { PortalHost, PortalItem } from "@tamagui/portal";
-import React, { createContext, useContext, useEffect, useId } from "react";
+import { StackZIndexContext } from "@tamagui/z-index-stack";
+import React, { createContext, useContext, useId, useMemo } from "react";
 import { jsx } from "react/jsx-runtime";
-const CurrentAdaptContextScope = createContext(""),
-  AdaptContext = createStyledContext({
+const AdaptContext = createStyledContext({
     Contents: null,
     scopeName: "",
     portalName: "",
@@ -16,23 +15,27 @@ const CurrentAdaptContextScope = createContext(""),
     setChildren: null,
     setWhen: () => {}
   }),
+  LastAdaptContextScope = createContext(""),
   ProvideAdaptContext = ({
     children,
     ...context
   }) => {
-    const scope = context.scopeName || "";
-    return /* @__PURE__ */jsx(CurrentAdaptContextScope.Provider, {
-      value: scope,
+    const scope = context.scopeName || "",
+      lastScope = useContext(LastAdaptContextScope);
+    return /* @__PURE__ */jsx(LastAdaptContextScope.Provider, {
+      value: lastScope || context.lastScope || "",
       children: /* @__PURE__ */jsx(AdaptContext.Provider, {
         scope,
+        lastScope: lastScope || context.lastScope,
         ...context,
         children
       })
     });
   },
-  useAdaptContext = (scope = "") => {
-    const contextScope = useContext(CurrentAdaptContextScope);
-    return AdaptContext.useStyledContext(scope === "" && contextScope || scope);
+  useAdaptContext = scope => {
+    const lastScope = useContext(LastAdaptContextScope),
+      adaptScope = scope ?? lastScope;
+    return AdaptContext.useStyledContext(adaptScope);
   },
   AdaptPortals = /* @__PURE__ */new Map(),
   AdaptParent = ({
@@ -41,28 +44,36 @@ const CurrentAdaptContextScope = createContext(""),
     scope,
     portal
   }) => {
-    const portalName = `AdaptPortal${scope}`,
-      id = useId();
-    let FinalContents = Contents || AdaptPortals.get(id);
-    FinalContents || (FinalContents = () => /* @__PURE__ */jsx(PortalHost, {
-      name: portalName,
-      forwardProps: typeof portal == "boolean" ? void 0 : portal?.forwardProps
-    }), AdaptPortals.set(id, FinalContents)), useEffect(() => () => {
-      AdaptPortals.delete(id);
-    }, []);
+    const id = useId(),
+      portalName = `AdaptPortal${scope}${id}`,
+      FinalContents = useMemo(() => {
+        if (Contents) return Contents;
+        if (AdaptPortals.has(portalName)) return AdaptPortals.get(portalName);
+        const element = () => /* @__PURE__ */jsx(PortalHost, {
+          name: portalName,
+          forwardProps: typeof portal == "boolean" ? void 0 : portal?.forwardProps
+        }, id);
+        return AdaptPortals.set(portalName, element), element;
+      }, [portalName, Contents]);
+    useIsomorphicLayoutEffect(() => (AdaptPortals.set(portalName, FinalContents), () => {
+      AdaptPortals.delete(portalName);
+    }), [portalName]);
     const [when, setWhen] = React.useState(null),
       [platform, setPlatform] = React.useState(null),
       [children2, setChildren] = React.useState(null);
-    return /* @__PURE__ */jsx(ProvideAdaptContext, {
-      Contents: FinalContents,
-      when,
-      platform,
-      setPlatform,
-      setWhen,
-      setChildren,
-      portalName,
-      scopeName: scope,
-      children
+    return /* @__PURE__ */jsx(LastAdaptContextScope, {
+      value: scope,
+      children: /* @__PURE__ */jsx(ProvideAdaptContext, {
+        Contents: FinalContents,
+        when,
+        platform,
+        setPlatform,
+        setWhen,
+        setChildren,
+        portalName,
+        scopeName: scope,
+        children
+      })
     });
   },
   AdaptContents = ({
@@ -85,7 +96,6 @@ const Adapt = withStaticProperties(function (props) {
         scope
       } = props,
       context = useAdaptContext(scope),
-      scopeName = scope ?? context.scopeName,
       enabled = useAdaptIsActiveGiven(props);
     useIsomorphicLayoutEffect(() => {
       context?.setWhen?.(when || enabled), context?.setPlatform?.(platform || null);
@@ -100,10 +110,7 @@ const Adapt = withStaticProperties(function (props) {
     return useIsomorphicLayoutEffect(() => {
       typeof children == "function" && output !== void 0 && context?.setChildren(output);
     }, [output]), /* @__PURE__ */jsx(StackZIndexContext, {
-      children: /* @__PURE__ */jsx(CurrentAdaptContextScope.Provider, {
-        value: scopeName,
-        children: enabled ? output : null
-      })
+      children: enabled ? output : null
     });
   }, {
     Contents: AdaptContents
@@ -125,6 +132,7 @@ const Adapt = withStaticProperties(function (props) {
   }) => {
     const media = useMedia();
     if (when == null && platform == null) return !1;
+    if (when === !0) return !0;
     let enabled = !1;
     return platform === "touch" ? enabled = isTouchable : platform === "native" ? enabled = !isWeb : platform === "web" ? enabled = isWeb : platform === "ios" ? enabled = isIos : platform === "android" && (enabled = isAndroid), platform && enabled == !1 ? !1 : (when && typeof when == "string" && (enabled = media[when]), enabled);
   },

package/dist/esm/Adapt.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["StackZIndexContext","isAndroid","isIos","isTouchable","isWeb","useIsomorphicLayoutEffect","createStyledContext","useMedia","withStaticProperties","PortalHost","PortalItem","React","createContext","useContext","useEffect","useId","jsx","CurrentAdaptContextScope","AdaptContext","Contents","scopeName","portalName","platform","setPlatform","x","when","setChildren","setWhen","ProvideAdaptContext","children","context","scope","Provider","value","useAdaptContext","contextScope","useStyledContext","AdaptPortals","Map","AdaptParent","portal","id","FinalContents","get","name","forwardProps","set","delete","useState","children2","AdaptContents","rest","Error","process","env","NODE_ENV","createElement","key","shouldForwardSpace","Adapt","props","enabled","useAdaptIsActiveGiven","output","Component","AdaptPortalContents","isActive","useAdaptIsActive","passThrough","hostName","media"],"sources":["../../src/Adapt.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["isAndroid","isIos","isTouchable","isWeb","useIsomorphicLayoutEffect","createStyledContext","useMedia","withStaticProperties","PortalHost","PortalItem","StackZIndexContext","React","createContext","useContext","useId","useMemo","jsx","AdaptContext","Contents","scopeName","portalName","platform","setPlatform","x","when","setChildren","setWhen","LastAdaptContextScope","ProvideAdaptContext","children","context","scope","lastScope","Provider","value","useAdaptContext","adaptScope","useStyledContext","AdaptPortals","Map","AdaptParent","portal","id","FinalContents","has","get","element","name","forwardProps","set","delete","useState","children2","AdaptContents","rest","Error","process","env","NODE_ENV","createElement","key","shouldForwardSpace","Adapt","props","enabled","useAdaptIsActiveGiven","output","Component","AdaptPortalContents","isActive","useAdaptIsActive","passThrough","hostName","media"],"sources":["../../src/Adapt.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/Adapt.native.js

@@ -1,12 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { StackZIndexContext } from "@tamagui/z-index-stack";
 import { isAndroid, isIos, isTouchable, isWeb, useIsomorphicLayoutEffect } from "@tamagui/constants";
 import { createStyledContext, useMedia } from "@tamagui/core";
 import { withStaticProperties } from "@tamagui/helpers";
 import { PortalHost, PortalItem } from "@tamagui/portal";
-import React, { createContext, useContext, useEffect, useId } from "react";
-var CurrentAdaptContextScope = /* @__PURE__ */createContext(""),
-  AdaptContext = createStyledContext({
+import { StackZIndexContext } from "@tamagui/z-index-stack";
+import React, { createContext, useContext, useId, useMemo } from "react";
+var AdaptContext = createStyledContext({
     Contents: null,
     scopeName: "",
     portalName: "",
@@ -16,26 +15,28 @@ var CurrentAdaptContextScope = /* @__PURE__ */createContext(""),
     setChildren: null,
     setWhen: function () {}
   }),
+  LastAdaptContextScope = /* @__PURE__ */createContext(""),
   ProvideAdaptContext = function (param) {
     var {
         children,
         ...context
       } = param,
-      scope = context.scopeName || "";
-    return /* @__PURE__ */_jsx(CurrentAdaptContextScope.Provider, {
-      value: scope,
+      scope = context.scopeName || "",
+      lastScope = useContext(LastAdaptContextScope);
+    return /* @__PURE__ */_jsx(LastAdaptContextScope.Provider, {
+      value: lastScope || context.lastScope || "",
       children: /* @__PURE__ */_jsx(AdaptContext.Provider, {
         scope,
+        lastScope: lastScope || context.lastScope,
         ...context,
         children
       })
     });
   },
-  useAdaptContext = function () {
-    var scope = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "",
-      contextScope = useContext(CurrentAdaptContextScope),
-      context = AdaptContext.useStyledContext(scope === "" && contextScope || scope);
-    return context;
+  useAdaptContext = function (scope) {
+    var lastScope = useContext(LastAdaptContextScope),
+      adaptScope = scope ?? lastScope;
+    return AdaptContext.useStyledContext(adaptScope);
   },
   AdaptPortals = /* @__PURE__ */new Map(),
   AdaptParent = function (param) {
@@ -45,32 +46,40 @@ var CurrentAdaptContextScope = /* @__PURE__ */createContext(""),
         scope,
         portal
       } = param,
-      portalName = `AdaptPortal${scope}`,
       id = useId(),
-      FinalContents = Contents || AdaptPortals.get(id);
-    FinalContents || (FinalContents = function () {
-      return /* @__PURE__ */_jsx(PortalHost, {
-        name: portalName,
-        forwardProps: typeof portal == "boolean" ? void 0 : portal?.forwardProps
-      });
-    }, AdaptPortals.set(id, FinalContents)), useEffect(function () {
-      return function () {
-        AdaptPortals.delete(id);
+      portalName = `AdaptPortal${scope}${id}`,
+      FinalContents = useMemo(function () {
+        if (Contents) return Contents;
+        if (AdaptPortals.has(portalName)) return AdaptPortals.get(portalName);
+        var element = function () {
+          return /* @__PURE__ */_jsx(PortalHost, {
+            name: portalName,
+            forwardProps: typeof portal == "boolean" ? void 0 : portal?.forwardProps
+          }, id);
+        };
+        return AdaptPortals.set(portalName, element), element;
+      }, [portalName, Contents]);
+    useIsomorphicLayoutEffect(function () {
+      return AdaptPortals.set(portalName, FinalContents), function () {
+        AdaptPortals.delete(portalName);
       };
-    }, []);
+    }, [portalName]);
     var [when, setWhen] = React.useState(null),
       [platform, setPlatform] = React.useState(null),
       [children2, setChildren] = React.useState(null);
-    return /* @__PURE__ */_jsx(ProvideAdaptContext, {
-      Contents: FinalContents,
-      when,
-      platform,
-      setPlatform,
-      setWhen,
-      setChildren,
-      portalName,
-      scopeName: scope,
-      children
+    return /* @__PURE__ */_jsx(LastAdaptContextScope, {
+      value: scope,
+      children: /* @__PURE__ */_jsx(ProvideAdaptContext, {
+        Contents: FinalContents,
+        when,
+        platform,
+        setPlatform,
+        setWhen,
+        setChildren,
+        portalName,
+        scopeName: scope,
+        children
+      })
     });
   },
   AdaptContents = function (param) {
@@ -94,7 +103,6 @@ var Adapt = withStaticProperties(function (props) {
         scope
       } = props,
       context = useAdaptContext(scope),
-      scopeName = scope ?? context.scopeName,
       enabled = useAdaptIsActiveGiven(props);
     useIsomorphicLayoutEffect(function () {
       var _context_setWhen, _context_setPlatform;
@@ -113,10 +121,7 @@ var Adapt = withStaticProperties(function (props) {
     return useIsomorphicLayoutEffect(function () {
       typeof children == "function" && output !== void 0 && context?.setChildren(output);
     }, [output]), /* @__PURE__ */_jsx(StackZIndexContext, {
-      children: /* @__PURE__ */_jsx(CurrentAdaptContextScope.Provider, {
-        value: scopeName,
-        children: enabled ? output : null
-      })
+      children: enabled ? output : null
     });
   }, {
     Contents: AdaptContents
@@ -139,6 +144,7 @@ var Adapt = withStaticProperties(function (props) {
       } = param,
       media = useMedia();
     if (when == null && platform == null) return !1;
+    if (when === !0) return !0;
     var enabled = !1;
     return platform === "touch" ? enabled = isTouchable : platform === "native" ? enabled = !isWeb : platform === "web" ? enabled = isWeb : platform === "ios" ? enabled = isIos : platform === "android" && (enabled = isAndroid), platform && enabled == !1 ? !1 : (when && typeof when == "string" && (enabled = media[when]), enabled);
   },

package/dist/esm/Adapt.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["jsx","_jsx","StackZIndexContext","isAndroid","isIos","isTouchable","isWeb","useIsomorphicLayoutEffect","createStyledContext","useMedia","withStaticProperties","PortalHost","PortalItem","React","createContext","useContext","useEffect","useId","CurrentAdaptContextScope","AdaptContext","Contents","scopeName","portalName","platform","setPlatform","x","when","setChildren","setWhen","ProvideAdaptContext","param","children","context","scope","Provider","value","useAdaptContext","arguments","length","contextScope","useStyledContext","AdaptPortals","Map","AdaptParent","portal","id","FinalContents","get","name","forwardProps","set","delete","useState","children2","AdaptContents","rest","Error","process","env","NODE_ENV","createElement","key","shouldForwardSpace","Adapt","props","enabled","useAdaptIsActiveGiven","_context_setWhen","_context_setPlatform","call","output","Component","AdaptPortalContents","isActive","useAdaptIsActive","passThrough","hostName"],"sources":["../../src/Adapt.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["jsx","_jsx","isAndroid","isIos","isTouchable","isWeb","useIsomorphicLayoutEffect","createStyledContext","useMedia","withStaticProperties","PortalHost","PortalItem","StackZIndexContext","React","createContext","useContext","useId","useMemo","AdaptContext","Contents","scopeName","portalName","platform","setPlatform","x","when","setChildren","setWhen","LastAdaptContextScope","ProvideAdaptContext","param","children","context","scope","lastScope","Provider","value","useAdaptContext","adaptScope","useStyledContext","AdaptPortals","Map","AdaptParent","portal","id","FinalContents","has","get","element","name","forwardProps","set","delete","useState","children2","AdaptContents","rest","Error","process","env","NODE_ENV","createElement","key","shouldForwardSpace","Adapt","props","enabled","useAdaptIsActiveGiven","_context_setWhen","_context_setPlatform","call","output","Component","AdaptPortalContents","isActive","useAdaptIsActive","passThrough","hostName","media"],"sources":["../../src/Adapt.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/adapt",
-  "version": "1.130.8",
+  "version": "1.131.1",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -31,14 +31,14 @@
     }
   },
   "dependencies": {
-    "@tamagui/constants": "1.130.8",
-    "@tamagui/core": "1.130.8",
-    "@tamagui/helpers": "1.130.8",
-    "@tamagui/portal": "1.130.8",
-    "@tamagui/z-index-stack": "1.130.8"
+    "@tamagui/constants": "1.131.1",
+    "@tamagui/core": "1.131.1",
+    "@tamagui/helpers": "1.131.1",
+    "@tamagui/portal": "1.131.1",
+    "@tamagui/z-index-stack": "1.131.1"
   },
   "devDependencies": {
-    "@tamagui/build": "1.130.8",
+    "@tamagui/build": "1.131.1",
     "react": "*"
   },
   "publishConfig": {

package/src/Adapt.tsx

@@ -1,4 +1,3 @@
-import { StackZIndexContext } from '@tamagui/z-index-stack'
 import {
   isAndroid,
   isIos,
@@ -10,7 +9,8 @@ import type { AllPlatforms, MediaQueryKey } from '@tamagui/core'
 import { createStyledContext, useMedia } from '@tamagui/core'
 import { withStaticProperties } from '@tamagui/helpers'
 import { PortalHost, PortalItem } from '@tamagui/portal'
-import React, { createContext, useContext, useEffect, useId } from 'react'
+import { StackZIndexContext } from '@tamagui/z-index-stack'
+import React, { createContext, useContext, useId, useMemo } from 'react'
 
 /**
  * Interfaces
@@ -28,6 +28,7 @@ export type AdaptParentContextI = {
   setWhen: (when: AdaptWhen) => any
   setChildren: (children: any) => any
   portalName?: string
+  lastScope?: string
 }
 
 type MediaQueryKeyString = MediaQueryKey extends string ? MediaQueryKey : never
@@ -41,12 +42,6 @@ export type AdaptProps = {
 
 type Component = (props: any) => any
 
-/**
- * Contexts
- */
-
-const CurrentAdaptContextScope = createContext('')
-
 export const AdaptContext = createStyledContext<AdaptParentContextI>({
   Contents: null as any,
   scopeName: '',
@@ -58,27 +53,32 @@ export const AdaptContext = createStyledContext<AdaptParentContextI>({
   setWhen: () => {},
 })
 
+const LastAdaptContextScope = createContext('')
+
 export const ProvideAdaptContext = ({
   children,
   ...context
 }: AdaptParentContextI & { children: any }) => {
   const scope = context.scopeName || ''
+  const lastScope = useContext(LastAdaptContextScope)
 
   return (
-    <CurrentAdaptContextScope.Provider value={scope}>
-      <AdaptContext.Provider scope={scope} {...context}>
+    <LastAdaptContextScope.Provider value={lastScope || context.lastScope || ''}>
+      <AdaptContext.Provider
+        scope={scope}
+        lastScope={lastScope || context.lastScope}
+        {...context}
+      >
         {children}
       </AdaptContext.Provider>
-    </CurrentAdaptContextScope.Provider>
+    </LastAdaptContextScope.Provider>
   )
 }
 
-export const useAdaptContext = (scope = '') => {
-  const contextScope = useContext(CurrentAdaptContextScope)
-  const context = AdaptContext.useStyledContext(
-    scope === '' ? contextScope || scope : scope
-  )
-  return context
+export const useAdaptContext = (scope?: string) => {
+  const lastScope = useContext(LastAdaptContextScope)
+  const adaptScope = scope ?? lastScope
+  return AdaptContext.useStyledContext(adaptScope)
 }
 
 /**
@@ -87,8 +87,8 @@ export const useAdaptContext = (scope = '') => {
 
 type AdaptParentProps = {
   children?: React.ReactNode
-  scope: string
   Contents?: AdaptParentContextI['Contents']
+  scope: string
   portal?:
     | boolean
     | {
@@ -99,28 +99,35 @@ type AdaptParentProps = {
 const AdaptPortals = new Map()
 
 export const AdaptParent = ({ children, Contents, scope, portal }: AdaptParentProps) => {
-  const portalName = `AdaptPortal${scope}`
   const id = useId()
+  const portalName = `AdaptPortal${scope}${id}`
 
-  let FinalContents = Contents || AdaptPortals.get(id)
-
-  if (!FinalContents) {
-    FinalContents = () => {
+  const FinalContents = useMemo(() => {
+    if (Contents) {
+      return Contents
+    }
+    if (AdaptPortals.has(portalName)) {
+      return AdaptPortals.get(portalName)
+    }
+    const element = () => {
       return (
         <PortalHost
+          key={id}
           name={portalName}
           forwardProps={typeof portal === 'boolean' ? undefined : portal?.forwardProps}
         />
       )
     }
-    AdaptPortals.set(id, FinalContents)
-  }
+    AdaptPortals.set(portalName, element)
+    return element
+  }, [portalName, Contents])
 
-  useEffect(() => {
+  useIsomorphicLayoutEffect(() => {
+    AdaptPortals.set(portalName, FinalContents)
     return () => {
-      AdaptPortals.delete(id)
+      AdaptPortals.delete(portalName)
     }
-  }, [])
+  }, [portalName])
 
   const [when, setWhen] = React.useState<AdaptWhen>(null)
   const [platform, setPlatform] = React.useState<AdaptPlatform>(null)
@@ -129,18 +136,20 @@ export const AdaptParent = ({ children, Contents, scope, portal }: AdaptParentPr
   const [children2, setChildren] = React.useState(null)
 
   return (
-    <ProvideAdaptContext
-      Contents={FinalContents}
-      when={when}
-      platform={platform}
-      setPlatform={setPlatform}
-      setWhen={setWhen}
-      setChildren={setChildren}
-      portalName={portalName}
-      scopeName={scope}
-    >
-      {children}
-    </ProvideAdaptContext>
+    <LastAdaptContextScope value={scope}>
+      <ProvideAdaptContext
+        Contents={FinalContents}
+        when={when}
+        platform={platform}
+        setPlatform={setPlatform}
+        setWhen={setWhen}
+        setChildren={setChildren}
+        portalName={portalName}
+        scopeName={scope}
+      >
+        {children}
+      </ProvideAdaptContext>
+    </LastAdaptContextScope>
   )
 }
 
@@ -169,7 +178,6 @@ export const Adapt = withStaticProperties(
   function Adapt(props: AdaptProps) {
     const { platform, when, children, scope } = props
     const context = useAdaptContext(scope)
-    const scopeName = scope ?? context.scopeName
     const enabled = useAdaptIsActiveGiven(props)
 
     useIsomorphicLayoutEffect(() => {
@@ -201,13 +209,7 @@ export const Adapt = withStaticProperties(
       }
     }, [output])
 
-    return (
-      <StackZIndexContext>
-        <CurrentAdaptContextScope.Provider value={scopeName}>
-          {!enabled ? null : output}
-        </CurrentAdaptContextScope.Provider>
-      </StackZIndexContext>
-    )
+    return <StackZIndexContext>{!enabled ? null : output}</StackZIndexContext>
   },
   {
     Contents: AdaptContents,
@@ -239,6 +241,10 @@ const useAdaptIsActiveGiven = ({
     return false
   }
 
+  if (when === true) {
+    return true
+  }
+
   let enabled = false
 
   if (platform === 'touch') enabled = isTouchable

package/types/Adapt.d.ts

@@ -14,6 +14,7 @@ export type AdaptParentContextI = {
     setWhen: (when: AdaptWhen) => any;
     setChildren: (children: any) => any;
     portalName?: string;
+    lastScope?: string;
 };
 type MediaQueryKeyString = MediaQueryKey extends string ? MediaQueryKey : never;
 export type AdaptProps = {
@@ -33,8 +34,8 @@ export declare const useAdaptContext: (scope?: string) => AdaptParentContextI;
  */
 type AdaptParentProps = {
     children?: React.ReactNode;
-    scope: string;
     Contents?: AdaptParentContextI['Contents'];
+    scope: string;
     portal?: boolean | {
         forwardProps?: any;
     };

package/types/Adapt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Adapt.d.ts","sourceRoot":"","sources":["../src/Adapt.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAIhE,OAAO,KAAsD,MAAM,OAAO,CAAA;AAE1E;;GAEG;AAEH,MAAM,MAAM,SAAS,GAAG,mBAAmB,GAAG,OAAO,GAAG,IAAI,CAAA;AAC5D,MAAM,MAAM,aAAa,GAAG,YAAY,GAAG,OAAO,GAAG,IAAI,CAAA;AAEzD,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,EAAE,SAAS,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,aAAa,CAAA;IACvB,WAAW,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,GAAG,CAAA;IACzC,IAAI,EAAE,SAAS,CAAA;IACf,OAAO,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,GAAG,CAAA;IACjC,WAAW,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,GAAG,CAAA;IACnC,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,KAAK,mBAAmB,GAAG,aAAa,SAAS,MAAM,GAAG,aAAa,GAAG,KAAK,CAAA;AAE/E,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,SAAS,CAAA;IAChB,QAAQ,CAAC,EAAE,aAAa,CAAA;IACxB,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,KAAK,KAAK,CAAC,SAAS,CAAC,CAAA;CAC/E,CAAA;AAED,KAAK,SAAS,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAA;AAQpC,eAAO,MAAM,YAAY,4DASvB,CAAA;AAEF,eAAO,MAAM,mBAAmB,GAAI,0BAGjC,mBAAmB,GAAG;IAAE,QAAQ,EAAE,GAAG,CAAA;CAAE,4CAUzC,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,cAAU,wBAMzC,CAAA;AAED;;GAEG;AAEH,KAAK,gBAAgB,GAAG;IACtB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,mBAAmB,CAAC,UAAU,CAAC,CAAA;IAC1C,MAAM,CAAC,EACH,OAAO,GACP;QACE,YAAY,CAAC,EAAE,GAAG,CAAA;KACnB,CAAA;CACN,CAAA;AAID,eAAO,MAAM,WAAW,GAAI,uCAAuC,gBAAgB,4CA4ClF,CAAA;AAED;;GAEG;AAEH,eAAO,MAAM,aAAa;yBAAwB;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE;;CAanE,CAAA;AAID,eAAO,MAAM,KAAK,WACM,UAAU;;6BAlBgB;YAAE,KAAK,CAAC,EAAE,MAAM,CAAA;SAAE;;;CAgEnE,CAAA;AAED,eAAO,MAAM,mBAAmB,GAAI,OAAO;IACzC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB,4CASA,CAAA;AA+BD,eAAO,MAAM,gBAAgB,GAAI,QAAQ,MAAM,YAG9C,CAAA"}
+{"version":3,"file":"Adapt.d.ts","sourceRoot":"","sources":["../src/Adapt.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAKhE,OAAO,KAAoD,MAAM,OAAO,CAAA;AAExE;;GAEG;AAEH,MAAM,MAAM,SAAS,GAAG,mBAAmB,GAAG,OAAO,GAAG,IAAI,CAAA;AAC5D,MAAM,MAAM,aAAa,GAAG,YAAY,GAAG,OAAO,GAAG,IAAI,CAAA;AAEzD,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,EAAE,SAAS,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,aAAa,CAAA;IACvB,WAAW,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,GAAG,CAAA;IACzC,IAAI,EAAE,SAAS,CAAA;IACf,OAAO,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,GAAG,CAAA;IACjC,WAAW,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,GAAG,CAAA;IACnC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,KAAK,mBAAmB,GAAG,aAAa,SAAS,MAAM,GAAG,aAAa,GAAG,KAAK,CAAA;AAE/E,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,SAAS,CAAA;IAChB,QAAQ,CAAC,EAAE,aAAa,CAAA;IACxB,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,KAAK,KAAK,CAAC,SAAS,CAAC,CAAA;CAC/E,CAAA;AAED,KAAK,SAAS,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAA;AAEpC,eAAO,MAAM,YAAY,4DASvB,CAAA;AAIF,eAAO,MAAM,mBAAmB,GAAI,0BAGjC,mBAAmB,GAAG;IAAE,QAAQ,EAAE,GAAG,CAAA;CAAE,4CAezC,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,QAAQ,MAAM,wBAI7C,CAAA;AAED;;GAEG;AAEH,KAAK,gBAAgB,GAAG;IACtB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,QAAQ,CAAC,EAAE,mBAAmB,CAAC,UAAU,CAAC,CAAA;IAC1C,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EACH,OAAO,GACP;QACE,YAAY,CAAC,EAAE,GAAG,CAAA;KACnB,CAAA;CACN,CAAA;AAID,eAAO,MAAM,WAAW,GAAI,uCAAuC,gBAAgB,4CAqDlF,CAAA;AAED;;GAEG;AAEH,eAAO,MAAM,aAAa;yBAAwB;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE;;CAanE,CAAA;AAID,eAAO,MAAM,KAAK,WACM,UAAU;;6BAlBgB;YAAE,KAAK,CAAC,EAAE,MAAM,CAAA;SAAE;;;CAyDnE,CAAA;AAED,eAAO,MAAM,mBAAmB,GAAI,OAAO;IACzC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB,4CASA,CAAA;AAmCD,eAAO,MAAM,gBAAgB,GAAI,QAAQ,MAAM,YAG9C,CAAA"}