Add conditional logic and update deps to allow for plugin to be used with react redux 5 as well

Author: Choong Kim

package.json

@@ -28,10 +28,10 @@
     "prop-types": "^15.7.2"
   },
   "peerDependencies": {
-    "fusion-core": "^1.10.6",
+    "fusion-core": "^1.10.3",
     "fusion-react": "^2.0.0",
-    "react": "^16.8.6",
-    "react-redux": "^7.0.2"
+    "react": "14.x - 16.x",
+    "react-redux": ">= 5.x"
   },
   "devDependencies": {
     "@babel/preset-react": "^7.0.0",

src/hoc.js

@@ -8,7 +8,7 @@
 
 import PropTypes from 'prop-types';
 import React, {type ComponentType} from 'react';
-import {ReactReduxContext} from 'react-redux';
+import ReactRedux from 'react-redux';
 import type {Reducer} from 'redux';
 import {createRPCHandler, createRPCReactors} from 'fusion-rpc-redux';
 
@@ -57,8 +57,28 @@ export function withRPCRedux<Props: {}>(
   return (Component: ComponentType<Props>) => {
     const withRPCRedux = (oldProps, context) => {
       const {rpc} = context;
-      return (
-        <ReactReduxContext.Consumer>
+      return context.store && !ReactRedux.ReactReduxContext ? (
+        (function() {
+          if (mapStateToParams) {
+            const mapState = mapStateToParams;
+            mapStateToParams = (state, args) => mapState(state, args, oldProps);
+          }
+          const handler = createRPCHandler({
+            rpcId,
+            rpc,
+            store: context.store,
+            actions,
+            mapStateToParams,
+            transformParams,
+          });
+          const props = {
+            ...oldProps,
+            [propName]: handler,
+          };
+          return React.createElement(Component, props);
+        })()
+      ) : (
+        <ReactRedux.ReactReduxContext.Consumer>
           {({store}) => {
             if (mapStateToParams) {
               const mapState = mapStateToParams;
@@ -79,13 +99,14 @@ export function withRPCRedux<Props: {}>(
             };
             return React.createElement(Component, props);
           }}
-        </ReactReduxContext.Consumer>
+        </ReactRedux.ReactReduxContext.Consumer>
       );
     };
     const displayName = Component.displayName || Component.name || 'Anonymous';
     withRPCRedux.displayName = 'WithRPCRedux' + '(' + displayName + ')';
     withRPCRedux.contextTypes = {
       rpc: PropTypes.object.isRequired,
+      store: PropTypes.object,
     };
     return withRPCRedux;
   };