Merge pull request #26 from skomputer/delete-hotkey-fix

Adds delete and backspace key to list of "remove selection" hotkeys
skomputer · May 13, 2016 · 0fba366 · 0fba366
2 parents 0775d58 + aa663d0
commit 0fba366
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/app/components/Root.jsx b/app/components/Root.jsx
@@ -62,7 +62,7 @@ class Root extends Component {
       'resetZoom': 'ctrl+0',
       'shiftDown': { sequence: 'shift', action: 'keydown' },
       'shiftUp': { sequence: 'shift', action: 'keyup' },
-      'delete': ['alt+d', 'ctrl+d', 'command+d']
+      'delete': ['alt+d', 'ctrl+d', 'command+d', 'del', 'backspace']
     };
 
     const keyHandlers = {
@@ -73,7 +73,10 @@ class Root extends Component {
       'resetZoom': () => dispatch(resetZoom()),
       'shiftDown': () => this.setState({ shiftKey: true }),
       'shiftUp': () => this.setState({ shiftKey: false }),
-      'delete': () => dispatch(deleteSelection(selection))
+      'delete': (event) => {
+        event.preventDefault();
+        dispatch(deleteSelection(selection));
+      }
     };
 
     let graphApi = {

diff --git a/app/components/__tests__/Node-test.jsx b/app/components/__tests__/Node-test.jsx
@@ -9,6 +9,8 @@ import { shallow } from "enzyme";
 import Node from '../Node';
 import NodeCircle from "../NodeCircle";
 import NodeLabel from "../NodeLabel";
+import TestUtils from 'react-addons-test-utils';
+
 
 describe("Node Component", () => {