@tamagui/select 2.0.0-rc.4 → 2.0.0-rc.40

package/dist/jsx/context.native.js

@@ -5,57 +5,65 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var context_exports = {};
 __export(context_exports, {
   ForwardSelectContext: () => ForwardSelectContext,
   SelectItemParentProvider: () => SelectItemParentProvider,
   SelectProvider: () => SelectProvider,
+  SelectZIndexContext: () => SelectZIndexContext,
   useSelectContext: () => useSelectContext,
   useSelectItemParentContext: () => useSelectItemParentContext
 });
 module.exports = __toCommonJS(context_exports);
-var import_jsx_runtime = require("react/jsx-runtime"),
-  import_core = require("@tamagui/core"),
-  import_native = require("@tamagui/native"),
-  {
-    Provider: SelectProvider,
-    useStyledContext: useSelectContext
-  } = (0, import_core.createStyledContext)(null, "Select"),
-  {
-    Provider: SelectItemParentProvider,
-    useStyledContext: useSelectItemParentContext
-  } = (0, import_core.createStyledContext)(null, "SelectItem"),
-  ForwardSelectContext = function (param) {
-    var {
-        context,
-        itemContext,
-        children
-      } = param,
-      portalState = (0, import_native.getPortal)().state;
-    return portalState.type === "teleport" ? children : /* @__PURE__ */(0, import_jsx_runtime.jsx)(SelectProvider, {
-      isInSheet: !0,
+var import_jsx_runtime = require("react/jsx-runtime");
+var import_core = require("@tamagui/core");
+var import_native = require("@tamagui/native");
+var import_react = require("react");
+var SelectZIndexContext = /* @__PURE__ */(0, import_react.createContext)(void 0);
+var {
+  Provider: SelectProvider,
+  useStyledContext: useSelectContext
+} = (0, import_core.createStyledContext)(null, "Select");
+var {
+  Provider: SelectItemParentProvider,
+  useStyledContext: useSelectItemParentContext
+} = (0, import_core.createStyledContext)(null, "SelectItem");
+var ForwardSelectContext = function (param) {
+  var {
+    context,
+    itemContext,
+    children
+  } = param;
+  var portalState = (0, import_native.getPortal)().state;
+  if (portalState.type === "teleport") {
+    return children;
+  }
+  return /* @__PURE__ */(0, import_jsx_runtime.jsx)(SelectProvider, {
+    isInSheet: true,
+    scope: context.scopeName,
+    ...context,
+    children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(SelectItemParentProvider, {
       scope: context.scopeName,
-      ...context,
-      children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(SelectItemParentProvider, {
-        scope: context.scopeName,
-        ...itemContext,
-        children
-      })
-    });
-  };
+      ...itemContext,
+      children
+    })
+  });
+};
 //# sourceMappingURL=context.native.js.map

