Refactor using useContext and jsx

Author: Choong Kim

.prettierrc.js

@@ -0,0 +1,13 @@
+module.exports = {
+  printWidth: 80,
+  tabWidth: 2,
+  useTabs: false,
+  semi: true,
+  singleQuote: true,
+  trailingComma: 'es5',
+  bracketSpacing: false,
+  jsxBracketSameLine: false,
+  rangeStart: 0,
+  rangeEnd: Infinity,
+  parser: 'babylon'
+};

src/hoc.js

@@ -7,7 +7,7 @@
  */
 
 import PropTypes from 'prop-types';
-import React, {type ComponentType} from 'react';
+import React, {type ComponentType, useContext} from 'react';
 import ReactRedux from 'react-redux';
 import type {Reducer} from 'redux';
 import {createRPCHandler, createRPCReactors} from 'fusion-rpc-redux';
@@ -57,50 +57,30 @@ export function withRPCRedux<Props: {}>(
   return (Component: ComponentType<Props>) => {
     const withRPCRedux = (oldProps, context) => {
       const {rpc} = context;
-      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;
-              mapStateToParams = (state, args) =>
-                mapState(state, args, oldProps);
-            }
-            const handler = createRPCHandler({
-              rpcId,
-              rpc,
-              store,
-              actions,
-              mapStateToParams,
-              transformParams,
-            });
-            const props = {
-              ...oldProps,
-              [propName]: handler,
-            };
-            return React.createElement(Component, props);
-          }}
-        </ReactRedux.ReactReduxContext.Consumer>
-      );
+      const store =
+        context.store || useContext(ReactRedux.ReactReduxContext).store;
+      if (__DEV__ && context.store)
+        console.error(
+          'React-Redux 5.x is deprecated. Please upgrade your version of React-Redux'
+        );
+      if (mapStateToParams) {
+        const mapState = mapStateToParams;
+        mapStateToParams = (state, args) => mapState(state, args, oldProps);
+      }
+
+      const handler = createRPCHandler({
+        rpcId,
+        rpc,
+        store,
+        actions,
+        mapStateToParams,
+        transformParams,
+      });
+      const props = {
+        ...oldProps,
+        [propName]: handler,
+      };
+      return <Component {...props} />;
     };
     const displayName = Component.displayName || Component.name || 'Anonymous';
     withRPCRedux.displayName = 'WithRPCRedux' + '(' + displayName + ')';