@uniformdev/canvas-next-rsc 19.51.1-alpha.1 → 19.51.1-alpha.26

package/dist/client/routeClient.js

@@ -1,4 +1,4 @@
-import { RouteClient } from '@uniformdev/canvas';
+import { CANVAS_EDITOR_STATE, RouteClient } from '@uniformdev/canvas';
 import { isDevelopmentEnvironment } from '../utils/draft';
 import { buildPathTag } from '../utils/tag';
 export const getRouteClient = (options) => {
@@ -18,10 +18,13 @@ export const getRouteClient = (options) => {
                 requestedUrl = new URL(req.url);
             }
             const tags = [];
+            let state;
             if (requestedUrl) {
                 // this is here so this code breaks if parameters change here
                 const pathKey = 'path';
+                const stateKey = 'state';
                 const path = requestedUrl.searchParams.get(pathKey);
+                state = parseInt(requestedUrl.searchParams.get(stateKey) || '', 10);
                 if (path) {
                     // at this point, we do not know if this path is dynamic or not
                     // so apply each segment as a tag so we can clear any segment, ie:
@@ -43,6 +46,10 @@ export const getRouteClient = (options) => {
                 noCache = true;
                 revalidate = undefined;
             }
+            const extraHeaders = {};
+            if (state === CANVAS_EDITOR_STATE) {
+                extraHeaders['x-bypass-cache'] = 'true';
+            }
             return fetch(req, {
                 ...init,
                 cache: noCache ? 'no-cache' : 'force-cache',
@@ -50,6 +57,10 @@ export const getRouteClient = (options) => {
                     revalidate,
                     tags: tags.length ? tags : undefined,
                 },
+                headers: {
+                    ...((init === null || init === void 0 ? void 0 : init.headers) || {}),
+                    ...extraHeaders,
+                },
             });
         },
     });

package/dist/components/UniformComponent.d.ts

@@ -8,6 +8,8 @@ export type CompositionContext = Omit<RouteGetResponseComposition, 'compositionA
         [key: string]: string | undefined;
     } | undefined;
     cookieValue: string | undefined;