package/dist/jsx/context.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__defProp","Object","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key"],"sources":["../../src/context.tsx"],"sourcesContent":[null],"mappings":"AAAA,YAAS;;AACT,IAAAA,SAAS,GAAAC,MAAA,CAAAC,cAAiB;AAgCpB,IAAAC,gBAAA,GAAAF,MAAA,CAAAG,wBAAA;AA7BC,IAAAC,iBAAkB,GAAAJ,MAAA,CAAAK,mBAAgB;AAK5B,IACXC,YAAU,GAAAN,MAAA,CAAAO,SAAA,CAAAC,cAAA;AAAA,IACVC,QAAA,GAAAA,CAAAC,MAAkB,EAAAC,GAAA;IACpB,KAAI,IAAAC,IAAA,IAAAD,GAAA,EAGFZ,SAAA,CAAAW,MAAA,EAAAE,IAAA;MAAAC,GAAA,EAAAF,GAAA,CAAAC,IAAA;MAAAE,UAAA;IAAA;EAAA;EACAC,WAAA,GAAAA,CAAAC,EAAA,EAAAC,IAAA,EAAAC,MAAA,EAAAC,IAAA;IACA,IAAAF,IAAA,WAAAA,IAAA,uBAAAA,IAAA,gBACF,KAOsB,IAAAG,GAAU,IAAEhB,iBACP,CAAAa,IAAA,G","ignoreList":[]}
+{"version":3,"names":["__defProp","Object","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key","call","__toCommonJS","mod","value","context_exports","ForwardSelectContext"],"sources":["../../src/context.tsx"],"sourcesContent":[null],"mappings":"AAAA,YAAS;;AACT,IAAAA,SAAS,GAAAC,MAAA,CAAAC,cAAiB;AAC1B,IAAAC,gBAAS,GAAAF,MAAA,CAAqBG,wBAAA;AAmCxB,IAAAC,iBAAA,GAAAJ,MAAA,CAAAK,mBAAA;AA/BC,IAAAC,YAAM,GAAAN,MAAA,CAAAO,SAAsB,CAAAC,cAA2C;AAEvE,IAAAC,QAAQ,GAAAA,CAAAC,MAAU,EAAAC,GAAA;EAKlB,KAAM,IAAAC,IAAA,IAAAD,GAAA,EACXZ,SAAU,CAAAW,MAAA,EAAAE,IAAA;IAAAC,GAAA,EAAAF,GAAA,CAAAC,IAAA;IAAAE,UAAA;EAAA;AAAA;AAEZ,IAAIC,WAAA,GAAAA,CAAAC,EAAA,EAAAC,IAAkD,EAAAC,MAAa,EAAAC,IAAA,KAAY;EAExE,IAAMF,IAAA,WAAAA,IAAA,KAAwB,mBAAAA,IAAA;IACnC,SAAAG,GAAA,IAAAhB,iBAAA,CAAAa,IAAA,GACA,KAAAX,YAAA,CAAAe,IAAA,CAAAL,EAAA,EAAAI,GAAA,KAAAA,GAAA,KAAAF,MAAA,EACAnB,SAAA,CAAAiB,EAAA,EAAAI,GAAA;MAAAP,GAAA,EAAAA,CAAA,KAAAI,IAAA,CAAAG,GAAA;MAAAN,UAAA,IAAAK,IAAA,GAAAjB,gBAAA,CAAAe,IAAA,EAAAG,GAAA,MAAAD,IAAA,CAAAL;IAAA;EACF;EAOE,OAAME,EAAA;AACN;AACE,IAAAM,YAAO,GAAAC,GAAA,IAAAR,WAAA,CAAAhB,SAAA;EAAAyB,KAAA;AAAA,IAAAD,GAAA;AAAA,IACTE,eAAA;AAGAhB,QAAA,CACEgB,eAAA;EAMJC,oBAAA,EAAAA,CAAA,KAAAA,oBAAA","ignoreList":[]}

package/dist/jsx/index.js

@@ -1,3 +1,3 @@
-export * from "./Select";
-export * from "./context";
+export * from "./Select.mjs";
+export * from "./context.mjs";
 //# sourceMappingURL=index.js.map

package/dist/jsx/index.js.map

@@ -1,6 +1 @@
-{
-  "version": 3,
-  "sources": ["../../src/index.tsx"],
-  "mappings": "AAAA,cAAc;AAEd,cAAc;",
-  "names": []
-}
+{"version":3,"names":[],"sources":["../../src/index.tsx"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AAEd,cAAc","ignoreList":[]}

package/dist/jsx/index.native.js

@@ -5,15 +5,17 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  },
-  __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var index_exports = {};
 module.exports = __toCommonJS(index_exports);

package/dist/jsx/types.native.js

@@ -5,14 +5,16 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
-    get: () => from[key],
-    enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-  });
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+      get: () => from[key],
+      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+    });
+  }
   return to;
 };
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var types_exports = {};
 module.exports = __toCommonJS(types_exports);

package/dist/jsx/useSelectBreakpointActive.mjs

@@ -1,7 +1,7 @@
 import { useAdaptIsActive } from "@tamagui/adapt";
 const useShowSelectSheet = context => {
   const breakpointActive = useAdaptIsActive(context.adaptScope);
-  return context.open === !1 ? !1 : breakpointActive;
+  return context.open === false ? false : breakpointActive;
 };
 export { useShowSelectSheet };
 //# sourceMappingURL=useSelectBreakpointActive.mjs.map

