Use Provider instead of contextType to fix hoist issues

connectedcars · Feb 4, 2019 · 70857c7 · 70857c7
1 parent e47d6a1
commit 70857c7
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/hoc.tsx b/src/hoc.tsx
@@ -1,5 +1,6 @@
 import React from 'react'
-import { I18nContext, I18nContextProps } from './context'
+import { I18nContextProps } from './context'
+import { I18nProvider } from './provider'
 import { Omit } from './types'
 
 export interface WithTranslateProps extends I18nContextProps {}
@@ -10,10 +11,12 @@ function withTranslate<P extends object>(
   return class WithTranslate extends React.Component<P> {
     static displayName = `withTranslate(${BaseComponent.displayName})`
 
-    static contextType = I18nContext
-
     render() {
-      return <BaseComponent {...this.props} {...this.context} />
+      return (
+        <I18nProvider>
+          {i18nProps => <BaseComponent {...i18nProps} {...this.props} />}
+        </I18nProvider>
+      )
     }
   }
 }