add groupName to pause and resume keyboard shortcuts

maproulette · Sep 13, 2023 · 02f9181 · 02f9181
1 parent d8dc0d9
commit 02f9181
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/src/components/HOCs/WithKeyboardShortcuts/WithKeyboardShortcuts.js b/src/components/HOCs/WithKeyboardShortcuts/WithKeyboardShortcuts.js
@@ -54,11 +54,11 @@ const mapDispatchToProps = dispatch => {
     removeExternalKeyboardShortcut: (groupName, shortcutName) => {
       dispatch(removeKeyboardShortcut(groupName, shortcutName))
     },
-    pauseKeyboardShortcuts: () => {
-      dispatch(pauseKeyboardShortcuts())
+    pauseKeyboardShortcuts: (groupName) => {
+      dispatch(pauseKeyboardShortcuts(groupName))
     },
-    resumeKeyboardShortcuts: () => {
-      dispatch(resumeKeyboardShortcuts())
+    resumeKeyboardShortcuts: (groupName) => {
+      dispatch(resumeKeyboardShortcuts(groupName))
     },
     textInputActive: textInputActive,
     quickKeyHandler: (key, handler, allowModifierKeys=false) => (event => {

diff --git a/src/components/TaskConfirmationModal/TaskConfirmationModal.js b/src/components/TaskConfirmationModal/TaskConfirmationModal.js
@@ -34,6 +34,7 @@ import messages from './Messages'
 import ErrorTagDropdown from '../ErrorTagDropdown/ErrorTagDropdown'
 
 const shortcutGroup = 'taskConfirmation'
+const shortcutAction = 'pause'
 
 const ERROR_TAG_STATUSES = [
   TaskReviewStatus.rejected,
@@ -76,7 +77,7 @@ export class TaskConfirmationModal extends Component {
       this.commentInputRef.current.focus()
     }
 
-    this.props.pauseKeyboardShortcuts()
+    this.props.pauseKeyboardShortcuts(shortcutAction)
     this.props.activateKeyboardShortcut(
       shortcutGroup,
       this.props.keyboardShortcutGroups.taskConfirmation,
@@ -92,7 +93,7 @@ export class TaskConfirmationModal extends Component {
   componentWillUnmount() {
     this.props.deactivateKeyboardShortcut(shortcutGroup, 'confirmSubmit',
                                           this.handleKeyboardShortcuts)
-    this.props.resumeKeyboardShortcuts()
+    this.props.resumeKeyboardShortcuts(shortcutAction)
   }
 
   handleAddTag = (value) => {

diff --git a/src/components/Widgets/TaskMapWidget/TaskMapWidget.js b/src/components/Widgets/TaskMapWidget/TaskMapWidget.js
@@ -10,6 +10,8 @@ import EditSwitch from './RapidEditor/EditSwitch'
 import RapidEditor from './RapidEditor/RapidEditor';
 import WithKeyboardShortcuts from '../../HOCs/WithKeyboardShortcuts/WithKeyboardShortcuts'
 
+const shortcutAction = 'pause'
+
 const descriptor = {
   widgetKey: 'TaskMapWidget',
   label: messages.label,
@@ -26,7 +28,7 @@ export default class TaskMapWidget extends Component {
   }
 
   componentWillUnmount = () => {
-    this.props.resumeKeyboardShortcuts()
+    this.props.resumeKeyboardShortcuts(shortcutAction)
   }
 
   componentDidUpdate = (prevProps) => {
@@ -38,16 +40,16 @@ export default class TaskMapWidget extends Component {
       this.setState({ counter: this.state.counter + 1 })
     }
 
-    this.handlePauseShortcuts()
+    this.handlePauseShortcuts(shortcutAction)
   }
 
   handlePauseShortcuts = () => {
     const editMode = this.props.getUserAppSetting ? this.props.getUserAppSetting(this.props.user, 'isEditMode') : false;
 
     if (editMode) {
-      this.props.pauseKeyboardShortcuts()
+      this.props.pauseKeyboardShortcuts(shortcutAction)
     } else {
-      this.props.resumeKeyboardShortcuts()
+      this.props.resumeKeyboardShortcuts(shortcutAction)
     }
   }
 

diff --git a/src/services/KeyboardShortcuts/KeyboardShortcuts.js b/src/services/KeyboardShortcuts/KeyboardShortcuts.js
@@ -42,15 +42,17 @@ export const removeKeyboardShortcut = function(groupName, shortcutName) {
   }
 }
 
-export const pauseKeyboardShortcuts = function() {
+export const pauseKeyboardShortcuts = function(groupName) {
   return {
     type: PAUSE_KEYBOARD_SHORTCUTS,
+    groupName,
   }
 }
 
-export const resumeKeyboardShortcuts = function() {
+export const resumeKeyboardShortcuts = function(groupName) {
   return {
     type: RESUME_KEYBOARD_SHORTCUTS,
+    groupName,
   }
 }
 
@@ -103,7 +105,8 @@ export const currentKeyboardShortcuts = function(state={}, action) {
   }
   else if (action.type === PAUSE_KEYBOARD_SHORTCUTS) {
     // If we're already paused, ignore
-    if (_isEmpty(state.paused)) {
+    console.log(state)
+    if (!_isEmpty(state.paused)) {
       return state
     }