+    isDraftMode: boolean;
+    isContextualEditing: boolean;
 };
 export type ComponentProps<TProps = unknown> = TProps & {
     component: ComponentInstance;

package/dist/components/UniformComposition.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { Suspense } from 'react';
+import { isDraftModeEnabled, isIncontextEditingEnabled } from '../utils/draft';
 import { resolveComposition } from './retrieveRoute';
 import { UniformComponent } from './UniformComponent';
 import { UniformProvider } from './UniformContext';
@@ -24,6 +25,10 @@ const UniformCompositionInner = async ({ params, searchParams, update, children,
         path,
         searchParams,
         cookieValue,
+        isDraftMode: isDraftModeEnabled({ searchParams }),
+        isContextualEditing: isIncontextEditingEnabled({
+            searchParams,
+        }),
         ...rest,
     };
     return (_jsxs(UniformProvider, { cookieValue: cookieValue, seenComponents: seenComponents, children: [_jsx(UniformScript, { enabled: isCanvasEditing }), _jsx(UniformComponent, { data: evaluatedComposition, context: context }), Boolean(children) && children] }));

package/dist/components/UniformText.js

@@ -1,7 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { PureUniformText } from '@uniformdev/canvas-react/core';
-import { isIncontextEditingEnabled } from '../utils/draft';
 export const UniformText = ({ context, ...rest }) => {
-    const isEditing = isIncontextEditingEnabled(context);
-    return _jsx(PureUniformText, { ...rest, isContextualEditing: isEditing, skipCustomRendering: isEditing });
+    return (_jsx(PureUniformText, { ...rest, isContextualEditing: context.isContextualEditing, skipCustomRendering: context.isContextualEditing }));
 };

package/dist/components/renderComponent.js

@@ -1,11 +1,11 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { CANVAS_LOCALE_TAG_PARAM, CANVAS_PERSONALIZE_SLOT, CANVAS_PERSONALIZE_TYPE, CANVAS_TEST_SLOT, CANVAS_TEST_TYPE, IN_CONTEXT_EDITOR_COMPONENT_START_ROLE, PLACEHOLDER_ID, } from '@uniformdev/canvas';
+import { CANVAS_LOCALE_TAG_PARAM, CANVAS_PERSONALIZE_SLOT, CANVAS_PERSONALIZE_TYPE, CANVAS_TEST_SLOT, CANVAS_TEST_TYPE, IN_CONTEXT_EDITOR_COMPONENT_START_ROLE, isComponentPlaceholderId, } from '@uniformdev/canvas';
 import { componentStoreResolver } from '../register/componentStoreResolver';
 import { isIncontextEditingEnabled } from '../utils/draft';
 import { convertComponentToProps } from './convertComponentToProps';
 import { UniformComponent } from './UniformComponent';
 export function renderComponent({ component, context, resolveSystem, key = 0, indexInSlot, slotName, parentComponent, slotChildrenCount, emptyPlaceholder, }) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     const RenderComponent = componentStoreResolver(component);
     // custom handling for tests and personalizes
     if (component.type === CANVAS_TEST_TYPE) {
@@ -44,11 +44,9 @@ export function renderComponent({ component, context, resolveSystem, key = 0, in
             context,
         });
         const shouldRenderContextualEditingTags = Boolean(component._id) && isIncontextEditingEnabled(context);
-        const isPlaceholder = component._id === PLACEHOLDER_ID;
-        const isReadOnly = ((_a = component === null || component === void 0 ? void 0 : component._contextualEditing) === null || _a === void 0 ? void 0 : _a.isEditable)
-            ? undefined
-            : 'true';
-        return (_jsx(UniformComponent, { data: component, context: context, children: _jsxs(_Fragment, { children: [!shouldRenderContextualEditingTags ? null : (_jsx("script", { "data-role": IN_CONTEXT_EDITOR_COMPONENT_START_ROLE, "data-parent-id": parentComponent === null || parentComponent === void 0 ? void 0 : parentComponent._id, "data-parent-type": parentComponent === null || parentComponent === void 0 ? void 0 : parentComponent.type, "data-component-id": component._id, "data-slot-name": slotName !== null && slotName !== void 0 ? slotName : '', "data-component-index": indexInSlot !== null && indexInSlot !== void 0 ? indexInSlot : '', "data-total-components": slotChildrenCount !== null && slotChildrenCount !== void 0 ? slotChildrenCount : '', "data-component-name": component.type, "data-is-placeholder": isPlaceholder ? 'true' : undefined, "data-is-localized": ((_b = component.parameters) === null || _b === void 0 ? void 0 : _b[CANVAS_LOCALE_TAG_PARAM]) ? 'true' : undefined, "data-component-title": (_e = (_d = (_c = component.parameters) === null || _c === void 0 ? void 0 : _c.title) === null || _d === void 0 ? void 0 : _d.value) !== null && _e !== void 0 ? _e : '', "data-is-readonly": isReadOnly }, key)), isPlaceholder && emptyPlaceholder !== undefined ? (emptyPlaceholder) : (_jsx(RenderComponent, { ...props })), !shouldRenderContextualEditingTags ? null : _jsx("script", { "data-role": "component-end" })] }) }, key));
+        const isPlaceholder = isComponentPlaceholderId(component._id);
+        const isReadOnly = false;
+        return (_jsx(UniformComponent, { data: component, context: context, children: _jsxs(_Fragment, { children: [!shouldRenderContextualEditingTags ? null : (_jsx("script", { "data-role": IN_CONTEXT_EDITOR_COMPONENT_START_ROLE, "data-parent-id": parentComponent === null || parentComponent === void 0 ? void 0 : parentComponent._id, "data-parent-type": parentComponent === null || parentComponent === void 0 ? void 0 : parentComponent.type, "data-component-id": component._id, "data-slot-name": slotName !== null && slotName !== void 0 ? slotName : '', "data-component-index": indexInSlot !== null && indexInSlot !== void 0 ? indexInSlot : '', "data-total-components": slotChildrenCount !== null && slotChildrenCount !== void 0 ? slotChildrenCount : '', "data-component-name": component.type, "data-is-placeholder": isPlaceholder ? 'true' : undefined, "data-is-localized": ((_a = component.parameters) === null || _a === void 0 ? void 0 : _a[CANVAS_LOCALE_TAG_PARAM]) ? 'true' : undefined, "data-component-title": (_d = (_c = (_b = component.parameters) === null || _b === void 0 ? void 0 : _b.title) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : '', "data-is-readonly": isReadOnly }, key)), isPlaceholder && emptyPlaceholder !== undefined ? (emptyPlaceholder) : (_jsx(RenderComponent, { ...props })), !shouldRenderContextualEditingTags ? null : _jsx("script", { "data-role": "component-end" })] }) }, key));
     }
     return null;
 }

package/dist/utils/draft.js

@@ -6,16 +6,13 @@ export const isDraftModeEnabled = ({ searchParams, }) => {
     if (isDevelopmentEnvironment()) {
         return isIncontextEditingEnabled({ searchParams });
     }
-    return draftMode().isEnabled;
+    return draftMode().isEnabled || isIncontextEditingEnabled({ searchParams });
 };
 export const isIncontextEditingEnabled = ({ searchParams, }) => {
-    // workaround for this https://github.com/vercel/next.js/issues/49927, as draftMode() is not working in dev mode
-    // so we just need to check if the query string contains the IN_CONTEXT_EDITOR_QUERY_STRING_PARAM blindly
-    if (isDevelopmentEnvironment() || draftMode().isEnabled) {
-        const containsKey = typeof (searchParams === null || searchParams === void 0 ? void 0 : searchParams[IN_CONTEXT_EDITOR_QUERY_STRING_PARAM]) !== 'undefined';
-        return containsKey;
-    }
-    return false;
+    // todo (adaml): draft mode can't be trusted in edge mode, consider in context editing if query string
+    // is present: https://github.com/vercel/next.js/issues/52080
+    const containsKey = typeof (searchParams === null || searchParams === void 0 ? void 0 : searchParams[IN_CONTEXT_EDITOR_QUERY_STRING_PARAM]) !== 'undefined';
+    return containsKey;
 };
 export const isOnVercelPreviewEnvironment = () => {
     return process.env.VERCEL_ENV === 'preview';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next-rsc",
-  "version": "19.51.1-alpha.1+e55ae6c1e",
+  "version": "19.51.1-alpha.26+87b6d6f43",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "dev": "tsc --watch",
@@ -55,13 +55,13 @@
     "react-dom": "18.2.0"
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.51.1-alpha.1+e55ae6c1e",
-    "@uniformdev/canvas-react": "19.51.1-alpha.1+e55ae6c1e",
-    "@uniformdev/context": "19.51.1-alpha.1+e55ae6c1e",
-    "@uniformdev/project-map": "19.51.1-alpha.1+e55ae6c1e",
-    "@uniformdev/redirect": "19.51.1-alpha.1+e55ae6c1e",
-    "@uniformdev/richtext": "19.51.1-alpha.1+e55ae6c1e",
-    "@uniformdev/webhooks": "19.51.1-alpha.1+e55ae6c1e",
+    "@uniformdev/canvas": "19.51.1-alpha.26+87b6d6f43",
+    "@uniformdev/canvas-react": "19.51.1-alpha.26+87b6d6f43",
+    "@uniformdev/context": "19.51.1-alpha.26+87b6d6f43",
+    "@uniformdev/project-map": "19.51.1-alpha.26+87b6d6f43",
+    "@uniformdev/redirect": "19.51.1-alpha.26+87b6d6f43",
+    "@uniformdev/richtext": "19.51.1-alpha.26+87b6d6f43",
+    "@uniformdev/webhooks": "19.51.1-alpha.26+87b6d6f43",
     "@vercel/edge-config": "^0.2.0",
     "dequal": "^2.0.3",
     "js-cookie": "^3.0.5",
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e55ae6c1ea8df19f04a9dba22769d76e16d28d70"
+  "gitHead": "87b6d6f43ac5ed3bf05fbdba51dc239e04601dd1"
 }