From 214a5103f3e2914028206a13ba115c69a7ee07f1 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sat, 21 Oct 2017 11:06:58 +0900 Subject: emit mapped keys from input-component --- test/content/actions/input.test.js | 8 +-- test/content/components/common/input.test.js | 78 ++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 7 deletions(-) create mode 100644 test/content/components/common/input.test.js (limited to 'test') diff --git a/test/content/actions/input.test.js b/test/content/actions/input.test.js index 6031829..30705d2 100644 --- a/test/content/actions/input.test.js +++ b/test/content/actions/input.test.js @@ -5,16 +5,10 @@ import * as inputActions from 'content/actions/input'; describe("input actions", () => { describe("keyPress", () => { it('create INPUT_KEY_PRESS action', () => { - let action = inputActions.keyPress('a', false); + let action = inputActions.keyPress('a'); expect(action.type).to.equal(actions.INPUT_KEY_PRESS); expect(action.key).to.equal('a'); }); - - it('create INPUT_KEY_PRESS action from key with ctrl', () => { - let action = inputActions.keyPress('b', true); - expect(action.type).to.equal(actions.INPUT_KEY_PRESS); - expect(action.key).to.equal(''); - }); }); describe("clearKeys", () => { diff --git a/test/content/components/common/input.test.js b/test/content/components/common/input.test.js new file mode 100644 index 0000000..d4f554a --- /dev/null +++ b/test/content/components/common/input.test.js @@ -0,0 +1,78 @@ +import InputComponent from 'content/components/common/input'; +import { expect } from "chai"; + +describe('InputComponent', () => { + it('register callbacks', () => { + let component = new InputComponent(window.document); + component.onKey((key) => { + expect(key).is.equals('a'); + }); + component.onKeyDown({ key: 'a' }); + }); + + it('invoke callback once', () => { + let component = new InputComponent(window.document); + let a = 0, b = 0; + component.onKey((key) => { + if (key == 'a') { + ++a; + } else { + key == 'b' + ++b; + } + }); + component.onKeyDown({ key: 'a' }); + component.onKeyDown({ key: 'b' }); + component.onKeyPress({ key: 'a' }); + component.onKeyUp({ key: 'a' }); + component.onKeyPress({ key: 'b' }); + component.onKeyUp({ key: 'b' }); + + expect(a).is.equals(1); + expect(b).is.equals(1); + }) + + it('add prefix when ctrl pressed', () => { + let component = new InputComponent(window.document); + component.onKey((key) => { + expect(key).is.equals(''); + }); + component.onKeyDown({ key: 'a', ctrlKey: true }); + }) + + it('does not invoke only meta keys', () => { + let component = new InputComponent(window.document); + component.onKey((key) => { + expect.fail(); + }); + component.onKeyDown({ key: 'Shift' }); + component.onKeyDown({ key: 'Control' }); + component.onKeyDown({ key: 'Alt' }); + component.onKeyDown({ key: 'OS' }); + }) + + it('ignores events from input elements', () => { + ['input', 'textarea', 'select'].forEach((name) => { + let target = window.document.createElement(name); + let component = new InputComponent(target); + component.onKey((key) => { + expect.fail(); + }); + component.onKeyDown({ key: 'x', target }); + }); + }); + + it('ignores events from contenteditable elements', () => { + let target = window.document.createElement('div'); + let component = new InputComponent(target); + component.onKey((key) => { + expect.fail(); + }); + + target.setAttribute('contenteditable', ''); + component.onKeyDown({ key: 'x', target }); + + target.setAttribute('contenteditable', 'true'); + component.onKeyDown({ key: 'x', target }); + }) +}); -- cgit v1.2.3 From cd6f7e77887f535e88690b84ad081f7cc630306f Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sat, 21 Oct 2017 12:42:30 +0900 Subject: support shift modifier --- src/content/components/common/input.js | 13 ++++++++++++- test/content/components/common/input.test.js | 24 ++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/src/content/components/common/input.js b/src/content/components/common/input.js index 9af9fbe..f285b0c 100644 --- a/src/content/components/common/input.js +++ b/src/content/components/common/input.js @@ -1,6 +1,17 @@ +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 ''; + return ''; + } else if (e.shiftKey && e.key.length !== 1) { + return ''; } return e.key; }; diff --git a/test/content/components/common/input.test.js b/test/content/components/common/input.test.js index d4f554a..912ac34 100644 --- a/test/content/components/common/input.test.js +++ b/test/content/components/common/input.test.js @@ -40,6 +40,30 @@ describe('InputComponent', () => { 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 + ', () => { + let component = new InputComponent(window.document); + component.onKey((key) => { + expect(key).is.equals(''); + }); + component.onKeyDown({ key: 'Escape', shiftKey: true }); + }) + + it('press + ', () => { + let component = new InputComponent(window.document); + component.onKey((key) => { + expect(key).is.equals(''); + }); + component.onKeyDown({ key: 'Escape', ctrlKey: true }); + }) + it('does not invoke only meta keys', () => { let component = new InputComponent(window.document); component.onKey((key) => { -- cgit v1.2.3 From 59f7ef205df4750063c755a7b8834bfd7509da83 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sat, 21 Oct 2017 13:26:36 +0900 Subject: add addon actions --- src/content/actions/addon.js | 15 +++++++++++++++ src/content/actions/index.js | 4 ++++ src/content/reducers/addon.js | 24 +++++++++++++++++++++++ test/content/actions/addon.test.js | 26 +++++++++++++++++++++++++ test/content/reducers/addon.test.js | 38 +++++++++++++++++++++++++++++++++++++ 5 files changed, 107 insertions(+) create mode 100644 src/content/actions/addon.js create mode 100644 src/content/reducers/addon.js create mode 100644 test/content/actions/addon.test.js create mode 100644 test/content/reducers/addon.test.js (limited to 'test') diff --git a/src/content/actions/addon.js b/src/content/actions/addon.js new file mode 100644 index 0000000..8d38025 --- /dev/null +++ b/src/content/actions/addon.js @@ -0,0 +1,15 @@ +import actions from 'content/actions'; + +const enable = () => { + return { type: actions.ADDON_ENABLE }; +}; + +const disable = () => { + return { type: actions.ADDON_DISABLE }; +}; + +const toggleEnabled = () => { + return { type: actions.ADDON_TOGGLE_ENABLED }; +}; + +export { enable, disable, toggleEnabled }; diff --git a/src/content/actions/index.js b/src/content/actions/index.js index f8db948..085d510 100644 --- a/src/content/actions/index.js +++ b/src/content/actions/index.js @@ -1,5 +1,9 @@ export default { // User input + ADDON_ENABLE: 'addon.enable', + ADDON_DISABLE: 'addon.disable', + ADDON_TOGGLE_ENABLED: 'addon.toggle.enabled', + INPUT_KEY_PRESS: 'input.key,press', INPUT_CLEAR_KEYS: 'input.clear.keys', INPUT_SET_KEYMAPS: 'input.set.keymaps', diff --git a/src/content/reducers/addon.js b/src/content/reducers/addon.js new file mode 100644 index 0000000..8cc5ef1 --- /dev/null +++ b/src/content/reducers/addon.js @@ -0,0 +1,24 @@ +import actions from 'content/actions'; + +const defaultState = { + enabled: true, +}; + +export default function reducer(state = defaultState, action = {}) { + switch (action.type) { + case actions.ADDON_ENABLE: + return Object.assign({}, state, { + enabled: true, + }); + case actions.ADDON_DISABLE: + return Object.assign({}, state, { + enabled: false, + }); + case actions.ADDON_TOGGLE_ENABLED: + return Object.assign({}, state, { + enabled: !state.enabled, + }); + default: + return state; + } +} diff --git a/test/content/actions/addon.test.js b/test/content/actions/addon.test.js new file mode 100644 index 0000000..7f244dc --- /dev/null +++ b/test/content/actions/addon.test.js @@ -0,0 +1,26 @@ +import { expect } from "chai"; +import actions from 'content/actions'; +import * as addonActions from 'content/actions/addon'; + +describe("addon actions", () => { + describe("enable", () => { + it('create ADDON_ENABLE action', () => { + let action = addonActions.enable(); + expect(action.type).to.equal(actions.ADDON_ENABLE); + }); + }); + + describe("disable", () => { + it('create ADDON_DISABLE action', () => { + let action = addonActions.disable(); + expect(action.type).to.equal(actions.ADDON_DISABLE); + }); + }); + + describe("toggle", () => { + it('create ADDON_TOGGLE_ENABLED action', () => { + let action = addonActions.toggleEnabled(); + expect(action.type).to.equal(actions.ADDON_TOGGLE_ENABLED); + }); + }); +}); diff --git a/test/content/reducers/addon.test.js b/test/content/reducers/addon.test.js new file mode 100644 index 0000000..93f97e8 --- /dev/null +++ b/test/content/reducers/addon.test.js @@ -0,0 +1,38 @@ +import { expect } from "chai"; +import actions from 'content/actions'; +import addonReducer from 'content/reducers/addon'; + +describe("addon reducer", () => { + it('return the initial state', () => { + let state = addonReducer(undefined, {}); + expect(state).to.have.property('enabled', true); + }); + + it('return next state for ADDON_ENABLE', () => { + let action = { type: actions.ADDON_ENABLE}; + let prev = { enabled: false }; + let state = addonReducer(prev, action); + + expect(state.enabled).is.equal(true); + }); + + it('return next state for ADDON_DISABLE', () => { + let action = { type: actions.ADDON_DISABLE}; + let prev = { enabled: true }; + let state = addonReducer(prev, action); + + expect(state.enabled).is.equal(false); + }); + + it('return next state for ADDON_TOGGLE_ENABLED', () => { + let action = { type: actions.ADDON_TOGGLE_ENABLED }; + let state = { enabled: false }; + + state = addonReducer(state, action); + expect(state.enabled).is.equal(true); + + state = addonReducer(state, action); + expect(state.enabled).is.equal(false); + }); + +}); -- cgit v1.2.3