@sitecore-content-sdk/react 1.5.0 → 2.0.0-canary.10

package/dist/cjs/components/DesignLibrary/DesignLibraryServer.js

@@ -39,11 +39,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DesignLibraryServerPreview = exports.DesignLibraryServerVariantGeneration = exports.DesignLibraryServer = exports.__mockDependencies = void 0;
 const react_1 = __importDefault(require("react"));
-const layout_1 = require("@sitecore-content-sdk/core/layout");
+const layout_1 = require("@sitecore-content-sdk/content/layout");
 const DesignLibraryClientEvents_1 = require("./DesignLibraryClientEvents");
-const globalCache = __importStar(require("@sitecore-content-sdk/core/utils"));
-const editing_1 = require("@sitecore-content-sdk/core/editing");
-const codegen = __importStar(require("@sitecore-content-sdk/core/codegen"));
+const globalCache = __importStar(require("@sitecore-content-sdk/core/tools"));
+const editing_1 = require("@sitecore-content-sdk/content/editing");
+const codegen = __importStar(require("@sitecore-content-sdk/content/codegen"));
 const Placeholder_1 = require("../Placeholder");
 const DesignLibraryErrorBoundary_1 = require("./DesignLibraryErrorBoundary");
 const ErrorBoundary_1 = require("../ErrorBoundary");
