fix: consecutive selection

Determine the key modifier based on the host OS, use 'CMD' for Mac and 'Ctrl' for other OS. close #2664
cheminfo · Sep 13, 2023 · 53fff90 · 53fff90
1 parent d3d231f
commit 53fff90
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/component/context/KeyModifierContext.tsx b/src/component/context/KeyModifierContext.tsx
@@ -38,7 +38,7 @@ interface KeyModifierProviderProps {
 const isMac =
   navigator !== undefined && navigator.userAgent.toLowerCase().includes('mac');
 
-function getModifiers(event: KeyboardEvent) {
+export function getModifiers(event: KeyboardEvent) {
   const { shiftKey, altKey, metaKey } = event;
   const ctrlKey = isMac ? metaKey : event.ctrlKey;
   return { ctrlKey, shiftKey, altKey };

diff --git a/src/component/panels/SpectrumsPanel/SpectrumsTabs.tsx b/src/component/panels/SpectrumsPanel/SpectrumsTabs.tsx
@@ -13,6 +13,7 @@ import groupByInfoKey from '../../utility/GroupByInfoKey';
 
 import { SpectraTable } from './SpectraTable';
 import SpectrumSetting from './base/setting/SpectrumSetting';
+import { getModifiers } from '../../context/KeyModifierContext';
 
 interface SpectrumsTabsInnerProps {
   data: Spectrum[];
@@ -68,8 +69,9 @@ function SpectrumsTabsInner({
 
   function handleChangeActiveSpectrum(e, spectrum) {
     setTimeout(() => {
-      const modifier = `shift[${e.shiftKey ? 'true' : 'false'}]_ctrl[${
-        e.ctrlKey ? 'true' : 'false'
+      const { ctrlKey, shiftKey } = getModifiers(e);
+      const modifier = `shift[${shiftKey ? 'true' : 'false'}]_ctrl[${
+        ctrlKey ? 'true' : 'false'
       }]`;
       dispatch({
         type: 'CHANGE_ACTIVE_SPECTRUM',