Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions lib/ReduxInjector.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ var _redux = require('redux');

var _lodash = require('lodash');

var store = {};
var combine = _redux.combineReducers;
var store = {},
combine = _redux.combineReducers,
injectedReducers = {};

function combineReducersRecurse(reducers) {
// If this is a leaf or already combined.
Expand Down Expand Up @@ -76,7 +77,7 @@ function createInjectStore(initialReducers) {

store = _redux.createStore.apply(undefined, [combineReducersRecurse(initialReducers)].concat(args));

store.injectedReducers = initialReducers;
injectedReducers = initialReducers;

return store;
}
Expand All @@ -85,8 +86,8 @@ function injectReducer(key, reducer) {
var force = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;

// If already set, do nothing.
if ((0, _lodash.has)(store.injectedReducers, key) || force) return;
if ((0, _lodash.has)(injectedReducers, key) || force) return;

(0, _lodash.set)(store.injectedReducers, key, reducer);
store.replaceReducer(combineReducersRecurse(store.injectedReducers));
(0, _lodash.set)(injectedReducers, key, reducer);
store.replaceReducer(combineReducersRecurse(injectedReducers));
}
14 changes: 8 additions & 6 deletions src/ReduxInjector.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { createStore, combineReducers } from 'redux';
import { set, has } from 'lodash';

let store = {};
let combine = combineReducers;
let store = {},
combine = combineReducers,
injectedReducers = {};


function combineReducersRecurse(reducers) {
// If this is a leaf or already combined.
Expand Down Expand Up @@ -41,15 +43,15 @@ export function createInjectStore(initialReducers, ...args) {
...args
);

store.injectedReducers = initialReducers;
injectedReducers = initialReducers;

return store;
}

export function injectReducer(key, reducer, force = false) {
// If already set, do nothing.
if (has(store.injectedReducers, key) || force) return;
if (has(injectedReducers, key) || force) return;

set(store.injectedReducers, key, reducer);
store.replaceReducer(combineReducersRecurse(store.injectedReducers));
set(injectedReducers, key, reducer);
store.replaceReducer(combineReducersRecurse(injectedReducers));
}