@uniformdev/canvas-next-rsc 19.208.0 → 19.209.1

package/dist/{UniformComposition-B8budr-b.d.mts → UniformComposition-IWWzoI_H.d.mts}

@@ -28,11 +28,22 @@ type UniformCompositionProps = PageParameters & {
      * Function to map composition components to React components.
      */
     resolveComponent: ResolveComponentFunction;
+    /**
+     * Function to map empty placeholders to React components.
+     */
+    resolveEmptyPlaceholder?: ResolveEmptyPlaceholderFunction;
 } & (UniformStaticCompositionProps | UniformServerCompositionProps);
 declare const UniformComposition: React.FC<UniformCompositionProps>;
 type ResolveComponentFunction = (options: {
     component: ComponentInstance;
 }) => ResolveComponentResult;
+type ResolveEmptyPlaceholderFunction = (options: ResolveEmptyPlaceholderOptions) => ResolveEmptyPlaceholderResult;
+type ResolveEmptyPlaceholderOptions = {
+    parentComponent: ComponentInstance | undefined;
+    component: ComponentInstance;
+    slotName: string;
+    slotIndex: number;
+};
 type ResolveComponentResult = {
     component: ComponentType<ComponentProps<any, any>> | null;
     includeContext?: boolean;
@@ -40,6 +51,9 @@ type ResolveComponentResult = {
         fallback: ComponentType<any> | undefined;
     };
 };
