[JSS][React] SitecoreContextReactContext.Provider is not working prop…

…erly, because value never changes as it is always same class instance (#983)

packages/sitecore-jss-react/src/components/SitecoreContext.tsx

@@ -20,22 +20,22 @@ export class SitecoreContextFactory {
     };
   }
 
-  getSitecoreContext() {
+  getSitecoreContext = () => {
     return this.context;
   }
 
-  subscribeToContext(func: any) {
+  subscribeToContext = (func: any) => {
     this.subscribers.push(func);
   }
 
-  unsubscribeFromContext(func: any) {
+  unsubscribeFromContext = (func: any) => {
     const index = this.subscribers.indexOf(func);
     if (index >= 0) {
       this.subscribers.splice(index, 1);
     }
   }
 
-  setSitecoreContext(value: any) {
+  setSitecoreContext = (value: any) => {
     this.context = value;
     this.subscribers.forEach((func) => func(value));
   }
@@ -65,9 +65,7 @@ export class SitecoreContext extends React.Component<SitecoreContextProps> {
     } else {
       this.contextFactory = new SitecoreContextFactory();
     }
-  }
 
-  componentDidMount() {
     // we force the children of the context to re-render when the context is updated
     // even if the local props are unchanged; we assume the contents depend on the Sitecore context
     this.contextFactory.subscribeToContext(this.contextListener);
@@ -79,10 +77,16 @@ export class SitecoreContext extends React.Component<SitecoreContextProps> {
     this.contextFactory.unsubscribeFromContext(this.contextListener);
   }
 
+  /**
+   * React Context Provider should accept Object instead of
+   * SitecoreContextFactory class instance
+   */
+  getSitecoreContextValue = () => ({ ...this.contextFactory });
+
   render() {
     return (
     <ComponentFactoryReactContext.Provider value={this.componentFactory}>
-      <SitecoreContextReactContext.Provider value={this.contextFactory}>
+      <SitecoreContextReactContext.Provider value={this.getSitecoreContextValue()}>
         {this.props.children}
       </SitecoreContextReactContext.Provider>
     </ComponentFactoryReactContext.Provider>