@tamagui/sheet 1.115.5 → 1.116.1

package/dist/jsx/SheetScrollView.mjs

@@ -40,6 +40,8 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView",
       ref: composeRefs(scrollRef, ref),
       flex: 1,
       scrollEventThrottle: 8,
+      onResponderRelease: release,
+      className: "_ovs-contain",
       onScroll: e => {
         const {
           y
@@ -48,10 +50,8 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView",
       },
       onStartShouldSetResponder: () => (scrollBridge.scrollStartY = -1, state.current.isDragging = !0, !0),
       onMoveShouldSetResponder: () => !1,
-      onResponderRelease: release,
-      className: "_ovs-contain",
       ...props,
-      children: React.useMemo(() => children, [children])
+      children
     });
   });
 export { SheetScrollView };

package/dist/jsx/SheetScrollView.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["React","composeRefs","ScrollView","useSheetContext","jsx","SHEET_SCROLL_VIEW_NAME","SheetScrollView","forwardRef","__scopeSheet","children","onScroll","props","ref","context","scrollBridge","scrollRef","useRef","state","lastPageY","dragAt","dys","isScrolling","isDragging","release","current","scrollStartY","vy","length","recentDys","slice","reduce","a","b","flex","scrollEventThrottle","e","y","nativeEvent","contentOffset","onStartShouldSetResponder","onMoveShouldSetResponder","onResponderRelease","className","useMemo"],"sources":["../../src/SheetScrollView.tsx"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,KAAA,MAAW;AAClB,SAASC,WAAA,QAAmB;AAG5B,SAASC,UAAA,QAAkB;AAI3B,SAASC,eAAA,QAAuB;AAmE1B,SAAAC,GAAA;AA1DN,MAAMC,sBAAA,GAAyB;EAElBC,eAAA,GAAkBN,KAAA,CAAMO,UAAA,CAInC,CACE;IAAEC,YAAA;IAAcC,QAAA;IAAUC,QAAA;IAAU,GAAGC;EAAM,GAC7CC,GAAA,KACG;IACH,MAAMC,OAAA,GAAUV,eAAA,CAAgBE,sBAAA,EAAwBG,YAAY;MAC9D;QAAEM;MAAa,IAAID,OAAA;MAEnBE,SAAA,GAAYf,KAAA,CAAMgB,MAAA,CAA4B,IAAI;MAclDC,KAAA,GAAQjB,KAAA,CAAMgB,MAAA,CAAO;QACzBE,SAAA,EAAW;QACXC,MAAA,EAAQ;QACRC,GAAA,EAAK,EAAC;QAAA;QACNC,WAAA,EAAa;QACbC,UAAA,EAAY;MACd,CAAC;MAEKC,OAAA,GAAUA,CAAA,KAAM;QACpB,IAAI,CAACN,KAAA,CAAMO,OAAA,CAAQF,UAAA,EACjB;QAEFL,KAAA,CAAMO,OAAA,CAAQF,UAAA,GAAa,IAC3BR,YAAA,CAAaW,YAAA,GAAe,IAC5BR,KAAA,CAAMO,OAAA,CAAQH,WAAA,GAAc;QAE5B,IAAIK,EAAA,GAAK;QACT,IAAIT,KAAA,CAAMO,OAAA,CAAQJ,GAAA,CAAIO,MAAA,EAAQ;UAC5B,MAAMC,SAAA,GAAYX,KAAA,CAAMO,OAAA,CAAQJ,GAAA,CAAIS,KAAA,CAAM,GAAG;UAG7CH,EAAA,IAFaE,SAAA,CAAUD,MAAA,GAASC,SAAA,CAAUE,MAAA,CAAO,CAACC,CAAA,EAAGC,CAAA,KAAMD,CAAA,GAAIC,CAAA,EAAG,CAAC,IAAI,KAClDJ,SAAA,CAAUD,MAAA,GAClB;QACf;QACAV,KAAA,CAAMO,OAAA,CAAQJ,GAAA,GAAM,EAAC,EACrBN,YAAA,CAAaS,OAAA,CAAQ;UACnBJ,MAAA,EAAQF,KAAA,CAAMO,OAAA,CAAQL,MAAA;UACtBO;QACF,CAAC;MACH;IAEA,OACE,eAAAtB,GAAA,CAACF,UAAA;MACCU,GAAA,EAAKX,WAAA,CAAYc,SAAA,EAAkBH,GAAG;MACtCqB,IAAA,EAAM;MACNC,mBAAA,EAAqB;MAErBxB,QAAA,EAAWyB,CAAA,IAAM;QACf,MAAM;UAAEC;QAAE,IAAID,CAAA,CAAEE,WAAA,CAAYC,aAAA;QAC5BxB,YAAA,CAAasB,CAAA,GAAIA,CAAA,EACbA,CAAA,GAAI,MACNtB,YAAA,CAAaW,YAAA,GAAe,KAI9Bf,QAAA,GAAWyB,CAAC;MASd;MACAI,yBAAA,EAA2BA,CAAA,MACzBzB,YAAA,CAAaW,YAAA,GAAe,IAC5BR,KAAA,CAAMO,OAAA,CAAQF,UAAA,GAAa,IACpB;MAGTkB,wBAAA,EAA0BA,CAAA,KAAM;MAmChCC,kBAAA,EAAoBlB,OAAA;MACpBmB,SAAA,EAAU;MACT,GAAG/B,KAAA;MAEHF,QAAA,EAAAT,KAAA,CAAM2C,OAAA,CAAQ,MAAMlC,QAAA,EAAU,CAACA,QAAQ,CAAC;IAAA,CAC3C;EAEJ,CACF","ignoreList":[]}
+{"version":3,"names":["React","composeRefs","ScrollView","useSheetContext","jsx","SHEET_SCROLL_VIEW_NAME","SheetScrollView","forwardRef","__scopeSheet","children","onScroll","props","ref","context","scrollBridge","scrollRef","useRef","state","lastPageY","dragAt","dys","isScrolling","isDragging","release","current","scrollStartY","vy","length","recentDys","slice","reduce","a","b","flex","scrollEventThrottle","onResponderRelease","className","e","y","nativeEvent","contentOffset","onStartShouldSetResponder","onMoveShouldSetResponder"],"sources":["../../src/SheetScrollView.tsx"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,KAAA,MAAW;AAClB,SAASC,WAAA,QAAmB;AAG5B,SAASC,UAAA,QAAkB;AAI3B,SAASC,eAAA,QAAuB;AAmE1B,SAAAC,GAAA;AA1DN,MAAMC,sBAAA,GAAyB;EAElBC,eAAA,GAAkBN,KAAA,CAAMO,UAAA,CAInC,CACE;IAAEC,YAAA;IAAcC,QAAA;IAAUC,QAAA;IAAU,GAAGC;EAAM,GAC7CC,GAAA,KACG;IACH,MAAMC,OAAA,GAAUV,eAAA,CAAgBE,sBAAA,EAAwBG,YAAY;MAC9D;QAAEM;MAAa,IAAID,OAAA;MAEnBE,SAAA,GAAYf,KAAA,CAAMgB,MAAA,CAA4B,IAAI;MAclDC,KAAA,GAAQjB,KAAA,CAAMgB,MAAA,CAAO;QACzBE,SAAA,EAAW;QACXC,MAAA,EAAQ;QACRC,GAAA,EAAK,EAAC;QAAA;QACNC,WAAA,EAAa;QACbC,UAAA,EAAY;MACd,CAAC;MAEKC,OAAA,GAAUA,CAAA,KAAM;QACpB,IAAI,CAACN,KAAA,CAAMO,OAAA,CAAQF,UAAA,EACjB;QAEFL,KAAA,CAAMO,OAAA,CAAQF,UAAA,GAAa,IAC3BR,YAAA,CAAaW,YAAA,GAAe,IAC5BR,KAAA,CAAMO,OAAA,CAAQH,WAAA,GAAc;QAE5B,IAAIK,EAAA,GAAK;QACT,IAAIT,KAAA,CAAMO,OAAA,CAAQJ,GAAA,CAAIO,MAAA,EAAQ;UAC5B,MAAMC,SAAA,GAAYX,KAAA,CAAMO,OAAA,CAAQJ,GAAA,CAAIS,KAAA,CAAM,GAAG;UAG7CH,EAAA,IAFaE,SAAA,CAAUD,MAAA,GAASC,SAAA,CAAUE,MAAA,CAAO,CAACC,CAAA,EAAGC,CAAA,KAAMD,CAAA,GAAIC,CAAA,EAAG,CAAC,IAAI,KAClDJ,SAAA,CAAUD,MAAA,GAClB;QACf;QACAV,KAAA,CAAMO,OAAA,CAAQJ,GAAA,GAAM,EAAC,EACrBN,YAAA,CAAaS,OAAA,CAAQ;UACnBJ,MAAA,EAAQF,KAAA,CAAMO,OAAA,CAAQL,MAAA;UACtBO;QACF,CAAC;MACH;IAEA,OACE,eAAAtB,GAAA,CAACF,UAAA;MACCU,GAAA,EAAKX,WAAA,CAAYc,SAAA,EAAkBH,GAAG;MACtCqB,IAAA,EAAM;MACNC,mBAAA,EAAqB;MACrBC,kBAAA,EAAoBZ,OAAA;MACpBa,SAAA,EAAU;MAEV1B,QAAA,EAAW2B,CAAA,IAAM;QACf,MAAM;UAAEC;QAAE,IAAID,CAAA,CAAEE,WAAA,CAAYC,aAAA;QAC5B1B,YAAA,CAAawB,CAAA,GAAIA,CAAA,EACbA,CAAA,GAAI,MACNxB,YAAA,CAAaW,YAAA,GAAe,KAI9Bf,QAAA,GAAW2B,CAAC;MASd;MACAI,yBAAA,EAA2BA,CAAA,MACzB3B,YAAA,CAAaW,YAAA,GAAe,IAC5BR,KAAA,CAAMO,OAAA,CAAQF,UAAA,GAAa,IACpB;MAGToB,wBAAA,EAA0BA,CAAA,KAAM;MAmC/B,GAAG/B,KAAA;MAEHF;IAAA,CACH;EAEJ,CACF","ignoreList":[]}

package/dist/jsx/SheetScrollView.native.js

@@ -31,6 +31,8 @@ var SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = /* @__PURE__ *
     ref: composeRefs(scrollRef, ref),
     flex: 1,
     scrollEventThrottle: 8,
+    onResponderRelease: release,
+    className: "_ovs-contain",
     // scrollEnabled={scrollEnabled}
     onScroll: function(e) {
       var { y } = e.nativeEvent.contentOffset;
@@ -78,14 +80,8 @@ var SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = /* @__PURE__ *
     //     state.current.dys = state.current.dys.slice(-10)
     //   }
     // }}
-    onResponderRelease: release,
-    className: "_ovs-contain",
     ...props,
-    children: React.useMemo(function() {
-      return children;
-    }, [
-      children
-    ])
+    children
   });
 });
 export {

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/tamagui/code/ui/sheet/src/SheetScrollView.tsx"],
-  "mappings": ";AAAA,OAAOA,WAAW;AAClB,SAASC,mBAAmB;AAG5B,SAASC,kBAAkB;AAI3B,SAASC,uBAAuB;AAShC,IAAMC,yBAAyB,mBAElBC,kBAAkBL,sBAAMM,WAInC,SAAA,OAEEC,KAAAA;MADA,EAAEC,cAAcC,UAAUC,UAAU,GAAGC,MAAAA,IAA0C,OAG3EC,UAAUT,gBAAgBC,wBAAwBI,YAAAA,GAClD,EAAEK,aAAY,IAAKD,SAEnBE,YAAYd,MAAMe,OAA4B,IAAA,GAc9CC,QAAQhB,MAAMe,OAAO;IACzBE,WAAW;IACXC,QAAQ;IACRC,KAAK,CAAA;;IACLC,aAAa;IACbC,YAAY;EACd,CAAA,GAEMC,UAAU,WAAA;AACd,QAAKN,MAAMO,QAAQF,YAGnBL;YAAMO,QAAQF,aAAa,IAC3BR,aAAaW,eAAe,IAC5BR,MAAMO,QAAQH,cAAc;AAE5B,UAAIK,KAAK;AACT,UAAIT,MAAMO,QAAQJ,IAAIO,QAAQ;AAC5B,YAAMC,YAAYX,MAAMO,QAAQJ,IAAIS,MAAM,GAAC,GACrCC,OAAOF,UAAUD,SAASC,UAAUG,OAAO,SAACC,GAAGC,GAAAA;iBAAMD,IAAIC;WAAG,CAAA,IAAK,GACjEC,QAAQJ,OAAOF,UAAUD;AAC/BD,aAAKQ,QAAQ;MACf;AACAjB,YAAMO,QAAQJ,MAAM,CAAA,GACpBN,aAAaS,QAAQ;QACnBJ,QAAQF,MAAMO,QAAQL;QACtBO;MACF,CAAA;;EACF;AAEA,SACE,qBAACvB,YAAAA;IACCK,KAAKN,YAAYa,WAAkBP,GAAAA;IACnC2B,MAAM;IACNC,qBAAqB;;IAErBzB,UAAU,SAAC0B,GAAAA;AACT,UAAM,EAAEC,EAAC,IAAKD,EAAEE,YAAYC;AAC5B1B,mBAAawB,IAAIA,GACbA,IAAI,MACNxB,aAAaW,eAAe,KAI9Bd,YAAAA,QAAAA,SAAW0B,CAAAA;IASb;;;;;;;IACAI,2BAA2B,WAAA;AACzB3B,0BAAaW,eAAe,IAC5BR,MAAMO,QAAQF,aAAa,IACpB;IACT;;IAEAoB,0BAA0B,WAAA;aAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAmChCC,oBAAoBpB;IACpBqB,WAAU;IACT,GAAGhC;cAEHX,MAAM4C,QAAQ,WAAA;aAAMnC;OAAU;MAACA;KAAS;;AAG/C,CAAA;",
-  "names": ["React", "composeRefs", "ScrollView", "useSheetContext", "SHEET_SCROLL_VIEW_NAME", "SheetScrollView", "forwardRef", "ref", "__scopeSheet", "children", "onScroll", "props", "context", "scrollBridge", "scrollRef", "useRef", "state", "lastPageY", "dragAt", "dys", "isScrolling", "isDragging", "release", "current", "scrollStartY", "vy", "length", "recentDys", "slice", "dist", "reduce", "a", "b", "avgDy", "flex", "scrollEventThrottle", "e", "y", "nativeEvent", "contentOffset", "onStartShouldSetResponder", "onMoveShouldSetResponder", "onResponderRelease", "className", "useMemo"]
+  "mappings": ";AAAA,OAAOA,WAAW;AAClB,SAASC,mBAAmB;AAG5B,SAASC,kBAAkB;AAI3B,SAASC,uBAAuB;AAShC,IAAMC,yBAAyB,mBAElBC,kBAAkBL,sBAAMM,WAInC,SAAA,OAEEC,KAAAA;MADA,EAAEC,cAAcC,UAAUC,UAAU,GAAGC,MAAAA,IAA0C,OAG3EC,UAAUT,gBAAgBC,wBAAwBI,YAAAA,GAClD,EAAEK,aAAY,IAAKD,SAEnBE,YAAYd,MAAMe,OAA4B,IAAA,GAc9CC,QAAQhB,MAAMe,OAAO;IACzBE,WAAW;IACXC,QAAQ;IACRC,KAAK,CAAA;;IACLC,aAAa;IACbC,YAAY;EACd,CAAA,GAEMC,UAAU,WAAA;AACd,QAAKN,MAAMO,QAAQF,YAGnBL;YAAMO,QAAQF,aAAa,IAC3BR,aAAaW,eAAe,IAC5BR,MAAMO,QAAQH,cAAc;AAE5B,UAAIK,KAAK;AACT,UAAIT,MAAMO,QAAQJ,IAAIO,QAAQ;AAC5B,YAAMC,YAAYX,MAAMO,QAAQJ,IAAIS,MAAM,GAAC,GACrCC,OAAOF,UAAUD,SAASC,UAAUG,OAAO,SAACC,GAAGC,GAAAA;iBAAMD,IAAIC;WAAG,CAAA,IAAK,GACjEC,QAAQJ,OAAOF,UAAUD;AAC/BD,aAAKQ,QAAQ;MACf;AACAjB,YAAMO,QAAQJ,MAAM,CAAA,GACpBN,aAAaS,QAAQ;QACnBJ,QAAQF,MAAMO,QAAQL;QACtBO;MACF,CAAA;;EACF;AAEA,SACE,qBAACvB,YAAAA;IACCK,KAAKN,YAAYa,WAAkBP,GAAAA;IACnC2B,MAAM;IACNC,qBAAqB;IACrBC,oBAAoBd;IACpBe,WAAU;;IAEV3B,UAAU,SAAC4B,GAAAA;AACT,UAAM,EAAEC,EAAC,IAAKD,EAAEE,YAAYC;AAC5B5B,mBAAa0B,IAAIA,GACbA,IAAI,MACN1B,aAAaW,eAAe,KAI9Bd,YAAAA,QAAAA,SAAW4B,CAAAA;IASb;;;;;;;IACAI,2BAA2B,WAAA;AACzB7B,0BAAaW,eAAe,IAC5BR,MAAMO,QAAQF,aAAa,IACpB;IACT;;IAEAsB,0BAA0B,WAAA;aAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAmC/B,GAAGhC;;;AAKV,CAAA;",
+  "names": ["React", "composeRefs", "ScrollView", "useSheetContext", "SHEET_SCROLL_VIEW_NAME", "SheetScrollView", "forwardRef", "ref", "__scopeSheet", "children", "onScroll", "props", "context", "scrollBridge", "scrollRef", "useRef", "state", "lastPageY", "dragAt", "dys", "isScrolling", "isDragging", "release", "current", "scrollStartY", "vy", "length", "recentDys", "slice", "dist", "reduce", "a", "b", "avgDy", "flex", "scrollEventThrottle", "onResponderRelease", "className", "e", "y", "nativeEvent", "contentOffset", "onStartShouldSetResponder", "onMoveShouldSetResponder"]
 }

package/dist/jsx/nativeSheet.js

@@ -11,13 +11,18 @@ const nativeSheets = {
 function getNativeSheet(platform) {
   return nativeSheets[platform];
 }
-function setupNativeSheet(platform, Implementation) {
+function setupNativeSheet(platform, RNIOSModal) {
+  const { ModalSheetView, ModalSheetViewMainContent } = RNIOSModal;
   platform === "ios" && (nativeSheets[platform] = (props) => {
     const state = useSheetOpenState(props), providerProps = useSheetProviderProps(props, state), { open, setOpen } = state, ref = useRef();
-    return useEffect(() => {
-      ref.current?.setVisibility(open);
-    }, [open]), /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs(SheetProvider, { ...providerProps, onlyShowFrame: !0, children: [
-      /* @__PURE__ */ jsx(Implementation, { ref, onModalDismiss: () => setOpen(!1), children: /* @__PURE__ */ jsx(View, { style: { flex: 1 }, children: props.children }) }),
+    useEffect(() => {
+      open ? ref.current?.presentModal() : ref.current?.dismissModal();
+    }, [open]);
+    function setOpenInternal(next) {
+      props.onOpenChange?.(open), setOpen(next);
+    }
+    return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs(SheetProvider, { ...providerProps, onlyShowFrame: !0, children: [
+      /* @__PURE__ */ jsx(ModalSheetView, { ref, onModalDidDismiss: () => setOpenInternal(!1), children: /* @__PURE__ */ jsx(ModalSheetViewMainContent, { children: /* @__PURE__ */ jsx(View, { style: { flex: 1 }, children: props.children }) }) }),
       /* @__PURE__ */ jsx(
         YStack,
         {

package/dist/jsx/nativeSheet.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/nativeSheet.tsx"],
-  "mappings": "AAAA,SAAS,cAAc;AAEvB,SAAS,WAAW,cAAc;AAClC,SAAS,YAAY;AAErB,SAAS,qBAAqB;AAE9B,SAAS,yBAAyB;AAClC,SAAS,6BAA6B;AAsC9B,mBAGM,KAFJ,YADF;AAhCR,MAAM,eAAmF;AAAA,EACvF,KAAK;AACP;AAEO,SAAS,eAAe,UAAgC;AAC7D,SAAO,aAAa,QAAQ;AAC9B;AAEO,SAAS,iBAAiB,UAAgC,gBAAqB;AACpF,EAAI,aAAa,UACf,aAAa,QAAQ,IAAI,CAAC,UAAsB;AAC9C,UAAM,QAAQ,kBAAkB,KAAK,GAC/B,gBAAgB,sBAAsB,OAAO,KAAK,GAIlD,EAAE,MAAM,QAAQ,IAAI,OACpB,MAAM,OAET;AAEH,qBAAU,MAAM;AACd,UAAI,SAAS,cAAc,IAAI;AAAA,IACjC,GAAG,CAAC,IAAI,CAAC,GASP,gCACE,+BAAC,iBAAe,GAAG,eAAe,eAAa,IAC7C;AAAA,0BAAC,kBAAe,KAAU,gBAAgB,MAAM,QAAQ,EAAK,GAC3D,8BAAC,QAAK,OAAO,EAAE,MAAM,EAAE,GAAI,gBAAM,UAAS,GAC5C;AAAA,MAIA;AAAA,QAAC;AAAA;AAAA,UACC,UAAS;AAAA,UACT,SAAS;AAAA,UACT,eAAc;AAAA,UACd,OAAO;AAAA,UACP,QAAQ;AAAA,UAEP,gBAAM;AAAA;AAAA,MACT;AAAA,OACF,GACF;AAAA,EAEJ;AAEJ;",
+  "mappings": "AAAA,SAAS,cAAc;AAEvB,SAAS,WAAW,cAAc;AAClC,SAAS,YAAY;AACrB,SAAS,qBAAqB;AAE9B,SAAS,yBAAyB;AAClC,SAAS,6BAA6B;AAqD9B,mBAIQ,KAHN,YADF;AA/CR,MAAM,eAAmF;AAAA,EACvF,KAAK;AACP;AAEO,SAAS,eAAe,UAAgC;AAC7D,SAAO,aAAa,QAAQ;AAC9B;AAEO,SAAS,iBACd,UACA,YACA;AACA,QAAM,EAAE,gBAAgB,0BAA0B,IAAI;AAEtD,EAAI,aAAa,UACf,aAAa,QAAQ,IAAI,CAAC,UAAsB;AAC9C,UAAM,QAAQ,kBAAkB,KAAK,GAC/B,gBAAgB,sBAAsB,OAAO,KAAK,GAIlD,EAAE,MAAM,QAAQ,IAAI,OACpB,MAAM,OAGT;AAEH,cAAU,MAAM;AACd,MAAI,OACF,IAAI,SAAS,aAAa,IAE1B,IAAI,SAAS,aAAa;AAAA,IAE9B,GAAG,CAAC,IAAI,CAAC;AAET,aAAS,gBAAgB,MAAe;AACtC,YAAM,eAAe,IAAI,GACzB,QAAQ,IAAI;AAAA,IACd;AAQA,WACE,gCACE,+BAAC,iBAAe,GAAG,eAAe,eAAa,IAC7C;AAAA,0BAAC,kBAAe,KAAU,mBAAmB,MAAM,gBAAgB,EAAK,GACtE,8BAAC,6BACC,8BAAC,QAAK,OAAO,EAAE,MAAM,EAAE,GAAI,gBAAM,UAAS,GAC5C,GACF;AAAA,MAIA;AAAA,QAAC;AAAA;AAAA,UACC,UAAS;AAAA,UACT,SAAS;AAAA,UACT,eAAc;AAAA,UACd,OAAO;AAAA,UACP,QAAQ;AAAA,UAEP,gBAAM;AAAA;AAAA,MACT;AAAA,OACF,GACF;AAAA,EAEJ;AAEJ;",
   "names": []
 }

package/dist/jsx/nativeSheet.mjs

@@ -11,7 +11,11 @@ const nativeSheets = {
 function getNativeSheet(platform) {
   return nativeSheets[platform];
 }
-function setupNativeSheet(platform, Implementation) {
+function setupNativeSheet(platform, RNIOSModal) {
+  const {
+    ModalSheetView,
+    ModalSheetViewMainContent
+  } = RNIOSModal;
   platform === "ios" && (nativeSheets[platform] = props => {
     const state = useSheetOpenState(props),
       providerProps = useSheetProviderProps(props, state),
@@ -20,20 +24,26 @@ function setupNativeSheet(platform, Implementation) {
         setOpen
       } = state,
       ref = useRef();
-    return useEffect(() => {
-      ref.current?.setVisibility(open);
-    }, [open]), /* @__PURE__ */jsx(Fragment, {
+    useEffect(() => {
+      open ? ref.current?.presentModal() : ref.current?.dismissModal();
+    }, [open]);
+    function setOpenInternal(next) {
+      props.onOpenChange?.(open), setOpen(next);
+    }
+    return /* @__PURE__ */jsx(Fragment, {
       children: /* @__PURE__ */jsxs(SheetProvider, {
         ...providerProps,
         onlyShowFrame: !0,
-        children: [/* @__PURE__ */jsx(Implementation, {
+        children: [/* @__PURE__ */jsx(ModalSheetView, {
           ref,
-          onModalDismiss: () => setOpen(!1),
-          children: /* @__PURE__ */jsx(View, {
-            style: {
-              flex: 1
-            },
-            children: props.children
+          onModalDidDismiss: () => setOpenInternal(!1),
+          children: /* @__PURE__ */jsx(ModalSheetViewMainContent, {
+            children: /* @__PURE__ */jsx(View, {
+              style: {
+                flex: 1
+              },
+              children: props.children
+            })
           })
         }), /* @__PURE__ */jsx(YStack, {
           position: "absolute",

package/dist/jsx/nativeSheet.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["YStack","useEffect","useRef","View","SheetProvider","useSheetOpenState","useSheetProviderProps","Fragment","jsx","jsxs","nativeSheets","ios","getNativeSheet","platform","setupNativeSheet","Implementation","props","state","providerProps","open","setOpen","ref","current","setVisibility","children","onlyShowFrame","onModalDismiss","style","flex","position","opacity","pointerEvents","width","height"],"sources":["../../src/nativeSheet.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,MAAA,QAAc;AAEvB,SAASC,SAAA,EAAWC,MAAA,QAAc;AAClC,SAASC,IAAA,QAAY;AAErB,SAASC,aAAA,QAAqB;AAE9B,SAASC,iBAAA,QAAyB;AAClC,SAASC,qBAAA,QAA6B;AAsC9B,SAAAC,QAAA,EAGMC,GAAA,EAFJC,IAAA,QADF;AAhCR,MAAMC,YAAA,GAAmF;EACvFC,GAAA,EAAK;AACP;AAEO,SAASC,eAAeC,QAAA,EAAgC;EAC7D,OAAOH,YAAA,CAAaG,QAAQ;AAC9B;AAEO,SAASC,iBAAiBD,QAAA,EAAgCE,cAAA,EAAqB;EAChFF,QAAA,KAAa,UACfH,YAAA,CAAaG,QAAQ,IAAKG,KAAA,IAAsB;IAC9C,MAAMC,KAAA,GAAQZ,iBAAA,CAAkBW,KAAK;MAC/BE,aAAA,GAAgBZ,qBAAA,CAAsBU,KAAA,EAAOC,KAAK;MAIlD;QAAEE,IAAA;QAAMC;MAAQ,IAAIH,KAAA;MACpBI,GAAA,GAAMnB,MAAA,CAET;IAEH,OAAAD,SAAA,CAAU,MAAM;MACdoB,GAAA,CAAIC,OAAA,EAASC,aAAA,CAAcJ,IAAI;IACjC,GAAG,CAACA,IAAI,CAAC,GASP,eAAAX,GAAA,CAAAD,QAAA;MACEiB,QAAA,iBAAAf,IAAA,CAACL,aAAA;QAAe,GAAGc,aAAA;QAAeO,aAAA,EAAa;QAC7CD,QAAA,kBAAAhB,GAAA,CAACO,cAAA;UAAeM,GAAA;UAAUK,cAAA,EAAgBA,CAAA,KAAMN,OAAA,CAAQ,EAAK;UAC3DI,QAAA,iBAAAhB,GAAA,CAACL,IAAA;YAAKwB,KAAA,EAAO;cAAEC,IAAA,EAAM;YAAE;YAAIJ,QAAA,EAAAR,KAAA,CAAMQ;UAAA,CAAS;QAAA,CAC5C,GAIA,eAAAhB,GAAA,CAACR,MAAA;UACC6B,QAAA,EAAS;UACTC,OAAA,EAAS;UACTC,aAAA,EAAc;UACdC,KAAA,EAAO;UACPC,MAAA,EAAQ;UAEPT,QAAA,EAAAR,KAAA,CAAMQ;QAAA,CACT;MAAA,CACF;IAAA,CACF;EAEJ;AAEJ","ignoreList":[]}
+{"version":3,"names":["YStack","useEffect","useRef","View","SheetProvider","useSheetOpenState","useSheetProviderProps","Fragment","jsx","jsxs","nativeSheets","ios","getNativeSheet","platform","setupNativeSheet","RNIOSModal","ModalSheetView","ModalSheetViewMainContent","props","state","providerProps","open","setOpen","ref","current","presentModal","dismissModal","setOpenInternal","next","onOpenChange","children","onlyShowFrame","onModalDidDismiss","style","flex","position","opacity","pointerEvents","width","height"],"sources":["../../src/nativeSheet.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,MAAA,QAAc;AAEvB,SAASC,SAAA,EAAWC,MAAA,QAAc;AAClC,SAASC,IAAA,QAAY;AACrB,SAASC,aAAA,QAAqB;AAE9B,SAASC,iBAAA,QAAyB;AAClC,SAASC,qBAAA,QAA6B;AAqD9B,SAAAC,QAAA,EAIQC,GAAA,EAHNC,IAAA,QADF;AA/CR,MAAMC,YAAA,GAAmF;EACvFC,GAAA,EAAK;AACP;AAEO,SAASC,eAAeC,QAAA,EAAgC;EAC7D,OAAOH,YAAA,CAAaG,QAAQ;AAC9B;AAEO,SAASC,iBACdD,QAAA,EACAE,UAAA,EACA;EACA,MAAM;IAAEC,cAAA;IAAgBC;EAA0B,IAAIF,UAAA;EAElDF,QAAA,KAAa,UACfH,YAAA,CAAaG,QAAQ,IAAKK,KAAA,IAAsB;IAC9C,MAAMC,KAAA,GAAQd,iBAAA,CAAkBa,KAAK;MAC/BE,aAAA,GAAgBd,qBAAA,CAAsBY,KAAA,EAAOC,KAAK;MAIlD;QAAEE,IAAA;QAAMC;MAAQ,IAAIH,KAAA;MACpBI,GAAA,GAAMrB,MAAA,CAGT;IAEHD,SAAA,CAAU,MAAM;MACVoB,IAAA,GACFE,GAAA,CAAIC,OAAA,EAASC,YAAA,CAAa,IAE1BF,GAAA,CAAIC,OAAA,EAASE,YAAA,CAAa;IAE9B,GAAG,CAACL,IAAI,CAAC;IAET,SAASM,gBAAgBC,IAAA,EAAe;MACtCV,KAAA,CAAMW,YAAA,GAAeR,IAAI,GACzBC,OAAA,CAAQM,IAAI;IACd;IAQA,OACE,eAAApB,GAAA,CAAAD,QAAA;MACEuB,QAAA,iBAAArB,IAAA,CAACL,aAAA;QAAe,GAAGgB,aAAA;QAAeW,aAAA,EAAa;QAC7CD,QAAA,kBAAAtB,GAAA,CAACQ,cAAA;UAAeO,GAAA;UAAUS,iBAAA,EAAmBA,CAAA,KAAML,eAAA,CAAgB,EAAK;UACtEG,QAAA,iBAAAtB,GAAA,CAACS,yBAAA;YACCa,QAAA,iBAAAtB,GAAA,CAACL,IAAA;cAAK8B,KAAA,EAAO;gBAAEC,IAAA,EAAM;cAAE;cAAIJ,QAAA,EAAAZ,KAAA,CAAMY;YAAA,CAAS;UAAA,CAC5C;QAAA,CACF,GAIA,eAAAtB,GAAA,CAACR,MAAA;UACCmC,QAAA,EAAS;UACTC,OAAA,EAAS;UACTC,aAAA,EAAc;UACdC,KAAA,EAAO;UACPC,MAAA,EAAQ;UAEPT,QAAA,EAAAZ,KAAA,CAAMY;QAAA,CACT;MAAA,CACF;IAAA,CACF;EAEJ;AAEJ","ignoreList":[]}

package/dist/jsx/nativeSheet.native.js

@@ -11,29 +11,42 @@ var nativeSheets = {
 function getNativeSheet(platform) {
   return nativeSheets[platform];
 }
-function setupNativeSheet(platform, Implementation) {
+function setupNativeSheet(platform, RNIOSModal) {
+  var { ModalSheetView, ModalSheetViewMainContent } = RNIOSModal;
   platform === "ios" && (nativeSheets[platform] = function(props) {
     var state = useSheetOpenState(props), providerProps = useSheetProviderProps(props, state), { open, setOpen } = state, ref = useRef();
-    return useEffect(function() {
-      var _ref_current;
-      (_ref_current = ref.current) === null || _ref_current === void 0 || _ref_current.setVisibility(open);
+    useEffect(function() {
+      if (open) {
+        var _ref_current;
+        (_ref_current = ref.current) === null || _ref_current === void 0 || _ref_current.presentModal();
+      } else {
+        var _ref_current1;
+        (_ref_current1 = ref.current) === null || _ref_current1 === void 0 || _ref_current1.dismissModal();
+      }
     }, [
       open
-    ]), /* @__PURE__ */ _jsx(_Fragment, {
+    ]);
+    function setOpenInternal(next) {
+      var _props_onOpenChange;
+      (_props_onOpenChange = props.onOpenChange) === null || _props_onOpenChange === void 0 || _props_onOpenChange.call(props, open), setOpen(next);
+    }
+    return /* @__PURE__ */ _jsx(_Fragment, {
       children: /* @__PURE__ */ _jsxs(SheetProvider, {
         ...providerProps,
         onlyShowFrame: !0,
         children: [
-          /* @__PURE__ */ _jsx(Implementation, {
+          /* @__PURE__ */ _jsx(ModalSheetView, {
             ref,
-            onModalDismiss: function() {
-              return setOpen(!1);
+            onModalDidDismiss: function() {
+              return setOpenInternal(!1);
             },
-            children: /* @__PURE__ */ _jsx(View, {
-              style: {
-                flex: 1
-              },
-              children: props.children
+            children: /* @__PURE__ */ _jsx(ModalSheetViewMainContent, {
+              children: /* @__PURE__ */ _jsx(View, {
+                style: {
+                  flex: 1
+                },
+                children: props.children
+              })
             })
           }),
           /* for some reason select triggers wont show on native if this isn't inside the actual tree not inside implementation... */

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/tamagui/code/ui/sheet/src/nativeSheet.tsx"],
-  "mappings": ";AAAA,SAASA,cAAc;AAEvB,SAASC,WAAWC,cAAc;AAClC,SAASC,YAAY;AAErB,SAASC,qBAAqB;AAE9B,SAASC,yBAAyB;AAClC,SAASC,6BAA6B;AAMtC,IAAMC,eAAmF;EACvFC,KAAK;AACP;AAEO,SAASC,eAAeC,UAA8B;AAC3D,SAAOH,aAAaG,QAAAA;AACtB;AAEO,SAASC,iBAAiBD,UAAgCE,gBAAmB;AAClF,EAAIF,aAAa,UACfH,aAAaG,QAAAA,IAAY,SAACG,OAAAA;AACxB,QAAMC,QAAQT,kBAAkBQ,KAAAA,GAC1BE,gBAAgBT,sBAAsBO,OAAOC,KAAAA,GAI7C,EAAEE,MAAMC,QAAO,IAAKH,OACpBI,MAAMhB,OAAAA;AAIZD,qBAAU,WAAA;UACRiB;OAAAA,eAAAA,IAAIC,aAAO,QAAXD,iBAAAA,UAAAA,aAAaE,cAAcJ,IAAAA;IAC7B,GAAG;MAACA;KAAK,GASP,qBAAA,WAAA;gBACE,sBAACZ,eAAAA;QAAe,GAAGW;QAAeM,eAAa;;UAC7C,qBAACT,gBAAAA;YAAeM;YAAUI,gBAAgB,WAAA;qBAAML,QAAQ,EAAA;;sBACtD,qBAACd,MAAAA;cAAKoB,OAAO;gBAAEC,MAAM;cAAE;wBAAIX,MAAMY;;;;;UAKnC,qBAACzB,QAAAA;YACC0B,UAAS;YACTC,SAAS;YACTC,eAAc;YACdC,OAAO;YACPC,QAAQ;sBAEPjB,MAAMY;;;;;EAKjB;AAEJ;",
-  "names": ["YStack", "useEffect", "useRef", "View", "SheetProvider", "useSheetOpenState", "useSheetProviderProps", "nativeSheets", "ios", "getNativeSheet", "platform", "setupNativeSheet", "Implementation", "props", "state", "providerProps", "open", "setOpen", "ref", "current", "setVisibility", "onlyShowFrame", "onModalDismiss", "style", "flex", "children", "position", "opacity", "pointerEvents", "width", "height"]
+  "mappings": ";AAAA,SAASA,cAAc;AAEvB,SAASC,WAAWC,cAAc;AAClC,SAASC,YAAY;AACrB,SAASC,qBAAqB;AAE9B,SAASC,yBAAyB;AAClC,SAASC,6BAA6B;AAMtC,IAAMC,eAAmF;EACvFC,KAAK;AACP;AAEO,SAASC,eAAeC,UAA8B;AAC3D,SAAOH,aAAaG,QAAAA;AACtB;AAEO,SAASC,iBACdD,UACAE,YAAmE;AAEnE,MAAM,EAAEC,gBAAgBC,0BAAyB,IAAKF;AAEtD,EAAIF,aAAa,UACfH,aAAaG,QAAAA,IAAY,SAACK,OAAAA;AACxB,QAAMC,QAAQX,kBAAkBU,KAAAA,GAC1BE,gBAAgBX,sBAAsBS,OAAOC,KAAAA,GAI7C,EAAEE,MAAMC,QAAO,IAAKH,OACpBI,MAAMlB,OAAAA;AAKZD,cAAU,WAAA;AACR,UAAIiB,MAAM;YACRE;SAAAA,eAAAA,IAAIC,aAAO,QAAXD,iBAAAA,UAAAA,aAAaE,aAAY;MAC3B,OAAO;YACLF;SAAAA,gBAAAA,IAAIC,aAAO,QAAXD,kBAAAA,UAAAA,cAAaG,aAAY;MAC3B;IACF,GAAG;MAACL;KAAK;AAET,aAASM,gBAAgBC,MAAa;UACpCV;OAAAA,sBAAAA,MAAMW,kBAAY,QAAlBX,wBAAAA,UAAAA,oBAAAA,KAAAA,OAAqBG,IAAAA,GACrBC,QAAQM,IAAAA;IACV;AAQA,WACE,qBAAA,WAAA;gBACE,sBAACrB,eAAAA;QAAe,GAAGa;QAAeU,eAAa;;UAC7C,qBAACd,gBAAAA;YAAeO;YAAUQ,mBAAmB,WAAA;qBAAMJ,gBAAgB,EAAA;;sBACjE,qBAACV,2BAAAA;wBACC,qBAACX,MAAAA;gBAAK0B,OAAO;kBAAEC,MAAM;gBAAE;0BAAIf,MAAMgB;;;;;;UAMrC,qBAAC/B,QAAAA;YACCgC,UAAS;YACTC,SAAS;YACTC,eAAc;YACdC,OAAO;YACPC,QAAQ;sBAEPrB,MAAMgB;;;;;EAKjB;AAEJ;",
+  "names": ["YStack", "useEffect", "useRef", "View", "SheetProvider", "useSheetOpenState", "useSheetProviderProps", "nativeSheets", "ios", "getNativeSheet", "platform", "setupNativeSheet", "RNIOSModal", "ModalSheetView", "ModalSheetViewMainContent", "props", "state", "providerProps", "open", "setOpen", "ref", "current", "presentModal", "dismissModal", "setOpenInternal", "next", "onOpenChange", "onlyShowFrame", "onModalDidDismiss", "style", "flex", "children", "position", "opacity", "pointerEvents", "width", "height"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/sheet",
-  "version": "1.115.5",
+  "version": "1.116.1",
   "sideEffects": [
     "*.css"
   ],
@@ -35,26 +35,26 @@
     }
   },
   "dependencies": {
-    "@tamagui/animate-presence": "1.115.5",
-    "@tamagui/animations-react-native": "1.115.5",
-    "@tamagui/compose-refs": "1.115.5",
-    "@tamagui/constants": "1.115.5",
-    "@tamagui/core": "1.115.5",
-    "@tamagui/create-context": "1.115.5",
-    "@tamagui/helpers": "1.115.5",
-    "@tamagui/portal": "1.115.5",
-    "@tamagui/remove-scroll": "1.115.5",
-    "@tamagui/scroll-view": "1.115.5",
-    "@tamagui/stacks": "1.115.5",
-    "@tamagui/use-constant": "1.115.5",
-    "@tamagui/use-controllable-state": "1.115.5",
-    "@tamagui/use-keyboard-visible": "1.115.5"
+    "@tamagui/animate-presence": "1.116.1",
+    "@tamagui/animations-react-native": "1.116.1",
+    "@tamagui/compose-refs": "1.116.1",
+    "@tamagui/constants": "1.116.1",
+    "@tamagui/core": "1.116.1",
+    "@tamagui/create-context": "1.116.1",
+    "@tamagui/helpers": "1.116.1",
+    "@tamagui/portal": "1.116.1",
+    "@tamagui/remove-scroll": "1.116.1",
+    "@tamagui/scroll-view": "1.116.1",
+    "@tamagui/stacks": "1.116.1",
+    "@tamagui/use-constant": "1.116.1",
+    "@tamagui/use-controllable-state": "1.116.1",
+    "@tamagui/use-keyboard-visible": "1.116.1"
   },
   "peerDependencies": {
     "react": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.115.5",
+    "@tamagui/build": "1.116.1",
     "react": "^18.2.0 || ^19.0.0"
   },
   "publishConfig": {

package/src/SheetImplementationCustom.tsx

@@ -1,4 +1,3 @@
-import { AdaptParentContext } from '@tamagui/adapt'
 import { AnimatePresence } from '@tamagui/animate-presence'
 import { useComposedRefs } from '@tamagui/compose-refs'
 import {
@@ -16,7 +15,7 @@ import {
   useThemeName,
 } from '@tamagui/core'
 import { Portal } from '@tamagui/portal'
-import React from 'react'
+import React, { useId } from 'react'
 import type {
   Animated,
   GestureResponderEvent,
@@ -75,7 +74,7 @@ export const SheetImplementationCustom = React.forwardRef<View, SheetProps>(
     const { open, controller, isHidden } = state
 
     const sheetRef = React.useRef<View>(null)
-    const ref = useComposedRefs(forwardedRef, sheetRef)
+    const ref = useComposedRefs(forwardedRef, sheetRef, providerProps.contentRef as any)
 
     // TODO this can be extracted into a helper getAnimationConfig(animationProp as array | string)
     const animationConfig = (() => {
@@ -99,8 +98,14 @@ export const SheetImplementationCustom = React.forwardRef<View, SheetProps>(
      * This is a hacky workaround for native:
      */
     const [isShowingInnerSheet, setIsShowingInnerSheet] = React.useState(false)
-    const shouldHideParentSheet = !isWeb && modal && isShowingInnerSheet
-    const parentSheetContext = React.useContext(SheetInsideSheetContext)
+    const shouldHideParentSheet =
+      !isWeb &&
+      modal &&
+      isShowingInnerSheet &&
+      // if not using weird portal limitation we dont need to hide parent sheet
+      process.env.TAMAGUI_USE_NATIVE_PORTAL !== 'false'
+
+    const sheetInsideSheet = React.useContext(SheetInsideSheetContext)
     const onInnerSheet = React.useCallback((hasChild: boolean) => {
       setIsShowingInnerSheet(hasChild)
     }, [])
@@ -119,12 +124,12 @@ export const SheetImplementationCustom = React.forwardRef<View, SheetProps>(
     const AnimatedView = (animationDriver.View ?? Stack) as typeof Animated.View
 
     useIsomorphicLayoutEffect(() => {
-      if (!(parentSheetContext && open)) return
-      parentSheetContext(true)
+      if (!(sheetInsideSheet && open)) return
+      sheetInsideSheet(true)
       return () => {
-        parentSheetContext(false)
+        sheetInsideSheet(false)
       }
-    }, [parentSheetContext, open])
+    }, [sheetInsideSheet, open])
 
     const nextParentContext = React.useMemo(
       () => ({
@@ -431,6 +436,12 @@ export const SheetImplementationCustom = React.forwardRef<View, SheetProps>(
         ? `${maxSnapPoint}${isWeb ? 'dvh' : '%'}`
         : maxSnapPoint
 
+    const id = useId()
+    // const { AdaptProvider, when, children } = useAdaptParent({
+    //   scope: `${id}Sheet`,
+    //   portal: true,
+    // })
+
     const contents = (
       <ParentSheetContext.Provider value={nextParentContext}>
         <SheetProvider {...providerProps}>
@@ -470,7 +481,7 @@ export const SheetImplementationCustom = React.forwardRef<View, SheetProps>(
                 width: '100%',
                 height: forcedContentHeight,
                 minHeight: forcedContentHeight,
-                opacity,
+                opacity: !shouldHideParentSheet ? opacity : 0,
                 ...((shouldHideParentSheet || !open) && {
                   pointerEvents: 'none',
                 }),
@@ -478,26 +489,23 @@ export const SheetImplementationCustom = React.forwardRef<View, SheetProps>(
               animatedStyle,
             ]}
           >
+            {/* <AdaptProvider>{props.children}</AdaptProvider> */}
             {props.children}
           </AnimatedView>
         </SheetProvider>
       </ParentSheetContext.Provider>
     )
 
-    const adaptContext = React.useContext(AdaptParentContext)
-
     // start mounted so we get an accurate measurement the first time
-    const shouldMountChildren = Boolean(opacity || !unmountChildrenWhenHidden)
+    const shouldMountChildren = unmountChildrenWhenHidden ? !opacity : true
 
     if (modal) {
       const modalContents = (
-        <Portal zIndex={zIndex} {...portalProps}>
+        <Portal stackZIndex={zIndex} {...portalProps}>
           {shouldMountChildren && (
             <ContainerComponent>
               <Theme forceClassName name={themeName}>
-                <AdaptParentContext.Provider value={adaptContext}>
-                  {contents}
-                </AdaptParentContext.Provider>
+                {contents}
               </Theme>
             </ContainerComponent>
           )}

package/src/SheetScrollView.tsx

@@ -77,6 +77,8 @@ export const SheetScrollView = React.forwardRef<
         ref={composeRefs(scrollRef as any, ref)}
         flex={1}
         scrollEventThrottle={8}
+        onResponderRelease={release}
+        className="_ovs-contain"
         // scrollEnabled={scrollEnabled}
         onScroll={(e) => {
           const { y } = e.nativeEvent.contentOffset
@@ -137,11 +139,9 @@ export const SheetScrollView = React.forwardRef<
         //     state.current.dys = state.current.dys.slice(-10)
         //   }
         // }}
-        onResponderRelease={release}
-        className="_ovs-contain"
         {...props}
       >
-        {React.useMemo(() => children, [children])}
+        {children}
       </ScrollView>
     )
   }

package/src/nativeSheet.tsx

@@ -2,7 +2,6 @@ import { YStack } from '@tamagui/stacks'
 import type { FunctionComponent } from 'react'
 import { useEffect, useRef } from 'react'
 import { View } from 'react-native'
-
 import { SheetProvider } from './SheetContext'
 import type { SheetProps } from './types'
 import { useSheetOpenState } from './useSheetOpenState'
@@ -20,7 +19,12 @@ export function getNativeSheet(platform: SheetNativePlatforms) {
   return nativeSheets[platform]
 }
 
-export function setupNativeSheet(platform: SheetNativePlatforms, Implementation: any) {
+export function setupNativeSheet(
+  platform: SheetNativePlatforms,
+  RNIOSModal: { ModalSheetView: any; ModalSheetViewMainContent: any }
+) {
+  const { ModalSheetView, ModalSheetViewMainContent } = RNIOSModal
+
   if (platform === 'ios') {
     nativeSheets[platform] = (props: SheetProps) => {
       const state = useSheetOpenState(props)
@@ -30,13 +34,23 @@ export function setupNativeSheet(platform: SheetNativePlatforms, Implementation:
 
       const { open, setOpen } = state
       const ref = useRef<{
-        setVisibility: Function
+        presentModal: Function
+        dismissModal: Function
       }>()
 
       useEffect(() => {
-        ref.current?.setVisibility(open)
+        if (open) {
+          ref.current?.presentModal()
+        } else {
+          ref.current?.dismissModal()
+        }
       }, [open])
 
+      function setOpenInternal(next: boolean) {
+        props.onOpenChange?.(open)
+        setOpen(next)
+      }
+
       // modalContentPreferredContentSize={{
       //   mode: 'percent',
       //   percentWidth: '100%',
@@ -46,9 +60,11 @@ export function setupNativeSheet(platform: SheetNativePlatforms, Implementation:
       return (
         <>
           <SheetProvider {...providerProps} onlyShowFrame>
-            <Implementation ref={ref} onModalDismiss={() => setOpen(false)}>
-              <View style={{ flex: 1 }}>{props.children}</View>
-            </Implementation>
+            <ModalSheetView ref={ref} onModalDidDismiss={() => setOpenInternal(false)}>
+              <ModalSheetViewMainContent>
+                <View style={{ flex: 1 }}>{props.children}</View>
+              </ModalSheetViewMainContent>
+            </ModalSheetView>
 
             {/* for some reason select triggers wont show on native if this isn't inside the actual tree not inside implementation... */}
             {/* so just hiding it here for now... not great... */}

package/types/SheetImplementationCustom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SheetImplementationCustom.d.ts","sourceRoot":"","sources":["../src/SheetImplementationCustom.tsx"],"names":[],"mappings":"AAkBA,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB,OAAO,EAAsC,IAAI,EAAE,MAAM,cAAc,CAAA;AAIvE,OAAO,KAAK,EAAc,cAAc,EAAE,MAAM,SAAS,CAAA;AAWzD,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;yBAS3B,MAAO,aAAa;;;8BAud9B,CAAA"}
+{"version":3,"file":"SheetImplementationCustom.d.ts","sourceRoot":"","sources":["../src/SheetImplementationCustom.tsx"],"names":[],"mappings":"AAiBA,OAAO,KAAgB,MAAM,OAAO,CAAA;AAOpC,OAAO,EAAsC,IAAI,EAAE,MAAM,cAAc,CAAA;AAIvE,OAAO,KAAK,EAAc,cAAc,EAAE,MAAM,SAAS,CAAA;AAWzD,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;yBAUtB,MAAO,aAAa;;;8BA+dnC,CAAA"}

package/types/nativeSheet.d.ts

@@ -2,6 +2,9 @@ import type { FunctionComponent } from 'react';
 import type { SheetProps } from './types';
 type SheetNativePlatforms = 'ios';
 export declare function getNativeSheet(platform: SheetNativePlatforms): FunctionComponent<SheetProps> | null;
-export declare function setupNativeSheet(platform: SheetNativePlatforms, Implementation: any): void;
+export declare function setupNativeSheet(platform: SheetNativePlatforms, RNIOSModal: {
+    ModalSheetView: any;
+    ModalSheetViewMainContent: any;
+}): void;
 export {};
 //# sourceMappingURL=nativeSheet.d.ts.map

package/types/nativeSheet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nativeSheet.d.ts","sourceRoot":"","sources":["../src/nativeSheet.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAK9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAMzC,KAAK,oBAAoB,GAAG,KAAK,CAAA;AAMjC,wBAAgB,cAAc,CAAC,QAAQ,EAAE,oBAAoB,wCAE5D;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,oBAAoB,EAAE,cAAc,EAAE,GAAG,QA8CnF"}
+{"version":3,"file":"nativeSheet.d.ts","sourceRoot":"","sources":["../src/nativeSheet.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAI9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAMzC,KAAK,oBAAoB,GAAG,KAAK,CAAA;AAMjC,wBAAgB,cAAc,CAAC,QAAQ,EAAE,oBAAoB,wCAE5D;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,oBAAoB,EAC9B,UAAU,EAAE;IAAE,cAAc,EAAE,GAAG,CAAC;IAAC,yBAAyB,EAAE,GAAG,CAAA;CAAE,QA6DpE"}