Merge pull request #1463 from silx-kit/cancel-zoom-right-click

Allow canceling select-to-zoom interaction with right click
silx-kit · Aug 8, 2023 · d912a67 · d912a67
2 parents f609c92 + 9357917
commit d912a67
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/packages/lib/src/interactions/SelectionTool.tsx b/packages/lib/src/interactions/SelectionTool.tsx
@@ -1,5 +1,6 @@
 import { assertDefined } from '@h5web/shared';
 import {
+  useEventListener,
   useKeyboardEvent,
   usePrevious,
   useRafState,
@@ -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(