Merge pull request #341 from metasfresh/dev-215

fix #215 - preventing default action when having conflicting shortcut
metasfresh · Feb 17, 2017 · 640d601 · 640d601
2 parents 28fb765 + 0fb705c
commit 640d601
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/components/shortcuts/DocumentStatusContextShortcuts.js b/src/components/shortcuts/DocumentStatusContextShortcuts.js
@@ -2,13 +2,14 @@ import React, { Component } from 'react';
 import { Shortcuts } from 'react-shortcuts';
 
 class DocumentStatusContextShortcuts extends Component {
-    handleShortcuts = (action) => {
+    handleShortcuts = (action, event) => {
         const {
             handleDocumentCompleteStatus
         } = this.props;
 
         switch (action) {
             case 'COMPLETE_STATUS':
+                event.preventDefault();
                 return handleDocumentCompleteStatus();
         }
     }

diff --git a/src/components/shortcuts/PaginationContextShortcuts.js b/src/components/shortcuts/PaginationContextShortcuts.js
@@ -6,19 +6,23 @@ class PaginationContextShortcuts extends Component {
         super(props);
     }
 
-    handleShortcuts = (action) => {
+    handleShortcuts = (action, event) => {
         const {
             handleFirstPage, handleLastPage, handlePrevPage, handleNextPage
         } = this.props;
 
         switch (action) {
             case 'FIRST_PAGE':
+                event.preventDefault();
                 return handleFirstPage();
             case 'LAST_PAGE':
+                event.preventDefault();
                 return handleLastPage();
             case 'NEXT_PAGE':
+                event.preventDefault();
                 return handleNextPage();
             case 'PREV_PAGE':
+                event.preventDefault();
                 return handlePrevPage();
         }
     }