From 79a4a805f6be14572b4486ddb79b0ebb98e37690 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Wed, 4 Oct 2017 22:01:16 +0900 Subject: single reducer --- src/reducers/completion.js | 2 +- src/reducers/index.js | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src/reducers') diff --git a/src/reducers/completion.js b/src/reducers/completion.js index a8a6444..878aeac 100644 --- a/src/reducers/completion.js +++ b/src/reducers/completion.js @@ -63,6 +63,6 @@ export default function reducer(state = defaultState, action = {}) { }); } default: - return defaultState; + return state; } } diff --git a/src/reducers/index.js b/src/reducers/index.js index 9beb81c..db17edf 100644 --- a/src/reducers/index.js +++ b/src/reducers/index.js @@ -1,11 +1,15 @@ import inputReducer from '../reducers/input'; import consoleReducer from '../reducers/console'; import settingReducer from '../reducers/setting'; +import followReducer from '../reducers/follow'; +import completionReducer from '../reducers/completion'; const defaultState = { input: inputReducer(undefined, {}), console: consoleReducer(undefined, {}), setting: settingReducer(undefined, {}), + follow: followReducer(undefined, {}), + completion: completionReducer(undefined, {}), }; export default function reducer(state = defaultState, action = {}) { @@ -13,5 +17,7 @@ export default function reducer(state = defaultState, action = {}) { input: inputReducer(state.input, action), console: consoleReducer(state.console, action), setting: settingReducer(state.setting, action), + follow: followReducer(state.follow, action), + completion: completionReducer(state.completion, action), }); } -- cgit v1.2.3 From 32168a94e07478325a53779513533b76a6ef2c18 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Thu, 5 Oct 2017 20:14:58 +0900 Subject: fix imports in src --- src/actions/command.js | 4 ++-- src/actions/completion.js | 2 +- src/actions/console.js | 2 +- src/actions/follow.js | 2 +- src/actions/input.js | 2 +- src/actions/operation.js | 8 ++++---- src/actions/setting.js | 6 +++--- src/background/index.js | 14 +++++++------- src/components/background-input.js | 4 ++-- src/components/background.js | 12 ++++++------ src/components/console.js | 4 ++-- src/components/content-input.js | 2 +- src/components/follow.js | 8 ++++---- src/components/setting.js | 4 ++-- src/content/index.js | 16 ++++++++-------- src/pages/console.js | 12 ++++++------ src/pages/settings.js | 6 +++--- src/reducers/completion.js | 2 +- src/reducers/console.js | 2 +- src/reducers/follow.js | 2 +- src/reducers/index.js | 10 +++++----- src/reducers/input.js | 2 +- src/reducers/setting.js | 2 +- src/shared/validators/setting.js | 2 +- webpack.config.js | 2 +- 25 files changed, 66 insertions(+), 66 deletions(-) (limited to 'src/reducers') diff --git a/src/actions/command.js b/src/actions/command.js index f578afd..a40cc97 100644 --- a/src/actions/command.js +++ b/src/actions/command.js @@ -1,5 +1,5 @@ -import * as tabs from '../background/tabs'; -import * as histories from '../background/histories'; +import * as tabs from 'background/tabs'; +import * as histories from 'background/histories'; import * as consoleActions from './console'; const normalizeUrl = (string, searchConfig) => { diff --git a/src/actions/completion.js b/src/actions/completion.js index 1ffb025..733f516 100644 --- a/src/actions/completion.js +++ b/src/actions/completion.js @@ -1,4 +1,4 @@ -import actions from '../actions'; +import actions from 'actions'; const setItems = (groups) => { return { diff --git a/src/actions/console.js b/src/actions/console.js index e0ec631..ba1fbeb 100644 --- a/src/actions/console.js +++ b/src/actions/console.js @@ -1,4 +1,4 @@ -import actions from '../actions'; +import actions from 'actions'; const showCommand = (text) => { return { diff --git a/src/actions/follow.js b/src/actions/follow.js index 7ab689e..708cd95 100644 --- a/src/actions/follow.js +++ b/src/actions/follow.js @@ -1,4 +1,4 @@ -import actions from '../actions'; +import actions from 'actions'; const enable = (newTab) => { return { diff --git a/src/actions/input.js b/src/actions/input.js index 67788dd..61acb76 100644 --- a/src/actions/input.js +++ b/src/actions/input.js @@ -1,4 +1,4 @@ -import actions from '../actions'; +import actions from 'actions'; const asKeymapChars = (key, ctrl) => { if (ctrl) { diff --git a/src/actions/operation.js b/src/actions/operation.js index 3ed7f05..97bcf45 100644 --- a/src/actions/operation.js +++ b/src/actions/operation.js @@ -1,8 +1,8 @@ -import operations from '../shared/operations'; -import messages from '../content/messages'; +import operations from 'shared/operations'; +import messages from 'content/messages'; import * as consoleActions from './console'; -import * as tabs from '../background/tabs'; -import * as zooms from '../background/zooms'; +import * as tabs from 'background/tabs'; +import * as zooms from 'background/zooms'; const exec = (operation, tab) => { switch (operation.type) { diff --git a/src/actions/setting.js b/src/actions/setting.js index 7898f06..2a47608 100644 --- a/src/actions/setting.js +++ b/src/actions/setting.js @@ -1,6 +1,6 @@ -import actions from '../actions'; -import messages from '../content/messages'; -import DefaultSettings from '../shared/default-settings'; +import actions from 'actions'; +import messages from 'content/messages'; +import DefaultSettings from 'shared/default-settings'; const load = () => { return browser.storage.local.get('settings').then((value) => { diff --git a/src/background/index.js b/src/background/index.js index 9a1adc6..8dc55cb 100644 --- a/src/background/index.js +++ b/src/background/index.js @@ -1,10 +1,10 @@ -import * as consoleActions from '../actions/console'; -import * as settingsActions from '../actions/setting'; -import BackgroundComponent from '../components/background'; -import BackgroundInputComponent from '../components/background-input'; -import reducers from '../reducers'; -import messages from '../content/messages'; -import { createStore } from '../store'; +import * as consoleActions from 'actions/console'; +import * as settingsActions from 'actions/setting'; +import BackgroundComponent from 'components/background'; +import BackgroundInputComponent from 'components/background-input'; +import reducers from 'reducers'; +import messages from 'content/messages'; +import { createStore } from 'store'; const store = createStore(reducers, (e, sender) => { console.error('Vim-Vixen:', e); diff --git a/src/components/background-input.js b/src/components/background-input.js index 4735d5a..bd6ecf9 100644 --- a/src/components/background-input.js +++ b/src/components/background-input.js @@ -1,5 +1,5 @@ -import * as inputActions from '../actions/input'; -import * as operationActions from '../actions/operation'; +import * as inputActions from 'actions/input'; +import * as operationActions from 'actions/operation'; export default class BackgroundInputComponent { constructor(store) { diff --git a/src/components/background.js b/src/components/background.js index 0585a04..08d5115 100644 --- a/src/components/background.js +++ b/src/components/background.js @@ -1,9 +1,9 @@ -import messages from '../content/messages'; -import * as commandActions from '../actions/command'; -import * as consoleActions from '../actions/console'; -import * as inputActions from '../actions/input'; -import * as settingsActions from '../actions/setting'; -import * as tabActions from '../actions/tab'; +import messages from 'content/messages'; +import * as commandActions from 'actions/command'; +import * as consoleActions from 'actions/console'; +import * as inputActions from 'actions/input'; +import * as settingsActions from 'actions/setting'; +import * as tabActions from 'actions/tab'; export default class BackgroundComponent { constructor(store) { diff --git a/src/components/console.js b/src/components/console.js index 9580dcf..25b135c 100644 --- a/src/components/console.js +++ b/src/components/console.js @@ -1,5 +1,5 @@ -import messages from '../content/messages'; -import * as completionActions from '../actions/completion'; +import messages from 'content/messages'; +import * as completionActions from 'actions/completion'; export default class ConsoleComponent { constructor(wrapper, store) { diff --git a/src/components/content-input.js b/src/components/content-input.js index 10c785b..38d57fd 100644 --- a/src/components/content-input.js +++ b/src/components/content-input.js @@ -1,4 +1,4 @@ -import messages from '../content/messages'; +import messages from 'content/messages'; export default class ContentInputComponent { constructor(target) { diff --git a/src/components/follow.js b/src/components/follow.js index d2d3902..9221759 100644 --- a/src/components/follow.js +++ b/src/components/follow.js @@ -1,7 +1,7 @@ -import * as followActions from '../actions/follow'; -import messages from '../content/messages'; -import Hint from '../content/hint'; -import HintKeyProducer from '../content/hint-key-producer'; +import * as followActions from 'actions/follow'; +import messages from 'content/messages'; +import Hint from 'content/hint'; +import HintKeyProducer from 'content/hint-key-producer'; const DEFAULT_HINT_CHARSET = 'abcdefghijklmnopqrstuvwxyz'; diff --git a/src/components/setting.js b/src/components/setting.js index 1f3b3fe..c2f99b6 100644 --- a/src/components/setting.js +++ b/src/components/setting.js @@ -1,5 +1,5 @@ -import * as settingActions from '../actions/setting'; -import { validate } from '../shared/validators/setting'; +import * as settingActions from 'actions/setting'; +import { validate } from 'shared/validators/setting'; export default class SettingComponent { constructor(wrapper, store) { diff --git a/src/content/index.js b/src/content/index.js index a9a50be..31b37cf 100644 --- a/src/content/index.js +++ b/src/content/index.js @@ -1,13 +1,13 @@ import './console-frame.scss'; import * as consoleFrames from './console-frames'; -import * as scrolls from '../content/scrolls'; -import * as navigates from '../content/navigates'; -import * as followActions from '../actions/follow'; -import { createStore } from '../store'; -import ContentInputComponent from '../components/content-input'; -import FollowComponent from '../components/follow'; -import reducers from '../reducers'; -import operations from '../shared/operations'; +import * as scrolls from 'content/scrolls'; +import * as navigates from 'content/navigates'; +import * as followActions from 'actions/follow'; +import { createStore } from 'store'; +import ContentInputComponent from 'components/content-input'; +import FollowComponent from 'components/follow'; +import reducers from 'reducers'; +import operations from 'shared/operations'; import messages from './messages'; const store = createStore(reducers); diff --git a/src/pages/console.js b/src/pages/console.js index 0e152d3..a4536ec 100644 --- a/src/pages/console.js +++ b/src/pages/console.js @@ -1,10 +1,10 @@ import './console.scss'; -import messages from '../content/messages'; -import CompletionComponent from '../components/completion'; -import ConsoleComponent from '../components/console'; -import reducers from '../reducers'; -import { createStore } from '../store'; -import * as completionActions from '../actions/completion'; +import messages from 'content/messages'; +import CompletionComponent from 'components/completion'; +import ConsoleComponent from 'components/console'; +import reducers from 'reducers'; +import { createStore } from 'store'; +import * as completionActions from 'actions/completion'; const store = createStore(reducers); let completionComponent = null; diff --git a/src/pages/settings.js b/src/pages/settings.js index 076d23d..6e25e6f 100644 --- a/src/pages/settings.js +++ b/src/pages/settings.js @@ -1,7 +1,7 @@ import './settings.scss'; -import SettingComponent from '../components/setting'; -import settingReducer from '../reducers/setting'; -import { createStore } from '../store'; +import SettingComponent from 'components/setting'; +import settingReducer from 'reducers/setting'; +import { createStore } from 'store'; const store = createStore(settingReducer); let settingComponent = null; diff --git a/src/reducers/completion.js b/src/reducers/completion.js index 878aeac..f85a500 100644 --- a/src/reducers/completion.js +++ b/src/reducers/completion.js @@ -1,4 +1,4 @@ -import actions from '../actions'; +import actions from 'actions'; const defaultState = { groupSelection: -1, diff --git a/src/reducers/console.js b/src/reducers/console.js index 5c49c3b..3e63672 100644 --- a/src/reducers/console.js +++ b/src/reducers/console.js @@ -1,4 +1,4 @@ -import actions from '../actions'; +import actions from 'actions'; const defaultState = { errorShown: false, diff --git a/src/reducers/follow.js b/src/reducers/follow.js index 136b367..a2397b4 100644 --- a/src/reducers/follow.js +++ b/src/reducers/follow.js @@ -1,4 +1,4 @@ -import actions from '../actions'; +import actions from 'actions'; const defaultState = { enabled: false, diff --git a/src/reducers/index.js b/src/reducers/index.js index db17edf..5a4f14b 100644 --- a/src/reducers/index.js +++ b/src/reducers/index.js @@ -1,8 +1,8 @@ -import inputReducer from '../reducers/input'; -import consoleReducer from '../reducers/console'; -import settingReducer from '../reducers/setting'; -import followReducer from '../reducers/follow'; -import completionReducer from '../reducers/completion'; +import inputReducer from 'reducers/input'; +import consoleReducer from 'reducers/console'; +import settingReducer from 'reducers/setting'; +import followReducer from 'reducers/follow'; +import completionReducer from 'reducers/completion'; const defaultState = { input: inputReducer(undefined, {}), diff --git a/src/reducers/input.js b/src/reducers/input.js index 8be701e..2e4bcd8 100644 --- a/src/reducers/input.js +++ b/src/reducers/input.js @@ -1,4 +1,4 @@ -import actions from '../actions'; +import actions from 'actions'; const defaultState = { keys: '', diff --git a/src/reducers/setting.js b/src/reducers/setting.js index 735d4fb..7326ed7 100644 --- a/src/reducers/setting.js +++ b/src/reducers/setting.js @@ -1,4 +1,4 @@ -import actions from '../actions'; +import actions from 'actions'; const defaultState = { settings: {} diff --git a/src/shared/validators/setting.js b/src/shared/validators/setting.js index 4dc35ff..5039ec2 100644 --- a/src/shared/validators/setting.js +++ b/src/shared/validators/setting.js @@ -1,4 +1,4 @@ -import operations from '../operations'; +import operations from 'shared/operations'; const VALID_TOP_KEYS = ['keymaps', 'search']; const VALID_OPERATION_VALUES = Object.keys(operations).map((key) => { diff --git a/webpack.config.js b/webpack.config.js index e4d5a17..3d4ef03 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -40,7 +40,7 @@ module.exports = { resolve: { extensions: [ '.js' ], - modules: [path.join(__dirname), 'node_modules'] + modules: [path.join(__dirname, 'src'), 'node_modules'] }, plugins: [ -- cgit v1.2.3 From 45368384d1bbcbc005bf1eb3cdc7f7c8b137c28c Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sat, 7 Oct 2017 07:51:39 +0900 Subject: remove completion actions/reducer --- src/actions/completion.js | 22 ---------- src/actions/console.js | 26 +++++++++--- src/actions/index.js | 10 +++-- src/components/completion.js | 6 +-- src/components/console.js | 20 +++++++-- src/pages/console.js | 14 ------- src/reducers/completion.js | 68 ------------------------------ src/reducers/console.js | 60 +++++++++++++++++++++++++-- src/reducers/index.js | 3 -- test/actions/completion.test.js | 27 ------------ test/actions/console.test.js | 30 ++++++++++---- test/reducers/completion.test.js | 90 ---------------------------------------- test/reducers/console.test.js | 87 +++++++++++++++++++++++++++++++++++--- 13 files changed, 204 insertions(+), 259 deletions(-) delete mode 100644 src/actions/completion.js delete mode 100644 src/reducers/completion.js delete mode 100644 test/actions/completion.test.js delete mode 100644 test/reducers/completion.test.js (limited to 'src/reducers') diff --git a/src/actions/completion.js b/src/actions/completion.js deleted file mode 100644 index 733f516..0000000 --- a/src/actions/completion.js +++ /dev/null @@ -1,22 +0,0 @@ -import actions from 'actions'; - -const setItems = (groups) => { - return { - type: actions.COMPLETION_SET_ITEMS, - groups, - }; -}; - -const selectNext = () => { - return { - type: actions.COMPLETION_SELECT_NEXT - }; -}; - -const selectPrev = () => { - return { - type: actions.COMPLETION_SELECT_PREV - }; -}; - -export { setItems, selectNext, selectPrev }; diff --git a/src/actions/console.js b/src/actions/console.js index ba1fbeb..4183489 100644 --- a/src/actions/console.js +++ b/src/actions/console.js @@ -7,6 +7,19 @@ const showCommand = (text) => { }; }; +const showError = (text) => { + return { + type: actions.CONSOLE_SHOW_ERROR, + text: text + }; +}; + +const hide = () => { + return { + type: actions.CONSOLE_HIDE + }; +}; + const setCompletions = (completions) => { return { type: actions.CONSOLE_SET_COMPLETIONS, @@ -14,17 +27,18 @@ const setCompletions = (completions) => { }; }; -const showError = (text) => { +const completionNext = () => { return { - type: actions.CONSOLE_SHOW_ERROR, - text: text + type: actions.CONSOLE_COMPLETION_NEXT, }; }; -const hide = () => { +const completionPrev = () => { return { - type: actions.CONSOLE_HIDE + type: actions.CONSOLE_COMPLETION_PREV, }; }; -export { showCommand, setCompletions, showError, hide }; +export { + showCommand, showError, hide, setCompletions, completionNext, completionPrev +}; diff --git a/src/actions/index.js b/src/actions/index.js index 4e8d4a7..6a64795 100644 --- a/src/actions/index.js +++ b/src/actions/index.js @@ -1,9 +1,11 @@ export default { // console commands - CONSOLE_SHOW_COMMAND: 'vimvixen.console.show.command', - CONSOLE_SET_COMPLETIONS: 'vimvixen.console.set.completions', - CONSOLE_SHOW_ERROR: 'vimvixen.console.show.error', - CONSOLE_HIDE: 'vimvixen.console.hide', + CONSOLE_SHOW_COMMAND: 'console.show.command', + CONSOLE_SET_COMPLETIONS: 'console.set.completions', + CONSOLE_SHOW_ERROR: 'console.show.error', + CONSOLE_HIDE: 'console.hide', + CONSOLE_COMPLETION_NEXT: 'console.completion.next', + CONSOLE_COMPLETION_PREV: 'console.completion.prev', // User input INPUT_KEY_PRESS: 'input.key,press', diff --git a/src/components/completion.js b/src/components/completion.js index d1fdd06..f527a84 100644 --- a/src/components/completion.js +++ b/src/components/completion.js @@ -6,15 +6,15 @@ export default class Completion { } update() { - let state = this.store.getState().completion; + let state = this.store.getState().console; if (JSON.stringify(this.prevState) === JSON.stringify(state)) { return; } this.wrapper.innerHTML = ''; - for (let i = 0; i < state.groups.length; ++i) { - let group = state.groups[i]; + for (let i = 0; i < state.completions.length; ++i) { + let group = state.completions[i]; let title = this.createCompletionTitle(group.name); this.wrapper.append(title); diff --git a/src/components/console.js b/src/components/console.js index 3a7f88b..12341c1 100644 --- a/src/components/console.js +++ b/src/components/console.js @@ -1,5 +1,5 @@ import messages from 'content/messages'; -import * as completionActions from 'actions/completion'; +import * as consoleActions from 'actions/console'; export default class ConsoleComponent { constructor(wrapper, store) { @@ -39,9 +39,9 @@ export default class ConsoleComponent { }).then(this.onBlur); case KeyboardEvent.DOM_VK_TAB: if (e.shiftKey) { - this.store.dispatch(completionActions.selectPrev()); + this.store.dispatch(consoleActions.completionPrev()); } else { - this.store.dispatch(completionActions.selectNext()); + this.store.dispatch(consoleActions.completionNext()); } e.stopPropagation(); e.preventDefault(); @@ -66,7 +66,7 @@ export default class ConsoleComponent { type: messages.CONSOLE_QUERY_COMPLETIONS, text: e.target.value }).then((completions) => { - this.store.dispatch(completionActions.setItems(completions)); + this.store.dispatch(consoleActions.setCompletions(completions)); }); } @@ -85,6 +85,18 @@ export default class ConsoleComponent { this.hideError(); } + if (state.groupSelection >= 0 && state.itemSelection >= 0) { + let group = state.completions[state.groupSelection]; + let item = group.items[state.itemSelection]; + this.setCommandValue(item.content); + } else if (state.completions.length > 0 && + JSON.stringify(this.prevState.completions) === + JSON.stringify(state.completions)) { + // Reset input only completion groups not changed (unselected an item in + // completion) in order to avoid to override previous input + this.setCommandCompletionOrigin(); + } + this.prevState = state; } diff --git a/src/pages/console.js b/src/pages/console.js index 4d3dd3f..20a60f6 100644 --- a/src/pages/console.js +++ b/src/pages/console.js @@ -9,7 +9,6 @@ import * as consoleActions from 'actions/console'; const store = createStore(reducers); let completionComponent = null; let consoleComponent = null; -let prevState = {}; window.addEventListener('load', () => { let wrapper = document.querySelector('#vimvixen-console-completion'); @@ -21,19 +20,6 @@ window.addEventListener('load', () => { store.subscribe(() => { completionComponent.update(); consoleComponent.update(); - - let state = store.getState().completion; - - if (state.groupSelection >= 0) { - let item = state.groups[state.groupSelection].items[state.itemSelection]; - consoleComponent.setCommandValue(item.content); - } else if (state.groups.length > 0 && - JSON.stringify(prevState.groups) === JSON.stringify(state.groups)) { - // Reset input only completion groups not changed (unselected an item in - // completion) in order to avoid to override previous input - consoleComponent.setCommandCompletionOrigin(); - } - prevState = state; }); browser.runtime.onMessage.addListener((action) => { diff --git a/src/reducers/completion.js b/src/reducers/completion.js deleted file mode 100644 index f85a500..0000000 --- a/src/reducers/completion.js +++ /dev/null @@ -1,68 +0,0 @@ -import actions from 'actions'; - -const defaultState = { - groupSelection: -1, - itemSelection: -1, - groups: [], -}; - -const nextSelection = (state) => { - if (state.groupSelection < 0) { - return [0, 0]; - } - - let group = state.groups[state.groupSelection]; - if (state.groupSelection + 1 >= state.groups.length && - state.itemSelection + 1 >= group.items.length) { - return [-1, -1]; - } - if (state.itemSelection + 1 >= group.items.length) { - return [state.groupSelection + 1, 0]; - } - return [state.groupSelection, state.itemSelection + 1]; -}; - -const prevSelection = (state) => { - if (state.groupSelection < 0) { - return [ - state.groups.length - 1, - state.groups[state.groups.length - 1].items.length - 1 - ]; - } - if (state.groupSelection === 0 && state.itemSelection === 0) { - return [-1, -1]; - } else if (state.itemSelection === 0) { - return [ - state.groupSelection - 1, - state.groups[state.groupSelection - 1].items.length - 1 - ]; - } - return [state.groupSelection, state.itemSelection - 1]; -}; - -export default function reducer(state = defaultState, action = {}) { - switch (action.type) { - case actions.COMPLETION_SET_ITEMS: - return Object.assign({}, state, { - groups: action.groups, - groupSelection: -1, - itemSelection: -1, - }); - case actions.COMPLETION_SELECT_NEXT: { - let next = nextSelection(state); - return Object.assign({}, state, { - groupSelection: next[0], - itemSelection: next[1], - }); - } - case actions.COMPLETION_SELECT_PREV: { - let next = prevSelection(state); - return Object.assign({}, state, { - groupSelection: next[0], - itemSelection: next[1], - }); - } - default: - return state; - } -} diff --git a/src/reducers/console.js b/src/reducers/console.js index 3e63672..b9ed5b8 100644 --- a/src/reducers/console.js +++ b/src/reducers/console.js @@ -6,6 +6,42 @@ const defaultState = { commandShown: false, commandText: '', completions: [], + groupSelection: -1, + itemSelection: -1, +}; + +const nextSelection = (state) => { + if (state.groupSelection < 0) { + return [0, 0]; + } + + let group = state.completions[state.groupSelection]; + if (state.groupSelection + 1 >= state.completions.length && + state.itemSelection + 1 >= group.items.length) { + return [-1, -1]; + } + if (state.itemSelection + 1 >= group.items.length) { + return [state.groupSelection + 1, 0]; + } + return [state.groupSelection, state.itemSelection + 1]; +}; + +const prevSelection = (state) => { + if (state.groupSelection < 0) { + return [ + state.completions.length - 1, + state.completions[state.completions.length - 1].items.length - 1 + ]; + } + if (state.groupSelection === 0 && state.itemSelection === 0) { + return [-1, -1]; + } else if (state.itemSelection === 0) { + return [ + state.groupSelection - 1, + state.completions[state.groupSelection - 1].items.length - 1 + ]; + } + return [state.groupSelection, state.itemSelection - 1]; }; export default function reducer(state = defaultState, action = {}) { @@ -17,10 +53,6 @@ export default function reducer(state = defaultState, action = {}) { errorShown: false, completions: [] }); - case actions.CONSOLE_SET_COMPLETIONS: - return Object.assign({}, state, { - completions: action.completions - }); case actions.CONSOLE_SHOW_ERROR: return Object.assign({}, state, { errorText: action.text, @@ -36,6 +68,26 @@ export default function reducer(state = defaultState, action = {}) { errorShown: false, commandShown: false }); + case actions.CONSOLE_SET_COMPLETIONS: + return Object.assign({}, state, { + completions: action.completions, + groupSelection: -1, + itemSelection: -1, + }); + case actions.CONSOLE_COMPLETION_NEXT: { + let next = nextSelection(state); + return Object.assign({}, state, { + groupSelection: next[0], + itemSelection: next[1], + }); + } + case actions.CONSOLE_COMPLETION_PREV: { + let next = prevSelection(state); + return Object.assign({}, state, { + groupSelection: next[0], + itemSelection: next[1], + }); + } default: return state; } diff --git a/src/reducers/index.js b/src/reducers/index.js index 5a4f14b..8ed6452 100644 --- a/src/reducers/index.js +++ b/src/reducers/index.js @@ -2,14 +2,12 @@ import inputReducer from 'reducers/input'; import consoleReducer from 'reducers/console'; import settingReducer from 'reducers/setting'; import followReducer from 'reducers/follow'; -import completionReducer from 'reducers/completion'; const defaultState = { input: inputReducer(undefined, {}), console: consoleReducer(undefined, {}), setting: settingReducer(undefined, {}), follow: followReducer(undefined, {}), - completion: completionReducer(undefined, {}), }; export default function reducer(state = defaultState, action = {}) { @@ -18,6 +16,5 @@ export default function reducer(state = defaultState, action = {}) { console: consoleReducer(state.console, action), setting: settingReducer(state.setting, action), follow: followReducer(state.follow, action), - completion: completionReducer(state.completion, action), }); } diff --git a/test/actions/completion.test.js b/test/actions/completion.test.js deleted file mode 100644 index 92de383..0000000 --- a/test/actions/completion.test.js +++ /dev/null @@ -1,27 +0,0 @@ -import { expect } from "chai"; -import actions from 'actions'; -import * as completionActions from 'actions/completion'; - -describe("completion actions", () => { - describe('setItems', () => { - it('create COMPLETION_SET_ITEMS action', () => { - let action = completionActions.setItems([1, 2, 3]); - expect(action.type).to.equal(actions.COMPLETION_SET_ITEMS); - expect(action.groups).to.deep.equal([1, 2, 3]); - }); - }); - - describe('selectNext', () => { - it('create COMPLETION_SELECT_NEXT action', () => { - let action = completionActions.selectNext(); - expect(action.type).to.equal(actions.COMPLETION_SELECT_NEXT); - }); - }); - - describe('selectPrev', () => { - it('create COMPLETION_SELECT_PREV action', () => { - let action = completionActions.selectPrev(); - expect(action.type).to.equal(actions.COMPLETION_SELECT_PREV); - }); - }); -}); diff --git a/test/actions/console.test.js b/test/actions/console.test.js index 2dbcf55..ff905bc 100644 --- a/test/actions/console.test.js +++ b/test/actions/console.test.js @@ -11,14 +11,6 @@ describe("console actions", () => { }); }); - describe("setCompletions", () => { - it('create CONSOLE_SET_COMPLETIONS action', () => { - let action = consoleActions.setCompletions([1,2,3]); - expect(action.type).to.equal(actions.CONSOLE_SET_COMPLETIONS); - expect(action.completions).to.deep.equal([1, 2, 3]); - }); - }); - describe("showError", () => { it('create CONSOLE_SHOW_ERROR action', () => { let action = consoleActions.showError('an error'); @@ -33,5 +25,27 @@ describe("console actions", () => { expect(action.type).to.equal(actions.CONSOLE_HIDE); }); }); + + describe("setCompletions", () => { + it('create CONSOLE_SET_COMPLETIONS action', () => { + let action = consoleActions.setCompletions([1,2,3]); + expect(action.type).to.equal(actions.CONSOLE_SET_COMPLETIONS); + expect(action.completions).to.deep.equal([1, 2, 3]); + }); + }); + + describe("completionPrev", () => { + it('create CONSOLE_COMPLETION_PREV action', () => { + let action = consoleActions.completionPrev(); + expect(action.type).to.equal(actions.CONSOLE_COMPLETION_PREV); + }); + }); + + describe("completionNext", () => { + it('create CONSOLE_COMPLETION_NEXT action', () => { + let action = consoleActions.completionNext(); + expect(action.type).to.equal(actions.CONSOLE_COMPLETION_NEXT); + }); + }); }); diff --git a/test/reducers/completion.test.js b/test/reducers/completion.test.js deleted file mode 100644 index b2b36d9..0000000 --- a/test/reducers/completion.test.js +++ /dev/null @@ -1,90 +0,0 @@ -import { expect } from "chai"; -import actions from 'actions'; -import completionReducer from 'reducers/completion'; - -describe("completion reducer", () => { - it ('return the initial state', () => { - let state = completionReducer(undefined, {}); - expect(state).to.have.property('groupSelection', -1); - expect(state).to.have.property('itemSelection', -1); - expect(state).to.have.deep.property('groups', []); - }); - - it ('return next state for COMPLETION_SET_ITEMS', () => { - let state = { - groupSelection: 0, - itemSelection: 0, - groups: [], - } - let action = { - type: actions.COMPLETION_SET_ITEMS, - groups: [{ - name: 'Apple', - items: [1, 2, 3] - }, { - name: 'Banana', - items: [4, 5, 6] - }] - } - state = completionReducer(state, action); - expect(state).to.have.property('groups', action.groups); - expect(state).to.have.property('groupSelection', -1); - expect(state).to.have.property('itemSelection', -1); - }); - - it ('return next state for COMPLETION_SELECT_NEXT', () => { - let action = { type: actions.COMPLETION_SELECT_NEXT }; - let state = { - groupSelection: -1, - itemSelection: -1, - groups: [{ - name: 'Apple', - items: [1, 2] - }, { - name: 'Banana', - items: [3] - }] - }; - - state = completionReducer(state, action); - expect(state).to.have.property('groupSelection', 0); - expect(state).to.have.property('itemSelection', 0); - - state = completionReducer(state, action); - expect(state).to.have.property('groupSelection', 0); - expect(state).to.have.property('itemSelection', 1); - - state = completionReducer(state, action); - state = completionReducer(state, action); - expect(state).to.have.property('groupSelection', -1); - expect(state).to.have.property('itemSelection', -1); - }); - - it ('return next state for COMPLETION_SELECT_PREV', () => { - let action = { type: actions.COMPLETION_SELECT_PREV }; - let state = { - groupSelection: -1, - itemSelection: -1, - groups: [{ - name: 'Apple', - items: [1, 2] - }, { - name: 'Banana', - items: [3] - }] - }; - - state = completionReducer(state, action); - expect(state).to.have.property('groupSelection', 1); - expect(state).to.have.property('itemSelection', 0); - - state = completionReducer(state, action); - expect(state).to.have.property('groupSelection', 0); - expect(state).to.have.property('itemSelection', 1); - - state = completionReducer(state, action); - state = completionReducer(state, action); - expect(state).to.have.property('groupSelection', -1); - expect(state).to.have.property('itemSelection', -1); - }); -}); diff --git a/test/reducers/console.test.js b/test/reducers/console.test.js index d9f500f..5ebf4bc 100644 --- a/test/reducers/console.test.js +++ b/test/reducers/console.test.js @@ -10,6 +10,8 @@ describe("console reducer", () => { expect(state).to.have.property('commandShown', false); expect(state).to.have.property('commandText', ''); expect(state).to.have.deep.property('completions', []); + expect(state).to.have.property('groupSelection', -1); + expect(state).to.have.property('itemSelection', -1); }); it('return next state for CONSOLE_SHOW_COMMAND', () => { @@ -20,12 +22,6 @@ describe("console reducer", () => { expect(state).to.have.property('errorShown', false); }); - it('return next state for CONSOLE_SET_COMPLETIONS', () => { - let action = { type: actions.CONSOLE_SET_COMPLETIONS, completions: [1, 2, 3] }; - let state = consoleReducer({}, action); - expect(state).to.have.deep.property('completions', [1, 2, 3]); - }); - it('return next state for CONSOLE_SHOW_ERROR', () => { let action = { type: actions.CONSOLE_SHOW_ERROR, text: 'an error' }; let state = consoleReducer({}, action); @@ -40,4 +36,83 @@ describe("console reducer", () => { expect(state).to.have.property('errorShown', false); expect(state).to.have.property('commandShown', false); }); + + it ('return next state for CONSOLE_SET_COMPLETIONS', () => { + let state = { + groupSelection: 0, + itemSelection: 0, + completions: [], + } + let action = { + type: actions.CONSOLE_SET_COMPLETIONS, + completions: [{ + name: 'Apple', + items: [1, 2, 3] + }, { + name: 'Banana', + items: [4, 5, 6] + }] + } + state = consoleReducer(state, action); + expect(state).to.have.property('completions', action.completions); + expect(state).to.have.property('groupSelection', -1); + expect(state).to.have.property('itemSelection', -1); + }); + + it ('return next state for CONSOLE_COMPLETION_NEXT', () => { + let action = { type: actions.CONSOLE_COMPLETION_NEXT }; + let state = { + groupSelection: -1, + itemSelection: -1, + completions: [{ + name: 'Apple', + items: [1, 2] + }, { + name: 'Banana', + items: [3] + }] + }; + + state = consoleReducer(state, action); + expect(state).to.have.property('groupSelection', 0); + expect(state).to.have.property('itemSelection', 0); + + state = consoleReducer(state, action); + expect(state).to.have.property('groupSelection', 0); + expect(state).to.have.property('itemSelection', 1); + + state = consoleReducer(state, action); + state = consoleReducer(state, action); + expect(state).to.have.property('groupSelection', -1); + expect(state).to.have.property('itemSelection', -1); + }); + + it ('return next state for CONSOLE_COMPLETION_PREV', () => { + let action = { type: actions.CONSOLE_COMPLETION_PREV }; + let state = { + groupSelection: -1, + itemSelection: -1, + completions: [{ + name: 'Apple', + items: [1, 2] + }, { + name: 'Banana', + items: [3] + }] + }; + + state = consoleReducer(state, action); + expect(state).to.have.property('groupSelection', 1); + expect(state).to.have.property('itemSelection', 0); + + state = consoleReducer(state, action); + expect(state).to.have.property('groupSelection', 0); + expect(state).to.have.property('itemSelection', 1); + + state = consoleReducer(state, action); + state = consoleReducer(state, action); + expect(state).to.have.property('groupSelection', -1); + expect(state).to.have.property('itemSelection', -1); + }); + }); -- cgit v1.2.3