Merge pull request #4113 from KBVE/patch-atomic-expo-ios-test-02-24-2…

…025-1740445192 [CI] Merge patch-atomic-expo-ios-test-02-24-2025-1740445192 into dev
KBVE · Feb 25, 2025 · 436eebb · 436eebb
2 parents 809d6fa + f00818f
commit 436eebb
Show file tree

Hide file tree

Showing 74 changed files with 2,798 additions and 1,186 deletions.
diff --git a/apps/cityvote/expo-cityvote/.tamagui/tamagui-components.config.cjs b/apps/cityvote/expo-cityvote/.tamagui/tamagui-components.config.cjs
@@ -29675,21 +29675,24 @@ function createSheet({
       frameSize,
       contentRef,
       open
-    } = context2, composedContentRef = useComposedRefs(forwardedRef, contentRef), offscreenSize = useSheetOffscreenSize(context2), sheetContents = (0, import_react22.useMemo)(() => /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(StackZIndexContext, {
-      zIndex: resolveViewZIndex(props.zIndex),
-      children: /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(Frame2, {
+    } = context2, composedContentRef = useComposedRefs(forwardedRef, contentRef), offscreenSize = useSheetOffscreenSize(context2), sheetContents = (0, import_react22.useMemo)(() => (
+      // @ts-expect-error
+      /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(Frame2, {
         ref: composedContentRef,
         flex: hasFit ? 0 : 1,
         height: hasFit ? void 0 : frameSize,
         pointerEvents: open ? "auto" : "none",
         ...props,
-        children: [children, adjustPaddingForOffscreenContent && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_core8.Stack, {
+        children: [/* @__PURE__ */ (0, import_jsx_runtime14.jsx)(StackZIndexContext, {
+          zIndex: resolveViewZIndex(props.zIndex),
+          children
+        }), adjustPaddingForOffscreenContent && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_core8.Stack, {
           "data-sheet-offscreen-pad": true,
           height: offscreenSize,
           width: "100%"
         })]
       })
-    }), [open, props, frameSize, offscreenSize, adjustPaddingForOffscreenContent, hasFit]);
+    ), [open, props, frameSize, offscreenSize, adjustPaddingForOffscreenContent, hasFit]);
     return /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(import_jsx_runtime14.Fragment, {
       children: [/* @__PURE__ */ (0, import_jsx_runtime14.jsx)(RemoveScroll, {
         forwardProps: true,

diff --git a/apps/cityvote/expo-cityvote/.tamagui/tamagui.config.cjs b/apps/cityvote/expo-cityvote/.tamagui/tamagui.config.cjs
@@ -31504,21 +31504,24 @@ function createSheet({
       frameSize,
       contentRef,
       open
-    } = context2, composedContentRef = useComposedRefs(forwardedRef, contentRef), offscreenSize = useSheetOffscreenSize(context2), sheetContents = (0, import_react23.useMemo)(() => /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(StackZIndexContext, {
-      zIndex: resolveViewZIndex(props.zIndex),
-      children: /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(Frame2, {
+    } = context2, composedContentRef = useComposedRefs(forwardedRef, contentRef), offscreenSize = useSheetOffscreenSize(context2), sheetContents = (0, import_react23.useMemo)(() => (
+      // @ts-expect-error
+      /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(Frame2, {
         ref: composedContentRef,
         flex: hasFit ? 0 : 1,
         height: hasFit ? void 0 : frameSize,
         pointerEvents: open ? "auto" : "none",
         ...props,
-        children: [children, adjustPaddingForOffscreenContent && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_core9.Stack, {
+        children: [/* @__PURE__ */ (0, import_jsx_runtime14.jsx)(StackZIndexContext, {
+          zIndex: resolveViewZIndex(props.zIndex),
+          children
+        }), adjustPaddingForOffscreenContent && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_core9.Stack, {
           "data-sheet-offscreen-pad": true,
           height: offscreenSize,
           width: "100%"
         })]
       })
-    }), [open, props, frameSize, offscreenSize, adjustPaddingForOffscreenContent, hasFit]);
+    ), [open, props, frameSize, offscreenSize, adjustPaddingForOffscreenContent, hasFit]);
     return /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(import_jsx_runtime14.Fragment, {
       children: [/* @__PURE__ */ (0, import_jsx_runtime14.jsx)(RemoveScroll, {
         forwardProps: true,