Avoid wrapping via contextType

herecydev · Feb 20, 2020 · 62625b9 · 62625b9
1 parent f60e994
commit 62625b9
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/packages/gatsby-react-router-scroll/src/ScrollContainer.js b/packages/gatsby-react-router-scroll/src/ScrollContainer.js
@@ -20,7 +20,7 @@ class ScrollContainer extends React.Component {
   }
 
   componentDidMount() {
-    this.props.context.registerElement(
+    this.context.registerElement(
       this.props.scrollKey,
       ReactDOM.findDOMNode(this), // eslint-disable-line react/no-find-dom-node
       this.shouldUpdateScroll
@@ -50,7 +50,7 @@ class ScrollContainer extends React.Component {
   }
 
   componentWillUnmount() {
-    this.props.context.unregisterElement(this.scrollKey)
+    this.context.unregisterElement(this.scrollKey)
   }
 
   shouldUpdateScroll = (prevRouterProps, routerProps) => {
@@ -61,7 +61,7 @@ class ScrollContainer extends React.Component {
 
     // Hack to allow accessing scrollBehavior._stateStorage.
     return shouldUpdateScroll.call(
-      this.props.context.scrollBehavior,
+      this.context.scrollBehavior,
       prevRouterProps,
       routerProps
     )
@@ -72,12 +72,7 @@ class ScrollContainer extends React.Component {
   }
 }
 
-const ScrollContainerConsumer = props => (
-  <ScrollBehaviorContext.Consumer>
-    {context => <ScrollContainer {...props} context={context} />}
-  </ScrollBehaviorContext.Consumer>
-)
+ScrollContainer.propTypes = propTypes
+ScrollContainer.contextType = ScrollBehaviorContext
 
-ScrollContainerConsumer.propTypes = propTypes
-
-export default ScrollContainerConsumer
+export default ScrollContainer