From b865569ce253e35304bde23366b2ce1cbe67e5f7 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 28 Oct 2026 04:29:50 +0100
Subject: [PATCH] fix: skip tour steps whose target sits in a closed drawer on
 the phone

---
 components/tour/__tests__/tour.test.tsx | 5 +++++
 components/tour/tour-overlay.tsx        | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/components/tour/__tests__/tour.test.tsx b/components/tour/__tests__/tour.test.tsx
index 64bd27601..6c0b1de38 100644
--- a/components/tour/__tests__/tour.test.tsx
+++ b/components/tour/__tests__/tour.test.tsx
@@ -64,6 +64,11 @@ describe('tour targets', () => {
     expect(findTourTarget('[data-tour="one"]')?.id).toBe('tabbar');
   });
 
+  it('ignores a copy in a closed drawer', () => {
+    anchors('<div inert><a data-tour="one" id="drawer" data-size></a></div>');
+    expect(findTourTarget('[data-tour="one"]')).toBeNull();
+  });
+
   it('skips a step whose target is in the page but not shown, instead of leaving the user behind the overlay', () => {
     anchors('<a data-tour="one"></a>');
     render(<TourOverlay />);
diff --git a/components/tour/tour-overlay.tsx b/components/tour/tour-overlay.tsx
index 83f789252..8751bbc03 100644
--- a/components/tour/tour-overlay.tsx
+++ b/components/tour/tour-overlay.tsx
@@ -24,12 +24,16 @@ const TOOLTIP_MAX_W = 360;
 /**
  * The first element for the selector that is on screen. The same anchor can
  * exist twice (the rail and the phone's tab bar); one with no size is not
- * rendered in this layout and has nothing to point at.
+ * rendered in this layout, and one in a closed drawer (inert, or pushed off
+ * the side of the screen) can't be seen: neither has anything to point at.
  */
 export function findTourTarget(selector: string): Element | null {
   for (const el of document.querySelectorAll(selector)) {
+    if (el.closest("[inert]")) continue;
     const r = el.getBoundingClientRect();
-    if (r.width > 0 || r.height > 0) return el;
+    if (r.width === 0 && r.height === 0) continue;
+    if (r.right <= 0 || r.left >= window.innerWidth) continue;
+    return el;
   }
   return null;
 }