Merge pull request #641 from ueokande/cancel-by-ctrl-c

Cancel console by Ctrl+C

2 files changed, 14 insertions, 1 deletions

diff --git a/src/console/components/Console.tsx b/src/console/components/Console.tsx
index 7da2f36..1743d15 100644
--- a/src/console/components/Console.tsx
+++ b/src/console/components/Console.tsx
@@ -72,6 +72,13 @@ class Console extends React.Component<Props> {
       break;
     case '[':
       if (e.ctrlKey) {
+        e.preventDefault();
+        return this.props.dispatch(consoleActions.hideCommand());
+      }
+      break;
+    case 'c':
+      if (e.ctrlKey) {
+        e.preventDefault();
         return this.props.dispatch(consoleActions.hideCommand());
       }
       break;
diff --git a/src/content/InputDriver.ts b/src/content/InputDriver.ts
index cddc825..0472088 100644
--- a/src/content/InputDriver.ts
+++ b/src/content/InputDriver.ts
@@ -2,7 +2,13 @@ import * as dom from '../shared/utils/dom';
 import Key, * as keys from './domains/Key';
 
 const cancelKey = (e: KeyboardEvent): boolean => {
-  return e.key === 'Escape' || e.key === '[' && e.ctrlKey;
+  if (e.key === 'Escape') {
+    return true;
+  }
+  if (e.key === '[' && e.ctrlKey) {
+    return true;
+  }
+  return false;
 };
 
 export default class InputDriver {