Skip to content
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.

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

Allow canceling select-to-zoom interaction with right click #1463

Merged
merged 1 commit into from
Aug 8, 2023
Merged
Changes from all commits
Commits
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
20 changes: 11 additions & 9 deletions packages/lib/src/interactions/SelectionTool.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { assertDefined } from '@h5web/shared';
import {
useEventListener,
useKeyboardEvent,
usePrevious,
useRafState,
Expand Down Expand Up @@ -138,15 +139,16 @@ function SelectionTool(props: Props) {

useCanvasEvents({ onPointerDown, onPointerMove, onPointerUp });

useKeyboardEvent(
'Escape',
() => {
startEvtRef.current = undefined;
setRawSelection(undefined);
},
[],
{ event: 'keydown' },
);
function cancelSelection() {
startEvtRef.current = undefined;
setRawSelection(undefined);
}

useKeyboardEvent('Escape', cancelSelection, [], { event: 'keydown' });
useEventListener(window, 'contextmenu', (evt: MouseEvent) => {
evt.preventDefault();
cancelSelection();
});

// Compute effective selection
const selection = useMemo(
Expand Down