From ac42e352a2a81c0b6f3679d64d04881f982b6600 Mon Sep 17 00:00:00 2001
From: Silberengel <silberengel7@protonmail.com>
Date: Thu, 9 Apr 2026 09:15:57 +0200
Subject: [PATCH] fix zap modality

---
 src/PageManager.tsx                 |  3 +++
 src/components/NoteDrawer/index.tsx | 16 +++-----------
 src/lib/sheet-dismiss-guard.ts      | 33 +++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 13 deletions(-)
 create mode 100644 src/lib/sheet-dismiss-guard.ts

diff --git a/src/PageManager.tsx b/src/PageManager.tsx
index 47e29b55..126e3a42 100644
--- a/src/PageManager.tsx
+++ b/src/PageManager.tsx
@@ -6,6 +6,7 @@ import { RefreshButton } from '@/components/RefreshButton'
 import { Button } from '@/components/ui/button'
 import { cn } from '@/lib/utils'
 import logger from '@/lib/logger'
+import { preventRadixSheetCloseForPortaledOverlay } from '@/lib/sheet-dismiss-guard'
 import { ChevronLeft } from 'lucide-react'
 import { NavigationService } from '@/services/navigation.service'
 // Page imports needed for primary note view
@@ -2254,6 +2255,8 @@ export function PageManager({ maxStackSize = 5 }: { maxStackSize?: number }) {
                   side="right"
                   className="w-full sm:max-w-[1042px] overflow-y-auto p-0"
                   hideClose
+                  onPointerDownOutside={(e) => preventRadixSheetCloseForPortaledOverlay(e)}
+                  onInteractOutside={(e) => preventRadixSheetCloseForPortaledOverlay(e)}
                 >
                   <div className="h-full">
                     {secondaryStack.map((item, index) => {
diff --git a/src/components/NoteDrawer/index.tsx b/src/components/NoteDrawer/index.tsx
index 56a93d1c..91a5339b 100644
--- a/src/components/NoteDrawer/index.tsx
+++ b/src/components/NoteDrawer/index.tsx
@@ -1,4 +1,5 @@
 import { useState, useEffect, useRef } from 'react'
+import { preventRadixSheetCloseForPortaledOverlay } from '@/lib/sheet-dismiss-guard'
 import { Sheet, SheetContent } from '@/components/ui/sheet'
 import NotePage from '@/pages/secondary/NotePage'
 import { useSecondaryPage } from '@/PageManager'
@@ -53,19 +54,8 @@ export default function NoteDrawer({ open, onOpenChange, noteId, initialEvent }:
         side="right"
         className="w-full sm:max-w-[1042px] overflow-y-auto p-0"
         hideClose
-        onPointerDownOutside={(e) => {
-          // Prevent the drawer from closing when the user interacts with a lightbox portal.
-          // The lightbox renders into document.body (outside the Sheet DOM) so Radix UI
-          // would otherwise treat every click inside the lightbox as "outside" the drawer.
-          if (document.body.classList.contains('yarl__no_scroll')) {
-            e.preventDefault()
-          }
-        }}
-        onInteractOutside={(e) => {
-          if (document.body.classList.contains('yarl__no_scroll')) {
-            e.preventDefault()
-          }
-        }}
+        onPointerDownOutside={(e) => preventRadixSheetCloseForPortaledOverlay(e)}
+        onInteractOutside={(e) => preventRadixSheetCloseForPortaledOverlay(e)}
       >
         <div className="min-h-full">
           <NotePage
diff --git a/src/lib/sheet-dismiss-guard.ts b/src/lib/sheet-dismiss-guard.ts
new file mode 100644
index 00000000..2669e8c5
--- /dev/null
+++ b/src/lib/sheet-dismiss-guard.ts
@@ -0,0 +1,33 @@
+/**
+ * Radix Sheet closes on outside pointer/focus. Full-page portals on `document.body`
+ * (lightbox, Bitcoin Connect `bc-modal`) sit outside the Sheet DOM, so Radix treats
+ * interactions there as "dismiss sheet" unless we call {@link preventDefault}.
+ */
+
+type RadixOutsideEvent = {
+  preventDefault: () => void
+  detail?: { originalEvent?: Event }
+}
+
+function eventComposedPath(e: RadixOutsideEvent): EventTarget[] {
+  const orig = e.detail?.originalEvent
+  if (orig && typeof orig.composedPath === 'function') {
+    return orig.composedPath()
+  }
+  return []
+}
+
+export function preventRadixSheetCloseForPortaledOverlay(e: RadixOutsideEvent): void {
+  if (typeof document === 'undefined') return
+  if (document.body.classList.contains('yarl__no_scroll')) {
+    e.preventDefault()
+    return
+  }
+  const path = eventComposedPath(e)
+  const inBitcoinConnectModal = path.some(
+    (node) => node instanceof HTMLElement && node.tagName.toLowerCase() === 'bc-modal'
+  )
+  if (inBitcoinConnectModal) {
+    e.preventDefault()
+  }
+}