fix: avoid rendering Context directly warning

Author: jquense

package.json

@@ -59,12 +59,12 @@
     "@4c/semantic-release-config": "^1.0.2",
     "@babel/cli": "^7.0.0-beta.39",
     "@babel/core": "^7.0.0-beta.39",
-    "@monastic.panic/enzyme-adapter-react-16": "^1.2.2",
     "babel-core": "bridge",
     "babel-eslint": "^8.2.1",
     "babel-jest": "^22.4.3",
     "codecov": "^3.0.2",
-    "enzyme": "^3.3.0",
+    "enzyme": "^3.7.0",
+    "enzyme-adapter-react-16": "^1.6.0",
     "eslint": "^4.16.0",
     "eslint-config-4catalyzer-react": "^0.4.1",
     "eslint-config-prettier": "^2.9.0",
@@ -77,8 +77,8 @@
     "jest": "^22.4.3",
     "lint-staged": "^7.1.0",
     "prettier": "^1.10.2",
-    "react": "^16.3.2",
-    "react-dom": "^16.3.2",
+    "react": "^16.6.0",
+    "react-dom": "^16.6.0",
     "semantic-release": "^15.4.0",
     "travis-deploy-once": "^5.0.0"
   },

src/mapContextToProps.js

@@ -9,6 +9,8 @@ const getDisplayName = Component => {
   return name ? `ContextTransform(${name})` : 'ContextTransform';
 };
 
+const ensureConsumer = c => c.Consumer || c;
+
 function $mapContextToProps(
   {
     consumers: maybeArrayOfConsumers,
@@ -23,7 +25,7 @@ function $mapContextToProps(
     consumers = [maybeArrayOfConsumers];
   }
 
-  const SingleConsumer = consumers[0];
+  const SingleConsumer = ensureConsumer(consumers[0]);
   function singleRender(props, ref) {
     const propsWithRef = { [forwardRefAs]: ref, ...props };
     return (
@@ -38,9 +40,10 @@ function $mapContextToProps(
   function multiRender(props, ref) {
     const propsWithRef = { [forwardRefAs]: ref, ...props };
     return consumers.reduceRight(
-      (inner, Consumer) => (...args) => (
-        <Consumer>{value => inner(...args, value)}</Consumer>
-      ),
+      (inner, Context) => (...args) => {
+        const Consumer = ensureConsumer(Context);
+        return <Consumer>{value => inner(...args, value)}</Consumer>;
+      },
       (...contexts) => (
         <Component {...propsWithRef} {...mapToProps(...contexts, props)} />
       ),

test/index.js

@@ -1,4 +1,4 @@
 import { configure } from 'enzyme';
-import Adapter from '@monastic.panic/enzyme-adapter-react-16';
+import Adapter from 'enzyme-adapter-react-16';
 
 configure({ adapter: new Adapter() });

test/mapContextToProps.test.js

@@ -137,4 +137,16 @@ describe('mapContextToProps', () => {
 
     expect(Mapper.render.displayName).toEqual('WithIntl');
   });
+
+  it('should not warn about Contexts', () => {
+    const Mapper = mapContextToProps(
+      {
+        consumers: React.createContext('foo'),
+        mapToProps: foo => ({ children: foo }),
+        displayName: 'WithIntl',
+      },
+      'div',
+    );
+    mount(<Mapper />);
+  });
 });