Merge pull request #19 from ueokande/content-and-background-redux-completely

Refactor: full redux on content and background

6 files changed, 66 insertions, 79 deletions

diff --git a/src/reducers/completion.js b/src/reducers/completion.js
deleted file mode 100644
index a8a6444..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 defaultState;
-  }
-}
diff --git a/src/reducers/console.js b/src/reducers/console.js
index 5c49c3b..b9ed5b8 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,
@@ -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/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 9beb81c..8ed6452 100644
--- a/src/reducers/index.js
+++ b/src/reducers/index.js
@@ -1,11 +1,13 @@
-import inputReducer from '../reducers/input';
-import consoleReducer from '../reducers/console';
-import settingReducer from '../reducers/setting';
+import inputReducer from 'reducers/input';
+import consoleReducer from 'reducers/console';
+import settingReducer from 'reducers/setting';
+import followReducer from 'reducers/follow';
 
 const defaultState = {
   input: inputReducer(undefined, {}),
   console: consoleReducer(undefined, {}),
   setting: settingReducer(undefined, {}),
+  follow: followReducer(undefined, {}),
 };
 
 export default function reducer(state = defaultState, action = {}) {
@@ -13,5 +15,6 @@ 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),
   });
 }
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: {}