Bugfix / control-a hot key fix (#336)

* disable shortcut key propogation * update WA tool --------- Co-authored-by: PhotoNomad0 <[email protected]>
unfoldingWord · Dec 23, 2024 · 76ead65 · 76ead65
1 parent d1fedd0
commit 76ead65
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 17 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/Container.js b/src/components/Container.js
@@ -131,7 +131,7 @@ const isMacOS = (os === 'mac');
 // Define key combinations based on the operating system
 const keyMap = {
   REFRESH: os === 'mac' ? 'command+f' : 'ctrl+f',
-  ACCEPT: os === 'mac' ? 'command+a' : 'ctrl+a',
+  ACCEPT: os === 'mac' ? 'command+e' : 'ctrl+e',
   REJECT: os === 'mac' ? 'command+j' : 'ctrl+j',
   CLEAR: os === 'mac' ? 'command+k' : 'ctrl+k',
   COMPLETE: os === 'mac' ? 'command+t' : 'ctrl+t',
@@ -787,38 +787,44 @@ export class Container extends Component {
     }
 
     const handlers = {
-      REFRESH: () => {
+      REFRESH: (e) => {
         // console.log('F - Refresh action triggered')
         this.handleRefreshSuggestions()
+        e.stopPropagation()
       },
-      ACCEPT: () => {
-        // console.log('A - Accept action triggered')
+      ACCEPT: (e) => {
+        // console.log('E - Accept action triggered')
         if (this.getHasRenderedSuggestions()) {
           this.handleAcceptSuggestions()
         } else {
           // console.log('No suggestions')
         }
+        e.stopPropagation()
       },
-      REJECT: () => {
+      REJECT: (e) => {
         // console.log('J - Reject action triggered')
         if (this.getHasRenderedSuggestions()) {
           this.handleRejectSuggestions()
         } else {
           // console.log('No suggestions')
         }
+        e.stopPropagation()
       },
-      CLEAR: () => {
+      CLEAR: (e) => {
         // console.log('K - Clear action triggered')
         this.handleClearAlignments()
+        e.stopPropagation()
       },
-      COMPLETE: () => {
+      COMPLETE: (e) => {
         // console.log('T - Complete action triggered')
         this.handleToggleComplete(null, false, true) // toggle complete
+        e.stopPropagation()
       },
-      NEXT: () => {
+      NEXT: (e) => {
         // console.log('N - Next action triggered, contextId', contextId)
         const { changeToNextContextId } = this.props;
         changeToNextContextId()
+        e.stopPropagation()
       }
     };
 

diff --git a/src/components/MAPControls.js b/src/components/MAPControls.js
@@ -160,7 +160,7 @@ const getShortcutTable = (translate, isMacOS) => {
   const functionKey = isMacOS ? 'Command' : 'Ctrl';
   const shortcuts = [
     { action: 'suggestions.refresh_suggestions', shortcut: functionKey + '+F' },
-    { action: 'suggestions.accept_suggestions', shortcut: functionKey + '+A' },
+    { action: 'suggestions.accept_suggestions', shortcut: functionKey + '+E' },
     { action: 'suggestions.reject_suggestions', shortcut: functionKey + '+J' },
     { action: 'suggestions.clear_suggestions', shortcut: functionKey + '+K' },
     { action: 'toggle_alignment_complete', shortcut: functionKey + '+T' },