@sitecore-jss/sitecore-jss-react 21.5.2-canary.1 → 21.5.2-canary.3

package/dist/cjs/components/BYOCComponent.js

@@ -87,24 +87,21 @@ class BYOCComponent extends react_1.default.Component {
         };
         const fallbackComponent = this.props.missingComponentComponent ? (react_1.default.createElement(this.props.missingComponentComponent, Object.assign({}, unRegisteredComponentProps))) : (react_1.default.createElement(MissingComponent_1.MissingComponent, Object.assign({}, unRegisteredComponentProps)));
         const ErrorComponent = this.props.errorComponent;
-        const isNull = props.fetchedData && Object.keys(props.fetchedData).length === 0;
-        let componentProps = isNull ? null : props.fetchedData;
-        if (!componentProps) {
-            if ((_a = props.params) === null || _a === void 0 ? void 0 : _a.ComponentProps) {
-                try {
-                    componentProps = (_b = JSON.parse(props.params.ComponentProps)) !== null && _b !== void 0 ? _b : {};
-                }
-                catch (e) {
-                    console.error(`Parsing props for ${componentName} component from rendering params failed. Error: ${e}`);
-                    return ErrorComponent ? (react_1.default.createElement(ErrorComponent, { error: e })) : (react_1.default.createElement(DefaultErrorComponent, { error: e }));
-                }
+        let componentProps = null;
+        if ((_a = props.params) === null || _a === void 0 ? void 0 : _a.ComponentProps) {
+            try {
+                componentProps = (_b = JSON.parse(props.params.ComponentProps)) !== null && _b !== void 0 ? _b : {};
             }
-            else {
-                componentProps = props.fields ? (0, utils_1.getDataFromFields)(props.fields) : {};
+            catch (e) {
+                console.error(`Parsing props for ${componentName} component from rendering params failed. Error: ${e}`);
+                return ErrorComponent ? (react_1.default.createElement(ErrorComponent, { error: e })) : (react_1.default.createElement(DefaultErrorComponent, { error: e }));
             }
         }
+        else {
+            componentProps = props.fields ? (0, utils_1.getDataFromFields)(props.fields) : {};
+        }
         // we render fallback on client to avoid problems with client-only components
-        return (react_1.default.createElement(FEAAS.ExternalComponent, Object.assign({ componentName: componentName, clientFallback: fallbackComponent }, componentProps)));
+        return (react_1.default.createElement(FEAAS.ExternalComponent, Object.assign({ componentName: componentName, clientFallback: fallbackComponent, datasources: props.fetchedData }, componentProps)));
     }
 }
 exports.BYOCComponent = BYOCComponent;
@@ -114,8 +111,8 @@ exports.BYOCComponent = BYOCComponent;
  */
 function fetchBYOCComponentServerProps(params) {
     return __awaiter(this, void 0, void 0, function* () {
-        const fetchDataOptions = params.ComponentProps
-            ? JSON.parse(params.ComponentProps)
+        const fetchDataOptions = params.ComponentDataOverride
+            ? JSON.parse(params.ComponentDataOverride)
             : {};
         const fetchedData = yield FEAAS.DataSettings.fetch(fetchDataOptions || {});
         return {

package/dist/cjs/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ComponentBuilder = exports.EditFrame = exports.withDatasourceCheck = exports.withPlaceholder = exports.withEditorChromes = exports.useSitecoreContext = exports.withSitecoreContext = exports.SitecoreContextReactContext = exports.SitecoreContext = exports.VisitorIdentification = exports.File = exports.LinkPropTypes = exports.Link = exports.BYOCWrapper = exports.fetchBYOCComponentServerProps = exports.BYOCComponent = exports.FEaaSWrapper = exports.fetchFEaaSComponentServerProps = exports.FEaaSComponent = exports.DateField = exports.Text = exports.RichTextPropTypes = exports.RichText = exports.getEEMarkup = exports.Image = exports.Placeholder = exports.getFEAASLibraryStylesheetLinks = exports.mediaApi = exports.RestDictionaryService = exports.GraphQLDictionaryService = exports.trackingApi = exports.getFieldValue = exports.getChildPlaceholder = exports.RestLayoutService = exports.GraphQLLayoutService = exports.LayoutServicePageState = exports.DefaultEditFrameButtons = exports.DefaultEditFrameButton = exports.resetEditorChromes = exports.isEditorActive = exports.enableDebug = exports.constants = void 0;
+exports.ComponentBuilder = exports.EditFrame = exports.withDatasourceCheck = exports.withPlaceholder = exports.withEditorChromes = exports.useSitecoreContext = exports.withSitecoreContext = exports.SitecoreContextReactContext = exports.SitecoreContext = exports.VisitorIdentification = exports.File = exports.LinkPropTypes = exports.Link = exports.BYOCWrapper = exports.fetchBYOCComponentServerProps = exports.BYOCComponent = exports.FEaaSWrapper = exports.fetchFEaaSComponentServerProps = exports.FEaaSComponent = exports.DateField = exports.Text = exports.RichTextPropTypes = exports.RichText = exports.getEEMarkup = exports.Image = exports.Placeholder = exports.getFEAASLibraryStylesheetLinks = exports.mediaApi = exports.RestDictionaryService = exports.GraphQLDictionaryService = exports.trackingApi = exports.getFieldValue = exports.getChildPlaceholder = exports.RestLayoutService = exports.GraphQLLayoutService = exports.LayoutServicePageState = exports.getContentStylesheetLink = exports.DefaultEditFrameButtons = exports.DefaultEditFrameButton = exports.resetEditorChromes = exports.isEditorActive = exports.enableDebug = exports.constants = void 0;
 var sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
 Object.defineProperty(exports, "constants", { enumerable: true, get: function () { return sitecore_jss_1.constants; } });
 Object.defineProperty(exports, "enableDebug", { enumerable: true, get: function () { return sitecore_jss_1.enableDebug; } });
@@ -10,6 +10,7 @@ Object.defineProperty(exports, "resetEditorChromes", { enumerable: true, get: fu
 Object.defineProperty(exports, "DefaultEditFrameButton", { enumerable: true, get: function () { return utils_1.DefaultEditFrameButton; } });
 Object.defineProperty(exports, "DefaultEditFrameButtons", { enumerable: true, get: function () { return utils_1.DefaultEditFrameButtons; } });
 var layout_1 = require("@sitecore-jss/sitecore-jss/layout");
+Object.defineProperty(exports, "getContentStylesheetLink", { enumerable: true, get: function () { return layout_1.getContentStylesheetLink; } });
 Object.defineProperty(exports, "LayoutServicePageState", { enumerable: true, get: function () { return layout_1.LayoutServicePageState; } });
 Object.defineProperty(exports, "GraphQLLayoutService", { enumerable: true, get: function () { return layout_1.GraphQLLayoutService; } });
 Object.defineProperty(exports, "RestLayoutService", { enumerable: true, get: function () { return layout_1.RestLayoutService; } });

package/dist/esm/components/BYOCComponent.js

@@ -58,24 +58,21 @@ export class BYOCComponent extends React.Component {
         };
         const fallbackComponent = this.props.missingComponentComponent ? (React.createElement(this.props.missingComponentComponent, Object.assign({}, unRegisteredComponentProps))) : (React.createElement(MissingComponent, Object.assign({}, unRegisteredComponentProps)));
         const ErrorComponent = this.props.errorComponent;
-        const isNull = props.fetchedData && Object.keys(props.fetchedData).length === 0;
-        let componentProps = isNull ? null : props.fetchedData;
-        if (!componentProps) {
-            if ((_a = props.params) === null || _a === void 0 ? void 0 : _a.ComponentProps) {
-                try {
-                    componentProps = (_b = JSON.parse(props.params.ComponentProps)) !== null && _b !== void 0 ? _b : {};
-                }
-                catch (e) {
-                    console.error(`Parsing props for ${componentName} component from rendering params failed. Error: ${e}`);
-                    return ErrorComponent ? (React.createElement(ErrorComponent, { error: e })) : (React.createElement(DefaultErrorComponent, { error: e }));
-                }
+        let componentProps = null;
+        if ((_a = props.params) === null || _a === void 0 ? void 0 : _a.ComponentProps) {
+            try {
+                componentProps = (_b = JSON.parse(props.params.ComponentProps)) !== null && _b !== void 0 ? _b : {};
             }
-            else {
-                componentProps = props.fields ? getDataFromFields(props.fields) : {};
+            catch (e) {
+                console.error(`Parsing props for ${componentName} component from rendering params failed. Error: ${e}`);
+                return ErrorComponent ? (React.createElement(ErrorComponent, { error: e })) : (React.createElement(DefaultErrorComponent, { error: e }));
             }
         }
+        else {
+            componentProps = props.fields ? getDataFromFields(props.fields) : {};
+        }
         // we render fallback on client to avoid problems with client-only components
-        return (React.createElement(FEAAS.ExternalComponent, Object.assign({ componentName: componentName, clientFallback: fallbackComponent }, componentProps)));
+        return (React.createElement(FEAAS.ExternalComponent, Object.assign({ componentName: componentName, clientFallback: fallbackComponent, datasources: props.fetchedData }, componentProps)));
     }
 }
 /**
@@ -84,8 +81,8 @@ export class BYOCComponent extends React.Component {
  */
 export function fetchBYOCComponentServerProps(params) {
     return __awaiter(this, void 0, void 0, function* () {
-        const fetchDataOptions = params.ComponentProps
-            ? JSON.parse(params.ComponentProps)
+        const fetchDataOptions = params.ComponentDataOverride
+            ? JSON.parse(params.ComponentDataOverride)
             : {};
         const fetchedData = yield FEAAS.DataSettings.fetch(fetchDataOptions || {});
         return {

package/dist/esm/index.js

@@ -1,6 +1,6 @@
 export { constants, enableDebug } from '@sitecore-jss/sitecore-jss';
 export { isEditorActive, resetEditorChromes, DefaultEditFrameButton, DefaultEditFrameButtons, } from '@sitecore-jss/sitecore-jss/utils';
-export { LayoutServicePageState, GraphQLLayoutService, RestLayoutService, getChildPlaceholder, getFieldValue, } from '@sitecore-jss/sitecore-jss/layout';
+export { getContentStylesheetLink, LayoutServicePageState, GraphQLLayoutService, RestLayoutService, getChildPlaceholder, getFieldValue, } from '@sitecore-jss/sitecore-jss/layout';
 export { trackingApi, } from '@sitecore-jss/sitecore-jss/tracking';
 export { GraphQLDictionaryService, RestDictionaryService, } from '@sitecore-jss/sitecore-jss/i18n';
 export { mediaApi } from '@sitecore-jss/sitecore-jss/media';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-react",
-  "version": "21.5.2-canary.1",
+  "version": "21.5.2-canary.3",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -27,7 +27,7 @@
     "url": "https://github.com/sitecore/jss/issues"
   },
   "devDependencies": {
-    "@sitecore-feaas/clientside": "^0.3.17",
+    "@sitecore-feaas/clientside": "^0.5.4",
     "@types/chai": "^4.3.4",
     "@types/chai-string": "^1.4.2",
     "@types/deep-equal": "^1.0.1",
@@ -58,19 +58,19 @@
     "typescript": "~4.9.3"
   },
   "peerDependencies": {
-    "@sitecore-feaas/clientside": "^0.3.17",
+    "@sitecore-feaas/clientside": "^0.5.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^21.5.2-canary.1",
+    "@sitecore-jss/sitecore-jss": "^21.5.2-canary.3",
     "deep-equal": "^2.1.0",
     "prop-types": "^15.8.1",
     "style-attr": "^1.3.0"
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "91879eeca4386e74c511d91e65871c9ee8e5059f",
+  "gitHead": "901eaa31fb2cfdc84cbe2070ae849fd97090ce07",
   "files": [
     "dist",
     "types"

package/types/ComponentBuilder.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/react" />
 import { ComponentType } from 'react';
 import { ComponentFactory } from './components/sharedTypes';
 /**

package/types/components/BYOCComponent.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/react" />
 import React from 'react';
 import { ComponentFields } from '@sitecore-jss/sitecore-jss/layout';
 import { MissingComponentProps } from './MissingComponent';
@@ -24,6 +25,10 @@ export type BYOCComponentParams = {
      * JSON props to pass into rendered component
      */
     ComponentProps?: string;
+    /**
+     * A JSON object with data sources to be fetched and passed to the component
+     */
+    ComponentDataOverride?: string;
     /**
      * A string with classes that can be used to apply themes, via SXA functionality
      */

package/types/components/Date.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/react" />
 import React from 'react';
 export interface DateFieldProps {
     /** The date field data. */

package/types/components/EditFrame.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/react" />
 import React, { PropsWithChildren } from 'react';
 import { EditFrameDataSource, EditButtonTypes } from '@sitecore-jss/sitecore-jss/utils';
 export interface EditFrameProps {

package/types/components/File.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/react" />
 import React from 'react';
 export interface FileFieldValue {
     [propName: string]: unknown;

package/types/components/HiddenRendering.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/react" />
 import React from 'react';
 export declare const HiddenRendering: () => React.JSX.Element;
 export declare const HIDDEN_RENDERING_NAME = "Hidden Rendering";

package/types/components/Image.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/react" />
 import React from 'react';
 export interface ImageFieldValue {
     [attributeName: string]: unknown;

package/types/components/Link.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/react" />
 import React from 'react';
 import PropTypes from 'prop-types';
 export interface LinkFieldValue {

package/types/components/MissingComponent.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/react" />
 import React from 'react';
 export interface MissingComponentProps {
     rendering?: {

package/types/components/Placeholder.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/react" />
 import React from 'react';
 import { PlaceholderProps } from './PlaceholderCommon';
 import { ComponentRendering, HtmlElementRendering } from '@sitecore-jss/sitecore-jss/layout';

package/types/components/PlaceholderCommon.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/react" />
 import React, { ComponentType } from 'react';
 import PropTypes from 'prop-types';
 import { ComponentFactory } from './sharedTypes';

package/types/components/RichText.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/react" />
 import React from 'react';
 import PropTypes from 'prop-types';
 export interface RichTextField {

package/types/components/SitecoreContext.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/react" />
 import React from 'react';
 import PropTypes from 'prop-types';
 import { ComponentFactory } from './sharedTypes';

package/types/components/Text.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/react" />
 import { FunctionComponent } from 'react';
 export interface TextField {
     value?: string | number;

package/types/components/VisitorIdentification.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/react" />
 import React from 'react';
 interface VisitorIdentificationProps {
     defer?: boolean;

package/types/components/sharedTypes.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/react" />
 import { ComponentType } from 'react';
 /**
  * @param {string} componentName component to be imported from the component factory

package/types/enhancers/withComponentFactory.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/react" />
 import React from 'react';
 import { ComponentFactory } from '../components/sharedTypes';
 export interface ComponentFactoryProps {

package/types/enhancers/withDatasourceCheck.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/react" />
 import React from 'react';
 import { ComponentRendering } from '@sitecore-jss/sitecore-jss/layout';
 export declare const DefaultEditingError: () => JSX.Element;

package/types/enhancers/withEditorChromes.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="@types/react" />
 import React from 'react';
 export declare const withEditorChromes: (WrappedComponent: React.ComponentClass<unknown> | React.FC<unknown>) => React.ComponentClass<{}, any>;

package/types/enhancers/withSitecoreContext.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/react" />
 import React, { ReactNode } from 'react';
 import { SitecoreContextValue } from '../components/SitecoreContext';
 export interface WithSitecoreContextOptions {

package/types/index.d.ts

@@ -1,6 +1,6 @@
 export { constants, enableDebug } from '@sitecore-jss/sitecore-jss';
 export { isEditorActive, resetEditorChromes, DefaultEditFrameButton, DefaultEditFrameButtons, EditFrameDataSource, FieldEditButton, WebEditButton, EditButtonTypes, } from '@sitecore-jss/sitecore-jss/utils';
-export { LayoutService, LayoutServiceData, LayoutServicePageState, LayoutServiceContext, LayoutServiceContextData, GraphQLLayoutService, RestLayoutService, RouteData, Field, Item, HtmlElementRendering, getChildPlaceholder, getFieldValue, ComponentRendering, ComponentFields, ComponentParams, } from '@sitecore-jss/sitecore-jss/layout';
+export { getContentStylesheetLink, LayoutService, LayoutServiceData, LayoutServicePageState, LayoutServiceContext, LayoutServiceContextData, GraphQLLayoutService, RestLayoutService, RouteData, Field, Item, HtmlElementRendering, getChildPlaceholder, getFieldValue, ComponentRendering, ComponentFields, ComponentParams, } from '@sitecore-jss/sitecore-jss/layout';
 export { trackingApi, TrackingRequestOptions, CampaignInstance, GoalInstance, OutcomeInstance, EventInstance, PageViewInstance, } from '@sitecore-jss/sitecore-jss/tracking';
 export { DictionaryPhrases, DictionaryService, GraphQLDictionaryService, RestDictionaryService, } from '@sitecore-jss/sitecore-jss/i18n';
 export { mediaApi } from '@sitecore-jss/sitecore-jss/media';