package/dist/jsx/useSelectBreakpointActive.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["useAdaptIsActive","useShowSelectSheet","context","breakpointActive","adaptScope","open"],"sources":["../../src/useSelectBreakpointActive.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,gBAAA,QAAwB;AAG1B,MAAMC,kBAAA,GAAsBC,OAAA,IAAgC;EACjE,MAAMC,gBAAA,GAAmBH,gBAAA,CAAiBE,OAAA,CAAQE,UAAU;EAC5D,OAAOF,OAAA,CAAQG,IAAA,KAAS,KAAQ,KAAQF,gBAAA;AAC1C","ignoreList":[]}
+{"version":3,"names":["useAdaptIsActive","useShowSelectSheet","context","breakpointActive","adaptScope","open"],"sources":["../../src/useSelectBreakpointActive.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,gBAAA,QAAwB;AAG1B,MAAMC,kBAAA,GAAsBC,OAAA,IAAgC;EACjE,MAAMC,gBAAA,GAAmBH,gBAAA,CAAiBE,OAAA,CAAQE,UAAU;EAC5D,OAAOF,OAAA,CAAQG,IAAA,KAAS,QAAQ,QAAQF,gBAAA;AAC1C","ignoreList":[]}

package/dist/jsx/useSelectBreakpointActive.native.js

@@ -5,29 +5,31 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var useSelectBreakpointActive_exports = {};
 __export(useSelectBreakpointActive_exports, {
   useShowSelectSheet: () => useShowSelectSheet
 });
 module.exports = __toCommonJS(useSelectBreakpointActive_exports);
-var import_adapt = require("@tamagui/adapt"),
-  useShowSelectSheet = function (context) {
-    var breakpointActive = (0, import_adapt.useAdaptIsActive)(context.adaptScope);
-    return context.open === !1 ? !1 : breakpointActive;
-  };
+var import_adapt = require("@tamagui/adapt");
+var useShowSelectSheet = function (context) {
+  var breakpointActive = (0, import_adapt.useAdaptIsActive)(context.adaptScope);
+  return context.open === false ? false : breakpointActive;
+};
 //# sourceMappingURL=useSelectBreakpointActive.native.js.map

package/dist/jsx/useSelectBreakpointActive.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__defProp","Object","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__hasOwnProp","prototype","hasOwnProperty"],"sources":["../../src/useSelectBreakpointActive.tsx"],"sourcesContent":[null],"mappings":"AAAA,YAAS;;AAGF,IAAAA,SAAM,GAAAC,MAAA,CAAAC,cAAsB;AACjC,IAAAC,gBAAM,GAAAF,MAAmB,CAAAG,wBAAyB;AAClD,IAAAC,iBAAe,GAAAJ,MAAS,CAAQK,mBAAQ;AAC1C,IAAAC,YAAA,GAAAN,MAAA,CAAAO,SAAA,CAAAC,cAAA","ignoreList":[]}
+{"version":3,"names":["__defProp","Object","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__hasOwnProp","prototype","hasOwnProperty"],"sources":["../../src/useSelectBreakpointActive.tsx"],"sourcesContent":[null],"mappings":"AAAA,YAAS;;AAGF,IAAAA,SAAM,GAAAC,MAAA,CAAAC,cAAsB;AACjC,IAAAC,gBAAM,GAAAF,MAAmB,CAAAG,wBAAyB;AAClD,IAAAC,iBAAe,GAAAJ,MAAS,CAAAK,mBAAgB;AAC1C,IAAAC,YAAA,GAAAN,MAAA,CAAAO,SAAA,CAAAC,cAAA","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/select",
-  "version": "2.0.0-rc.4",
+  "version": "2.0.0-rc.40",
   "source": "src/index.tsx",
   "files": [
     "src",
@@ -18,15 +18,12 @@
     "./package.json": "./package.json",
     ".": {
       "types": "./types/index.d.ts",
-      "react-native": {
-        "module": "./dist/esm/index.native.js",
-        "import": "./dist/esm/index.native.js",
-        "require": "./dist/cjs/index.native.js"
-      },
+      "react-native": "./dist/esm/index.native.js",
+      "browser": "./dist/esm/index.mjs",
       "module": "./dist/esm/index.mjs",
       "import": "./dist/esm/index.mjs",
       "require": "./dist/cjs/index.cjs",
-      "default": "./dist/cjs/index.native.js"
+      "default": "./dist/esm/index.mjs"
     }
   },
   "publishConfig": {
@@ -39,38 +36,37 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@floating-ui/react": "^0.27.16",
-    "@floating-ui/react-dom": "^2.1.6",
-    "@floating-ui/react-native": "^0.10.7",
-    "@tamagui/adapt": "2.0.0-rc.4",
-    "@tamagui/animate-presence": "2.0.0-rc.4",
-    "@tamagui/compose-refs": "2.0.0-rc.4",
-    "@tamagui/constants": "2.0.0-rc.4",
-    "@tamagui/core": "2.0.0-rc.4",
-    "@tamagui/create-context": "2.0.0-rc.4",
-    "@tamagui/dismissable": "2.0.0-rc.4",
-    "@tamagui/focus-scope": "2.0.0-rc.4",
-    "@tamagui/focusable": "2.0.0-rc.4",
-    "@tamagui/get-token": "2.0.0-rc.4",
-    "@tamagui/helpers": "2.0.0-rc.4",
-    "@tamagui/list-item": "2.0.0-rc.4",
-    "@tamagui/native": "2.0.0-rc.4",
-    "@tamagui/portal": "2.0.0-rc.4",
-    "@tamagui/remove-scroll": "2.0.0-rc.4",
-    "@tamagui/separator": "2.0.0-rc.4",
-    "@tamagui/sheet": "2.0.0-rc.4",
-    "@tamagui/stacks": "2.0.0-rc.4",
-    "@tamagui/text": "2.0.0-rc.4",
-    "@tamagui/use-controllable-state": "2.0.0-rc.4",
-    "@tamagui/use-debounce": "2.0.0-rc.4",
-    "@tamagui/use-event": "2.0.0-rc.4",
-    "@tamagui/use-previous": "2.0.0-rc.4"
+    "@tamagui/adapt": "2.0.0-rc.40",
+    "@tamagui/animate-presence": "2.0.0-rc.40",
+    "@tamagui/compose-refs": "2.0.0-rc.40",
+    "@tamagui/constants": "2.0.0-rc.40",
+    "@tamagui/core": "2.0.0-rc.40",
+    "@tamagui/create-context": "2.0.0-rc.40",
+    "@tamagui/dismissable": "2.0.0-rc.40",
+    "@tamagui/floating": "2.0.0-rc.40",
+    "@tamagui/focus-scope": "2.0.0-rc.40",
+    "@tamagui/focusable": "2.0.0-rc.40",
+    "@tamagui/get-token": "2.0.0-rc.40",
+    "@tamagui/helpers": "2.0.0-rc.40",
+    "@tamagui/list-item": "2.0.0-rc.40",
+    "@tamagui/native": "2.0.0-rc.40",
+    "@tamagui/portal": "2.0.0-rc.40",
+    "@tamagui/remove-scroll": "2.0.0-rc.40",
+    "@tamagui/separator": "2.0.0-rc.40",
+    "@tamagui/sheet": "2.0.0-rc.40",
+    "@tamagui/stacks": "2.0.0-rc.40",
+    "@tamagui/text": "2.0.0-rc.40",
+    "@tamagui/use-controllable-state": "2.0.0-rc.40",
+    "@tamagui/use-debounce": "2.0.0-rc.40",
+    "@tamagui/use-event": "2.0.0-rc.40",
+    "@tamagui/use-previous": "2.0.0-rc.40",
+    "@tamagui/z-index-stack": "2.0.0-rc.40"
   },
   "devDependencies": {
-    "@tamagui/build": "2.0.0-rc.4",
+    "@tamagui/build": "2.0.0-rc.40",
     "react": ">=19",
     "react-dom": "*",
-    "react-native": "0.81.5"
+    "react-native": "0.83.2"
   },
   "peerDependencies": {
     "react": ">=19",

package/src/Select.tsx

@@ -22,6 +22,7 @@ import * as React from 'react'
 import {
   SelectItemParentProvider,
   SelectProvider,
+  SelectZIndexContext,
   useSelectContext,
   useSelectItemParentContext,
 } from './context'
@@ -511,6 +512,8 @@ function SelectInner(props: SelectScopedProps<SelectProps> & { adaptScope: strin
     dir,
     id,
     renderValue,
+    lazyMount,
+    zIndex,
   } = props
 
   const isAdapted = useAdaptIsActive(adaptScope)
@@ -604,7 +607,7 @@ function SelectInner(props: SelectScopedProps<SelectProps> & { adaptScope: strin
     [setActiveIndexFast]
   )
 
-  return (
+  const content = (
     <SelectItemParentProvider
       scopeName={scope}
       scope={scope}
@@ -612,6 +615,7 @@ function SelectInner(props: SelectScopedProps<SelectProps> & { adaptScope: strin
       initialValue={React.useMemo(() => value, [open])}
       size={sizeProp}
       activeIndexSubscribe={activeIndexSubscribe}
+      activeIndexRef={activeIndexRef}
       valueSubscribe={valueSubscribe}
       setOpen={setOpen}
       id={id}
@@ -650,6 +654,7 @@ function SelectInner(props: SelectScopedProps<SelectProps> & { adaptScope: strin
         open={open}
         native={native}
         renderValue={renderValue}
+        lazyMount={lazyMount}
       >
         <SelectSheetController onOpenChange={setOpen} scope={scope}>
           {shouldRenderWebNative ? (
@@ -671,4 +676,14 @@ function SelectInner(props: SelectScopedProps<SelectProps> & { adaptScope: strin
       </SelectProvider>
     </SelectItemParentProvider>
   )
+
+  if (zIndex !== undefined) {
+    return (
+      <SelectZIndexContext.Provider value={zIndex}>
+        {content}
+      </SelectZIndexContext.Provider>
+    )
+  }
+
+  return content
 }

package/src/SelectContent.tsx

@@ -1,10 +1,16 @@
-import { FloatingOverlay, FloatingPortal } from '@floating-ui/react'
-import { isWeb, Theme, useIsTouchDevice, useThemeName } from '@tamagui/core'
+import { isWeb } from '@tamagui/core'
+import { Dismissable } from '@tamagui/dismissable'
 import type { FocusScopeProps } from '@tamagui/focus-scope'
 import { FocusScope } from '@tamagui/focus-scope'
-import React from 'react'
 
-import { useSelectContext, useSelectItemParentContext } from './context'
+import { Portal } from '@tamagui/portal'
+import { RemoveScroll } from '@tamagui/remove-scroll'
+import { useContext } from 'react'
+import {
+  SelectZIndexContext,
+  useSelectContext,
+  useSelectItemParentContext,
+} from './context'
 import type { SelectContentProps } from './types'
 import { useShowSelectSheet } from './useSelectBreakpointActive'
 
@@ -15,25 +21,14 @@ import { useShowSelectSheet } from './useSelectBreakpointActive'
 export const SelectContent = ({
   children,
   scope,
-  zIndex = 1000,
   ...focusScopeProps
 }: SelectContentProps & FocusScopeProps) => {
   const context = useSelectContext(scope)
   const itemParentContext = useSelectItemParentContext(scope)
-  const themeName = useThemeName()
+  const zIndex = useContext(SelectZIndexContext)
   const showSheet = useShowSelectSheet(context)
 
-  const contents = (
-    <Theme forceClassName name={themeName}>
-      {children}
-    </Theme>
-  )
-
-  const touch = useIsTouchDevice()
-
-  const overlayStyle = React.useMemo(() => {
-    return { zIndex, pointerEvents: context.open ? 'auto' : 'none' } as const
-  }, [context.open])
+  const contents = children
 
   if (itemParentContext.shouldRenderWebNative) {
     return <>{children}</>
@@ -47,25 +42,41 @@ export const SelectContent = ({
   }
 
   return (
-    <FloatingPortal>
-      <FloatingOverlay
-        style={overlayStyle}
-        lockScroll={!context.disablePreventBodyScroll && !!context.open && !touch}
-      >
-        <FocusScope
-          {...focusScopeProps}
-          loop
-          enabled={!!context.open}
-          trapped
-          onMountAutoFocus={(e) => {
-            // prevent FocusScope from auto-focusing - we handle focus in SelectItem
-            e.preventDefault()
-          }}
+    <Portal open={context.open} zIndex={zIndex} stackZIndex={100_000}>
+      <RemoveScroll enabled={context.open && !context.disablePreventBodyScroll}>
+        <Dismissable
+          asChild
+          forceUnmount={!context.open}
+          onDismiss={() => itemParentContext.setOpen(false)}
+          // prevent focus-outside and pointer-outside from triggering dismiss:
+          // SelectImpl has its own document pointerdown listener for outside clicks,
+          // and focus changes during open (e.g. FocusScope trapping) shouldn't dismiss.
+          // only escape key should trigger onDismiss here.
+          onFocusOutside={(e) => e.preventDefault()}
+          onPointerDownOutside={(e) => e.preventDefault()}
         >
-          {/* wrap in div so FocusScope has a DOM element to attach ref to */}
-          {isWeb ? <div style={{ display: 'contents' }}>{contents}</div> : contents}
-        </FocusScope>
-      </FloatingOverlay>
-    </FloatingPortal>
+          <FocusScope
+            {...focusScopeProps}
+            enabled={!!context.open}
+            trapped
+            onMountAutoFocus={(e) => {
+              // prevent FocusScope from auto-focusing - floating-ui handles focus in SelectItem
+              e.preventDefault()
+            }}
+            onUnmountAutoFocus={(e) => {
+              // return focus to trigger on close
+              e.preventDefault()
+              const trigger = context.floatingContext?.refs?.reference?.current
+              if (trigger instanceof HTMLElement) {
+                trigger.focus()
+              }
+            }}
+          >
+            {/* div needed for FocusScope ref, display:contents keeps layout neutral */}
+            {isWeb ? <div style={{ display: 'contents' }}>{contents}</div> : contents}
+          </FocusScope>
+        </Dismissable>
+      </RemoveScroll>
+    </Portal>
   )
 }