diff options
| author | Shin'ya Ueoka <ueokande@i-beam.org> | 2018-07-13 22:30:05 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-13 22:30:05 +0900 |
| commit | 28bfa3ac8124d3453cd539db26da4f4703e783df (patch) | |
| tree | dd4461af8343a7d5c9fc13cc51cd0fd5edd0285e /src/background/reducers | |
| parent | 37840c2abb02948d36cdcfaab9063f3ea67fdb6b (diff) | |
| parent | 803e6ea7af60107182356b5fda8e3c2ddfacaefa (diff) | |
Merge pull request #431 from ueokande/command-completions
Command completions
Diffstat (limited to 'src/background/reducers')
| -rw-r--r-- | src/background/reducers/index.js | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/src/background/reducers/index.js b/src/background/reducers/index.js index 78f855c..465f927 100644 --- a/src/background/reducers/index.js +++ b/src/background/reducers/index.js @@ -1,17 +1,8 @@ -import settingReducer from './setting'; -import findReducer from './find'; -import tabReducer from './tab'; +import { combineReducers } from 'redux'; +import setting from './setting'; +import find from './find'; +import tab from './tab'; -// Make setting reducer instead of re-use -const defaultState = { - setting: settingReducer(undefined, {}), - find: findReducer(undefined, {}), - tab: tabReducer(undefined, {}), -}; - -export default function reducer(state = defaultState, action = {}) { - return { ...state, - setting: settingReducer(state.setting, action), - find: findReducer(state.find, action), - tab: tabReducer(state.tab, action), }; -} +export default combineReducers({ + setting, find, tab, +}); |