+type ResolveEmptyPlaceholderResult = {
+    component: ComponentType<ComponentProps<any, any>> | null;
+};
 declare const resolveComposition: (props: Omit<ResolveComponentsOptions, "slotName" | "slotIndex" | "target"> & {
     composition: ComponentInstance;
     compositionContext: CompositionContext;
@@ -60,6 +74,7 @@ type ResolveComponentsOptions = {
     slotName: string | undefined;
     slotIndex: number | undefined;
     resolveComponent: ResolveComponentFunction;
+    resolveEmptyPlaceholder: ResolveEmptyPlaceholderFunction | undefined;
     compositionContext: CompositionContext;
     mode: UniformCompositionProps['mode'];
 };

package/dist/{UniformComposition-B8budr-b.d.ts → UniformComposition-IWWzoI_H.d.ts}

@@ -28,11 +28,22 @@ type UniformCompositionProps = PageParameters & {
      * Function to map composition components to React components.
      */
     resolveComponent: ResolveComponentFunction;
+    /**
+     * Function to map empty placeholders to React components.
+     */
+    resolveEmptyPlaceholder?: ResolveEmptyPlaceholderFunction;
 } & (UniformStaticCompositionProps | UniformServerCompositionProps);
 declare const UniformComposition: React.FC<UniformCompositionProps>;
 type ResolveComponentFunction = (options: {
     component: ComponentInstance;
 }) => ResolveComponentResult;
+type ResolveEmptyPlaceholderFunction = (options: ResolveEmptyPlaceholderOptions) => ResolveEmptyPlaceholderResult;
+type ResolveEmptyPlaceholderOptions = {
+    parentComponent: ComponentInstance | undefined;
+    component: ComponentInstance;
+    slotName: string;
+    slotIndex: number;
+};
 type ResolveComponentResult = {
     component: ComponentType<ComponentProps<any, any>> | null;
     includeContext?: boolean;
@@ -40,6 +51,9 @@ type ResolveComponentResult = {
         fallback: ComponentType<any> | undefined;
     };
 };
+type ResolveEmptyPlaceholderResult = {
+    component: ComponentType<ComponentProps<any, any>> | null;
+};
 declare const resolveComposition: (props: Omit<ResolveComponentsOptions, "slotName" | "slotIndex" | "target"> & {
     composition: ComponentInstance;
     compositionContext: CompositionContext;
@@ -60,6 +74,7 @@ type ResolveComponentsOptions = {
     slotName: string | undefined;
     slotIndex: number | undefined;
     resolveComponent: ResolveComponentFunction;
+    resolveEmptyPlaceholder: ResolveEmptyPlaceholderFunction | undefined;
     compositionContext: CompositionContext;
     mode: UniformCompositionProps['mode'];
 };

package/dist/component.d.mts

@@ -1,7 +1,7 @@
 import { ComponentProps, CompositionContext, SlotDefinition } from '@uniformdev/canvas-next-rsc-shared';
 export { ComponentProps, CompositionContext } from '@uniformdev/canvas-next-rsc-shared';
 import React__default, { PropsWithChildren, ReactNode, Key } from 'react';
-export { R as ResolveComponentFunction, a as ResolveComponentResult } from './UniformComposition-B8budr-b.mjs';
+export { R as ResolveComponentFunction, a as ResolveComponentResult } from './UniformComposition-IWWzoI_H.mjs';
 import { ComponentInstance } from '@uniformdev/canvas';
 import { RichTextNode } from '@uniformdev/richtext';
 import { PureUniformTextProps } from '@uniformdev/canvas-react/core';

package/dist/component.d.ts

@@ -1,7 +1,7 @@
 import { ComponentProps, CompositionContext, SlotDefinition } from '@uniformdev/canvas-next-rsc-shared';
 export { ComponentProps, CompositionContext } from '@uniformdev/canvas-next-rsc-shared';
 import React__default, { PropsWithChildren, ReactNode, Key } from 'react';
-export { R as ResolveComponentFunction, a as ResolveComponentResult } from './UniformComposition-B8budr-b.js';
+export { R as ResolveComponentFunction, a as ResolveComponentResult } from './UniformComposition-IWWzoI_H.js';
 import { ComponentInstance } from '@uniformdev/canvas';
 import { RichTextNode } from '@uniformdev/richtext';
 import { PureUniformTextProps } from '@uniformdev/canvas-react/core';

package/dist/index.d.mts

@@ -5,8 +5,8 @@ import { ManifestClient } from '@uniformdev/context/api';
 import { ProjectMapClient, ProjectMapNode } from '@uniformdev/project-map';
 import { ContextState, ContextOptions } from '@uniformdev/context';
 import React__default, { PropsWithChildren } from 'react';
-import { U as UniformCompositionProps } from './UniformComposition-B8budr-b.mjs';
-export { b as UniformComposition, r as resolveComposition } from './UniformComposition-B8budr-b.mjs';
+import { U as UniformCompositionProps } from './UniformComposition-IWWzoI_H.mjs';
+export { b as UniformComposition, r as resolveComposition } from './UniformComposition-IWWzoI_H.mjs';
 import { ClientContextComponent } from '@uniformdev/canvas-next-rsc-client';
 
 type GetCanvasClientOptions = {

package/dist/index.d.ts

@@ -5,8 +5,8 @@ import { ManifestClient } from '@uniformdev/context/api';
 import { ProjectMapClient, ProjectMapNode } from '@uniformdev/project-map';
 import { ContextState, ContextOptions } from '@uniformdev/context';
 import React__default, { PropsWithChildren } from 'react';
-import { U as UniformCompositionProps } from './UniformComposition-B8budr-b.js';
-export { b as UniformComposition, r as resolveComposition } from './UniformComposition-B8budr-b.js';
+import { U as UniformCompositionProps } from './UniformComposition-IWWzoI_H.js';
+export { b as UniformComposition, r as resolveComposition } from './UniformComposition-IWWzoI_H.js';
 import { ClientContextComponent } from '@uniformdev/canvas-next-rsc-client';
 
 type GetCanvasClientOptions = {

package/dist/index.esm.js

@@ -419,6 +419,7 @@ async function generateStaticParams() {
 
 // src/components/UniformComposition.ts
 import {
+  CANVAS_CONTEXTUAL_EDITING_PARAM,
   CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE2,
   CANVAS_EDITOR_STATE as CANVAS_EDITOR_STATE2,
   CANVAS_ENRICHMENT_TAG_PARAM,
@@ -753,6 +754,7 @@ var VisibilityRulesWrapper = (props) => {
 // src/components/UniformComposition.ts
 var UniformComposition = async ({
   resolveComponent,
+  resolveEmptyPlaceholder,
   route,
   ...props
 }) => {
@@ -777,13 +779,16 @@ var UniformComposition = async ({
   const state = route.compositionApiResponse.state;
   if (state === CANVAS_DRAFT_STATE2 || state === CANVAS_EDITOR_STATE2) {
     walkNodeTree(route.compositionApiResponse.composition, (node) => {
+      var _a, _b;
       if (node.type === "component" && node.node.parameters) {
+        const contextualEditing = node.node.parameters[CANVAS_CONTEXTUAL_EDITING_PARAM];
+        const editableFields = (_b = (_a = contextualEditing == null ? void 0 : contextualEditing.value) == null ? void 0 : _a.editableParameters) != null ? _b : [];
         Object.keys(node.node.parameters).forEach((key) => {
           const parameter = node.node.parameters[key];
           if (parameter.type === "text") {
             const contextualParameter = parameter;
             contextualParameter._contextualEditing = {
-              isEditable: true
+              isEditable: editableFields.includes(key)
             };
           }
         });
@@ -807,7 +812,8 @@ var UniformComposition = async ({
     resolveComponent,
     serverContext,
     compositionContext,
-    mode: props.mode
+    mode: props.mode,
+    resolveEmptyPlaceholder
   });
   let transfer = null;
   if (props.mode === "server") {
@@ -880,6 +886,7 @@ var resolveSlots = ({
   component,
   root,
   resolveComponent,
+  resolveEmptyPlaceholder,
   serverContext,
   compositionContext,
   mode
@@ -899,7 +906,8 @@ var resolveSlots = ({
         resolveComponent,
         serverContext,
         compositionContext,
-        mode
+        mode,
+        resolveEmptyPlaceholder
       });
       if (resolved) {
         slots[slotName] = {
@@ -930,6 +938,7 @@ var resolveComponents = ({
   slotName,
   slotIndex,
   resolveComponent,
+  resolveEmptyPlaceholder,
   compositionContext,
   mode
 }) => {
@@ -955,11 +964,29 @@ var resolveComponents = ({
       component,
       server: isServer
     });
+    const isPlaceholder = isComponentPlaceholderId(component == null ? void 0 : component._id);
+    let resolveResult = null;
+    if (isPlaceholder && resolveEmptyPlaceholder) {
+      const resolvedPlaceholder = resolveEmptyPlaceholder({
+        parentComponent: parent,
+        component,
+        slotName,
+        slotIndex: componentIndex
+      });
+      if (resolvedPlaceholder) {
+        resolveResult = {
+          component: resolvedPlaceholder.component
+        };
+      }
+    }
+    if (!resolveResult) {
+      resolveResult = resolveComponent({ component });
+    }
     const {
       component: regularComponent,
       includeContext,
       suspense: componentSuspense
-    } = resolveComponent({ component }) || {
+    } = resolveResult || {
       component: null
     };
     if (!systemComponent && !regularComponent) {
@@ -971,6 +998,7 @@ var resolveComponents = ({
       resolveComponent,
       serverContext,
       compositionContext,
+      resolveEmptyPlaceholder,
       mode
     });
     const resolvedComponent = systemComponent || regularComponent;
@@ -1020,13 +1048,13 @@ var resolveComponents = ({
       if (tagElement) {
         elements.push(tagElement);
       }
-      const isPlaceholder = isComponentPlaceholderId(component == null ? void 0 : component._id);
-      if (!isPlaceholder || compositionContext.previewMode === "editor") {
+      const isPlaceholder2 = isComponentPlaceholderId(component == null ? void 0 : component._id);
+      if (!isPlaceholder2 || compositionContext.previewMode === "editor") {
         childNode = createElement3(
           PureContextualEditingComponentWrapper,
           {
             key: `${slotName}-${componentIndex}-wrapper`,
-            isPlaceholder,
+            isPlaceholder: isPlaceholder2,
             parentComponent: parent,
             component,
             slotName,

package/dist/index.js

@@ -780,6 +780,7 @@ var VisibilityRulesWrapper = (props) => {
 // src/components/UniformComposition.ts
 var UniformComposition = async ({
   resolveComponent,
+  resolveEmptyPlaceholder,
   route,
   ...props
 }) => {
@@ -804,13 +805,16 @@ var UniformComposition = async ({
   const state = route.compositionApiResponse.state;
   if (state === import_canvas8.CANVAS_DRAFT_STATE || state === import_canvas8.CANVAS_EDITOR_STATE) {
     (0, import_canvas8.walkNodeTree)(route.compositionApiResponse.composition, (node) => {
+      var _a, _b;
       if (node.type === "component" && node.node.parameters) {
+        const contextualEditing = node.node.parameters[import_canvas8.CANVAS_CONTEXTUAL_EDITING_PARAM];
+        const editableFields = (_b = (_a = contextualEditing == null ? void 0 : contextualEditing.value) == null ? void 0 : _a.editableParameters) != null ? _b : [];
         Object.keys(node.node.parameters).forEach((key) => {
           const parameter = node.node.parameters[key];
           if (parameter.type === "text") {
             const contextualParameter = parameter;
             contextualParameter._contextualEditing = {
-              isEditable: true
+              isEditable: editableFields.includes(key)
             };
           }
         });
@@ -834,7 +838,8 @@ var UniformComposition = async ({
     resolveComponent,
     serverContext,
     compositionContext,
-    mode: props.mode
+    mode: props.mode,
+    resolveEmptyPlaceholder
   });
   let transfer = null;
   if (props.mode === "server") {
@@ -907,6 +912,7 @@ var resolveSlots = ({
   component,
   root,
   resolveComponent,
+  resolveEmptyPlaceholder,
   serverContext,
   compositionContext,
   mode
@@ -926,7 +932,8 @@ var resolveSlots = ({
         resolveComponent,
         serverContext,
         compositionContext,
-        mode
+        mode,
+        resolveEmptyPlaceholder
       });
       if (resolved) {
         slots[slotName] = {
@@ -957,6 +964,7 @@ var resolveComponents = ({
   slotName,
   slotIndex,
   resolveComponent,
+  resolveEmptyPlaceholder,
   compositionContext,
   mode
 }) => {
@@ -982,11 +990,29 @@ var resolveComponents = ({
       component,
       server: isServer
     });
+    const isPlaceholder = (0, import_canvas8.isComponentPlaceholderId)(component == null ? void 0 : component._id);
+    let resolveResult = null;
+    if (isPlaceholder && resolveEmptyPlaceholder) {
+      const resolvedPlaceholder = resolveEmptyPlaceholder({
+        parentComponent: parent,
+        component,
+        slotName,
+        slotIndex: componentIndex
+      });
+      if (resolvedPlaceholder) {
+        resolveResult = {
+          component: resolvedPlaceholder.component
+        };
+      }
+    }
+    if (!resolveResult) {
+      resolveResult = resolveComponent({ component });
+    }
     const {
       component: regularComponent,
       includeContext,
       suspense: componentSuspense
-    } = resolveComponent({ component }) || {
+    } = resolveResult || {
       component: null
     };
     if (!systemComponent && !regularComponent) {
@@ -998,6 +1024,7 @@ var resolveComponents = ({
       resolveComponent,
       serverContext,
       compositionContext,
+      resolveEmptyPlaceholder,
       mode
     });
     const resolvedComponent = systemComponent || regularComponent;
@@ -1047,13 +1074,13 @@ var resolveComponents = ({
       if (tagElement) {
         elements.push(tagElement);
       }
-      const isPlaceholder = (0, import_canvas8.isComponentPlaceholderId)(component == null ? void 0 : component._id);
-      if (!isPlaceholder || compositionContext.previewMode === "editor") {
+      const isPlaceholder2 = (0, import_canvas8.isComponentPlaceholderId)(component == null ? void 0 : component._id);
+      if (!isPlaceholder2 || compositionContext.previewMode === "editor") {
         childNode = (0, import_react10.createElement)(
           import_core.PureContextualEditingComponentWrapper,
           {
             key: `${slotName}-${componentIndex}-wrapper`,
-            isPlaceholder,
+            isPlaceholder: isPlaceholder2,
             parentComponent: parent,
             component,
             slotName,

package/dist/index.mjs

@@ -419,6 +419,7 @@ async function generateStaticParams() {
 
 // src/components/UniformComposition.ts
 import {
+  CANVAS_CONTEXTUAL_EDITING_PARAM,
   CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE2,
   CANVAS_EDITOR_STATE as CANVAS_EDITOR_STATE2,
   CANVAS_ENRICHMENT_TAG_PARAM,
@@ -753,6 +754,7 @@ var VisibilityRulesWrapper = (props) => {
 // src/components/UniformComposition.ts
 var UniformComposition = async ({
   resolveComponent,
+  resolveEmptyPlaceholder,
   route,
   ...props
 }) => {
@@ -777,13 +779,16 @@ var UniformComposition = async ({
   const state = route.compositionApiResponse.state;
   if (state === CANVAS_DRAFT_STATE2 || state === CANVAS_EDITOR_STATE2) {
     walkNodeTree(route.compositionApiResponse.composition, (node) => {
+      var _a, _b;
       if (node.type === "component" && node.node.parameters) {
+        const contextualEditing = node.node.parameters[CANVAS_CONTEXTUAL_EDITING_PARAM];
+        const editableFields = (_b = (_a = contextualEditing == null ? void 0 : contextualEditing.value) == null ? void 0 : _a.editableParameters) != null ? _b : [];
         Object.keys(node.node.parameters).forEach((key) => {
           const parameter = node.node.parameters[key];
           if (parameter.type === "text") {
             const contextualParameter = parameter;
             contextualParameter._contextualEditing = {
-              isEditable: true
+              isEditable: editableFields.includes(key)
             };
           }
         });
@@ -807,7 +812,8 @@ var UniformComposition = async ({
     resolveComponent,
     serverContext,
     compositionContext,
-    mode: props.mode
+    mode: props.mode,
+    resolveEmptyPlaceholder
   });
   let transfer = null;
   if (props.mode === "server") {
@@ -880,6 +886,7 @@ var resolveSlots = ({
   component,
   root,
   resolveComponent,
+  resolveEmptyPlaceholder,
   serverContext,
   compositionContext,
   mode
@@ -899,7 +906,8 @@ var resolveSlots = ({
         resolveComponent,
         serverContext,
         compositionContext,
-        mode
+        mode,
+        resolveEmptyPlaceholder
       });
       if (resolved) {
         slots[slotName] = {
@@ -930,6 +938,7 @@ var resolveComponents = ({
   slotName,
   slotIndex,
   resolveComponent,
+  resolveEmptyPlaceholder,
   compositionContext,
   mode
 }) => {
@@ -955,11 +964,29 @@ var resolveComponents = ({
       component,
       server: isServer
     });
+    const isPlaceholder = isComponentPlaceholderId(component == null ? void 0 : component._id);
+    let resolveResult = null;
+    if (isPlaceholder && resolveEmptyPlaceholder) {
+      const resolvedPlaceholder = resolveEmptyPlaceholder({
+        parentComponent: parent,
+        component,
+        slotName,
+        slotIndex: componentIndex
+      });
+      if (resolvedPlaceholder) {
+        resolveResult = {
+          component: resolvedPlaceholder.component
+        };
+      }
+    }
+    if (!resolveResult) {
+      resolveResult = resolveComponent({ component });
+    }
     const {
       component: regularComponent,
       includeContext,
       suspense: componentSuspense
-    } = resolveComponent({ component }) || {
+    } = resolveResult || {
       component: null
     };
     if (!systemComponent && !regularComponent) {
@@ -971,6 +998,7 @@ var resolveComponents = ({
       resolveComponent,
       serverContext,
       compositionContext,
+      resolveEmptyPlaceholder,
       mode
     });
     const resolvedComponent = systemComponent || regularComponent;
@@ -1020,13 +1048,13 @@ var resolveComponents = ({
       if (tagElement) {
         elements.push(tagElement);
       }
-      const isPlaceholder = isComponentPlaceholderId(component == null ? void 0 : component._id);
-      if (!isPlaceholder || compositionContext.previewMode === "editor") {
+      const isPlaceholder2 = isComponentPlaceholderId(component == null ? void 0 : component._id);
+      if (!isPlaceholder2 || compositionContext.previewMode === "editor") {
         childNode = createElement3(
           PureContextualEditingComponentWrapper,
           {
             key: `${slotName}-${componentIndex}-wrapper`,
-            isPlaceholder,
+            isPlaceholder: isPlaceholder2,
             parentComponent: parent,
             component,
             slotName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next-rsc",
-  "version": "19.208.0",
+  "version": "19.209.1",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
@@ -61,15 +61,15 @@
     "react-dom": "18.3.1"
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.208.0",
-    "@uniformdev/canvas-next-rsc-client": "^19.208.0",
-    "@uniformdev/canvas-next-rsc-shared": "^19.208.0",
-    "@uniformdev/canvas-react": "19.208.0",
-    "@uniformdev/context": "19.208.0",
-    "@uniformdev/project-map": "19.208.0",
-    "@uniformdev/redirect": "19.208.0",
-    "@uniformdev/richtext": "19.208.0",
-    "@uniformdev/webhooks": "19.208.0",
+    "@uniformdev/canvas": "19.209.1",
+    "@uniformdev/canvas-next-rsc-client": "^19.209.1",
+    "@uniformdev/canvas-next-rsc-shared": "^19.209.1",
+    "@uniformdev/canvas-react": "19.209.1",
+    "@uniformdev/context": "19.209.1",
+    "@uniformdev/project-map": "19.209.1",
+    "@uniformdev/redirect": "19.209.1",
+    "@uniformdev/richtext": "19.209.1",
+    "@uniformdev/webhooks": "19.209.1",
     "@vercel/edge-config": "^0.4.0",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
@@ -86,5 +86,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9b96344a84cc37c1c54f9164b89ca7697611a2c0"
+  "gitHead": "4dd40ad208d31d9c446a01434e804a0d47a562a9"
 }