2 files changed, 37 insertions, 25 deletions

diff --git a/src/components/content-input.js b/src/components/content-input.js
index 504835c..488a51d 100644
--- a/src/components/content-input.js
+++ b/src/components/content-input.js
@@ -12,30 +12,6 @@ export default class ContentInputComponent {
   }
 
   update() {
-    let settings = this.store.getState().setting.settings;
-    if (!settings || !settings.json) {
-      return;
-    }
-    let input = this.store.getState().input;
-    let keymaps = JSON.parse(settings.json).keymaps;
-
-    let matched = Object.keys(keymaps).filter((keyStr) => {
-      return keyStr.startsWith(input.keys);
-    });
-    if (matched.length === 0) {
-      this.store.dispatch(inputActions.clearKeys());
-      return Promise.resolve();
-    } else if (matched.length > 1 ||
-      matched.length === 1 && input.keys !== matched[0]) {
-      return Promise.resolve();
-    }
-    let operation = keymaps[matched];
-    try {
-      this.store.dispatch(operationActions.exec(operation));
-    } catch (e) {
-      console.error(e);
-    }
-    this.store.dispatch(inputActions.clearKeys());
   }
 
   onKeyPress(e) {
@@ -68,7 +44,34 @@ export default class ContentInputComponent {
     if (e.key === 'OS') {
       return;
     }
+    let keymaps = this.keymaps();
+    if (!keymaps) {
+      return;
+    }
     this.store.dispatch(inputActions.keyPress(e.key, e.ctrlKey));
+
+    if (this.mapKeys(keymaps)) {
+      e.preventDefault();
+      e.stopPropagation();
+    }
+  }
+
+  mapKeys(keymaps) {
+    let input = this.store.getState().input;
+    let matched = Object.keys(keymaps).filter((keyStr) => {
+      return keyStr.startsWith(input.keys);
+    });
+    if (matched.length === 0) {
+      this.store.dispatch(inputActions.clearKeys());
+      return false;
+    } else if (matched.length > 1 ||
+      matched.length === 1 && input.keys !== matched[0]) {
+      return true;
+    }
+    let operation = keymaps[matched];
+    this.store.dispatch(operationActions.exec(operation));
+    this.store.dispatch(inputActions.clearKeys());
+    return true;
   }
 
   fromInput(e) {
@@ -76,4 +79,12 @@ export default class ContentInputComponent {
       e.target instanceof HTMLTextAreaElement ||
       e.target instanceof HTMLSelectElement;
   }
+
+  keymaps() {
+    let settings = this.store.getState().setting.settings;
+    if (!settings || !settings.json) {
+      return null;
+    }
+    return JSON.parse(settings.json).keymaps;
+  }
 }
diff --git a/src/content/index.js b/src/content/index.js
index a2e3e3d..2c13c70 100644
--- a/src/content/index.js
+++ b/src/content/index.js
@@ -9,7 +9,8 @@ import messages from './messages';
 
 const store = createStore(reducers);
 const followComponent = new FollowComponent(window.document.body, store);
-const contentInputComponent = new ContentInputComponent(window, store);
+const contentInputComponent =
+  new ContentInputComponent(window.document.body, store);
 store.subscribe(() => {
   try {
     followComponent.update();