From 1301928f48266166895fa4ab959f678636a366d3 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Tue, 3 Nov 2026 11:39:36 +0000 Subject: [PATCH 1/8] fix(desktop): annotation tools reach same-origin iframes The preview pick preload runs only in the guest's top frame, so on pages that render content in a same-origin iframe (a Storybook canvas) Select, Region, Draw, Erase, the tool keys and Escape never saw input over the frame, and clicks fell through to the page. The session now listens in every reachable same-origin frame (re-attaching when a frame loads or navigates), converts frame event coordinates to the top viewport, descends into frames when hit testing and when collecting Region candidates, clips frame element rects by each enclosing frame, and applies the crosshair cursor in frames. Element checks no longer rely on instanceof, which fails across realms. Cross-origin frames keep selecting the iframe element itself. Co-Authored-By: Claude Opus 5.5 --- apps/desktop/src/preview/PickPreload.ts | 282 +++++++++++++++++------- 1 file changed, 208 insertions(+), 74 deletions(-) diff --git a/apps/desktop/src/preview/PickPreload.ts b/apps/desktop/src/preview/PickPreload.ts index 4cb5987cdeb85..21c5cc48391e8 100644 --- a/apps/desktop/src/preview/PickPreload.ts +++ b/apps/desktop/src/preview/PickPreload.ts @@ -43,6 +43,8 @@ const MAX_MARQUEE_ELEMENTS = 20; const ELEMENT_CONTEXT_TIMEOUT_MS = 5_000; const CONTENT_LAYER_Z_INDEX = 1; const CHROME_LAYER_Z_INDEX = 10; +const CROSSHAIR_CURSOR_CSS = + "html[data-t3code-annotation-tool] body, html[data-t3code-annotation-tool] body * { cursor: crosshair !important; }"; let recordingCursor: ReturnType | null = null; ipcRenderer.on( @@ -219,13 +221,6 @@ window.addEventListener("auxclick", suppressNavigationButton, true); const nextId = createAnnotationIdSource(); -const rectFromDomRect = (rect: DOMRect): PreviewAnnotationRect => ({ - x: rect.left, - y: rect.top, - width: rect.width, - height: rect.height, -}); - const normalizeRect = ( startX: number, startY: number, @@ -258,16 +253,99 @@ function unionRects( }; } -function isAnnotationNode(element: Element): boolean { - return element instanceof Element && element.closest(`[${OVERLAY_ATTRIBUTE}]`) !== null; +// Nodes from a same-origin frame belong to that frame's realm, so `instanceof` checks fail on them. +const isElementNode = (node: EventTarget | null): node is Element => + node !== null && "nodeType" in node && node.nodeType === Node.ELEMENT_NODE; + +const hasInlineStyle = (element: Element): element is HTMLElement | SVGElement => + "style" in element; + +const styleOf = (element: Element): CSSStyleDeclaration => + (element.ownerDocument.defaultView ?? window).getComputedStyle(element); + +function isAnnotationNode(node: EventTarget | null): boolean { + return isElementNode(node) && node.closest(`[${OVERLAY_ATTRIBUTE}]`) !== null; +} + +const isFrameElement = (node: EventTarget | null): node is HTMLIFrameElement | HTMLFrameElement => + isElementNode(node) && (node.tagName === "IFRAME" || node.tagName === "FRAME"); + +/** The document of a same-origin frame; null for cross-origin frames and non-frames. */ +const frameDocument = (element: Element): Document | null => + isFrameElement(element) ? element.contentDocument : null; + +function frameDocuments(root: Document): Document[] { + return Array.from(root.querySelectorAll("iframe, frame")).flatMap((frame) => { + const inner = frameDocument(frame); + return inner ? [inner, ...frameDocuments(inner)] : []; + }); +} + +/** Where a frame's viewport origin sits in its parent's viewport. */ +function frameContentOffset(frame: Element): PreviewAnnotationPoint { + const rect = frame.getBoundingClientRect(); + const style = styleOf(frame); + return { + x: rect.left + frame.clientLeft + (Number.parseFloat(style.paddingLeft) || 0), + y: rect.top + frame.clientTop + (Number.parseFloat(style.paddingTop) || 0), + }; +} + +const enclosingFrame = (view: Window | null): Element | null => view?.frameElement ?? null; + +/** Translates a point in `view`'s viewport into the top viewport. */ +function topPoint(view: Window | null, x: number, y: number): PreviewAnnotationPoint { + for (let frame = enclosingFrame(view); frame;) { + const offset = frameContentOffset(frame); + x += offset.x; + y += offset.y; + frame = enclosingFrame(frame.ownerDocument.defaultView); + } + return { x, y }; } -function pickFromPoint(clientX: number, clientY: number): Element | null { - for (const candidate of document.elementsFromPoint(clientX, clientY)) { - if (!(candidate instanceof Element)) continue; +const eventPoint = (event: MouseEvent): PreviewAnnotationPoint => + topPoint(event.view, event.clientX, event.clientY); + +function intersectRects( + left: PreviewAnnotationRect, + right: PreviewAnnotationRect, +): PreviewAnnotationRect { + const x = Math.max(left.x, right.x); + const y = Math.max(left.y, right.y); + return { + x, + y, + width: Math.max(0, Math.min(left.x + left.width, right.x + right.width) - x), + height: Math.max(0, Math.min(left.y + left.height, right.y + right.height) - y), + }; +} + +/** Moves a rect in `view`'s viewport into the top viewport, clipped by each enclosing frame. */ +function inTopViewport(view: Window, rect: PreviewAnnotationRect): PreviewAnnotationRect { + const frame = enclosingFrame(view); + if (!frame) return rect; + return intersectRects({ ...rect, ...topPoint(view, rect.x, rect.y) }, visibleElementRect(frame)); +} + +const EMPTY_RECT: PreviewAnnotationRect = { x: 0, y: 0, width: 0, height: 0 }; + +function elementRect(element: Element): PreviewAnnotationRect { + const view = element.ownerDocument.defaultView; + if (!view) return EMPTY_RECT; + const rect = element.getBoundingClientRect(); + return inTopViewport(view, { x: rect.left, y: rect.top, width: rect.width, height: rect.height }); +} + +/** Takes top-viewport coordinates and descends into same-origin frames. */ +function pickFromPoint(x: number, y: number, root: Document = document): Element | null { + for (const candidate of root.elementsFromPoint(x, y)) { if (isAnnotationNode(candidate) || candidate.hasAttribute(INPUT_LAYER_ATTRIBUTE)) continue; - if (candidate === document.documentElement || candidate === document.body) continue; - return candidate; + if (candidate === root.documentElement || candidate === root.body) continue; + const inner = frameDocument(candidate); + if (!inner) return candidate; + const offset = frameContentOffset(candidate); + return pickFromPoint(x - offset.x, y - offset.y, inner) ?? candidate; } return null; } @@ -276,7 +354,7 @@ function describeRawElement(element: Element): string { const tag = element.tagName.toLowerCase(); const id = element.id ? `#${element.id}` : ""; const classes = - element instanceof HTMLElement && typeof element.className === "string" + typeof element.className === "string" ? element.className .trim() .split(/\s+/) @@ -316,15 +394,18 @@ function positionBox(node: HTMLElement, rect: PreviewAnnotationRect): void { } function visibleElementRect(element: Element): PreviewAnnotationRect { + const ownerDocument = element.ownerDocument; + const view = ownerDocument.defaultView; + if (!view) return EMPTY_RECT; const rect = element.getBoundingClientRect(); let left = Math.max(0, rect.left); let top = Math.max(0, rect.top); - let right = Math.min(document.documentElement.clientWidth, rect.right); - let bottom = Math.min(document.documentElement.clientHeight, rect.bottom); - if (getComputedStyle(element).position !== "fixed") { + let right = Math.min(ownerDocument.documentElement.clientWidth, rect.right); + let bottom = Math.min(ownerDocument.documentElement.clientHeight, rect.bottom); + if (view.getComputedStyle(element).position !== "fixed") { for (let ancestor = element.parentElement; ancestor; ancestor = ancestor.parentElement) { - if (ancestor === document.body || ancestor === document.documentElement) break; - const style = getComputedStyle(ancestor); + if (ancestor === ownerDocument.body || ancestor === ownerDocument.documentElement) break; + const style = view.getComputedStyle(ancestor); const bounds = ancestor.getBoundingClientRect(); const clipLeft = bounds.left + ancestor.clientLeft; const clipTop = bounds.top + ancestor.clientTop; @@ -338,7 +419,12 @@ function visibleElementRect(element: Element): PreviewAnnotationRect { } } } - return { x: left, y: top, width: Math.max(0, right - left), height: Math.max(0, bottom - top) }; + return inTopViewport(view, { + x: left, + y: top, + width: Math.max(0, right - left), + height: Math.max(0, bottom - top), + }); } function createLabel(): HTMLDivElement { @@ -544,7 +630,7 @@ function startAnnotation(sendEnabled: boolean): void { root.style.cssText = "pointer-events:none"; const cursorStyle = document.createElement("style"); cursorStyle.setAttribute(OVERLAY_ATTRIBUTE, ""); - cursorStyle.textContent = `html[data-t3code-annotation-tool] body, html[data-t3code-annotation-tool] body * { cursor: crosshair !important; } [${OVERLAY_ATTRIBUTE}], [${OVERLAY_ATTRIBUTE}] * { cursor: default !important; } [${OVERLAY_ATTRIBUTE}] input[type=number]::-webkit-inner-spin-button, [${OVERLAY_ATTRIBUTE}] input[type=number]::-webkit-outer-spin-button { appearance:none; margin:0; }`; + cursorStyle.textContent = `${CROSSHAIR_CURSOR_CSS} [${OVERLAY_ATTRIBUTE}], [${OVERLAY_ATTRIBUTE}] * { cursor: default !important; } [${OVERLAY_ATTRIBUTE}] input[type=number]::-webkit-inner-spin-button, [${OVERLAY_ATTRIBUTE}] input[type=number]::-webkit-outer-spin-button { appearance:none; margin:0; }`; document.documentElement.appendChild(cursorStyle); shadowRoot.appendChild(root); @@ -645,6 +731,8 @@ function startAnnotation(sendEnabled: boolean): void { let editorPosition: { left: number; top: number } | null = null; let editorDrag: { pointerId: number; offsetX: number; offsetY: number } | null = null; let editorLayoutFrame: number | null = null; + // Same-origin frame documents the session listens in, with the cursor style it added to each. + const frames = new Map(); const resizeComment = (): void => { const maxHeight = 96; @@ -680,10 +768,12 @@ function startAnnotation(sendEnabled: boolean): void { if (tool !== "select") hoverOutline.style.display = "none"; if (tool !== "marquee") marqueeBox.style.display = "none"; document.documentElement.setAttribute("data-t3code-annotation-tool", tool); + for (const frame of frames.keys()) + frame.documentElement?.setAttribute("data-t3code-annotation-tool", tool); }; const removeSelected = (target: SelectedElement): void => { - if (target.element instanceof HTMLElement || target.element instanceof SVGElement) { + if (hasInlineStyle(target.element)) { for (const [property, baseline] of target.baselineStyles) { if (baseline) target.element.style.setProperty(property, baseline); else target.element.style.removeProperty(property); @@ -731,15 +821,14 @@ function startAnnotation(sendEnabled: boolean): void { const setStyleForSelected = (property: string, value: string): void => { for (const target of selected.values()) { - if (!(target.element instanceof HTMLElement || target.element instanceof SVGElement)) - continue; + if (!hasInlineStyle(target.element)) continue; if (!target.baselineStyles.has(property)) { target.baselineStyles.set(property, target.element.style.getPropertyValue(property)); } const key = `${target.id}:${property}`; const previousValue = styleChanges.get(key)?.previousValue ?? - getComputedStyle(target.element).getPropertyValue(property).trim(); + styleOf(target.element).getPropertyValue(property).trim(); target.element.style.setProperty(property, value, "important"); styleChanges.set(key, { targetId: target.id, @@ -951,7 +1040,7 @@ function startAnnotation(sendEnabled: boolean): void { const syncStyleControls = (): void => { const first = selected.values().next().value as SelectedElement | undefined; if (!first) return; - const computed = getComputedStyle(first.element); + const computed = styleOf(first.element); const rect = first.element.getBoundingClientRect(); aspectRatio = rect.height > 0 ? rect.width / rect.height : 1; widthInput.value = String(Math.round(rect.width)); @@ -1137,8 +1226,8 @@ function startAnnotation(sendEnabled: boolean): void { const removeTargetAtPoint = (x: number, y: number): boolean => { for (const target of Array.from(selected.values()).toReversed()) { - const rect = target.element.getBoundingClientRect(); - if (x >= rect.left && x <= rect.right && y >= rect.top && y <= rect.bottom) { + const rect = elementRect(target.element); + if (x >= rect.x && x <= rect.x + rect.width && y >= rect.y && y <= rect.y + rect.height) { removeSelected(target); return true; } @@ -1173,29 +1262,30 @@ function startAnnotation(sendEnabled: boolean): void { }; const selectElementsInRect = (rect: PreviewAnnotationRect): number => { - const candidates = Array.from(document.querySelectorAll("body *")) - .filter((element) => !isAnnotationNode(element)) - .map((element) => ({ element, rect: element.getBoundingClientRect() })) + const candidates = [document, ...frameDocuments(document)] + .flatMap((root) => Array.from(root.querySelectorAll("body *"))) + .filter((element) => !isAnnotationNode(element) && frameDocument(element) === null) + .map((element) => ({ element, rect: elementRect(element) })) .filter(({ rect: candidate }) => { if (candidate.width < 2 || candidate.height < 2) return false; return !( - candidate.right < rect.x || - candidate.left > rect.x + rect.width || - candidate.bottom < rect.y || - candidate.top > rect.y + rect.height + candidate.x + candidate.width < rect.x || + candidate.x > rect.x + rect.width || + candidate.y + candidate.height < rect.y || + candidate.y > rect.y + rect.height ); }) .filter(({ element, rect: candidate }) => { - const centerX = candidate.left + candidate.width / 2; - const centerY = candidate.top + candidate.height / 2; + const centerX = candidate.x + candidate.width / 2; + const centerY = candidate.y + candidate.height / 2; return ( centerX >= rect.x && centerX <= rect.x + rect.width && centerY >= rect.y && centerY <= rect.y + rect.height && (element.children.length === 0 || - element instanceof HTMLButtonElement || - element instanceof HTMLAnchorElement || + element.tagName === "BUTTON" || + element.tagName === "A" || element.getAttribute("role") === "button") ); }) @@ -1212,29 +1302,24 @@ function startAnnotation(sendEnabled: boolean): void { }; const onPointerMove = (event: PointerEvent): void => { - if (isAnnotationNode(event.target as Element)) { + if (isAnnotationNode(event.target)) { clearHoverOutline(); return; } + const point = eventPoint(event); if (tool === "select" && dragStart === null) { - const target = pickFromPoint(event.clientX, event.clientY); + const target = pickFromPoint(point.x, point.y); if (target) positionBox(hoverOutline, visibleElementRect(target)); else clearHoverOutline(); return; } clearHoverOutline(); if (tool === "marquee" && dragStart) { - positionBox( - marqueeBox, - normalizeRect(dragStart.x, dragStart.y, event.clientX, event.clientY), - ); + positionBox(marqueeBox, normalizeRect(dragStart.x, dragStart.y, point.x, point.y)); return; } if (tool === "draw" && activeStroke) { - activeStroke.target.points = [ - ...activeStroke.target.points, - { x: event.clientX, y: event.clientY }, - ]; + activeStroke.target.points = [...activeStroke.target.points, point]; activeStroke.target.bounds = strokeBounds( activeStroke.target.points, activeStroke.target.width, @@ -1244,19 +1329,20 @@ function startAnnotation(sendEnabled: boolean): void { }; const onPointerDown = (event: PointerEvent): void => { - if (event.button !== 0 || isAnnotationNode(event.target as Element)) return; + if (event.button !== 0 || isAnnotationNode(event.target)) return; event.preventDefault(); event.stopPropagation(); + const point = eventPoint(event); if (tool === "select") { - const target = pickFromPoint(event.clientX, event.clientY); + const target = pickFromPoint(point.x, point.y); if (target) toggleSelected(target, event.shiftKey); return; } if (tool === "erase") { - removeTargetAtPoint(event.clientX, event.clientY); + removeTargetAtPoint(point.x, point.y); return; } - dragStart = { x: event.clientX, y: event.clientY }; + dragStart = point; if (tool === "draw") { const stroke: PreviewAnnotationStrokeTarget = { id: nextId("stroke"), @@ -1283,7 +1369,8 @@ function startAnnotation(sendEnabled: boolean): void { event.preventDefault(); event.stopPropagation(); if (tool === "marquee") { - const rect = normalizeRect(dragStart.x, dragStart.y, event.clientX, event.clientY); + const point = eventPoint(event); + const rect = normalizeRect(dragStart.x, dragStart.y, point.x, point.y); marqueeBox.style.display = "none"; if (isUsableRect(rect)) { const found = selectElementsInRect(rect); @@ -1309,7 +1396,7 @@ function startAnnotation(sendEnabled: boolean): void { }; const onClick = (event: MouseEvent): void => { - if (isAnnotationNode(event.target as Element)) return; + if (isAnnotationNode(event.target)) return; event.preventDefault(); event.stopPropagation(); }; @@ -1324,8 +1411,7 @@ function startAnnotation(sendEnabled: boolean): void { const restoreStyles = (): void => { for (const target of selected.values()) { - if (!(target.element instanceof HTMLElement || target.element instanceof SVGElement)) - continue; + if (!hasInlineStyle(target.element)) continue; for (const [property, baseline] of target.baselineStyles) { if (baseline) target.element.style.setProperty(property, baseline); else target.element.style.removeProperty(property); @@ -1338,14 +1424,14 @@ function startAnnotation(sendEnabled: boolean): void { finished = true; rootResizeObserver.disconnect(); restoreStyles(); - window.removeEventListener("pointermove", onPointerMove, true); - window.removeEventListener("pointerdown", onPointerDown, true); - window.removeEventListener("pointerup", onPointerUp, true); - window.removeEventListener("pointerout", onPointerOut, true); - window.removeEventListener("click", onClick, true); + unlisten(document); + for (const [frame, style] of frames) { + unlisten(frame); + frame.documentElement?.removeAttribute("data-t3code-annotation-tool"); + style.remove(); + } + frames.clear(); window.removeEventListener("blur", onWindowBlur); - window.removeEventListener("keydown", onKeyDown, true); - window.removeEventListener("scroll", repaint, true); window.removeEventListener("resize", repaint); dragHandle.removeEventListener("pointerdown", onEditorPointerDown); dragHandle.removeEventListener("pointermove", onEditorPointerMove); @@ -1365,7 +1451,7 @@ function startAnnotation(sendEnabled: boolean): void { const onCancel = (): void => teardown(false); const onCaptured = (): void => teardown(false); const onKeyDown = (event: KeyboardEvent): void => { - if (isAnnotationNode(event.target as Element) && event.key !== "Escape") return; + if (isAnnotationNode(event.target) && event.key !== "Escape") return; if (event.key === "Escape") { event.preventDefault(); event.stopPropagation(); @@ -1403,7 +1489,7 @@ function startAnnotation(sendEnabled: boolean): void { return { id: target.id, element, - rect: rectFromDomRect(target.element.getBoundingClientRect()), + rect: elementRect(target.element), }; }), ) @@ -1454,14 +1540,62 @@ function startAnnotation(sendEnabled: boolean): void { submitAnnotation(submission); }); - window.addEventListener("pointermove", onPointerMove, { capture: true, passive: false }); - window.addEventListener("pointerdown", onPointerDown, { capture: true, passive: false }); - window.addEventListener("pointerup", onPointerUp, { capture: true, passive: false }); - window.addEventListener("pointerout", onPointerOut, { capture: true, passive: true }); - window.addEventListener("click", onClick, { capture: true, passive: false }); + function listen(root: Document): void { + // A frame load stops at its document instead of reaching the window. + root.addEventListener("load", onLoad, { capture: true, passive: true }); + const view = root.defaultView; + if (!view) return; + view.addEventListener("pointermove", onPointerMove, { capture: true, passive: false }); + view.addEventListener("pointerdown", onPointerDown, { capture: true, passive: false }); + view.addEventListener("pointerup", onPointerUp, { capture: true, passive: false }); + view.addEventListener("pointerout", onPointerOut, { capture: true, passive: true }); + view.addEventListener("click", onClick, { capture: true, passive: false }); + view.addEventListener("keydown", onKeyDown, { capture: true }); + view.addEventListener("scroll", repaint, { capture: true, passive: true }); + } + + function unlisten(root: Document): void { + root.removeEventListener("load", onLoad, true); + const view = root.defaultView; + if (!view) return; + view.removeEventListener("pointermove", onPointerMove, true); + view.removeEventListener("pointerdown", onPointerDown, true); + view.removeEventListener("pointerup", onPointerUp, true); + view.removeEventListener("pointerout", onPointerOut, true); + view.removeEventListener("click", onClick, true); + view.removeEventListener("keydown", onKeyDown, true); + view.removeEventListener("scroll", repaint, true); + } + + // The preload runs only in the top frame, so input over a same-origin frame needs listeners there. + function attachFrames(): void { + const current = frameDocuments(document); + for (const [frame, style] of frames) { + if (current.includes(frame)) continue; + unlisten(frame); + style.remove(); + frames.delete(frame); + } + for (const frame of current) { + if (frames.has(frame) || !frame.defaultView || !frame.documentElement) continue; + const style = frame.createElement("style"); + style.setAttribute(OVERLAY_ATTRIBUTE, ""); + style.textContent = CROSSHAIR_CURSOR_CSS; + frame.documentElement.appendChild(style); + frame.documentElement.setAttribute("data-t3code-annotation-tool", tool); + listen(frame); + frames.set(frame, style); + } + repaint(); + } + + function onLoad(event: Event): void { + if (isFrameElement(event.target)) attachFrames(); + } + + listen(document); + attachFrames(); window.addEventListener("blur", onWindowBlur); - window.addEventListener("keydown", onKeyDown, { capture: true }); - window.addEventListener("scroll", repaint, { capture: true, passive: true }); window.addEventListener("resize", repaint, { passive: true }); ipcRenderer.on(CANCEL_PICK_CHANNEL, onCancel); ipcRenderer.on(ANNOTATION_CAPTURED_CHANNEL, onCaptured); From ac02c80323ccd8e30333f15cb0ff5264ce3198fb Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Tue, 3 Nov 2026 11:48:28 +0000 Subject: [PATCH 2/8] fix(desktop): Region maps each frame's rects once Co-Authored-By: Claude Opus 5.5 --- apps/desktop/src/preview/PickPreload.ts | 37 +++++++++++++++++-------- 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/apps/desktop/src/preview/PickPreload.ts b/apps/desktop/src/preview/PickPreload.ts index 21c5cc48391e8..aaeaa9984e88d 100644 --- a/apps/desktop/src/preview/PickPreload.ts +++ b/apps/desktop/src/preview/PickPreload.ts @@ -268,7 +268,7 @@ function isAnnotationNode(node: EventTarget | null): boolean { } const isFrameElement = (node: EventTarget | null): node is HTMLIFrameElement | HTMLFrameElement => - isElementNode(node) && (node.tagName === "IFRAME" || node.tagName === "FRAME"); + isElementNode(node) && (node.localName === "iframe" || node.localName === "frame"); /** The document of a same-origin frame; null for cross-origin frames and non-frames. */ const frameDocument = (element: Element): Document | null => @@ -321,20 +321,28 @@ function intersectRects( }; } -/** Moves a rect in `view`'s viewport into the top viewport, clipped by each enclosing frame. */ -function inTopViewport(view: Window, rect: PreviewAnnotationRect): PreviewAnnotationRect { +type RectMapper = (rect: PreviewAnnotationRect) => PreviewAnnotationRect; + +/** Moves rects in `view`'s viewport into the top viewport, clipped by each enclosing frame. */ +function topViewportMapper(view: Window): RectMapper { const frame = enclosingFrame(view); - if (!frame) return rect; - return intersectRects({ ...rect, ...topPoint(view, rect.x, rect.y) }, visibleElementRect(frame)); + if (!frame) return (rect) => rect; + const offset = topPoint(view, 0, 0); + const clip = visibleElementRect(frame); + return (rect) => intersectRects({ ...rect, x: rect.x + offset.x, y: rect.y + offset.y }, clip); } +const inTopViewport = (view: Window, rect: PreviewAnnotationRect): PreviewAnnotationRect => + topViewportMapper(view)(rect); + const EMPTY_RECT: PreviewAnnotationRect = { x: 0, y: 0, width: 0, height: 0 }; -function elementRect(element: Element): PreviewAnnotationRect { +function elementRect(element: Element, toTop?: RectMapper): PreviewAnnotationRect { const view = element.ownerDocument.defaultView; if (!view) return EMPTY_RECT; const rect = element.getBoundingClientRect(); - return inTopViewport(view, { x: rect.left, y: rect.top, width: rect.width, height: rect.height }); + const local = { x: rect.left, y: rect.top, width: rect.width, height: rect.height }; + return toTop ? toTop(local) : inTopViewport(view, local); } /** Takes top-viewport coordinates and descends into same-origin frames. */ @@ -1263,9 +1271,14 @@ function startAnnotation(sendEnabled: boolean): void { const selectElementsInRect = (rect: PreviewAnnotationRect): number => { const candidates = [document, ...frameDocuments(document)] - .flatMap((root) => Array.from(root.querySelectorAll("body *"))) - .filter((element) => !isAnnotationNode(element) && frameDocument(element) === null) - .map((element) => ({ element, rect: elementRect(element) })) + .flatMap((root) => { + if (!root.defaultView) return []; + // One offset and clip per document: per element they would re-walk every frame ancestor. + const toTop = topViewportMapper(root.defaultView); + return Array.from(root.querySelectorAll("body *")) + .filter((element) => !isAnnotationNode(element) && frameDocument(element) === null) + .map((element) => ({ element, rect: elementRect(element, toTop) })); + }) .filter(({ rect: candidate }) => { if (candidate.width < 2 || candidate.height < 2) return false; return !( @@ -1284,8 +1297,8 @@ function startAnnotation(sendEnabled: boolean): void { centerY >= rect.y && centerY <= rect.y + rect.height && (element.children.length === 0 || - element.tagName === "BUTTON" || - element.tagName === "A" || + element.localName === "button" || + element.localName === "a" || element.getAttribute("role") === "button") ); }) From f6508695735e0a02530b6da0366fdc860574507a Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Tue, 3 Nov 2026 11:55:08 +0000 Subject: [PATCH 3/8] fix(desktop): annotation maps scaled same-origin frames Co-Authored-By: Claude Opus 5.5 --- .../src/preview/AnnotationStyles.generated.ts | 2 +- apps/desktop/src/preview/PickPreload.ts | 69 +++++++++++++++---- 2 files changed, 56 insertions(+), 15 deletions(-) diff --git a/apps/desktop/src/preview/AnnotationStyles.generated.ts b/apps/desktop/src/preview/AnnotationStyles.generated.ts index d02abc8ac6123..baf172ea324ba 100644 --- a/apps/desktop/src/preview/AnnotationStyles.generated.ts +++ b/apps/desktop/src/preview/AnnotationStyles.generated.ts @@ -1,3 +1,3 @@ // Generated by scripts/build-preview-annotation-css.mjs. Do not edit. export const previewAnnotationStyles = - '/*! tailwindcss v4.3.3 | MIT License | https://tailwindcss.com */\n@layer properties;\n:root, :host {\n --spacing: 0.25rem;\n --text-xs: 0.75rem;\n --text-xs--line-height: calc(1 / 0.75);\n --text-sm: 0.875rem;\n --text-sm--line-height: calc(1.25 / 0.875);\n --text-lg: 1.125rem;\n --text-lg--line-height: calc(1.75 / 1.125);\n --font-weight-medium: 500;\n --font-weight-semibold: 600;\n --font-weight-bold: 700;\n --blur-xl: 24px;\n --default-font-family: var(--t3-font-sans);\n --default-mono-font-family: var(--t3-font-mono);\n}\n*, ::after, ::before, ::backdrop, ::file-selector-button {\n box-sizing: border-box;\n margin: 0;\n padding: 0;\n border: 0 solid;\n}\nhtml, :host {\n line-height: 1.5;\n -webkit-text-size-adjust: 100%;\n tab-size: 4;\n font-family: var(--default-font-family, -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, \'Helvetica Neue\', \'Noto Sans\', Arial, sans-serif, \'Apple Color Emoji\', \'Segoe UI Emoji\', \'Segoe UI Symbol\', \'Noto Color Emoji\');\n font-feature-settings: var(--default-font-feature-settings, normal);\n font-variation-settings: var(--default-font-variation-settings, normal);\n -webkit-tap-highlight-color: transparent;\n}\nhr {\n height: 0;\n color: inherit;\n border-top-width: 1px;\n}\nabbr:where([title]) {\n -webkit-text-decoration: underline dotted;\n text-decoration: underline dotted;\n}\nh1, h2, h3, h4, h5, h6 {\n font-size: inherit;\n font-weight: inherit;\n}\na {\n color: inherit;\n -webkit-text-decoration: inherit;\n text-decoration: inherit;\n}\nb, strong {\n font-weight: bolder;\n}\ncode, kbd, samp, pre {\n font-family: var(--default-mono-font-family, ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, \'Liberation Mono\', \'Courier New\', monospace);\n font-feature-settings: var(--default-mono-font-feature-settings, normal);\n font-variation-settings: var(--default-mono-font-variation-settings, normal);\n font-size: 1em;\n}\nsmall {\n font-size: 80%;\n}\nsub, sup {\n font-size: 75%;\n line-height: 0;\n position: relative;\n vertical-align: baseline;\n}\nsub {\n bottom: -0.25em;\n}\nsup {\n top: -0.5em;\n}\ntable {\n text-indent: 0;\n border-color: inherit;\n border-collapse: collapse;\n}\n:-moz-focusring:where(:not(iframe)) {\n outline: auto;\n}\nprogress {\n vertical-align: baseline;\n}\nsummary {\n display: list-item;\n}\nol, ul, menu {\n list-style: none;\n}\nimg, svg, video, canvas, audio, iframe, embed, object {\n display: block;\n vertical-align: middle;\n}\nimg, video {\n max-width: 100%;\n height: auto;\n}\nbutton, input, select, optgroup, textarea, ::file-selector-button {\n font: inherit;\n font-feature-settings: inherit;\n font-variation-settings: inherit;\n letter-spacing: inherit;\n color: inherit;\n border-radius: 0;\n background-color: transparent;\n opacity: 1;\n}\n:where(select:is([multiple], [size])) optgroup {\n font-weight: bolder;\n}\n:where(select:is([multiple], [size])) optgroup option {\n padding-inline-start: 20px;\n}\n::file-selector-button {\n margin-inline-end: 4px;\n}\n::placeholder {\n opacity: 1;\n}\n@supports (not (-webkit-appearance: -apple-pay-button)) or (contain-intrinsic-size: 1px) {\n ::placeholder {\n color: currentcolor;\n @supports (color: color-mix(in lab, red, red)) {\n color: color-mix(in oklab, currentcolor 50%, transparent);\n }\n }\n}\ntextarea {\n resize: vertical;\n}\n::-webkit-search-decoration {\n -webkit-appearance: none;\n}\n::-webkit-date-and-time-value {\n min-height: 1lh;\n text-align: inherit;\n}\n::-webkit-datetime-edit {\n display: inline-flex;\n}\n::-webkit-datetime-edit-fields-wrapper {\n padding: 0;\n}\n::-webkit-datetime-edit, ::-webkit-datetime-edit-year-field, ::-webkit-datetime-edit-month-field, ::-webkit-datetime-edit-day-field, ::-webkit-datetime-edit-hour-field, ::-webkit-datetime-edit-minute-field, ::-webkit-datetime-edit-second-field, ::-webkit-datetime-edit-millisecond-field, ::-webkit-datetime-edit-meridiem-field {\n padding-block: 0;\n}\n::-webkit-calendar-picker-indicator {\n line-height: 1;\n}\n:-moz-ui-invalid {\n box-shadow: none;\n}\nbutton, input:where([type=\'button\'], [type=\'reset\'], [type=\'submit\']), ::file-selector-button {\n appearance: button;\n}\n::-webkit-inner-spin-button, ::-webkit-outer-spin-button {\n height: auto;\n}\n[hidden]:where(:not([hidden=\'until-found\'])) {\n display: none !important;\n}\n.pointer-events-auto {\n pointer-events: auto;\n}\n.pointer-events-none {\n pointer-events: none;\n}\n.visible {\n visibility: visible;\n}\n.absolute {\n position: absolute;\n}\n.fixed {\n position: fixed;\n}\n.inset-0 {\n inset: 0px;\n}\n.top-1\\/2 {\n top: calc(1 / 2 * 100%);\n}\n.top-2\\.5 {\n top: calc(var(--spacing) * 2.5);\n}\n.right-2 {\n right: calc(var(--spacing) * 2);\n}\n.left-1\\/2 {\n left: calc(1 / 2 * 100%);\n}\n.z-1 {\n z-index: 1;\n}\n.block {\n display: block;\n}\n.flex {\n display: flex;\n}\n.grid {\n display: grid;\n}\n.hidden {\n display: none;\n}\n.inline-flex {\n display: inline-flex;\n}\n.h-7 {\n height: calc(var(--spacing) * 7);\n}\n.h-8 {\n height: calc(var(--spacing) * 8);\n}\n.max-h-24 {\n max-height: calc(var(--spacing) * 24);\n}\n.max-h-\\[calc\\(100vh-16px\\)\\] {\n max-height: calc(100vh - 16px);\n}\n.max-h-\\[min\\(176px\\,calc\\(100vh-180px\\)\\)\\] {\n max-height: min(176px, calc(100vh - 180px));\n}\n.min-h-7 {\n min-height: calc(var(--spacing) * 7);\n}\n.min-h-8 {\n min-height: calc(var(--spacing) * 8);\n}\n.w-6 {\n width: calc(var(--spacing) * 6);\n}\n.w-8 {\n width: calc(var(--spacing) * 8);\n}\n.w-\\[min\\(360px\\,calc\\(100vw-16px\\)\\)\\] {\n width: min(360px, calc(100vw - 16px));\n}\n.w-full {\n width: 100%;\n}\n.max-w-70 {\n max-width: calc(var(--spacing) * 70);\n}\n.min-w-0 {\n min-width: 0px;\n}\n.flex-1 {\n flex: 1;\n}\n.shrink-0 {\n flex-shrink: 0;\n}\n.-translate-x-1\\/2 {\n --tw-translate-x: calc(calc(1 / 2 * 100%) * -1);\n translate: var(--tw-translate-x) var(--tw-translate-y);\n}\n.-translate-y-1\\/2 {\n --tw-translate-y: calc(calc(1 / 2 * 100%) * -1);\n translate: var(--tw-translate-x) var(--tw-translate-y);\n}\n.cursor-grab {\n cursor: grab;\n}\n.cursor-pointer {\n cursor: pointer;\n}\n.resize {\n resize: both;\n}\n.resize-none {\n resize: none;\n}\n.appearance-none {\n appearance: none;\n}\n.grid-cols-\\[22px_minmax\\(0\\,1fr\\)\\] {\n grid-template-columns: 22px minmax(0,1fr);\n}\n.grid-cols-\\[82px_minmax\\(0\\,1fr\\)\\] {\n grid-template-columns: 82px minmax(0,1fr);\n}\n.flex-col {\n flex-direction: column;\n}\n.items-center {\n align-items: center;\n}\n.items-start {\n align-items: flex-start;\n}\n.justify-center {\n justify-content: center;\n}\n.gap-0\\.5 {\n gap: calc(var(--spacing) * 0.5);\n}\n.gap-1 {\n gap: var(--spacing);\n}\n.gap-2 {\n gap: calc(var(--spacing) * 2);\n}\n.overflow-auto {\n overflow: auto;\n}\n.overflow-hidden {\n overflow: hidden;\n}\n.overflow-y-hidden {\n overflow-y: hidden;\n}\n.rounded-lg {\n border-radius: var(--t3-radius);\n}\n.rounded-md {\n border-radius: calc(var(--t3-radius) - 2px);\n}\n.rounded-xl {\n border-radius: calc(var(--t3-radius) + 4px);\n}\n.border {\n border-style: var(--tw-border-style);\n border-width: 1px;\n}\n.border-0 {\n border-style: var(--tw-border-style);\n border-width: 0px;\n}\n.border-t {\n border-top-style: var(--tw-border-style);\n border-top-width: 1px;\n}\n.border-b {\n border-bottom-style: var(--tw-border-style);\n border-bottom-width: 1px;\n}\n.border-border {\n border-color: var(--t3-border);\n}\n.border-input {\n border-color: var(--t3-input);\n}\n.border-primary {\n border-color: var(--t3-primary);\n}\n.border-transparent {\n border-color: transparent;\n}\n.border-b-transparent {\n border-bottom-color: transparent;\n}\n.bg-background {\n background-color: var(--t3-background);\n}\n.bg-muted {\n background-color: var(--t3-muted);\n}\n.bg-muted\\/40 {\n background-color: var(--t3-muted);\n @supports (color: color-mix(in lab, red, red)) {\n background-color: color-mix(in oklab, var(--t3-muted) 40%, transparent);\n }\n}\n.bg-popover\\/95 {\n background-color: var(--t3-popover);\n @supports (color: color-mix(in lab, red, red)) {\n background-color: color-mix(in oklab, var(--t3-popover) 95%, transparent);\n }\n}\n.bg-popover\\/96 {\n background-color: var(--t3-popover);\n @supports (color: color-mix(in lab, red, red)) {\n background-color: color-mix(in oklab, var(--t3-popover) 96%, transparent);\n }\n}\n.bg-primary {\n background-color: var(--t3-primary);\n}\n.bg-primary\\/10 {\n background-color: var(--t3-primary);\n @supports (color: color-mix(in lab, red, red)) {\n background-color: color-mix(in oklab, var(--t3-primary) 10%, transparent);\n }\n}\n.bg-transparent {\n background-color: transparent;\n}\n.p-0 {\n padding: 0px;\n}\n.p-1 {\n padding: var(--spacing);\n}\n.p-2 {\n padding: calc(var(--spacing) * 2);\n}\n.px-0 {\n padding-inline: 0px;\n}\n.px-1 {\n padding-inline: var(--spacing);\n}\n.px-2 {\n padding-inline: calc(var(--spacing) * 2);\n}\n.px-2\\.5 {\n padding-inline: calc(var(--spacing) * 2.5);\n}\n.px-3 {\n padding-inline: calc(var(--spacing) * 3);\n}\n.py-1 {\n padding-block: var(--spacing);\n}\n.py-1\\.5 {\n padding-block: calc(var(--spacing) * 1.5);\n}\n.py-2 {\n padding-block: calc(var(--spacing) * 2);\n}\n.font-mono {\n font-family: var(--t3-font-mono);\n}\n.font-sans {\n font-family: var(--t3-font-sans);\n}\n.text-lg {\n font-size: var(--text-lg);\n line-height: var(--tw-leading, var(--text-lg--line-height));\n}\n.text-sm {\n font-size: var(--text-sm);\n line-height: var(--tw-leading, var(--text-sm--line-height));\n}\n.text-xs {\n font-size: var(--text-xs);\n line-height: var(--tw-leading, var(--text-xs--line-height));\n}\n.leading-5 {\n --tw-leading: calc(var(--spacing) * 5);\n line-height: calc(var(--spacing) * 5);\n}\n.font-bold {\n --tw-font-weight: var(--font-weight-bold);\n font-weight: var(--font-weight-bold);\n}\n.font-medium {\n --tw-font-weight: var(--font-weight-medium);\n font-weight: var(--font-weight-medium);\n}\n.font-semibold {\n --tw-font-weight: var(--font-weight-semibold);\n font-weight: var(--font-weight-semibold);\n}\n.text-foreground {\n color: var(--t3-foreground);\n}\n.text-muted-foreground {\n color: var(--t3-muted-foreground);\n}\n.text-popover-foreground {\n color: var(--t3-popover-foreground);\n}\n.text-primary {\n color: var(--t3-primary);\n}\n.text-primary-foreground {\n color: var(--t3-primary-foreground);\n}\n.shadow-2xl {\n --tw-shadow: 0 25px 50px -12px var(--tw-shadow-color, rgb(0 0 0 / 0.25));\n box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);\n}\n.shadow-lg {\n --tw-shadow: 0 10px 15px -3px var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 4px 6px -4px var(--tw-shadow-color, rgb(0 0 0 / 0.1));\n box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);\n}\n.shadow-md {\n --tw-shadow: 0 4px 6px -1px var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 2px 4px -2px var(--tw-shadow-color, rgb(0 0 0 / 0.1));\n box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);\n}\n.shadow-sm {\n --tw-shadow: 0 1px 3px 0 var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 1px 2px -1px var(--tw-shadow-color, rgb(0 0 0 / 0.1));\n box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);\n}\n.shadow-xs {\n --tw-shadow: 0 1px 2px 0 var(--tw-shadow-color, rgb(0 0 0 / 0.05));\n box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);\n}\n.ring-0 {\n --tw-ring-shadow: var(--tw-ring-inset,) 0 0 0 calc(0px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);\n box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);\n}\n.blur {\n --tw-blur: blur(8px);\n filter: var(--tw-blur,) var(--tw-brightness,) var(--tw-contrast,) var(--tw-grayscale,) var(--tw-hue-rotate,) var(--tw-invert,) var(--tw-saturate,) var(--tw-sepia,) var(--tw-drop-shadow,);\n}\n.backdrop-blur-xl {\n --tw-backdrop-blur: blur(var(--blur-xl));\n -webkit-backdrop-filter: var(--tw-backdrop-blur,) var(--tw-backdrop-brightness,) var(--tw-backdrop-contrast,) var(--tw-backdrop-grayscale,) var(--tw-backdrop-hue-rotate,) var(--tw-backdrop-invert,) var(--tw-backdrop-opacity,) var(--tw-backdrop-saturate,) var(--tw-backdrop-sepia,);\n backdrop-filter: var(--tw-backdrop-blur,) var(--tw-backdrop-brightness,) var(--tw-backdrop-contrast,) var(--tw-backdrop-grayscale,) var(--tw-backdrop-hue-rotate,) var(--tw-backdrop-invert,) var(--tw-backdrop-opacity,) var(--tw-backdrop-saturate,) var(--tw-backdrop-sepia,);\n}\n.outline-none {\n --tw-outline-style: none;\n outline-style: none;\n}\n.select-none {\n -webkit-user-select: none;\n user-select: none;\n}\n.placeholder\\:text-muted-foreground::placeholder {\n color: var(--t3-muted-foreground);\n}\n@media (hover: hover) {\n .hover\\:bg-accent:hover {\n background-color: var(--t3-accent);\n }\n .hover\\:bg-primary\\/90:hover {\n background-color: var(--t3-primary);\n }\n @supports (color: color-mix(in lab, red, red)) {\n .hover\\:bg-primary\\/90:hover {\n background-color: color-mix(in oklab, var(--t3-primary) 90%, transparent);\n }\n }\n .hover\\:text-accent-foreground:hover {\n color: var(--t3-accent-foreground);\n }\n}\n.focus\\:border-b-primary:focus {\n border-bottom-color: var(--t3-primary);\n}\n.focus\\:ring-0:focus {\n --tw-ring-shadow: var(--tw-ring-inset,) 0 0 0 calc(0px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);\n box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);\n}\n.focus\\:outline-none:focus {\n --tw-outline-style: none;\n outline-style: none;\n}\n.disabled\\:pointer-events-none:disabled {\n pointer-events: none;\n}\n.disabled\\:opacity-60:disabled {\n opacity: 60%;\n}\n:host {\n --t3-font-sans: "DM Sans Variable", "DM Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", system-ui,\n sans-serif;\n --t3-font-mono: "SF Mono", "SFMono-Regular", "JetBrains Mono", Consolas, "Liberation Mono", Menlo, monospace;\n --t3-radius: 0.625rem;\n --t3-background: white;\n --t3-foreground: oklch(0.269 0 0);\n --t3-popover: white;\n --t3-popover-foreground: oklch(0.269 0 0);\n --t3-primary: oklch(0.488 0.217 264);\n --t3-primary-foreground: white;\n --t3-muted: rgb(0 0 0 / 4%);\n --t3-muted-foreground: oklch(0.556 0 0);\n --t3-accent: rgb(0 0 0 / 4%);\n --t3-accent-foreground: oklch(0.269 0 0);\n --t3-border: rgb(0 0 0 / 8%);\n --t3-input: rgb(0 0 0 / 10%);\n --t3-ring: oklch(0.488 0.217 264);\n color: var(--t3-foreground);\n font-family: var(--t3-font-sans);\n}\n* {\n box-sizing: border-box;\n border-color: var(--t3-border);\n}\nbutton, input, select, textarea {\n font: inherit;\n}\nbutton:focus-visible, input:focus-visible, select:focus-visible, textarea:focus-visible {\n outline: 2px solid var(--t3-ring);\n @supports (color: color-mix(in lab, red, red)) {\n outline: 2px solid color-mix(in srgb, var(--t3-ring) 72%, transparent);\n }\n outline-offset: -2px;\n}\n@property --tw-translate-x {\n syntax: "*";\n inherits: false;\n initial-value: 0;\n}\n@property --tw-translate-y {\n syntax: "*";\n inherits: false;\n initial-value: 0;\n}\n@property --tw-translate-z {\n syntax: "*";\n inherits: false;\n initial-value: 0;\n}\n@property --tw-border-style {\n syntax: "*";\n inherits: false;\n initial-value: solid;\n}\n@property --tw-leading {\n syntax: "*";\n inherits: false;\n}\n@property --tw-font-weight {\n syntax: "*";\n inherits: false;\n}\n@property --tw-shadow {\n syntax: "*";\n inherits: false;\n initial-value: 0 0 #0000;\n}\n@property --tw-shadow-color {\n syntax: "*";\n inherits: false;\n}\n@property --tw-shadow-alpha {\n syntax: "";\n inherits: false;\n initial-value: 100%;\n}\n@property --tw-inset-shadow {\n syntax: "*";\n inherits: false;\n initial-value: 0 0 #0000;\n}\n@property --tw-inset-shadow-color {\n syntax: "*";\n inherits: false;\n}\n@property --tw-inset-shadow-alpha {\n syntax: "";\n inherits: false;\n initial-value: 100%;\n}\n@property --tw-ring-color {\n syntax: "*";\n inherits: false;\n}\n@property --tw-ring-shadow {\n syntax: "*";\n inherits: false;\n initial-value: 0 0 #0000;\n}\n@property --tw-inset-ring-color {\n syntax: "*";\n inherits: false;\n}\n@property --tw-inset-ring-shadow {\n syntax: "*";\n inherits: false;\n initial-value: 0 0 #0000;\n}\n@property --tw-ring-inset {\n syntax: "*";\n inherits: false;\n}\n@property --tw-ring-offset-width {\n syntax: "";\n inherits: false;\n initial-value: 0px;\n}\n@property --tw-ring-offset-color {\n syntax: "*";\n inherits: false;\n initial-value: #fff;\n}\n@property --tw-ring-offset-shadow {\n syntax: "*";\n inherits: false;\n initial-value: 0 0 #0000;\n}\n@property --tw-blur {\n syntax: "*";\n inherits: false;\n}\n@property --tw-brightness {\n syntax: "*";\n inherits: false;\n}\n@property --tw-contrast {\n syntax: "*";\n inherits: false;\n}\n@property --tw-grayscale {\n syntax: "*";\n inherits: false;\n}\n@property --tw-hue-rotate {\n syntax: "*";\n inherits: false;\n}\n@property --tw-invert {\n syntax: "*";\n inherits: false;\n}\n@property --tw-opacity {\n syntax: "*";\n inherits: false;\n}\n@property --tw-saturate {\n syntax: "*";\n inherits: false;\n}\n@property --tw-sepia {\n syntax: "*";\n inherits: false;\n}\n@property --tw-drop-shadow {\n syntax: "*";\n inherits: false;\n}\n@property --tw-drop-shadow-color {\n syntax: "*";\n inherits: false;\n}\n@property --tw-drop-shadow-alpha {\n syntax: "";\n inherits: false;\n initial-value: 100%;\n}\n@property --tw-drop-shadow-size {\n syntax: "*";\n inherits: false;\n}\n@property --tw-backdrop-blur {\n syntax: "*";\n inherits: false;\n}\n@property --tw-backdrop-brightness {\n syntax: "*";\n inherits: false;\n}\n@property --tw-backdrop-contrast {\n syntax: "*";\n inherits: false;\n}\n@property --tw-backdrop-grayscale {\n syntax: "*";\n inherits: false;\n}\n@property --tw-backdrop-hue-rotate {\n syntax: "*";\n inherits: false;\n}\n@property --tw-backdrop-invert {\n syntax: "*";\n inherits: false;\n}\n@property --tw-backdrop-opacity {\n syntax: "*";\n inherits: false;\n}\n@property --tw-backdrop-saturate {\n syntax: "*";\n inherits: false;\n}\n@property --tw-backdrop-sepia {\n syntax: "*";\n inherits: false;\n}\n@layer properties {\n *, ::before, ::after, ::backdrop {\n --tw-translate-x: 0;\n --tw-translate-y: 0;\n --tw-translate-z: 0;\n --tw-border-style: solid;\n --tw-leading: initial;\n --tw-font-weight: initial;\n --tw-shadow: 0 0 #0000;\n --tw-shadow-color: initial;\n --tw-shadow-alpha: 100%;\n --tw-inset-shadow: 0 0 #0000;\n --tw-inset-shadow-color: initial;\n --tw-inset-shadow-alpha: 100%;\n --tw-ring-color: initial;\n --tw-ring-shadow: 0 0 #0000;\n --tw-inset-ring-color: initial;\n --tw-inset-ring-shadow: 0 0 #0000;\n --tw-ring-inset: initial;\n --tw-ring-offset-width: 0px;\n --tw-ring-offset-color: #fff;\n --tw-ring-offset-shadow: 0 0 #0000;\n --tw-blur: initial;\n --tw-brightness: initial;\n --tw-contrast: initial;\n --tw-grayscale: initial;\n --tw-hue-rotate: initial;\n --tw-invert: initial;\n --tw-opacity: initial;\n --tw-saturate: initial;\n --tw-sepia: initial;\n --tw-drop-shadow: initial;\n --tw-drop-shadow-color: initial;\n --tw-drop-shadow-alpha: 100%;\n --tw-drop-shadow-size: initial;\n --tw-backdrop-blur: initial;\n --tw-backdrop-brightness: initial;\n --tw-backdrop-contrast: initial;\n --tw-backdrop-grayscale: initial;\n --tw-backdrop-hue-rotate: initial;\n --tw-backdrop-invert: initial;\n --tw-backdrop-opacity: initial;\n --tw-backdrop-saturate: initial;\n --tw-backdrop-sepia: initial;\n }\n}\n'; + '/*! tailwindcss v4.3.3 | MIT License | https://tailwindcss.com */\n@layer properties;\n:root, :host {\n --spacing: 0.25rem;\n --text-xs: 0.75rem;\n --text-xs--line-height: calc(1 / 0.75);\n --text-sm: 0.875rem;\n --text-sm--line-height: calc(1.25 / 0.875);\n --text-lg: 1.125rem;\n --text-lg--line-height: calc(1.75 / 1.125);\n --font-weight-medium: 500;\n --font-weight-semibold: 600;\n --font-weight-bold: 700;\n --blur-xl: 24px;\n --default-font-family: var(--t3-font-sans);\n --default-mono-font-family: var(--t3-font-mono);\n}\n*, ::after, ::before, ::backdrop, ::file-selector-button {\n box-sizing: border-box;\n margin: 0;\n padding: 0;\n border: 0 solid;\n}\nhtml, :host {\n line-height: 1.5;\n -webkit-text-size-adjust: 100%;\n tab-size: 4;\n font-family: var(--default-font-family, -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, \'Helvetica Neue\', \'Noto Sans\', Arial, sans-serif, \'Apple Color Emoji\', \'Segoe UI Emoji\', \'Segoe UI Symbol\', \'Noto Color Emoji\');\n font-feature-settings: var(--default-font-feature-settings, normal);\n font-variation-settings: var(--default-font-variation-settings, normal);\n -webkit-tap-highlight-color: transparent;\n}\nhr {\n height: 0;\n color: inherit;\n border-top-width: 1px;\n}\nabbr:where([title]) {\n -webkit-text-decoration: underline dotted;\n text-decoration: underline dotted;\n}\nh1, h2, h3, h4, h5, h6 {\n font-size: inherit;\n font-weight: inherit;\n}\na {\n color: inherit;\n -webkit-text-decoration: inherit;\n text-decoration: inherit;\n}\nb, strong {\n font-weight: bolder;\n}\ncode, kbd, samp, pre {\n font-family: var(--default-mono-font-family, ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, \'Liberation Mono\', \'Courier New\', monospace);\n font-feature-settings: var(--default-mono-font-feature-settings, normal);\n font-variation-settings: var(--default-mono-font-variation-settings, normal);\n font-size: 1em;\n}\nsmall {\n font-size: 80%;\n}\nsub, sup {\n font-size: 75%;\n line-height: 0;\n position: relative;\n vertical-align: baseline;\n}\nsub {\n bottom: -0.25em;\n}\nsup {\n top: -0.5em;\n}\ntable {\n text-indent: 0;\n border-color: inherit;\n border-collapse: collapse;\n}\n:-moz-focusring:where(:not(iframe)) {\n outline: auto;\n}\nprogress {\n vertical-align: baseline;\n}\nsummary {\n display: list-item;\n}\nol, ul, menu {\n list-style: none;\n}\nimg, svg, video, canvas, audio, iframe, embed, object {\n display: block;\n vertical-align: middle;\n}\nimg, video {\n max-width: 100%;\n height: auto;\n}\nbutton, input, select, optgroup, textarea, ::file-selector-button {\n font: inherit;\n font-feature-settings: inherit;\n font-variation-settings: inherit;\n letter-spacing: inherit;\n color: inherit;\n border-radius: 0;\n background-color: transparent;\n opacity: 1;\n}\n:where(select:is([multiple], [size])) optgroup {\n font-weight: bolder;\n}\n:where(select:is([multiple], [size])) optgroup option {\n padding-inline-start: 20px;\n}\n::file-selector-button {\n margin-inline-end: 4px;\n}\n::placeholder {\n opacity: 1;\n}\n@supports (not (-webkit-appearance: -apple-pay-button)) or (contain-intrinsic-size: 1px) {\n ::placeholder {\n color: currentcolor;\n @supports (color: color-mix(in lab, red, red)) {\n color: color-mix(in oklab, currentcolor 50%, transparent);\n }\n }\n}\ntextarea {\n resize: vertical;\n}\n::-webkit-search-decoration {\n -webkit-appearance: none;\n}\n::-webkit-date-and-time-value {\n min-height: 1lh;\n text-align: inherit;\n}\n::-webkit-datetime-edit {\n display: inline-flex;\n}\n::-webkit-datetime-edit-fields-wrapper {\n padding: 0;\n}\n::-webkit-datetime-edit, ::-webkit-datetime-edit-year-field, ::-webkit-datetime-edit-month-field, ::-webkit-datetime-edit-day-field, ::-webkit-datetime-edit-hour-field, ::-webkit-datetime-edit-minute-field, ::-webkit-datetime-edit-second-field, ::-webkit-datetime-edit-millisecond-field, ::-webkit-datetime-edit-meridiem-field {\n padding-block: 0;\n}\n::-webkit-calendar-picker-indicator {\n line-height: 1;\n}\n:-moz-ui-invalid {\n box-shadow: none;\n}\nbutton, input:where([type=\'button\'], [type=\'reset\'], [type=\'submit\']), ::file-selector-button {\n appearance: button;\n}\n::-webkit-inner-spin-button, ::-webkit-outer-spin-button {\n height: auto;\n}\n[hidden]:where(:not([hidden=\'until-found\'])) {\n display: none !important;\n}\n.pointer-events-auto {\n pointer-events: auto;\n}\n.pointer-events-none {\n pointer-events: none;\n}\n.visible {\n visibility: visible;\n}\n.absolute {\n position: absolute;\n}\n.fixed {\n position: fixed;\n}\n.inset-0 {\n inset: 0px;\n}\n.top-1\\/2 {\n top: calc(1 / 2 * 100%);\n}\n.top-2\\.5 {\n top: calc(var(--spacing) * 2.5);\n}\n.right-2 {\n right: calc(var(--spacing) * 2);\n}\n.left-1\\/2 {\n left: calc(1 / 2 * 100%);\n}\n.z-1 {\n z-index: 1;\n}\n.block {\n display: block;\n}\n.flex {\n display: flex;\n}\n.grid {\n display: grid;\n}\n.hidden {\n display: none;\n}\n.inline-flex {\n display: inline-flex;\n}\n.h-7 {\n height: calc(var(--spacing) * 7);\n}\n.h-8 {\n height: calc(var(--spacing) * 8);\n}\n.max-h-24 {\n max-height: calc(var(--spacing) * 24);\n}\n.max-h-\\[calc\\(100vh-16px\\)\\] {\n max-height: calc(100vh - 16px);\n}\n.max-h-\\[min\\(176px\\,calc\\(100vh-180px\\)\\)\\] {\n max-height: min(176px, calc(100vh - 180px));\n}\n.min-h-7 {\n min-height: calc(var(--spacing) * 7);\n}\n.min-h-8 {\n min-height: calc(var(--spacing) * 8);\n}\n.w-6 {\n width: calc(var(--spacing) * 6);\n}\n.w-8 {\n width: calc(var(--spacing) * 8);\n}\n.w-\\[min\\(360px\\,calc\\(100vw-16px\\)\\)\\] {\n width: min(360px, calc(100vw - 16px));\n}\n.w-full {\n width: 100%;\n}\n.max-w-70 {\n max-width: calc(var(--spacing) * 70);\n}\n.min-w-0 {\n min-width: 0px;\n}\n.flex-1 {\n flex: 1;\n}\n.shrink-0 {\n flex-shrink: 0;\n}\n.-translate-x-1\\/2 {\n --tw-translate-x: calc(calc(1 / 2 * 100%) * -1);\n translate: var(--tw-translate-x) var(--tw-translate-y);\n}\n.-translate-y-1\\/2 {\n --tw-translate-y: calc(calc(1 / 2 * 100%) * -1);\n translate: var(--tw-translate-x) var(--tw-translate-y);\n}\n.transform {\n transform: var(--tw-rotate-x,) var(--tw-rotate-y,) var(--tw-rotate-z,) var(--tw-skew-x,) var(--tw-skew-y,);\n}\n.cursor-grab {\n cursor: grab;\n}\n.cursor-pointer {\n cursor: pointer;\n}\n.resize {\n resize: both;\n}\n.resize-none {\n resize: none;\n}\n.appearance-none {\n appearance: none;\n}\n.grid-cols-\\[22px_minmax\\(0\\,1fr\\)\\] {\n grid-template-columns: 22px minmax(0,1fr);\n}\n.grid-cols-\\[82px_minmax\\(0\\,1fr\\)\\] {\n grid-template-columns: 82px minmax(0,1fr);\n}\n.flex-col {\n flex-direction: column;\n}\n.items-center {\n align-items: center;\n}\n.items-start {\n align-items: flex-start;\n}\n.justify-center {\n justify-content: center;\n}\n.gap-0\\.5 {\n gap: calc(var(--spacing) * 0.5);\n}\n.gap-1 {\n gap: var(--spacing);\n}\n.gap-2 {\n gap: calc(var(--spacing) * 2);\n}\n.overflow-auto {\n overflow: auto;\n}\n.overflow-hidden {\n overflow: hidden;\n}\n.overflow-y-hidden {\n overflow-y: hidden;\n}\n.rounded-lg {\n border-radius: var(--t3-radius);\n}\n.rounded-md {\n border-radius: calc(var(--t3-radius) - 2px);\n}\n.rounded-xl {\n border-radius: calc(var(--t3-radius) + 4px);\n}\n.border {\n border-style: var(--tw-border-style);\n border-width: 1px;\n}\n.border-0 {\n border-style: var(--tw-border-style);\n border-width: 0px;\n}\n.border-t {\n border-top-style: var(--tw-border-style);\n border-top-width: 1px;\n}\n.border-b {\n border-bottom-style: var(--tw-border-style);\n border-bottom-width: 1px;\n}\n.border-border {\n border-color: var(--t3-border);\n}\n.border-input {\n border-color: var(--t3-input);\n}\n.border-primary {\n border-color: var(--t3-primary);\n}\n.border-transparent {\n border-color: transparent;\n}\n.border-b-transparent {\n border-bottom-color: transparent;\n}\n.bg-background {\n background-color: var(--t3-background);\n}\n.bg-muted {\n background-color: var(--t3-muted);\n}\n.bg-muted\\/40 {\n background-color: var(--t3-muted);\n @supports (color: color-mix(in lab, red, red)) {\n background-color: color-mix(in oklab, var(--t3-muted) 40%, transparent);\n }\n}\n.bg-popover\\/95 {\n background-color: var(--t3-popover);\n @supports (color: color-mix(in lab, red, red)) {\n background-color: color-mix(in oklab, var(--t3-popover) 95%, transparent);\n }\n}\n.bg-popover\\/96 {\n background-color: var(--t3-popover);\n @supports (color: color-mix(in lab, red, red)) {\n background-color: color-mix(in oklab, var(--t3-popover) 96%, transparent);\n }\n}\n.bg-primary {\n background-color: var(--t3-primary);\n}\n.bg-primary\\/10 {\n background-color: var(--t3-primary);\n @supports (color: color-mix(in lab, red, red)) {\n background-color: color-mix(in oklab, var(--t3-primary) 10%, transparent);\n }\n}\n.bg-transparent {\n background-color: transparent;\n}\n.p-0 {\n padding: 0px;\n}\n.p-1 {\n padding: var(--spacing);\n}\n.p-2 {\n padding: calc(var(--spacing) * 2);\n}\n.px-0 {\n padding-inline: 0px;\n}\n.px-1 {\n padding-inline: var(--spacing);\n}\n.px-2 {\n padding-inline: calc(var(--spacing) * 2);\n}\n.px-2\\.5 {\n padding-inline: calc(var(--spacing) * 2.5);\n}\n.px-3 {\n padding-inline: calc(var(--spacing) * 3);\n}\n.py-1 {\n padding-block: var(--spacing);\n}\n.py-1\\.5 {\n padding-block: calc(var(--spacing) * 1.5);\n}\n.py-2 {\n padding-block: calc(var(--spacing) * 2);\n}\n.font-mono {\n font-family: var(--t3-font-mono);\n}\n.font-sans {\n font-family: var(--t3-font-sans);\n}\n.text-lg {\n font-size: var(--text-lg);\n line-height: var(--tw-leading, var(--text-lg--line-height));\n}\n.text-sm {\n font-size: var(--text-sm);\n line-height: var(--tw-leading, var(--text-sm--line-height));\n}\n.text-xs {\n font-size: var(--text-xs);\n line-height: var(--tw-leading, var(--text-xs--line-height));\n}\n.leading-5 {\n --tw-leading: calc(var(--spacing) * 5);\n line-height: calc(var(--spacing) * 5);\n}\n.font-bold {\n --tw-font-weight: var(--font-weight-bold);\n font-weight: var(--font-weight-bold);\n}\n.font-medium {\n --tw-font-weight: var(--font-weight-medium);\n font-weight: var(--font-weight-medium);\n}\n.font-semibold {\n --tw-font-weight: var(--font-weight-semibold);\n font-weight: var(--font-weight-semibold);\n}\n.text-foreground {\n color: var(--t3-foreground);\n}\n.text-muted-foreground {\n color: var(--t3-muted-foreground);\n}\n.text-popover-foreground {\n color: var(--t3-popover-foreground);\n}\n.text-primary {\n color: var(--t3-primary);\n}\n.text-primary-foreground {\n color: var(--t3-primary-foreground);\n}\n.shadow-2xl {\n --tw-shadow: 0 25px 50px -12px var(--tw-shadow-color, rgb(0 0 0 / 0.25));\n box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);\n}\n.shadow-lg {\n --tw-shadow: 0 10px 15px -3px var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 4px 6px -4px var(--tw-shadow-color, rgb(0 0 0 / 0.1));\n box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);\n}\n.shadow-md {\n --tw-shadow: 0 4px 6px -1px var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 2px 4px -2px var(--tw-shadow-color, rgb(0 0 0 / 0.1));\n box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);\n}\n.shadow-sm {\n --tw-shadow: 0 1px 3px 0 var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 1px 2px -1px var(--tw-shadow-color, rgb(0 0 0 / 0.1));\n box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);\n}\n.shadow-xs {\n --tw-shadow: 0 1px 2px 0 var(--tw-shadow-color, rgb(0 0 0 / 0.05));\n box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);\n}\n.ring-0 {\n --tw-ring-shadow: var(--tw-ring-inset,) 0 0 0 calc(0px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);\n box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);\n}\n.blur {\n --tw-blur: blur(8px);\n filter: var(--tw-blur,) var(--tw-brightness,) var(--tw-contrast,) var(--tw-grayscale,) var(--tw-hue-rotate,) var(--tw-invert,) var(--tw-saturate,) var(--tw-sepia,) var(--tw-drop-shadow,);\n}\n.backdrop-blur-xl {\n --tw-backdrop-blur: blur(var(--blur-xl));\n -webkit-backdrop-filter: var(--tw-backdrop-blur,) var(--tw-backdrop-brightness,) var(--tw-backdrop-contrast,) var(--tw-backdrop-grayscale,) var(--tw-backdrop-hue-rotate,) var(--tw-backdrop-invert,) var(--tw-backdrop-opacity,) var(--tw-backdrop-saturate,) var(--tw-backdrop-sepia,);\n backdrop-filter: var(--tw-backdrop-blur,) var(--tw-backdrop-brightness,) var(--tw-backdrop-contrast,) var(--tw-backdrop-grayscale,) var(--tw-backdrop-hue-rotate,) var(--tw-backdrop-invert,) var(--tw-backdrop-opacity,) var(--tw-backdrop-saturate,) var(--tw-backdrop-sepia,);\n}\n.outline-none {\n --tw-outline-style: none;\n outline-style: none;\n}\n.select-none {\n -webkit-user-select: none;\n user-select: none;\n}\n.placeholder\\:text-muted-foreground::placeholder {\n color: var(--t3-muted-foreground);\n}\n@media (hover: hover) {\n .hover\\:bg-accent:hover {\n background-color: var(--t3-accent);\n }\n .hover\\:bg-primary\\/90:hover {\n background-color: var(--t3-primary);\n }\n @supports (color: color-mix(in lab, red, red)) {\n .hover\\:bg-primary\\/90:hover {\n background-color: color-mix(in oklab, var(--t3-primary) 90%, transparent);\n }\n }\n .hover\\:text-accent-foreground:hover {\n color: var(--t3-accent-foreground);\n }\n}\n.focus\\:border-b-primary:focus {\n border-bottom-color: var(--t3-primary);\n}\n.focus\\:ring-0:focus {\n --tw-ring-shadow: var(--tw-ring-inset,) 0 0 0 calc(0px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);\n box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);\n}\n.focus\\:outline-none:focus {\n --tw-outline-style: none;\n outline-style: none;\n}\n.disabled\\:pointer-events-none:disabled {\n pointer-events: none;\n}\n.disabled\\:opacity-60:disabled {\n opacity: 60%;\n}\n:host {\n --t3-font-sans: "DM Sans Variable", "DM Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", system-ui,\n sans-serif;\n --t3-font-mono: "SF Mono", "SFMono-Regular", "JetBrains Mono", Consolas, "Liberation Mono", Menlo, monospace;\n --t3-radius: 0.625rem;\n --t3-background: white;\n --t3-foreground: oklch(0.269 0 0);\n --t3-popover: white;\n --t3-popover-foreground: oklch(0.269 0 0);\n --t3-primary: oklch(0.488 0.217 264);\n --t3-primary-foreground: white;\n --t3-muted: rgb(0 0 0 / 4%);\n --t3-muted-foreground: oklch(0.556 0 0);\n --t3-accent: rgb(0 0 0 / 4%);\n --t3-accent-foreground: oklch(0.269 0 0);\n --t3-border: rgb(0 0 0 / 8%);\n --t3-input: rgb(0 0 0 / 10%);\n --t3-ring: oklch(0.488 0.217 264);\n color: var(--t3-foreground);\n font-family: var(--t3-font-sans);\n}\n* {\n box-sizing: border-box;\n border-color: var(--t3-border);\n}\nbutton, input, select, textarea {\n font: inherit;\n}\nbutton:focus-visible, input:focus-visible, select:focus-visible, textarea:focus-visible {\n outline: 2px solid var(--t3-ring);\n @supports (color: color-mix(in lab, red, red)) {\n outline: 2px solid color-mix(in srgb, var(--t3-ring) 72%, transparent);\n }\n outline-offset: -2px;\n}\n@property --tw-translate-x {\n syntax: "*";\n inherits: false;\n initial-value: 0;\n}\n@property --tw-translate-y {\n syntax: "*";\n inherits: false;\n initial-value: 0;\n}\n@property --tw-translate-z {\n syntax: "*";\n inherits: false;\n initial-value: 0;\n}\n@property --tw-rotate-x {\n syntax: "*";\n inherits: false;\n}\n@property --tw-rotate-y {\n syntax: "*";\n inherits: false;\n}\n@property --tw-rotate-z {\n syntax: "*";\n inherits: false;\n}\n@property --tw-skew-x {\n syntax: "*";\n inherits: false;\n}\n@property --tw-skew-y {\n syntax: "*";\n inherits: false;\n}\n@property --tw-border-style {\n syntax: "*";\n inherits: false;\n initial-value: solid;\n}\n@property --tw-leading {\n syntax: "*";\n inherits: false;\n}\n@property --tw-font-weight {\n syntax: "*";\n inherits: false;\n}\n@property --tw-shadow {\n syntax: "*";\n inherits: false;\n initial-value: 0 0 #0000;\n}\n@property --tw-shadow-color {\n syntax: "*";\n inherits: false;\n}\n@property --tw-shadow-alpha {\n syntax: "";\n inherits: false;\n initial-value: 100%;\n}\n@property --tw-inset-shadow {\n syntax: "*";\n inherits: false;\n initial-value: 0 0 #0000;\n}\n@property --tw-inset-shadow-color {\n syntax: "*";\n inherits: false;\n}\n@property --tw-inset-shadow-alpha {\n syntax: "";\n inherits: false;\n initial-value: 100%;\n}\n@property --tw-ring-color {\n syntax: "*";\n inherits: false;\n}\n@property --tw-ring-shadow {\n syntax: "*";\n inherits: false;\n initial-value: 0 0 #0000;\n}\n@property --tw-inset-ring-color {\n syntax: "*";\n inherits: false;\n}\n@property --tw-inset-ring-shadow {\n syntax: "*";\n inherits: false;\n initial-value: 0 0 #0000;\n}\n@property --tw-ring-inset {\n syntax: "*";\n inherits: false;\n}\n@property --tw-ring-offset-width {\n syntax: "";\n inherits: false;\n initial-value: 0px;\n}\n@property --tw-ring-offset-color {\n syntax: "*";\n inherits: false;\n initial-value: #fff;\n}\n@property --tw-ring-offset-shadow {\n syntax: "*";\n inherits: false;\n initial-value: 0 0 #0000;\n}\n@property --tw-blur {\n syntax: "*";\n inherits: false;\n}\n@property --tw-brightness {\n syntax: "*";\n inherits: false;\n}\n@property --tw-contrast {\n syntax: "*";\n inherits: false;\n}\n@property --tw-grayscale {\n syntax: "*";\n inherits: false;\n}\n@property --tw-hue-rotate {\n syntax: "*";\n inherits: false;\n}\n@property --tw-invert {\n syntax: "*";\n inherits: false;\n}\n@property --tw-opacity {\n syntax: "*";\n inherits: false;\n}\n@property --tw-saturate {\n syntax: "*";\n inherits: false;\n}\n@property --tw-sepia {\n syntax: "*";\n inherits: false;\n}\n@property --tw-drop-shadow {\n syntax: "*";\n inherits: false;\n}\n@property --tw-drop-shadow-color {\n syntax: "*";\n inherits: false;\n}\n@property --tw-drop-shadow-alpha {\n syntax: "";\n inherits: false;\n initial-value: 100%;\n}\n@property --tw-drop-shadow-size {\n syntax: "*";\n inherits: false;\n}\n@property --tw-backdrop-blur {\n syntax: "*";\n inherits: false;\n}\n@property --tw-backdrop-brightness {\n syntax: "*";\n inherits: false;\n}\n@property --tw-backdrop-contrast {\n syntax: "*";\n inherits: false;\n}\n@property --tw-backdrop-grayscale {\n syntax: "*";\n inherits: false;\n}\n@property --tw-backdrop-hue-rotate {\n syntax: "*";\n inherits: false;\n}\n@property --tw-backdrop-invert {\n syntax: "*";\n inherits: false;\n}\n@property --tw-backdrop-opacity {\n syntax: "*";\n inherits: false;\n}\n@property --tw-backdrop-saturate {\n syntax: "*";\n inherits: false;\n}\n@property --tw-backdrop-sepia {\n syntax: "*";\n inherits: false;\n}\n@layer properties {\n *, ::before, ::after, ::backdrop {\n --tw-translate-x: 0;\n --tw-translate-y: 0;\n --tw-translate-z: 0;\n --tw-rotate-x: initial;\n --tw-rotate-y: initial;\n --tw-rotate-z: initial;\n --tw-skew-x: initial;\n --tw-skew-y: initial;\n --tw-border-style: solid;\n --tw-leading: initial;\n --tw-font-weight: initial;\n --tw-shadow: 0 0 #0000;\n --tw-shadow-color: initial;\n --tw-shadow-alpha: 100%;\n --tw-inset-shadow: 0 0 #0000;\n --tw-inset-shadow-color: initial;\n --tw-inset-shadow-alpha: 100%;\n --tw-ring-color: initial;\n --tw-ring-shadow: 0 0 #0000;\n --tw-inset-ring-color: initial;\n --tw-inset-ring-shadow: 0 0 #0000;\n --tw-ring-inset: initial;\n --tw-ring-offset-width: 0px;\n --tw-ring-offset-color: #fff;\n --tw-ring-offset-shadow: 0 0 #0000;\n --tw-blur: initial;\n --tw-brightness: initial;\n --tw-contrast: initial;\n --tw-grayscale: initial;\n --tw-hue-rotate: initial;\n --tw-invert: initial;\n --tw-opacity: initial;\n --tw-saturate: initial;\n --tw-sepia: initial;\n --tw-drop-shadow: initial;\n --tw-drop-shadow-color: initial;\n --tw-drop-shadow-alpha: 100%;\n --tw-drop-shadow-size: initial;\n --tw-backdrop-blur: initial;\n --tw-backdrop-brightness: initial;\n --tw-backdrop-contrast: initial;\n --tw-backdrop-grayscale: initial;\n --tw-backdrop-hue-rotate: initial;\n --tw-backdrop-invert: initial;\n --tw-backdrop-opacity: initial;\n --tw-backdrop-saturate: initial;\n --tw-backdrop-sepia: initial;\n }\n}\n'; diff --git a/apps/desktop/src/preview/PickPreload.ts b/apps/desktop/src/preview/PickPreload.ts index aaeaa9984e88d..0eb0515748458 100644 --- a/apps/desktop/src/preview/PickPreload.ts +++ b/apps/desktop/src/preview/PickPreload.ts @@ -281,27 +281,57 @@ function frameDocuments(root: Document): Document[] { }); } -/** Where a frame's viewport origin sits in its parent's viewport. */ -function frameContentOffset(frame: Element): PreviewAnnotationPoint { +/** A frame viewport point (x, y) sits at (originX + x * scaleX, originY + y * scaleY) outside. */ +interface FrameTransform { + originX: number; + originY: number; + scaleX: number; + scaleY: number; +} + +const IDENTITY_TRANSFORM: FrameTransform = { originX: 0, originY: 0, scaleX: 1, scaleY: 1 }; + +/** Maps a frame's viewport into its parent's, including CSS scale such as Storybook's zoom. */ +function frameTransform(frame: Element): FrameTransform { const rect = frame.getBoundingClientRect(); const style = styleOf(frame); + const layoutWidth = "offsetWidth" in frame ? Number(frame.offsetWidth) : 0; + const layoutHeight = "offsetHeight" in frame ? Number(frame.offsetHeight) : 0; + const scaleX = layoutWidth > 0 ? rect.width / layoutWidth : 1; + const scaleY = layoutHeight > 0 ? rect.height / layoutHeight : 1; return { - x: rect.left + frame.clientLeft + (Number.parseFloat(style.paddingLeft) || 0), - y: rect.top + frame.clientTop + (Number.parseFloat(style.paddingTop) || 0), + originX: rect.left + (frame.clientLeft + (Number.parseFloat(style.paddingLeft) || 0)) * scaleX, + originY: rect.top + (frame.clientTop + (Number.parseFloat(style.paddingTop) || 0)) * scaleY, + scaleX, + scaleY, }; } const enclosingFrame = (view: Window | null): Element | null => view?.frameElement ?? null; -/** Translates a point in `view`'s viewport into the top viewport. */ -function topPoint(view: Window | null, x: number, y: number): PreviewAnnotationPoint { +/** Maps `view`'s viewport into the top viewport through every enclosing frame. */ +function topTransform(view: Window | null): FrameTransform { + let result = IDENTITY_TRANSFORM; for (let frame = enclosingFrame(view); frame;) { - const offset = frameContentOffset(frame); - x += offset.x; - y += offset.y; + const outer = frameTransform(frame); + result = { + originX: outer.originX + result.originX * outer.scaleX, + originY: outer.originY + result.originY * outer.scaleY, + scaleX: result.scaleX * outer.scaleX, + scaleY: result.scaleY * outer.scaleY, + }; frame = enclosingFrame(frame.ownerDocument.defaultView); } - return { x, y }; + return result; +} + +/** Translates a point in `view`'s viewport into the top viewport. */ +function topPoint(view: Window | null, x: number, y: number): PreviewAnnotationPoint { + const transform = topTransform(view); + return { + x: transform.originX + x * transform.scaleX, + y: transform.originY + y * transform.scaleY, + }; } const eventPoint = (event: MouseEvent): PreviewAnnotationPoint => @@ -327,9 +357,18 @@ type RectMapper = (rect: PreviewAnnotationRect) => PreviewAnnotationRect; function topViewportMapper(view: Window): RectMapper { const frame = enclosingFrame(view); if (!frame) return (rect) => rect; - const offset = topPoint(view, 0, 0); + const transform = topTransform(view); const clip = visibleElementRect(frame); - return (rect) => intersectRects({ ...rect, x: rect.x + offset.x, y: rect.y + offset.y }, clip); + return (rect) => + intersectRects( + { + x: transform.originX + rect.x * transform.scaleX, + y: transform.originY + rect.y * transform.scaleY, + width: rect.width * transform.scaleX, + height: rect.height * transform.scaleY, + }, + clip, + ); } const inTopViewport = (view: Window, rect: PreviewAnnotationRect): PreviewAnnotationRect => @@ -352,8 +391,10 @@ function pickFromPoint(x: number, y: number, root: Document = document): Element if (candidate === root.documentElement || candidate === root.body) continue; const inner = frameDocument(candidate); if (!inner) return candidate; - const offset = frameContentOffset(candidate); - return pickFromPoint(x - offset.x, y - offset.y, inner) ?? candidate; + const transform = frameTransform(candidate); + const innerX = (x - transform.originX) / transform.scaleX; + const innerY = (y - transform.originY) / transform.scaleY; + return pickFromPoint(innerX, innerY, inner) ?? candidate; } return null; } From 558139360cb2e1fab8974d1f6b83cd9b777f011a Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Tue, 3 Nov 2026 12:08:27 +0000 Subject: [PATCH 4/8] fix(desktop): clip frame rects to the frame viewport and repaint on frame resize Co-Authored-By: Claude Opus 5.5 --- apps/desktop/src/preview/PickPreload.ts | 32 +++++++++++++------------ 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/apps/desktop/src/preview/PickPreload.ts b/apps/desktop/src/preview/PickPreload.ts index 0eb0515748458..16fca3ce79645 100644 --- a/apps/desktop/src/preview/PickPreload.ts +++ b/apps/desktop/src/preview/PickPreload.ts @@ -358,17 +358,19 @@ function topViewportMapper(view: Window): RectMapper { const frame = enclosingFrame(view); if (!frame) return (rect) => rect; const transform = topTransform(view); - const clip = visibleElementRect(frame); - return (rect) => - intersectRects( - { - x: transform.originX + rect.x * transform.scaleX, - y: transform.originY + rect.y * transform.scaleY, - width: rect.width * transform.scaleX, - height: rect.height * transform.scaleY, - }, - clip, - ); + const toTop = (rect: PreviewAnnotationRect): PreviewAnnotationRect => ({ + x: transform.originX + rect.x * transform.scaleX, + y: transform.originY + rect.y * transform.scaleY, + width: rect.width * transform.scaleX, + height: rect.height * transform.scaleY, + }); + // The frame's viewport excludes its border and padding, which its visible box includes. + const viewport = view.document.documentElement; + const clip = intersectRects( + toTop({ x: 0, y: 0, width: viewport.clientWidth, height: viewport.clientHeight }), + visibleElementRect(frame), + ); + return (rect) => intersectRects(toTop(rect), clip); } const inTopViewport = (view: Window, rect: PreviewAnnotationRect): PreviewAnnotationRect => @@ -538,8 +540,8 @@ const HTML_PREVIEW_MAX_CHARS = 500; /** Preserve the tag, HTML, and crop rect when React context lookup fails or stalls. */ async function captureElement(element: Element): Promise { const base = { - pageUrl: location.href, - pageTitle: document.title?.trim() || null, + pageUrl: element.ownerDocument.location?.href ?? location.href, + pageTitle: element.ownerDocument.title?.trim() || null, tagName: element.tagName.toLowerCase(), pickedAt: new Date().toISOString(), }; @@ -1486,7 +1488,6 @@ function startAnnotation(sendEnabled: boolean): void { } frames.clear(); window.removeEventListener("blur", onWindowBlur); - window.removeEventListener("resize", repaint); dragHandle.removeEventListener("pointerdown", onEditorPointerDown); dragHandle.removeEventListener("pointermove", onEditorPointerMove); dragHandle.removeEventListener("pointerup", onEditorPointerUp); @@ -1606,6 +1607,7 @@ function startAnnotation(sendEnabled: boolean): void { view.addEventListener("click", onClick, { capture: true, passive: false }); view.addEventListener("keydown", onKeyDown, { capture: true }); view.addEventListener("scroll", repaint, { capture: true, passive: true }); + view.addEventListener("resize", repaint, { passive: true }); } function unlisten(root: Document): void { @@ -1619,6 +1621,7 @@ function startAnnotation(sendEnabled: boolean): void { view.removeEventListener("click", onClick, true); view.removeEventListener("keydown", onKeyDown, true); view.removeEventListener("scroll", repaint, true); + view.removeEventListener("resize", repaint); } // The preload runs only in the top frame, so input over a same-origin frame needs listeners there. @@ -1650,7 +1653,6 @@ function startAnnotation(sendEnabled: boolean): void { listen(document); attachFrames(); window.addEventListener("blur", onWindowBlur); - window.addEventListener("resize", repaint, { passive: true }); ipcRenderer.on(CANCEL_PICK_CHANNEL, onCancel); ipcRenderer.on(ANNOTATION_CAPTURED_CHANNEL, onCaptured); if (inputLayer) { From 974d8e82d2ac5fae8124e9fd18d7acf961ad1ad9 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Tue, 3 Nov 2026 13:15:27 +0000 Subject: [PATCH 5/8] fix(desktop): clear the annotation hover when a frame loses focus Co-Authored-By: Claude Opus 5.5 --- apps/desktop/src/preview/PickPreload.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/desktop/src/preview/PickPreload.ts b/apps/desktop/src/preview/PickPreload.ts index 16fca3ce79645..336f17e009ea2 100644 --- a/apps/desktop/src/preview/PickPreload.ts +++ b/apps/desktop/src/preview/PickPreload.ts @@ -1487,7 +1487,6 @@ function startAnnotation(sendEnabled: boolean): void { style.remove(); } frames.clear(); - window.removeEventListener("blur", onWindowBlur); dragHandle.removeEventListener("pointerdown", onEditorPointerDown); dragHandle.removeEventListener("pointermove", onEditorPointerMove); dragHandle.removeEventListener("pointerup", onEditorPointerUp); @@ -1608,6 +1607,7 @@ function startAnnotation(sendEnabled: boolean): void { view.addEventListener("keydown", onKeyDown, { capture: true }); view.addEventListener("scroll", repaint, { capture: true, passive: true }); view.addEventListener("resize", repaint, { passive: true }); + view.addEventListener("blur", onWindowBlur); } function unlisten(root: Document): void { @@ -1622,6 +1622,7 @@ function startAnnotation(sendEnabled: boolean): void { view.removeEventListener("keydown", onKeyDown, true); view.removeEventListener("scroll", repaint, true); view.removeEventListener("resize", repaint); + view.removeEventListener("blur", onWindowBlur); } // The preload runs only in the top frame, so input over a same-origin frame needs listeners there. @@ -1652,7 +1653,6 @@ function startAnnotation(sendEnabled: boolean): void { listen(document); attachFrames(); - window.addEventListener("blur", onWindowBlur); ipcRenderer.on(CANCEL_PICK_CHANNEL, onCancel); ipcRenderer.on(ANNOTATION_CAPTURED_CHANNEL, onCaptured); if (inputLayer) { From 037d6f4265c2b455565b7a926f4858eec1c5a859 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Tue, 17 Nov 2026 03:00:25 +0000 Subject: [PATCH 6/8] fix(desktop): release frame listeners after navigation and keep clipped rects in their frame A frame that navigated from its initial about:blank keeps the same Window while the old document's defaultView turns null, so teardown skipped removing its listeners and the frame stayed non-interactive. Keep each frame's Window and remove listeners from it. A selected element scrolled fully out of its frame produced an empty rect beyond the frame, which stretched the screenshot crop over unrelated content. Clamp empty intersections onto the clip's edge. Co-Authored-By: Claude Opus 5.5 --- apps/desktop/src/preview/PickPreload.test.ts | 23 ++++++++++++ apps/desktop/src/preview/PickPreload.ts | 37 ++++++++++---------- 2 files changed, 41 insertions(+), 19 deletions(-) diff --git a/apps/desktop/src/preview/PickPreload.test.ts b/apps/desktop/src/preview/PickPreload.test.ts index 61d3941ba41ab..ee82917d84c61 100644 --- a/apps/desktop/src/preview/PickPreload.test.ts +++ b/apps/desktop/src/preview/PickPreload.test.ts @@ -105,3 +105,26 @@ it("keeps the annotation when Escape dismisses an IME candidate in the comment", expect(shadowRoot.host.isConnected).toBe(true); expect(comment.value).toBe("draft"); }); + +it("captures clicks inside a same-origin frame and releases them when annotation ends", () => { + const frame = document.body.appendChild(document.createElement("iframe")); + const frameDocument = frame.contentDocument; + const frameWindow = frameDocument?.defaultView; + if (!frameDocument || !frameWindow) throw new Error("same-origin frame did not load"); + const button = frameDocument.body.appendChild(frameDocument.createElement("button")); + const click = () => { + const event = new frameWindow.MouseEvent("click", { + bubbles: true, + cancelable: true, + }); + button.dispatchEvent(event); + return event.defaultPrevented; + }; + + startAnnotation(); + expect(click(), "a click in the frame should go to the annotation, not the page").toBe(true); + + window.dispatchEvent(new KeyboardEvent("keydown", { key: "Escape", cancelable: true })); + expect(click(), "the frame should be usable again after annotation ends").toBe(false); + frame.remove(); +}); diff --git a/apps/desktop/src/preview/PickPreload.ts b/apps/desktop/src/preview/PickPreload.ts index d7819f870c15a..cb30d45765e50 100644 --- a/apps/desktop/src/preview/PickPreload.ts +++ b/apps/desktop/src/preview/PickPreload.ts @@ -396,8 +396,9 @@ function intersectRects( left: PreviewAnnotationRect, right: PreviewAnnotationRect, ): PreviewAnnotationRect { - const x = Math.max(left.x, right.x); - const y = Math.max(left.y, right.y); + // Clamped into `right`, so a fully clipped rect stays on the clip's edge instead of beyond it. + const x = Math.min(Math.max(left.x, right.x), right.x + right.width); + const y = Math.min(Math.max(left.y, right.y), right.y + right.height); return { x, y, @@ -1036,8 +1037,9 @@ function startAnnotation( let editorPosition: { left: number; top: number } | null = null; let editorDrag: { pointerId: number; offsetX: number; offsetY: number } | null = null; let editorLayoutFrame: number | null = null; - // Same-origin frame documents the session listens in, with the cursor style it added to each. - const frames = new Map(); + // Same-origin frame documents the session listens in. The window is kept because a document + // that navigated away reports a null defaultView while its reused window keeps our listeners. + const frames = new Map(); const resizeComment = (): void => { const maxHeight = 96; @@ -1759,9 +1761,9 @@ function startAnnotation( finished = true; rootResizeObserver.disconnect(); restoreStyles(); - unlisten(document); - for (const [frame, style] of frames) { - unlisten(frame); + unlisten(document, window); + for (const [frame, { view, style }] of frames) { + unlisten(frame, view); frame.documentElement?.removeAttribute("data-t3code-annotation-tool"); style.remove(); } @@ -1914,11 +1916,9 @@ function startAnnotation( submitAnnotation(submission); }; - function listen(root: Document): void { + function listen(root: Document, view: Window): void { // A frame load stops at its document instead of reaching the window. root.addEventListener("load", onLoad, { capture: true, passive: true }); - const view = root.defaultView; - if (!view) return; view.addEventListener("pointermove", onPointerMove, { capture: true, passive: false }); view.addEventListener("pointerdown", onPointerDown, { capture: true, passive: false }); view.addEventListener("pointerup", onPointerUp, { capture: true, passive: false }); @@ -1932,10 +1932,8 @@ function startAnnotation( view.addEventListener("focus", onWindowFocus); } - function unlisten(root: Document): void { + function unlisten(root: Document, view: Window): void { root.removeEventListener("load", onLoad, true); - const view = root.defaultView; - if (!view) return; view.removeEventListener("pointermove", onPointerMove, true); view.removeEventListener("pointerdown", onPointerDown, true); view.removeEventListener("pointerup", onPointerUp, true); @@ -1952,21 +1950,22 @@ function startAnnotation( // The preload runs only in the top frame, so input over a same-origin frame needs listeners there. function attachFrames(): void { const current = frameDocuments(document); - for (const [frame, style] of frames) { + for (const [frame, { view, style }] of frames) { if (current.includes(frame)) continue; - unlisten(frame); + unlisten(frame, view); style.remove(); frames.delete(frame); } for (const frame of current) { - if (frames.has(frame) || !frame.defaultView || !frame.documentElement) continue; + const view = frame.defaultView; + if (frames.has(frame) || !view || !frame.documentElement) continue; const style = frame.createElement("style"); style.setAttribute(OVERLAY_ATTRIBUTE, ""); style.textContent = CROSSHAIR_CURSOR_CSS; frame.documentElement.appendChild(style); frame.documentElement.setAttribute("data-t3code-annotation-tool", tool); - listen(frame); - frames.set(frame, style); + listen(frame, view); + frames.set(frame, { view, style }); } repaint(); } @@ -1975,7 +1974,7 @@ function startAnnotation( if (isFrameElement(event.target)) attachFrames(); } - listen(document); + listen(document, window); attachFrames(); // Bubble phase, so the overlay's own handlers still see these events. for (const type of PAGE_ISOLATED_EVENTS) From 3da8bf5b325936e09750e200b53e22af4f4a5c3a Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Tue, 17 Nov 2026 03:04:44 +0000 Subject: [PATCH 7/8] fix(desktop): a frame that navigated cross-origin no longer aborts annotation teardown Removing listeners through a cross-origin WindowProxy throws SecurityError. That window never carried our listeners, so ignore the error instead of letting it stop cleanup. Co-Authored-By: Claude Opus 5.5 --- apps/desktop/src/preview/PickPreload.ts | 26 ++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/apps/desktop/src/preview/PickPreload.ts b/apps/desktop/src/preview/PickPreload.ts index cb30d45765e50..e7f9e4a976017 100644 --- a/apps/desktop/src/preview/PickPreload.ts +++ b/apps/desktop/src/preview/PickPreload.ts @@ -1934,17 +1934,21 @@ function startAnnotation( function unlisten(root: Document, view: Window): void { root.removeEventListener("load", onLoad, true); - view.removeEventListener("pointermove", onPointerMove, true); - view.removeEventListener("pointerdown", onPointerDown, true); - view.removeEventListener("pointerup", onPointerUp, true); - view.removeEventListener("pointerout", onPointerOut, true); - view.removeEventListener("click", onClick, true); - view.removeEventListener("keydown", onKeyDown, true); - view.removeEventListener("keyup", onVoiceKeyUp, true); - view.removeEventListener("scroll", repaint, true); - view.removeEventListener("resize", repaint); - view.removeEventListener("blur", onWindowBlur); - view.removeEventListener("focus", onWindowFocus); + // A frame that navigated cross-origin is a new window without our listeners, and its + // proxy throws SecurityError here; that must not abort teardown. + try { + view.removeEventListener("pointermove", onPointerMove, true); + view.removeEventListener("pointerdown", onPointerDown, true); + view.removeEventListener("pointerup", onPointerUp, true); + view.removeEventListener("pointerout", onPointerOut, true); + view.removeEventListener("click", onClick, true); + view.removeEventListener("keydown", onKeyDown, true); + view.removeEventListener("keyup", onVoiceKeyUp, true); + view.removeEventListener("scroll", repaint, true); + view.removeEventListener("resize", repaint); + view.removeEventListener("blur", onWindowBlur); + view.removeEventListener("focus", onWindowFocus); + } catch {} } // The preload runs only in the top frame, so input over a same-origin frame needs listeners there. From 7ba3a965749f63801783db095067009c51bfbe3d Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Tue, 17 Nov 2026 04:22:26 +0000 Subject: [PATCH 8/8] fix(desktop): frame selections clipped out of view or navigated away crop nothing unrelated A frame element scrolled fully out of its frame kept a zero-height rect on the frame edge, which main treated as a visible line and cropped an unrelated strip. Fully clipped rects are now 0x0 and stay out of the crop union. Selections in a frame document that navigated away or was removed are dropped instead of lingering as ghost targets at (0, 0). Co-Authored-By: Claude Opus 5.5 --- apps/desktop/src/preview/PickPreload.test.ts | 77 +++++++++++++++++++- apps/desktop/src/preview/PickPreload.ts | 17 ++++- 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/apps/desktop/src/preview/PickPreload.test.ts b/apps/desktop/src/preview/PickPreload.test.ts index ee82917d84c61..4dd882f88b4bb 100644 --- a/apps/desktop/src/preview/PickPreload.test.ts +++ b/apps/desktop/src/preview/PickPreload.test.ts @@ -1,9 +1,10 @@ import { expect, it, vi } from "vite-plus/test"; -import { START_PICK_CHANNEL } from "./GuestProtocol.ts"; +import { ELEMENT_PICKED_CHANNEL, START_PICK_CHANNEL } from "./GuestProtocol.ts"; import "./PickPreload.ts"; const ipcListeners = vi.hoisted(() => new Map void>>()); +const ipcSend = vi.hoisted(() => vi.fn()); vi.mock("electron", () => ({ ipcRenderer: { @@ -11,7 +12,7 @@ vi.mock("electron", () => ({ ipcListeners.set(channel, [...(ipcListeners.get(channel) ?? []), listener]); }, off: () => {}, - send: () => {}, + send: ipcSend, invoke: async () => undefined, }, })); @@ -128,3 +129,75 @@ it("captures clicks inside a same-origin frame and releases them when annotation expect(click(), "the frame should be usable again after annotation ends").toBe(false); frame.remove(); }); + +const rectAt = (left: number, top: number, width: number, height: number) => + DOMRect.fromRect({ x: left, y: top, width, height }); + +/** A 400x300 frame at (0, 100) whose button sits at frame y=-200, fully scrolled out of view. */ +const selectClippedFrameButton = () => { + const frame = document.body.appendChild(document.createElement("iframe")); + const frameDocument = frame.contentDocument; + const frameWindow = frameDocument?.defaultView; + if (!frameDocument || !frameWindow) throw new Error("same-origin frame did not load"); + const button = frameDocument.body.appendChild(frameDocument.createElement("button")); + frame.getBoundingClientRect = () => rectAt(0, 100, 400, 300); + button.getBoundingClientRect = () => rectAt(10, -200, 100, 40); + for (const [root, width, height] of [ + [document, 1000, 700], + [frameDocument, 400, 300], + ] as const) { + Object.defineProperty(root.documentElement, "clientWidth", { + configurable: true, + value: width, + }); + Object.defineProperty(root.documentElement, "clientHeight", { + configurable: true, + value: height, + }); + } + document.elementsFromPoint = () => [frame]; + frameDocument.elementsFromPoint = () => [button]; + + const shadowRoot = startAnnotation(); + button.dispatchEvent( + new frameWindow.MouseEvent("pointerdown", { + bubbles: true, + cancelable: true, + view: frameWindow, + }), + ); + return { frame, shadowRoot }; +}; + +it("crops no screenshot around an element clipped out of its frame", async () => { + const { frame, shadowRoot } = selectClippedFrameButton(); + const attach = Array.from(shadowRoot.querySelectorAll("button")).find( + (button) => button.textContent === "Attach", + ); + if (!attach) throw new Error("Attach button not found"); + ipcSend.mockClear(); + + attach.click(); + await vi.waitFor(() => expect(ipcSend).toHaveBeenCalled()); + const [channel, annotation, screenshotRect] = ipcSend.mock.calls[0] ?? []; + expect(channel).toBe(ELEMENT_PICKED_CHANNEL); + expect(annotation.elements[0].rect).toMatchObject({ width: 0, height: 0 }); + expect(screenshotRect, "the frame edge strip is unrelated content").toBeNull(); + + window.dispatchEvent(new KeyboardEvent("keydown", { key: "Escape", cancelable: true })); + frame.remove(); +}); + +it("drops the selection of a frame whose document went away", () => { + const { frame, shadowRoot } = selectClippedFrameButton(); + const editor = shadowRoot.querySelector("textarea")?.closest("[style*=display]"); + expect(editor?.style.display).toBe("flex"); + + frame.remove(); + const replacement = document.body.appendChild(document.createElement("iframe")); + replacement.dispatchEvent(new Event("load")); + + expect(editor?.style.display, "no element is left to annotate").toBe("none"); + window.dispatchEvent(new KeyboardEvent("keydown", { key: "Escape", cancelable: true })); + replacement.remove(); +}); diff --git a/apps/desktop/src/preview/PickPreload.ts b/apps/desktop/src/preview/PickPreload.ts index e7f9e4a976017..9af14a4c7d651 100644 --- a/apps/desktop/src/preview/PickPreload.ts +++ b/apps/desktop/src/preview/PickPreload.ts @@ -399,6 +399,14 @@ function intersectRects( // Clamped into `right`, so a fully clipped rect stays on the clip's edge instead of beyond it. const x = Math.min(Math.max(left.x, right.x), right.x + right.width); const y = Math.min(Math.max(left.y, right.y), right.y + right.height); + // Fully outside has no pixels, so it must not read as a visible zero-width or zero-height line. + if ( + left.x > right.x + right.width || + left.x + left.width < right.x || + left.y > right.y + right.height || + left.y + left.height < right.y + ) + return { x, y, width: 0, height: 0 }; return { x, y, @@ -1886,7 +1894,10 @@ function startAnnotation( toolbar.style.display = "none"; hoverOutline.style.display = "none"; const screenshotRect = unionRects([ - ...elements.map((target) => target.rect), + // A target clipped out of its frame or detached by navigation has no pixels to crop. + ...elements + .map((target) => target.rect) + .filter((rect) => rect.width > 0 || rect.height > 0), ...submittedRegions.map((region) => region.rect), ...submittedStrokes.map((stroke) => stroke.bounds), ]); @@ -1959,6 +1970,10 @@ function startAnnotation( unlisten(frame, view); style.remove(); frames.delete(frame); + // Elements of a navigated-away document are gone from the page; keep no ghost selection. + for (const target of Array.from(selected.values())) + if (target.element.ownerDocument === frame) removeSelected(target); + updateStatus(); } for (const frame of current) { const view = frame.defaultView;