Consumerize ContextPane

jeremyckahn · Apr 30, 2019 · 3a8ee66 · 3a8ee66
1 parent aecec3b
commit 3a8ee66
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/Farmhand.js b/src/Farmhand.js
@@ -560,7 +560,7 @@ export default class Farmhand extends Component {
             <NotificationSystem ref={notificationSystemRef} />
             <div className="sidebar">
               <Navigation />
-              <ContextPane {...{ handlers, state }} />
+              <ContextPane />
               <DebugMenu {...{ handlers, state }} />
             </div>
             <Stage {...{ handlers, state }} />

diff --git a/src/components/ContextPane/ContextPane.js b/src/components/ContextPane/ContextPane.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import FarmhandContext from '../../Farmhand.context';
 import { object, shape, string } from 'prop-types';
 import Toolbelt from '../Toolbelt';
 import PlantableItems from '../PlantableItems';
@@ -9,7 +10,7 @@ import './ContextPane.sass';
 
 // TODO: Render player inventory for stageFocus === SHOP.
 
-const ContextPane = ({ handlers, state, state: { stageFocus } }) => (
+export const ContextPane = ({ handlers, state, state: { stageFocus } }) => (
   <div className="ContextPane">
     {stageFocus === stageFocusType.FIELD && (
       <>
@@ -37,4 +38,10 @@ ContextPane.propTypes = {
   }).isRequired,
 };
 
-export default ContextPane;
+export default function Consumer() {
+  return (
+    <FarmhandContext.Consumer>
+      {context => <ContextPane {...context} />}
+    </FarmhandContext.Consumer>
+  );
+}
diff --git a/src/components/ContextPane/ContextPane.test.js b/src/components/ContextPane/ContextPane.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import ContextPane from './ContextPane';
+import { ContextPane } from './ContextPane';
 import { stageFocusType } from '../../../src/enums';
 import PlantableItems from '../PlantableItems';
 import { shallow } from 'enzyme';