support mutliple modifiers for key bindings

src/content/actions/setting.js

@@ -1,9 +1,23 @@
 import actions from 'content/actions';
+import * as keyUtils from 'shared/utils/keys';
 
 const set = (value) => {
+  let maps = new Map();
+  if (value.keymaps) {
+    let entries = Object.entries(value.keymaps).map((entry) => {
+      return [
+        keyUtils.fromMapKeys(entry[0]),
+        entry[1],
+      ];
+    });
+    maps = new Map(entries);
+  }
+
   return {
     type: actions.SETTING_SET,
-    value,
+    value: Object.assign({}, value, {
+      keymaps: maps,
+    })
   };
 };
 

src/content/components/common/follow.js

@@ -46,7 +46,7 @@ export default class Follow {
     }
     this.win.parent.postMessage(JSON.stringify({
       type: messages.FOLLOW_KEY_PRESS,
-      key,
+      key: key.key,
     }), '*');
     return true;
   }

src/content/components/common/input.js

@@ -1,22 +1,5 @@
 import * as dom from 'shared/utils/dom';
-
-const modifierdKeyName = (name) => {
-  if (name.length === 1) {
-    return name.toUpperCase();
-  } else if (name === 'Escape') {
-    return 'Esc';
-  }
-  return name;
-};
-
-const mapKey = (e) => {
-  if (e.ctrlKey) {
-    return '<C-' + modifierdKeyName(e.key) + '>';
-  } else if (e.shiftKey && e.key.length !== 1) {
-    return '<S-' + modifierdKeyName(e.key) + '>';
-  }
-  return e.key;
-};
+import * as keys from 'shared/utils/keys';
 
 export default class InputComponent {
   constructor(target) {
@@ -64,7 +47,7 @@ export default class InputComponent {
       return;
     }
 
-    let key = mapKey(e);
+    let key = keys.fromKeyboardEvent(e);
 
     for (let listener of this.onKeyListeners) {
       let stop = listener(key);

src/content/components/common/keymapper.js

@@ -1,6 +1,19 @@
 import * as inputActions from 'content/actions/input';
 import * as operationActions from 'content/actions/operation';
 import operations from 'shared/operations';
+import * as keyUtils from 'shared/utils/keys';
+
+const mapStartsWith = (mapping, keys) => {
+  if (mapping.length < keys.length) {
+    return false;
+  }
+  for (let i = 0; i < keys.length; ++i) {
+    if (!keyUtils.equals(mapping[i], keys[i])) {
+      return false;
+    }
+  }
+  return true;
+};
 
 export default class KeymapperComponent {
   constructor(store) {
@@ -14,14 +27,14 @@ export default class KeymapperComponent {
     let input = state.input;
     let keymaps = state.setting.keymaps;
 
-    let matched = Object.keys(keymaps).filter((keyStr) => {
-      return keyStr.startsWith(input.keys);
+    let matched = Array.from(keymaps.keys()).filter((mapping) => {
+      return mapStartsWith(mapping, input.keys);
     });
     if (!state.addon.enabled) {
       // available keymaps are only ADDON_ENABLE and ADDON_TOGGLE_ENABLED if
       // the addon disabled
       matched = matched.filter((keys) => {
-        let type = keymaps[keys].type;
+        let type = keymaps.get(keys).type;
         return type === operations.ADDON_ENABLE ||
           type === operations.ADDON_TOGGLE_ENABLED;
       });
@@ -30,10 +43,10 @@ export default class KeymapperComponent {
       this.store.dispatch(inputActions.clearKeys());
       return false;
     } else if (matched.length > 1 ||
-      matched.length === 1 && input.keys !== matched[0]) {
+      matched.length === 1 && input.keys.length < matched[0].length) {
       return true;
     }
-    let operation = keymaps[matched];
+    let operation = keymaps.get(matched[0]);
     this.store.dispatch(operationActions.exec(operation));
     this.store.dispatch(inputActions.clearKeys());
     return true;

src/content/components/top-content/follow-controller.js

@@ -76,7 +76,7 @@ export default class FollowController {
       this.activate();
       this.store.dispatch(followControllerActions.disable());
       break;
-    case 'Escape':
+    case 'Esc':
       this.store.dispatch(followControllerActions.disable());
       break;
     case 'Backspace':

src/content/reducers/input.js

@@ -1,18 +1,18 @@
 import actions from 'content/actions';
 
 const defaultState = {
-  keys: ''
+  keys: []
 };
 
 export default function reducer(state = defaultState, action = {}) {
   switch (action.type) {
   case actions.INPUT_KEY_PRESS:
     return Object.assign({}, state, {
-      keys: state.keys + action.key
+      keys: state.keys.concat([action.key]),
     });
   case actions.INPUT_CLEAR_KEYS:
     return Object.assign({}, state, {
-      keys: '',
+      keys: [],
     });
   default:
     return state;

src/content/reducers/setting.js

@@ -1,7 +1,7 @@
 import actions from 'content/actions';
 
 const defaultState = {
-  keymaps: {},
+  keymaps: new Map(),
 };
 
 export default function reducer(state = defaultState, action = {}) {

test/content/actions/setting.test.js

@@ -7,7 +7,28 @@ describe("setting actions", () => {
     it('create SETTING_SET action', () => {
       let action = settingActions.set({ red: 'apple', yellow: 'banana' });
       expect(action.type).to.equal(actions.SETTING_SET);
-      expect(action.value).to.deep.equal({ red: 'apple', yellow: 'banana' });
+      expect(action.value.red).to.equal('apple');
+      expect(action.value.yellow).to.equal('banana');
+      expect(action.value.keymaps).to.be.empty;
+    });
+
+    it('converts keymaps', () => {
+      let action = settingActions.set({
+        keymaps: {
+          'dd': 'remove current tab',
+          'z<C-A>': 'increment',
+        }
+      });
+      let keymaps = action.value.keymaps;
+
+      expect(action.value.keymaps).to.have.deep.all.keys(
+        [
+          [{ key: 'd', shiftKey: false, ctrlKey: false, altKey: false, metaKey: false },
+           { key: 'd', shiftKey: false, ctrlKey: false, altKey: false, metaKey: false }],
+          [{ key: 'z', shiftKey: false, ctrlKey: false, altKey: false, metaKey: false },
+           { key: 'a', shiftKey: false, ctrlKey: true, altKey: false, metaKey: false }],
+        ]
+      );
     });
   });
 });

test/content/components/common/input.test.js

@@ -4,20 +4,21 @@ import { expect } from "chai";
 describe('InputComponent', () => {
   it('register callbacks', () => {
     let component = new InputComponent(window.document);
+    let key = { key: 'a', ctrlKey: true, shiftKey: false, altKey: false, metaKey: false };
     component.onKey((key) => {
-      expect(key).is.equals('a');
+      expect(key).to.deep.equal(key);
     });
-    component.onKeyDown({ key: 'a' });
+    component.onKeyDown(key);
   });
 
   it('invoke callback once', () => {
     let component = new InputComponent(window.document);
     let a = 0, b = 0;
     component.onKey((key) => {
-      if (key == 'a') {
+      if (key.key == 'a') {
         ++a;
       } else {
-        key == 'b'
+        key.key == 'b'
         ++b;
       }
     });
@@ -32,38 +33,6 @@ describe('InputComponent', () => {
     expect(b).is.equals(1);
   })
 
-  it('add prefix when ctrl pressed', () => {
-    let component = new InputComponent(window.document);
-    component.onKey((key) => {
-      expect(key).is.equals('<C-A>');
-    });
-    component.onKeyDown({ key: 'a', ctrlKey: true });
-  })
-
-  it('press X', () => {
-    let component = new InputComponent(window.document);
-    component.onKey((key) => {
-      expect(key).is.equals('X');
-    });
-    component.onKeyDown({ key: 'X', shiftKey: true });
-  })
-
-  it('press <Shift> + <Esc>', () => {
-    let component = new InputComponent(window.document);
-    component.onKey((key) => {
-      expect(key).is.equals('<S-Esc>');
-    });
-    component.onKeyDown({ key: 'Escape', shiftKey: true });
-  })
-
-  it('press <Ctrl> + <Esc>', () => {
-    let component = new InputComponent(window.document);
-    component.onKey((key) => {
-      expect(key).is.equals('<C-Esc>');
-    });
-    component.onKeyDown({ key: 'Escape', ctrlKey: true });
-  })
-
   it('does not invoke only meta keys', () => {
     let component = new InputComponent(window.document);
     component.onKey((key) => {

test/content/reducers/input.test.js

@@ -5,22 +5,22 @@ import inputReducer from 'content/reducers/input';
 describe("input reducer", () => {
   it('return the initial state', () => {
     let state = inputReducer(undefined, {});
-    expect(state).to.have.deep.property('keys', '');
+    expect(state).to.have.deep.property('keys', []);
   });
 
   it('return next state for INPUT_KEY_PRESS', () => {
     let action = { type: actions.INPUT_KEY_PRESS, key: 'a' };
     let state = inputReducer(undefined, action);
-    expect(state).to.have.deep.property('keys', 'a');
+    expect(state).to.have.deep.property('keys', ['a']);
 
-    action = { type: actions.INPUT_KEY_PRESS, key: '<C-B>' };
+    action = { type: actions.INPUT_KEY_PRESS, key: 'b' };
     state = inputReducer(state, action);
-    expect(state).to.have.deep.property('keys', 'a<C-B>');
+    expect(state).to.have.deep.property('keys', ['a', 'b']);
   });
 
   it('return next state for INPUT_CLEAR_KEYS', () => {
     let action = { type: actions.INPUT_CLEAR_KEYS };
-    let state = inputReducer({ keys: 'abc' }, action);
-    expect(state).to.have.deep.property('keys', '');
+    let state = inputReducer({ keys: [1, 2, 3] }, action);
+    expect(state).to.have.deep.property('keys', []);
   });
 });

test/content/reducers/setting.test.js

@@ -5,7 +5,7 @@ import settingReducer from 'content/reducers/setting';
 describe("content setting reducer", () => {
   it('return the initial state', () => {
     let state = settingReducer(undefined, {});
-    expect(state).to.deep.equal({ keymaps: {} });
+    expect(state.keymaps).to.be.empty;
   });
 
   it('return next state for SETTING_SET', () => {