Skip to content

fix(EPUB/Snapshot): allow Esc key to switch off annotation tool #191

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

Open
ramonmi wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(EPUB/Snapshot): allow Esc key to switch off annotation tool #191

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
434d396
fix(EPUB/Snapshot): allow Esc key to switch off annotation tool
ramonmi Mar 11, 2026
77a2c07
refine conditional logic
ramonmi Mar 11, 2026
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
18 changes: 14 additions & 4 deletions src/dom/common/dom-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1003,6 +1003,7 @@ abstract class DOMView<State extends DOMViewState, Data> {
let f = this._getFocusState();

if (key === 'Escape' && !this._resizingAnnotationID) {
let handled = false;
if (this._selectedAnnotationIDs.length) {
this._options.onSelectAnnotations([], event);
if (this._lastKeyboardFocusedAnnotationID) {
Expand All @@ -1011,14 +1012,23 @@ abstract class DOMView<State extends DOMViewState, Data> {
) as HTMLElement | SVGElement | null)
?.focus({ preventScroll: true });
}
handled = true;
}
else if (f.focusedElement) {
f.focusedElement.blur();
handled = true;
}
const selection = this._iframeWindow.getSelection();
if (selection && !selection.isCollapsed) {
selection.removeAllRanges();
handled = true;
}

// If Escape was handled locally (annotation selection/focus/text selection),
// don't forward it to common shortcuts.
if (handled) {
return;
}
this._iframeWindow.getSelection()?.removeAllRanges();
// The keyboard shortcut was handled here, therefore no need to
// pass it to this._onKeyDown(event) below
return;
}
else if (key === 'Shift-Tab') {
if (f.focusedElement) {
Expand Down
Loading