summaryrefslogtreecommitdiffstats
path: root/packages/gitbook-core
diff options
context:
space:
mode:
authorSamy Pesse <samypesse@gmail.com>2016-09-25 17:44:08 +0200
committerSamy Pesse <samypesse@gmail.com>2016-09-25 17:44:08 +0200
commite46cd78f803891dfc8c304ea8ec4bc813ad16b5b (patch)
tree7c3711581cb151fc58b186ea45a8f7f691d190e7 /packages/gitbook-core
parentfab88bb47e71ad47c928198ddbf7a4d0527e81bb (diff)
downloadgitbook-e46cd78f803891dfc8c304ea8ec4bc813ad16b5b.zip
gitbook-e46cd78f803891dfc8c304ea8ec4bc813ad16b5b.tar.gz
gitbook-e46cd78f803891dfc8c304ea8ec4bc813ad16b5b.tar.bz2
Fix core reducer destroying other reducers
Diffstat (limited to 'packages/gitbook-core')
-rw-r--r--packages/gitbook-core/src/connect.js4
-rw-r--r--packages/gitbook-core/src/reducers/index.js17
2 files changed, 11 insertions, 10 deletions
diff --git a/packages/gitbook-core/src/connect.js b/packages/gitbook-core/src/connect.js
index e30eb22..e18158e 100644
--- a/packages/gitbook-core/src/connect.js
+++ b/packages/gitbook-core/src/connect.js
@@ -6,8 +6,8 @@ const ReactRedux = require('react-redux');
* @param {Function} mapStateToProps
* @return {ReactComponent}
*/
-function connect(Component, mapStateToProps) {
- return ReactRedux.connect(mapStateToProps)(Component);
+function connect(Component, mapStateToProps, mapDispatchToProps) {
+ return ReactRedux.connect(mapStateToProps, mapDispatchToProps)(Component);
}
module.exports = connect;
diff --git a/packages/gitbook-core/src/reducers/index.js b/packages/gitbook-core/src/reducers/index.js
index 18c9f1e..49ea489 100644
--- a/packages/gitbook-core/src/reducers/index.js
+++ b/packages/gitbook-core/src/reducers/index.js
@@ -1,10 +1,11 @@
-const Redux = require('redux');
+const composeReducer = require('../composeReducer');
+const createReducer = require('../createReducer');
-module.exports = Redux.combineReducers({
- components: require('./components'),
- navigation: require('./navigation'),
+module.exports = composeReducer(
+ createReducer('components', require('./components')),
+ createReducer('navigation', require('./navigation')),
// GitBook JSON
- page: require('./page'),
- summary: require('./summary'),
- readme: require('./readme')
-});
+ createReducer('page', require('./page')),
+ createReducer('summary', require('./summary')),
+ createReducer('readme', require('./readme'))
+);