Skip to content

fix(ui): prevent annotation toolbar from stealing global comment focus #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
backnotprop merged 1 commit into from
Feb 16, 2026
+11 −1
Merged

fix(ui): prevent annotation toolbar from stealing global comment focus #157

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion packages/ui/components/AnnotationToolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ import { AttachmentsButton } from "./AttachmentsButton";

type PositionMode = 'center-above' | 'top-right';

const isEditableElement = (node: EventTarget | Element | null): boolean => {
if (!(node instanceof Element)) return false;
if (node.matches('input, textarea, select, [role="textbox"]')) return true;
if (node.closest('[contenteditable]:not([contenteditable="false"])')) return true;
return (node as HTMLElement).isContentEditable;
};

interface AnnotationToolbarProps {
element: HTMLElement;
positionMode: PositionMode;
Expand Down Expand Up @@ -129,6 +136,9 @@ export const AnnotationToolbar: React.FC<AnnotationToolbarProps> = ({
if (step !== "menu") return;

const handleKeyDown = (e: KeyboardEvent) => {
// Protect global comment and any editable field focus from type-to-comment capture.
if (e.isComposing) return;
if (isEditableElement(e.target) || isEditableElement(document.activeElement)) return;
// Escape closes the toolbar
if (e.key === "Escape") { onClose(); return; }
// Ignore if modifier keys are held (except shift for capitals)
Expand All @@ -146,7 +156,7 @@ export const AnnotationToolbar: React.FC<AnnotationToolbarProps> = ({

window.addEventListener("keydown", handleKeyDown);
return () => window.removeEventListener("keydown", handleKeyDown);
}, [step]);
}, [step, onClose]);

if (!position) return null;

Expand Down