[sitecore-embedded-jss-app] Remove usage of SitecoreContextFactory (#466

) * [sitecore-embedded-jss-app] Remove SitecoreContextFactory
Sitecore · Oct 7, 2020 · 9a0477a · 9a0477a
1 parent 0f96b6e
commit 9a0477a
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 12 deletions.
diff --git a/samples/sitecore-embedded-jss-app/src/boot/Root.js b/samples/sitecore-embedded-jss-app/src/boot/Root.js
@@ -4,14 +4,13 @@ import 'babel-polyfill';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { SitecoreContext } from '@sitecore-jss/sitecore-jss-react';
-import SitecoreContextFactory from './SitecoreContextFactory';
 import componentFactory from '../app/componentFactory';
 import App from '../app';
 
 class Root extends Component {
   render() {
     return (
-      <SitecoreContext componentFactory={componentFactory} contextFactory={SitecoreContextFactory}>
+      <SitecoreContext componentFactory={componentFactory} context={this.props.initialState.sitecore.context}>
         <App route={this.props.initialState.sitecore.route} />
       </SitecoreContext>
     );

diff --git a/samples/sitecore-embedded-jss-app/src/boot/SitecoreContextFactory.js b/samples/sitecore-embedded-jss-app/src/boot/SitecoreContextFactory.js
diff --git a/samples/sitecore-embedded-jss-app/src/client.js b/samples/sitecore-embedded-jss-app/src/client.js
@@ -2,7 +2,6 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import Root from './boot/Root';
 import SitecoreContentService from './boot/SitecoreContentService';
-import SitecoreContextFactory from './boot/SitecoreContextFactory';
 
 /* eslint-disable no-underscore-dangle */
 
@@ -38,9 +37,5 @@ if (window.__data) {
 
 // render with initial route data
 SitecoreContentService.getRouteData('/EmbeddedWizard/Wizard').then((routeData) => {
-  if (routeData && routeData.sitecore && routeData.sitecore.context) {
-    SitecoreContextFactory.setSitecoreContext(routeData.sitecore.context);
-  }
-
   return render(routeData, window.__data ? ReactDOM.hydrate : ReactDOM.render);
 });
diff --git a/samples/sitecore-embedded-jss-app/src/server.js b/samples/sitecore-embedded-jss-app/src/server.js
@@ -5,7 +5,6 @@ import ReactDOM from 'react-dom/server';
 import initialState from 'boot/initialState';
 import Root from 'boot/Root';
 import SitecoreContentService from 'boot/SitecoreContentService';
-import SitecoreContextFactory from 'boot/SitecoreContextFactory';
 import ServerHtml from 'app/ServerHtml';
 
 /*
@@ -23,7 +22,6 @@ export function renderView(callback, path, data, viewBag) {
     // get the route data and then render from it
     SitecoreContentService.getRouteData(path)
       .then((routeData) => {
-        SitecoreContextFactory.setSitecoreContext(routeData.sitecore.context);
         return <Root initialState={routeData} path={path} />;
       })
       .then((content) => {