@@ -103,10 +103,14 @@ const DesignLibraryServerVariantGeneration = async ({ page, rendering, loadServe
     let Component;
     let componentInitError;
     let generatedComponentData;
+    const getComponentInitError = (type, error) => ({
+        type,
+        message: error instanceof Error ? error.message : String(error),
+    });
     // load importmap and importmap payload to pass to FE
     // if not provided, or errors during load set error to pass to FE
     if (!loadServerImportMap) {
-        componentInitError = 'No loadImportMap provided';
+        componentInitError = getComponentInitError(codegen.DesignLibraryPreviewError.ImportMapMissing, 'No loadImportMap provided');
     }
     else {
         try {
@@ -115,7 +119,7 @@ const DesignLibraryServerVariantGeneration = async ({ page, rendering, loadServe
             importMapInfo = getImportMapInfo(importMap);
         }
         catch (e) {
-            componentInitError = `Error loading import map: ${e}`;
+            componentInitError = getComponentInitError(codegen.DesignLibraryPreviewError.ImportMapLoad, `Error loading import map: ${e}`);
         }
     }
     let componentToUpdate = (_b = (_a = rendering === null || rendering === void 0 ? void 0 : rendering.placeholders) === null || _a === void 0 ? void 0 : _a[layout_1.EDITING_COMPONENT_PLACEHOLDER]) === null || _b === void 0 ? void 0 : _b[0];
@@ -144,7 +148,7 @@ const DesignLibraryServerVariantGeneration = async ({ page, rendering, loadServe
             }
             catch (error) {
                 // error during component initialization - send error to client
-                componentInitError = error.toString();
+                componentInitError = getComponentInitError(codegen.DesignLibraryPreviewError.RenderInit, error);
             }
         }
     }
@@ -152,7 +156,9 @@ const DesignLibraryServerVariantGeneration = async ({ page, rendering, loadServe
         // we have a preview update, get it and clean the cache
         designLibraryStatus = editing_1.DesignLibraryStatus.RENDERED;
         const previewData = getCacheAndClean(componentPreviewKey);
-        componentInitError = previewData === null || previewData === void 0 ? void 0 : previewData.error;
+        if (previewData === null || previewData === void 0 ? void 0 : previewData.error) {
+            componentInitError = getComponentInitError(codegen.DesignLibraryPreviewError.GeneratedComponentFetch, previewData.error);
+        }
         if (previewData === null || previewData === void 0 ? void 0 : previewData.generatedComponentData) {
             generatedComponentData = previewData.generatedComponentData;
             try {
@@ -161,7 +167,7 @@ const DesignLibraryServerVariantGeneration = async ({ page, rendering, loadServe
             }
             catch (error) {
                 // error during component initialization - send error to client
-                componentInitError = error.toString();
+                componentInitError = getComponentInitError(codegen.DesignLibraryPreviewError.RenderInit, error);
             }
         }
     }

package/dist/cjs/components/EditingScripts.js

@@ -6,9 +6,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EditingScripts = void 0;
 const react_1 = __importDefault(require("react"));
-const withSitecore_1 = require("../enhancers/withSitecore");
-const editing_1 = require("@sitecore-content-sdk/core/editing");
-const editing_2 = require("@sitecore-content-sdk/core/editing");
+const SitecoreProvider_1 = require("./SitecoreProvider");
+const editing_1 = require("@sitecore-content-sdk/content/editing");
 /**
  * Renders client scripts and data for editing/preview mode for Pages.
  * Renders script required for the Design Library (when mode.isDesignLibrary is true).
@@ -17,7 +16,7 @@ const editing_2 = require("@sitecore-content-sdk/core/editing");
  */
 const EditingScripts = () => {
     var _a;
-    const { page: { mode, layout }, api, } = (0, withSitecore_1.useSitecore)();
+    const { page: { mode, layout }, api, } = (0, SitecoreProvider_1.useSitecore)();
     const { clientData, clientScripts } = layout.sitecore.context;
     // Don't render anything if not in editing mode and rendering type is not component
     if (mode.isNormal || mode.isPreview) {
@@ -32,7 +31,7 @@ const EditingScripts = () => {
         const month = String(now.getUTCMonth() + 1).padStart(2, '0');
         const year = String(now.getUTCFullYear());
         const cacheTimestamp = `${hour}-${day}-${month}-${year}`;
-        const scriptUrl = `${(0, editing_2.getDesignLibraryScriptLink)((_a = api === null || api === void 0 ? void 0 : api.edge) === null || _a === void 0 ? void 0 : _a.edgeUrl)}?cb=${cacheTimestamp}`;
+        const scriptUrl = `${(0, editing_1.getDesignLibraryScriptLink)((_a = api === null || api === void 0 ? void 0 : api.edge) === null || _a === void 0 ? void 0 : _a.edgeUrl)}?cb=${cacheTimestamp}`;
         return (react_1.default.createElement(react_1.default.Fragment, null,
             react_1.default.createElement("script", { src: scriptUrl, suppressHydrationWarning: true })));
     }

package/dist/cjs/components/ErrorBoundary.js

@@ -36,7 +36,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ErrorComponent = void 0;
 const react_1 = __importStar(require("react"));
-const withSitecore_1 = require("../enhancers/withSitecore");
+const SitecoreProvider_1 = require("./SitecoreProvider");
 /**
  * Simple error component applying basic error styling.
  * @param {object} props - Either with `message` (string) or with `children` (ReactNode), but not both.
@@ -45,7 +45,7 @@ const ErrorComponent = (props) => {
     return (react_1.default.createElement("div", { className: "sc-content-sdk-placeholder-error" }, props.message ? props.message : props.children));
 };
 exports.ErrorComponent = ErrorComponent;
-class ErrorBoundary extends react_1.default.Component {
+class ErrorBoundaryClass extends react_1.default.Component {
     constructor(props) {
         super(props);
         this.defaultErrorMessage = 'There was a problem loading this section.';
@@ -69,7 +69,7 @@ class ErrorBoundary extends react_1.default.Component {
         return this.isInDevMode() || this.props.page.mode.isEditing || this.props.page.mode.isPreview;
     }
     render() {
-        var _a;
+        var _a, _b;
         if (this.state.error) {
             if (this.props.errorComponent) {
                 return react_1.default.createElement(this.props.errorComponent, { error: this.state.error });
@@ -92,10 +92,14 @@ class ErrorBoundary extends react_1.default.Component {
             }
         }
         // do not apply suspense when suspense is disabled or when on already dynamic components
-        if (this.props.disableSuspense || this.props.isDynamic) {
+        if (((_b = this.props.disableSuspense) !== null && _b !== void 0 ? _b : true) || this.props.isDynamic)
             return this.props.children;
-        }
         return (react_1.default.createElement(react_1.Suspense, { fallback: react_1.default.createElement("h4", null, this.props.componentLoadingMessage || this.defaultLoadingMessage) }, this.props.children));
     }
 }
-exports.default = (0, withSitecore_1.withSitecore)()(ErrorBoundary);
+const ErrorBoundary = (props) => {
+    const { page } = (0, SitecoreProvider_1.useSitecore)();
+    const boundaryProps = Object.assign(Object.assign({}, props), { page });
+    return react_1.default.createElement(ErrorBoundaryClass, Object.assign({}, boundaryProps));
+};
+exports.default = ErrorBoundary;

package/dist/cjs/components/FieldMetadata.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FieldMetadata = void 0;
 const react_1 = __importDefault(require("react"));
-const editing_1 = require("@sitecore-content-sdk/core/editing");
+const editing_1 = require("@sitecore-content-sdk/content/editing");
 /**
  * The component which renders field metadata markup
  * @param {FieldMetadataProps} props the props of the component

package/dist/cjs/components/File.js

@@ -15,7 +15,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.File = void 0;
-const layout_1 = require("@sitecore-content-sdk/core/layout");
+const layout_1 = require("@sitecore-content-sdk/content/layout");
 const react_1 = __importDefault(require("react"));
 /**
  * The File component.
@@ -37,7 +37,9 @@ const File = (_a) => {
     const anchorAttrs = {
         href: file.src,
     };
-    return react_1.default.createElement('a', Object.assign(Object.assign({}, anchorAttrs), otherProps), linkText, children);
+    return (react_1.default.createElement("a", Object.assign({}, anchorAttrs, otherProps),
+        linkText,
+        children));
 };
 exports.File = File;
 exports.File.displayName = 'File';

package/dist/cjs/components/Form.js

@@ -36,10 +36,10 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Form = exports.mockFormModule = void 0;
 const react_1 = __importStar(require("react"));
-const core_1 = require("@sitecore-content-sdk/core");
-const withSitecore_1 = require("../enhancers/withSitecore");
+const content_1 = require("@sitecore-content-sdk/content");
+const SitecoreProvider_1 = require("./SitecoreProvider");
 const ErrorBoundary_1 = require("./ErrorBoundary");
-let { executeScriptElements, loadForm, subscribeToFormSubmitEvent } = core_1.form;
+let { executeScriptElements, loadForm, subscribeToFormSubmitEvent } = content_1.form;
 /**
  * Mock function to replace the form module functions for `testing` purposes.
  * @param {any} formModule - The form module to mock
@@ -56,11 +56,11 @@ exports.mockFormModule = mockFormModule;
  * @public
  */
 const Form = ({ params, rendering }) => {
-    var _a;
+    var _a, _b, _c, _d, _e;
     const id = params === null || params === void 0 ? void 0 : params.RenderingIdentifier;
     const [error, setError] = (0, react_1.useState)(false);
     const [content, setContent] = (0, react_1.useState)('');
-    const context = (0, withSitecore_1.useSitecore)();
+    const context = (0, SitecoreProvider_1.useSitecore)();
     const formRef = (0, react_1.useRef)(null);
     const isEditing = context.page.mode.isEditing;
     (0, react_1.useEffect)(() => {
@@ -91,10 +91,17 @@ const Form = ({ params, rendering }) => {
             }
             executeScriptElements(formRef.current);
         }
-    }, [content]);
+    }, [
+        content,
+        isEditing,
+        params.FormId,
+        rendering.uid,
+        (_b = (_a = context.api) === null || _a === void 0 ? void 0 : _a.edge) === null || _b === void 0 ? void 0 : _b.clientContextId,
+        (_d = (_c = context.api) === null || _c === void 0 ? void 0 : _c.edge) === null || _d === void 0 ? void 0 : _d.edgeUrl,
+    ]);
     if (isEditing && error) {
         return react_1.default.createElement(ErrorBoundary_1.ErrorComponent, { message: "There was a problem loading this section" });
     }
-    return (react_1.default.createElement("div", { ref: formRef, dangerouslySetInnerHTML: { __html: content }, className: (_a = params.styles) === null || _a === void 0 ? void 0 : _a.trimEnd(), id: id ? id : undefined }));
+    return (react_1.default.createElement("div", { ref: formRef, dangerouslySetInnerHTML: { __html: content }, className: (_e = params.styles) === null || _e === void 0 ? void 0 : _e.trimEnd(), id: id ? id : undefined }));
 };
 exports.Form = Form;

package/dist/cjs/components/Image.js

@@ -15,14 +15,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Image = void 0;
-/* eslint-disable no-unused-vars */
-const media_1 = require("@sitecore-content-sdk/core/media");
+const media_1 = require("@sitecore-content-sdk/content/media");
 const react_1 = __importDefault(require("react"));
 const utils_1 = require("../utils");
 const withFieldMetadata_1 = require("../enhancers/withFieldMetadata");
 const withEmptyFieldEditingComponent_1 = require("../enhancers/withEmptyFieldEditingComponent");
 const DefaultEmptyFieldEditingComponents_1 = require("./DefaultEmptyFieldEditingComponents");
-const layout_1 = require("@sitecore-content-sdk/core/layout");
+const layout_1 = require("@sitecore-content-sdk/content/layout");
 const getImageAttrs = (_a, imageParams, mediaUrlPrefix) => {
     var { src, srcSet } = _a, otherAttrs = __rest(_a, ["src", "srcSet"]);
     if (!src) {
@@ -40,17 +39,13 @@ const getImageAttrs = (_a, imageParams, mediaUrlPrefix) => {
     newAttrs.src = resolvedSrc;
     return newAttrs;
 };
-/**
- * The Image component.
- * @param {ImageProps} props component props
- * @public
- */
-exports.Image = (0, withFieldMetadata_1.withFieldMetadata)((0, withEmptyFieldEditingComponent_1.withEmptyFieldEditingComponent)((_a) => {
-    var { editable = true, imageParams, field, mediaUrlPrefix } = _a, otherProps = __rest(_a, ["editable", "imageParams", "field", "mediaUrlPrefix"]);
+const ImageComponent = (_a) => {
+    var { imageParams, field, mediaUrlPrefix } = _a, otherProps = __rest(_a, ["imageParams", "field", "mediaUrlPrefix"]);
     const dynamicMedia = field;
     if ((0, layout_1.isFieldValueEmpty)(dynamicMedia)) {
         return null;
     }
+    delete otherProps.editable; // prevent editable from being passed to the DOM
     // some wise-guy/gal is passing in a 'raw' image object value
     const img = dynamicMedia.src
         ? field
@@ -67,5 +62,13 @@ exports.Image = (0, withFieldMetadata_1.withFieldMetadata)((0, withEmptyFieldEdi
         return react_1.default.createElement("img", Object.assign({}, attrs));
     }
     return null; // we can't handle the truth
-}, { defaultEmptyFieldEditingComponent: DefaultEmptyFieldEditingComponents_1.DefaultEmptyFieldEditingComponentImage }));
+};
+/**
+ * The Image component.
+ * @param {ImageProps} props component props
+ * @public
+ */
+exports.Image = (0, withFieldMetadata_1.withFieldMetadata)((0, withEmptyFieldEditingComponent_1.withEmptyFieldEditingComponent)(ImageComponent, {
+    defaultEmptyFieldEditingComponent: DefaultEmptyFieldEditingComponents_1.DefaultEmptyFieldEditingComponentImage,
+}));
 exports.Image.displayName = 'Image';

package/dist/cjs/components/Link.js

@@ -1,38 +1,5 @@
 "use strict";
 'use client';
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -44,24 +11,21 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Link = void 0;
-const react_1 = __importStar(require("react"));
-const layout_1 = require("@sitecore-content-sdk/core/layout");
+const react_1 = __importDefault(require("react"));
+const layout_1 = require("@sitecore-content-sdk/content/layout");
 const withFieldMetadata_1 = require("../enhancers/withFieldMetadata");
 const withEmptyFieldEditingComponent_1 = require("../enhancers/withEmptyFieldEditingComponent");
 const DefaultEmptyFieldEditingComponents_1 = require("./DefaultEmptyFieldEditingComponents");
-/**
- * The Link component.
- * @param {LinkProps} props component props
- * @public
- */
-exports.Link = (0, withFieldMetadata_1.withFieldMetadata)((0, withEmptyFieldEditingComponent_1.withEmptyFieldEditingComponent)((0, react_1.forwardRef)(
-// eslint-disable-next-line no-unused-vars
-(_a, ref) => {
-    var { field, editable = true, showLinkTextWithChildrenPresent } = _a, otherProps = __rest(_a, ["field", "editable", "showLinkTextWithChildrenPresent"]);
+const LinkComponent = (_a) => {
+    var { field, showLinkTextWithChildrenPresent, ref } = _a, otherProps = __rest(_a, ["field", "showLinkTextWithChildrenPresent", "ref"]);
     const children = otherProps.children;
     const dynamicField = field;
+    delete otherProps.editable; // prevent editable from being passed to the DOM
     if ((0, layout_1.isFieldValueEmpty)(dynamicField)) {
         return null;
     }
@@ -85,7 +49,16 @@ exports.Link = (0, withFieldMetadata_1.withFieldMetadata)((0, withEmptyFieldEdit
         anchorAttrs.rel = 'noopener noreferrer';
     }
     const linkText = showLinkTextWithChildrenPresent || !children ? link.text || link.href : null;
-    const element = react_1.default.createElement('a', Object.assign(Object.assign(Object.assign({}, anchorAttrs), otherProps), { key: 'link', ref }), linkText, children);
-    return react_1.default.createElement(react_1.default.Fragment, null, element);
-}), { defaultEmptyFieldEditingComponent: DefaultEmptyFieldEditingComponents_1.DefaultEmptyFieldEditingComponentText, isForwardRef: true }), true);
+    return (react_1.default.createElement("a", Object.assign({}, anchorAttrs, otherProps, { key: "link", ref: ref }),
+        linkText,
+        children));
+};
+/**
+ * The Link component.
+ * @param {LinkProps} props component props
+ * @public
+ */
+exports.Link = (0, withFieldMetadata_1.withFieldMetadata)((0, withEmptyFieldEditingComponent_1.withEmptyFieldEditingComponent)(LinkComponent, {
+    defaultEmptyFieldEditingComponent: DefaultEmptyFieldEditingComponents_1.DefaultEmptyFieldEditingComponentText,
+}));
 exports.Link.displayName = 'Link';

package/dist/cjs/components/Placeholder/AppPlaceholder.js

@@ -6,74 +6,72 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppPlaceholder = void 0;
 const placeholder_utils_1 = require("./placeholder-utils");
 const react_1 = __importDefault(require("react"));
-const PlaceholderMetadata_1 = require("./PlaceholderMetadata");
 const ErrorBoundary_1 = __importDefault(require("../ErrorBoundary"));
 const ClientComponentWrapper_1 = require("./ClientComponentWrapper");
 const _rsc_env_1 = require("#rsc-env");
-/**
- * The implemention of placeholder compatible with React Server Components.
- * Renders components from the layout data for the given placeholder name, with consideration for page edit mode.
- * Pulls components from the provided component map.
- * @param {AppPlaceholderProps} props Placeholder props
- * @returns {React.ReactNode | React.ReactElement[]} rendered component(s)
- * @public
- */
-const AppPlaceholder = (props) => {
-    const { rendering: parentRendering, componentMap, page } = props;
-    const placeholderRenderings = (0, placeholder_utils_1.getPlaceholderRenderings)(parentRendering, props.name, page.mode.isEditing);
-    const components = placeholderRenderings
-        .map((rendering, index) => {
-        const { component: Component, isEmpty, componentType, dynamic, } = (0, placeholder_utils_1.getComponentForRendering)(rendering, props.name, componentMap, props.hiddenRenderingComponent, props.missingComponentComponent);
-        const isClient = componentType === 'client';
-        const key = rendering.uid || `component-${index}`;
-        // Use rsc context to determine the current runtime
-        const componentRuntime = _rsc_env_1.rsc ? 'server' : 'client';
-        const renderedProps = (0, placeholder_utils_1.getAppComponentProps)(props, rendering);
-        const finalRenderedProps = props.modifyComponentProps
-            ? props.modifyComponentProps(renderedProps)
-            : renderedProps;
+const PlaceholderMetadata_1 = require("./PlaceholderMetadata");
+const AppPlaceholderComponent = (props) => {
+    const renderingData = props.rendering;
+    const isEditing = props.page.mode.isEditing;
+    const placeholderRenderings = (0, placeholder_utils_1.getPlaceholderRenderings)(renderingData, props.name, isEditing);
+    const isEmpty = !placeholderRenderings.length;
+    const components = getPlaceholderComponents(props, placeholderRenderings);
+    if (isEmpty) {
+        let renderedOutput = components;
+        if (props.renderEmpty) {
+            renderedOutput = props.renderEmpty(components);
+        }
+        return isEditing ? (0, placeholder_utils_1.renderEmptyPlaceholder)(renderedOutput) : renderedOutput;
+    }
+    else if (props.render) {
+        return props.render(components, placeholderRenderings, props);
+    }
+    return components;
+};
+const getPlaceholderComponents = (placeholderProps, placeholderRenderings) => {
+    const { name, rendering, passThroughComponentProps, missingComponentComponent, hiddenRenderingComponent, errorComponent, componentLoadingMessage, renderEach, modifyComponentProps, componentMap, page, } = placeholderProps;
+    const isEditing = page.mode.isEditing;
+    const componentRuntime = _rsc_env_1.rsc ? 'server' : 'client';
+    const transformedComponents = placeholderRenderings
+        .map((componentRendering, index) => {
+        const { component: ChildComponent, isEmpty: componentEmpty, componentType, dynamic, } = (0, placeholder_utils_1.getComponentForRendering)(componentRendering, name, componentMap, hiddenRenderingComponent, missingComponentComponent);
+        const key = componentRendering.uid || `component-${index}`;
+        const renderedProps = modifyComponentProps
+            ? modifyComponentProps((0, placeholder_utils_1.getChildComponentProps)(placeholderProps, componentRendering))
+            : (0, placeholder_utils_1.getChildComponentProps)(placeholderProps, componentRendering);
         // Client wrapper is required only when component crosses boundary from server to client.
         // It happens when component is marker as client and rendered in RSC context.
         // Also, it is not required when component is hidden or empty, as it will be rendered whthout boundary crossing.
-        const useClientWrapper = isClient && _rsc_env_1.rsc && !isEmpty;
-        let rendered = useClientWrapper ? (react_1.default.createElement(ClientComponentWrapper_1.ClientComponentWrapper, { rendering: rendering, componentProps: finalRenderedProps, placeholderName: props.name, key: key })) : (react_1.default.createElement(Component, Object.assign({ key: key }, finalRenderedProps, { rendering: rendering, page: page, componentMap: componentMap })));
-        if (!isEmpty) {
+        const useClientWrapper = componentType === 'client' && _rsc_env_1.rsc && !componentEmpty;
+        let rendered = useClientWrapper ? (react_1.default.createElement(ClientComponentWrapper_1.ClientComponentWrapper, { rendering: renderedProps.rendering, componentProps: Object.assign(Object.assign({}, renderedProps), passThroughComponentProps), placeholderName: name, key: key })) : (react_1.default.createElement(ChildComponent, Object.assign({ key: key }, renderedProps, passThroughComponentProps, { page: page, componentMap: componentMap })));
+        if (renderEach) {
+            rendered = renderEach(rendered, index);
+        }
+        if (!componentEmpty) {
             const errorBoundaryKey = rendered.type + '-' + index;
-            const disableSuspense = props.disableSuspense || false;
-            rendered = (react_1.default.createElement(ErrorBoundary_1.default, { "data-testid": "error-boundary", key: errorBoundaryKey, errorComponent: props.errorComponent, componentLoadingMessage: props.componentLoadingMessage, isDynamic: dynamic, disableSuspense: disableSuspense, rendering: rendered.props.rendering }, rendered));
+            rendered = (react_1.default.createElement(ErrorBoundary_1.default, { "data-testid": "error-boundary", key: errorBoundaryKey, errorComponent: errorComponent, componentLoadingMessage: componentLoadingMessage, isDynamic: dynamic, disableSuspense: placeholderProps.disableSuspense, rendering: rendered.props.rendering }, rendered));
         }
         // if in edit mode then emit shallow chromes for hydration in Pages
-        if (page.mode.isEditing) {
-            const key = rendering.uid || `component-${index}`;
-            return (react_1.default.createElement(PlaceholderMetadata_1.PlaceholderMetadata, { key: key, rendering: rendering, componentRuntime: componentRuntime }, rendered));
-        }
-        return rendered;
+        return isEditing ? (react_1.default.createElement(PlaceholderMetadata_1.PlaceholderMetadata, { key: key, rendering: componentRendering, componentRuntime: componentRuntime }, rendered)) : (rendered);
     })
-        .filter((element) => element);
-    const finalRendering = page.mode.isEditing
-        ? [
-            react_1.default.createElement(PlaceholderMetadata_1.PlaceholderMetadata, { key: parentRendering.uid || 'placeholder-metadata-root', placeholderName: props.name, rendering: parentRendering }, components),
-        ]
-        : components;
-    const placeholderEmpty = !placeholderRenderings.length;
-    if (placeholderEmpty) {
-        const rendered = props.renderEmpty ? props.renderEmpty(finalRendering) : finalRendering;
-        return page.mode.isEditing ? (0, placeholder_utils_1.renderEmptyPlaceholder)(rendered) : rendered;
-    }
-    if (props.render) {
-        return props.render(components, placeholderRenderings, props);
-    }
-    else if (props.renderEach) {
-        const renderEach = props.renderEach;
-        return finalRendering.map((component, index) => {
-            if (component && component.props && component.props.type === 'text/sitecore') {
-                return component;
-            }
-            return renderEach(component, index);
-        });
-    }
-    else {
-        return finalRendering;
+        .filter((element) => element); // remove nulls
+    if (!isEditing) {
+        return transformedComponents;
     }
+    return [
+        react_1.default.createElement(PlaceholderMetadata_1.PlaceholderMetadata, { key: rendering.uid, placeholderName: name, rendering: rendering }, transformedComponents),
+    ];
 };
+/**
+ * The implemention of placeholder compatible with React Server Components.
+ * Renders components from the layout data for the given placeholder name, with consideration for page edit mode.
+ * Pulls components from the provided component map.
+ * @param {AppPlaceholderProps} props Placeholder props
+ * @returns {React.ReactNode | React.ReactElement[]} rendered component(s)
+ * @public
+ */
+const AppPlaceholder = (props) => (
+// Using error boundary for errors that may happen within Placeholder itself
+react_1.default.createElement(ErrorBoundary_1.default, { errorComponent: props.errorComponent },
+    react_1.default.createElement(AppPlaceholderComponent, Object.assign({}, props))));
 exports.AppPlaceholder = AppPlaceholder;

package/dist/cjs/components/Placeholder/ClientComponentWrapper.js

@@ -6,16 +6,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientComponentWrapper = void 0;
 const SitecoreProvider_1 = require("../SitecoreProvider");
-const react_1 = require("react");
-const react_2 = __importDefault(require("react"));
-const withSitecore_1 = require("../../enhancers/withSitecore");
+const react_1 = __importDefault(require("react"));
 const placeholder_utils_1 = require("./placeholder-utils");
 const ClientComponentWrapper = (props) => {
-    const { page } = (0, withSitecore_1.useSitecore)();
-    const componentMap = (0, react_1.useContext)(SitecoreProvider_1.ComponentMapReactContext);
-    const componentPropsWithContext = Object.assign(Object.assign({}, props.componentProps), { rendering: props.rendering, componentMap,
-        page });
-    const { component: Component } = (0, placeholder_utils_1.getComponentForRendering)(props.rendering, props.placeholderName, componentMap);
-    return react_2.default.createElement(Component, Object.assign({}, componentPropsWithContext));
+    const { page, componentMap: clientComponentMap } = (0, SitecoreProvider_1.useSitecore)();
+    const componentPropsWithContext = Object.assign(Object.assign({}, props.componentProps), { rendering: props.rendering, componentMap: clientComponentMap, page });
+    const { component: Component } = (0, placeholder_utils_1.getComponentForRendering)(props.rendering, props.placeholderName, clientComponentMap);
+    return react_1.default.createElement(Component, Object.assign({}, componentPropsWithContext));
 };
 exports.ClientComponentWrapper = ClientComponentWrapper;