@sitecore-jss/sitecore-jss-react 22.2.0-canary.5 → 22.2.0-canary.50

package/dist/cjs/components/EditingScripts.js

@@ -7,6 +7,7 @@ exports.EditingScripts = void 0;
 const react_1 = __importDefault(require("react"));
 const layout_1 = require("@sitecore-jss/sitecore-jss/layout");
 const withSitecoreContext_1 = require("../enhancers/withSitecoreContext");
+const editing_1 = require("@sitecore-jss/sitecore-jss/editing");
 /**
  * Renders client scripts and data for editing/preview mode in Pages.
  * This script is only rendered when EditMode is Metadata, otherwise it renders nothing.
@@ -14,13 +15,14 @@ const withSitecoreContext_1 = require("../enhancers/withSitecoreContext");
 const EditingScripts = () => {
     const { sitecoreContext: { pageState, editMode, clientData, clientScripts }, } = (0, withSitecoreContext_1.useSitecoreContext)();
     // Don't render anything if not in editing/preview mode
-    if (pageState === layout_1.LayoutServicePageState.Normal)
+    if (pageState === layout_1.LayoutServicePageState.Normal || pageState === layout_1.LayoutServicePageState.Preview) {
         return react_1.default.createElement(react_1.default.Fragment, null);
+    }
     if (editMode === layout_1.EditMode.Metadata) {
+        const jssClientData = Object.assign(Object.assign({}, clientData), (0, editing_1.getJssPagesClientData)());
         return (react_1.default.createElement(react_1.default.Fragment, null, clientScripts === null || clientScripts === void 0 ? void 0 :
             clientScripts.map((src, index) => (react_1.default.createElement("script", { src: src, key: index }))),
-            clientData &&
-                Object.keys(clientData).map((id) => (react_1.default.createElement("script", { key: id, id: id, type: "application/json", dangerouslySetInnerHTML: { __html: JSON.stringify(clientData[id]) } })))));
+            Object.keys(jssClientData).map((id) => (react_1.default.createElement("script", { key: id, id: id, type: "application/json", dangerouslySetInnerHTML: { __html: JSON.stringify(jssClientData[id]) } })))));
     }
     return react_1.default.createElement(react_1.default.Fragment, null);
 };

package/dist/cjs/components/PlaceholderMetadata.js

@@ -6,10 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlaceholderMetadata = void 0;
 const react_1 = __importDefault(require("react"));
 const layout_1 = require("@sitecore-jss/sitecore-jss/layout");
-/**
- * default value of uid for root placeholder when uid is not present.
- */
-const DEFAULT_PLACEHOLDER_UID = '00000000-0000-0000-0000-000000000000';
+const editing_1 = require("@sitecore-jss/sitecore-jss/editing");
 /**
  * A React component to generate metadata blocks for a placeholder or rendering.
  * It utilizes dynamic attributes based on whether the component acts as a placeholder
@@ -37,7 +34,7 @@ const PlaceholderMetadata = ({ rendering, placeholderName, children, }) => {
                     if (placeholderName === placeholder) {
                         phId = id
                             ? `${placeholderName}_${id}`
-                            : `${placeholderName}_${DEFAULT_PLACEHOLDER_UID}`;
+                            : `${placeholderName}_${editing_1.DEFAULT_PLACEHOLDER_UID}`;
                         break;
                     }
                     // Check if the placeholder is a dynamic placeholder
@@ -45,7 +42,7 @@ const PlaceholderMetadata = ({ rendering, placeholderName, children, }) => {
                         const pattern = (0, layout_1.getDynamicPlaceholderPattern)(placeholder);
                         // Check if the placeholder matches the dynamic placeholder pattern
                         if (pattern.test(placeholderName)) {
-                            phId = id ? `${placeholder}_${id}` : `${placeholder}_${DEFAULT_PLACEHOLDER_UID}`;
+                            phId = id ? `${placeholder}_${id}` : `${placeholder}_${editing_1.DEFAULT_PLACEHOLDER_UID}`;
                             break;
                         }
                     }

package/dist/esm/components/EditingScripts.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { EditMode, LayoutServicePageState } from '@sitecore-jss/sitecore-jss/layout';
 import { useSitecoreContext } from '../enhancers/withSitecoreContext';
+import { getJssPagesClientData } from '@sitecore-jss/sitecore-jss/editing';
 /**
  * Renders client scripts and data for editing/preview mode in Pages.
  * This script is only rendered when EditMode is Metadata, otherwise it renders nothing.
@@ -8,13 +9,14 @@ import { useSitecoreContext } from '../enhancers/withSitecoreContext';
 export const EditingScripts = () => {
     const { sitecoreContext: { pageState, editMode, clientData, clientScripts }, } = useSitecoreContext();
     // Don't render anything if not in editing/preview mode
-    if (pageState === LayoutServicePageState.Normal)
+    if (pageState === LayoutServicePageState.Normal || pageState === LayoutServicePageState.Preview) {
         return React.createElement(React.Fragment, null);
+    }
     if (editMode === EditMode.Metadata) {
+        const jssClientData = Object.assign(Object.assign({}, clientData), getJssPagesClientData());
         return (React.createElement(React.Fragment, null, clientScripts === null || clientScripts === void 0 ? void 0 :
             clientScripts.map((src, index) => (React.createElement("script", { src: src, key: index }))),
-            clientData &&
-                Object.keys(clientData).map((id) => (React.createElement("script", { key: id, id: id, type: "application/json", dangerouslySetInnerHTML: { __html: JSON.stringify(clientData[id]) } })))));
+            Object.keys(jssClientData).map((id) => (React.createElement("script", { key: id, id: id, type: "application/json", dangerouslySetInnerHTML: { __html: JSON.stringify(jssClientData[id]) } })))));
     }
     return React.createElement(React.Fragment, null);
 };

package/dist/esm/components/PlaceholderMetadata.js

@@ -1,9 +1,6 @@
 import React from 'react';
 import { getDynamicPlaceholderPattern, isDynamicPlaceholder, } from '@sitecore-jss/sitecore-jss/layout';
-/**
- * default value of uid for root placeholder when uid is not present.
- */
-const DEFAULT_PLACEHOLDER_UID = '00000000-0000-0000-0000-000000000000';
+import { DEFAULT_PLACEHOLDER_UID } from '@sitecore-jss/sitecore-jss/editing';
 /**
  * A React component to generate metadata blocks for a placeholder or rendering.
  * It utilizes dynamic attributes based on whether the component acts as a placeholder

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-react",
-  "version": "22.2.0-canary.5",
+  "version": "22.2.0-canary.50",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -61,14 +61,14 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^22.2.0-canary.5",
+    "@sitecore-jss/sitecore-jss": "^22.2.0-canary.50",
     "fast-deep-equal": "^3.1.3",
     "prop-types": "^15.8.1",
     "style-attr": "^1.3.0"
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "a37f9a68fe0447aed16ae317d1881ac9209c3c22",
+  "gitHead": "d30e42419052b47530203ce5692b3f78132b4ece",
   "files": [
     "dist",
     "types"

package/types/components/PlaceholderCommon.d.ts

@@ -69,7 +69,7 @@ export interface PlaceholderProps {
 }
 export declare class PlaceholderCommon<T extends PlaceholderProps> extends React.Component<T> {
     static propTypes: {
-        rendering: PropTypes.Validator<NonNullable<NonNullable<ComponentRendering | RouteData<Record<string, Field<import("@sitecore-jss/sitecore-jss/layout").GenericFieldValue> | Item | Item[]>>>>>;
+        rendering: PropTypes.Validator<NonNullable<NonNullable<ComponentRendering<import("@sitecore-jss/sitecore-jss/layout").ComponentFields> | RouteData<Record<string, Field<import("@sitecore-jss/sitecore-jss/layout").GenericFieldValue> | Item | Item[]>>>>>;
         fields: PropTypes.Requireable<{
             [x: string]: NonNullable<NonNullable<Field<import("@sitecore-jss/sitecore-jss/layout").GenericFieldValue> | Item[]>>;
         }>;
@@ -87,7 +87,7 @@ export declare class PlaceholderCommon<T extends PlaceholderProps> extends React
         error?: Error;
     }>;
     constructor(props: T);
-    static getPlaceholderDataFromRenderingData(rendering: ComponentRendering | RouteData, name: string, editMode?: EditMode): (ComponentRendering | HtmlElementRendering)[];
+    static getPlaceholderDataFromRenderingData(rendering: ComponentRendering | RouteData, name: string, editMode?: EditMode): (ComponentRendering<import("@sitecore-jss/sitecore-jss/layout").ComponentFields> | HtmlElementRendering)[];
     componentDidMount(): void;
     componentDidUpdate(): void;
     componentDidCatch(error: Error): void;