@sitecore-jss/sitecore-jss-react 21.3.0-canary.2 → 21.3.0-canary.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/cjs/components/FEaaSComponent.js +9 -5
  2. package/dist/esm/components/FEaaSComponent.js +9 -5
  3. package/package.json +3 -3
package/dist/cjs/components/FEaaSComponent.js CHANGED
@@ -44,7 +44,7 @@ exports.FEAAS_COMPONENT_RENDERING_NAME = 'FEaaSComponent';
44
44
  * @param {FEaaSComponentProps} props component props
45
45
  */
46
46
  const FEaaSComponent = (props) => {
47
- var _a, _b, _c, _d, _e, _f;
47
+ var _a, _b, _c, _d, _e, _f, _g;
48
48
  const computedRevision = ((_a = props.params) === null || _a === void 0 ? void 0 : _a.ComponentRevision) || props.revisionFallback;
49
49
  if ((!props.lastModified || !props.template) &&
50
50
  (!props.params ||
@@ -59,17 +59,21 @@ const FEaaSComponent = (props) => {
59
59
  let data = null;
60
60
  if ((_b = props.params) === null || _b === void 0 ? void 0 : _b.ComponentDataOverride) {
61
61
  // Use override data if provided
62
- data = props.params.ComponentDataOverride;
62
+ try {
63
+ data = JSON.parse(props.params.ComponentDataOverride);
64
+ }
65
+ catch (e) {
66
+ data = null;
67
+ }
63
68
  }
64
69
  else if (props.fields) {
65
70
  // Otherwise use datasource data (provided in fields)
66
- // FEaaS expects wrapping "_" as catch-all datasource template id
67
- data = JSON.stringify({ _: getDataFromFields(props.fields) });
71
+ data = getDataFromFields(props.fields);
68
72
  }
69
73
  // FEaaS control would still be hydrated by client
70
74
  // we pass all the props as a workaround to avoid hydration error, until we convert all JSS components to server side
71
75
  // this also allows component to fall back to full client-side rendering when template or src is empty
72
- return (react_1.default.createElement(FEAAS.Component, { data: data, template: props.template || '', "last-modified": props.lastModified, cdn: (_c = props.params) === null || _c === void 0 ? void 0 : _c.ComponentHostName, library: (_d = props.params) === null || _d === void 0 ? void 0 : _d.LibraryId, version: (_e = props.params) === null || _e === void 0 ? void 0 : _e.ComponentVersion, component: (_f = props.params) === null || _f === void 0 ? void 0 : _f.ComponentId, revision: computedRevision }));
76
+ return (react_1.default.createElement(FEAAS.Component, { data: data, template: props.template || '', "last-modified": props.lastModified, cdn: (_c = props.params) === null || _c === void 0 ? void 0 : _c.ComponentHostName, library: (_d = props.params) === null || _d === void 0 ? void 0 : _d.LibraryId, version: (_e = props.params) === null || _e === void 0 ? void 0 : _e.ComponentVersion, component: (_f = props.params) === null || _f === void 0 ? void 0 : _f.ComponentId, instance: (_g = props.params) === null || _g === void 0 ? void 0 : _g.ComponentInstanceId, revision: computedRevision }));
73
77
  };
74
78
  exports.FEaaSComponent = FEaaSComponent;
75
79
  /**
package/dist/esm/components/FEaaSComponent.js CHANGED
@@ -15,7 +15,7 @@ export const FEAAS_COMPONENT_RENDERING_NAME = 'FEaaSComponent';
15
15
  * @param {FEaaSComponentProps} props component props
16
16
  */
17
17
  export const FEaaSComponent = (props) => {
18
- var _a, _b, _c, _d, _e, _f;
18
+ var _a, _b, _c, _d, _e, _f, _g;
19
19
  const computedRevision = ((_a = props.params) === null || _a === void 0 ? void 0 : _a.ComponentRevision) || props.revisionFallback;
20
20
  if ((!props.lastModified || !props.template) &&
21
21
  (!props.params ||
@@ -30,17 +30,21 @@ export const FEaaSComponent = (props) => {
30
30
  let data = null;
31
31
  if ((_b = props.params) === null || _b === void 0 ? void 0 : _b.ComponentDataOverride) {
32
32
  // Use override data if provided
33
- data = props.params.ComponentDataOverride;
33
+ try {
34
+ data = JSON.parse(props.params.ComponentDataOverride);
35
+ }
36
+ catch (e) {
37
+ data = null;
38
+ }
34
39
  }
35
40
  else if (props.fields) {
36
41
  // Otherwise use datasource data (provided in fields)
37
- // FEaaS expects wrapping "_" as catch-all datasource template id
38
- data = JSON.stringify({ _: getDataFromFields(props.fields) });
42
+ data = getDataFromFields(props.fields);
39
43
  }
40
44
  // FEaaS control would still be hydrated by client
41
45
  // we pass all the props as a workaround to avoid hydration error, until we convert all JSS components to server side
42
46
  // this also allows component to fall back to full client-side rendering when template or src is empty
43
- return (React.createElement(FEAAS.Component, { data: data, template: props.template || '', "last-modified": props.lastModified, cdn: (_c = props.params) === null || _c === void 0 ? void 0 : _c.ComponentHostName, library: (_d = props.params) === null || _d === void 0 ? void 0 : _d.LibraryId, version: (_e = props.params) === null || _e === void 0 ? void 0 : _e.ComponentVersion, component: (_f = props.params) === null || _f === void 0 ? void 0 : _f.ComponentId, revision: computedRevision }));
47
+ return (React.createElement(FEAAS.Component, { data: data, template: props.template || '', "last-modified": props.lastModified, cdn: (_c = props.params) === null || _c === void 0 ? void 0 : _c.ComponentHostName, library: (_d = props.params) === null || _d === void 0 ? void 0 : _d.LibraryId, version: (_e = props.params) === null || _e === void 0 ? void 0 : _e.ComponentVersion, component: (_f = props.params) === null || _f === void 0 ? void 0 : _f.ComponentId, instance: (_g = props.params) === null || _g === void 0 ? void 0 : _g.ComponentInstanceId, revision: computedRevision }));
44
48
  };
45
49
  /**
46
50
  * Fetches server component props required for server rendering, based on rendering params.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sitecore-jss/sitecore-jss-react",
3
- "version": "21.3.0-canary.2",
3
+ "version": "21.3.0-canary.4",
4
4
  "main": "dist/cjs/index.js",
5
5
  "module": "dist/esm/index.js",
6
6
  "sideEffects": false,
@@ -62,14 +62,14 @@
62
62
  },
63
63
  "dependencies": {
64
64
  "@sitecore-feaas/clientside": "^0.3.0",
65
- "@sitecore-jss/sitecore-jss": "^21.3.0-canary.2",
65
+ "@sitecore-jss/sitecore-jss": "^21.3.0-canary.4",
66
66
  "deep-equal": "^2.1.0",
67
67
  "prop-types": "^15.8.1",
68
68
  "style-attr": "^1.3.0"
69
69
  },
70
70
  "description": "",
71
71
  "types": "types/index.d.ts",
72
- "gitHead": "a498d1b8b6bab066a58907a2a01a554b9d20bd42",
72
+ "gitHead": "9dfa65d417e4fe131729735e202397879232f0f2",
73
73
  "files": [
74
74
  "dist",
75
75
  "types"