refactor(redux): move common methods into redux common mixin

xing · Apr 16, 2019 · 52b5a7a · 52b5a7a
1 parent 900edc7
commit 52b5a7a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 48 deletions.
diff --git a/packages/redux/mixin.browser.js b/packages/redux/mixin.browser.js
@@ -1,21 +1,9 @@
-const React = require('react');
 const { compose, combineReducers, createStore } = require('redux');
-const { Provider } = require('react-redux');
-const {
-  strategies: {
-    sync: { override },
-  },
-} = require('hops-mixin');
 const ReduxRuntimeCommonMixin = require('./mixin.runtime-common');
 
 const ReduxCompose = global.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
 
 class ReduxMixin extends ReduxRuntimeCommonMixin {
-  constructor(config, element, { redux: options = {} } = {}) {
-    super(config);
-    this.reducers = options.reducers || {};
-  }
-
   createStore() {
     return createStore(
       combineReducers(this.reducers),
@@ -42,18 +30,6 @@ class ReduxMixin extends ReduxRuntimeCommonMixin {
   composeEnhancers(...enhancers) {
     return ReduxCompose(...enhancers);
   }
-
-  enhanceElement(reactElement) {
-    return React.createElement(
-      Provider,
-      { store: this.getReduxStore() },
-      reactElement
-    );
-  }
 }
 
-ReduxMixin.strategies = {
-  getReduxStore: override,
-};
-
 module.exports = ReduxMixin;
diff --git a/packages/redux/mixin.runtime-common.js b/packages/redux/mixin.runtime-common.js
@@ -1,3 +1,5 @@
+const React = require('react');
+const { Provider } = require('react-redux');
 const { applyMiddleware } = require('redux');
 const ReduxThunkMiddleware = require('redux-thunk').default;
 const {
@@ -11,6 +13,7 @@ class ReduxRuntimeCommonMixin extends Mixin {
   constructor(config, element, { redux: options = {} } = {}) {
     super(config);
     this.middlewares = options.middlewares || [];
+    this.reducers = options.reducers || {};
   }
 
   getReduxMiddlewares() {
@@ -27,10 +30,19 @@ class ReduxRuntimeCommonMixin extends Mixin {
 
     return middlewares.map(m => applyMiddleware(m));
   }
+
+  enhanceElement(reactElement) {
+    return React.createElement(
+      Provider,
+      { store: this.getReduxStore() },
+      reactElement
+    );
+  }
 }
 
 ReduxRuntimeCommonMixin.strategies = {
   getReduxMiddlewares: override,
+  getReduxStore: override,
 };
 
 module.exports = ReduxRuntimeCommonMixin;
diff --git a/packages/redux/mixin.server.js b/packages/redux/mixin.server.js
@@ -1,19 +1,7 @@
-const React = require('react');
 const { createStore, combineReducers, compose } = require('redux');
-const { Provider } = require('react-redux');
-const {
-  strategies: {
-    sync: { override },
-  },
-} = require('hops-mixin');
 const ReduxRuntimeCommonMixin = require('./mixin.runtime-common');
 
 class ReduxMixin extends ReduxRuntimeCommonMixin {
-  constructor(config, element, { redux: options = {} } = {}) {
-    super(config);
-    this.reducers = options.reducers || {};
-  }
-
   createStore() {
     return createStore(
       combineReducers(this.reducers),
@@ -44,18 +32,6 @@ class ReduxMixin extends ReduxRuntimeCommonMixin {
       },
     };
   }
-
-  enhanceElement(reactElement) {
-    return React.createElement(
-      Provider,
-      { store: this.getReduxStore() },
-      reactElement
-    );
-  }
 }
 
-ReduxMixin.strategies = {
-  getReduxStore: override,
-};
-
 module.exports = ReduxMixin;