@amplifyup/sdk 0.1.55 → 0.1.57

package/dist/react.d.mts

@@ -90,8 +90,8 @@ declare function Field(props: {
     /** Field value from your component props. Do not also pass `name`. */
     value?: unknown;
     /**
-     * @deprecated Will be removed. Use `value={…}` instead and omit `name`.
-     * Do not pass `name` together with `value`.
+     * @deprecated Prefer `value={…}`. Still used as the Composer save key when
+     * the same value appears on more than one prop.
      */
     name?: string;
     fallback?: ReactNode;
@@ -120,8 +120,8 @@ declare function RichText(props: {
     /** Markdown (or HTML) string from your component props. Do not also pass `name`. */
     value?: string | null;
     /**
-     * @deprecated Will be removed. Use `value={…}` (or string children) and omit `name`.
-     * Do not pass `name` together with `value`.
+     * @deprecated Prefer `value={…}`. Still used as the Composer save key when
+     * the same value appears on more than one prop.
      */
     name?: string;
     fallback?: ReactNode;

package/dist/react.d.ts

@@ -90,8 +90,8 @@ declare function Field(props: {
     /** Field value from your component props. Do not also pass `name`. */
     value?: unknown;
     /**
-     * @deprecated Will be removed. Use `value={…}` instead and omit `name`.
-     * Do not pass `name` together with `value`.
+     * @deprecated Prefer `value={…}`. Still used as the Composer save key when
+     * the same value appears on more than one prop.
      */
     name?: string;
     fallback?: ReactNode;
@@ -120,8 +120,8 @@ declare function RichText(props: {
     /** Markdown (or HTML) string from your component props. Do not also pass `name`. */
     value?: string | null;
     /**
-     * @deprecated Will be removed. Use `value={…}` (or string children) and omit `name`.
-     * Do not pass `name` together with `value`.
+     * @deprecated Prefer `value={…}`. Still used as the Composer save key when
+     * the same value appears on more than one prop.
      */
     name?: string;
     fallback?: ReactNode;

package/dist/react.js

@@ -2815,7 +2815,7 @@ Available Console Commands:
     if (typeof document === "undefined") return;
     this.teardownComposerDragDrop();
     const slotSelector = "[data-slot-id], [data-amplifyup-slot]";
-    const componentSelector = "[data-amplifyup-component], [data-component-id]";
+    const componentSelector = "[data-amplifyup-component], [data-component-id], [data-amplifyup-node], [data-node-id]";
     const clearDragOverState = () => {
       this.clearComposerDragHighlight();
     };
@@ -2864,6 +2864,7 @@ Available Console Commands:
       if (!target?.closest) return;
       const component = target.closest(componentSelector);
       const slot = target.closest(slotSelector);
+      const pageSlot = slot && slot.getAttribute("data-slot-source") === "page" ? slot : null;
       if (this.highlightComponentsEnabled && component) {
         if (!component.classList.contains("amplifyup-component-hover")) {
           clearComponentHover();
@@ -2875,7 +2876,7 @@ Available Console Commands:
         return;
       }
       clearComponentHover();
-      if (this.showZonesEnabled && slot) {
+      if (this.showZonesEnabled && slot && !pageSlot) {
         if (!slot.classList.contains("amplifyup-slot-hover")) {
           clearSlotHover();
           slot.classList.add("amplifyup-slot-hover");
@@ -3005,16 +3006,18 @@ Available Console Commands:
     const lines = [];
     if (highlightComponents) {
       lines.push(
-        "[data-amplifyup-component], [data-component-id] {",
+        "[data-amplifyup-component], [data-component-id], [data-amplifyup-node], [data-node-id] {",
         "  cursor: pointer !important;",
         "}",
-        "[data-amplifyup-component].amplifyup-selected, [data-component-id].amplifyup-selected {",
+        "[data-amplifyup-component].amplifyup-selected, [data-component-id].amplifyup-selected, [data-amplifyup-node].amplifyup-selected, [data-node-id].amplifyup-selected {",
         `  outline: 2px solid ${primary} !important;`,
         "  outline-offset: -2px !important;",
         "  box-shadow: inset 0 0 0 1px hsl(82 100% 52% / 0.25) !important;",
         "}",
         "[data-amplifyup-component].amplifyup-component-hover:not(.amplifyup-selected),",
-        "[data-component-id].amplifyup-component-hover:not(.amplifyup-selected) {",
+        "[data-component-id].amplifyup-component-hover:not(.amplifyup-selected),",
+        "[data-amplifyup-node].amplifyup-component-hover:not(.amplifyup-selected),",
+        "[data-node-id].amplifyup-component-hover:not(.amplifyup-selected) {",
         `  outline: 2px solid ${primary} !important;`,
         "  outline-offset: -2px !important;",
         "}"
@@ -3217,7 +3220,7 @@ Available Console Commands:
     let current = element;
     let sawPageSlot = false;
     while (current) {
-      if (current.hasAttribute("data-amplifyup-component") || current.hasAttribute("data-component-id") || current.hasAttribute("data-amplifyup-slot") || current.hasAttribute("data-slot-id")) {
+      if (current.hasAttribute("data-amplifyup-component") || current.hasAttribute("data-component-id") || current.hasAttribute("data-amplifyup-slot") || current.hasAttribute("data-slot-id") || current.hasAttribute("data-node-id") || current.hasAttribute("data-amplifyup-node")) {
         hierarchy.push(current);
         if (current.getAttribute("data-slot-source") === "page") {
           sawPageSlot = true;
@@ -3242,13 +3245,14 @@ Available Console Commands:
     const componentId = element.getAttribute("data-amplifyup-component") || element.getAttribute("data-component-id");
     const slotName = componentId ? null : element.getAttribute("data-amplifyup-slot") || element.getAttribute("data-slot-id");
     const componentName = element.getAttribute("data-component-name");
+    const nodeId = element.getAttribute("data-node-id") || element.closest("[data-node-id]")?.getAttribute("data-node-id") || null;
     const hierarchyInfo = hierarchy.map((el, index) => {
       const elComponentId = el.getAttribute("data-amplifyup-component") || el.getAttribute("data-component-id");
       const elSlotName = el.getAttribute("data-amplifyup-slot") || el.getAttribute("data-slot-id");
       const elComponentName = el.getAttribute("data-component-name");
       const isSlot = !elComponentId && !!elSlotName;
       const isPageSlot = isSlot && el.getAttribute("data-slot-source") === "page";
-      const nodeId = el.getAttribute("data-node-id") || (isSlot ? el.getAttribute("data-parent-node-id") : null);
+      const nodeId2 = el.getAttribute("data-node-id") || (isSlot ? el.getAttribute("data-parent-node-id") : null);
       return {
         index,
         componentId: elComponentId,
@@ -3256,7 +3260,7 @@ Available Console Commands:
         slotName: isSlot ? elSlotName : null,
         isSlot,
         isPageSlot,
-        nodeId
+        nodeId: nodeId2
       };
     });
     const rect = element.getBoundingClientRect ? element.getBoundingClientRect() : null;
@@ -3266,6 +3270,7 @@ Available Console Commands:
       componentId,
       componentName,
       slotName,
+      nodeId,
       hierarchy: hierarchyInfo,
       selectedIndex: hierarchy.length - 1,
       ...bounds && { bounds },
@@ -3295,22 +3300,27 @@ Available Console Commands:
     }
     const doc = document;
     if (highlightComponents) {
-      const componentElements = doc.querySelectorAll("[data-amplifyup-component], [data-component-id]");
+      const componentElements = doc.querySelectorAll(
+        "[data-amplifyup-component], [data-component-id], [data-amplifyup-node], [data-node-id]"
+      );
       console.log("[AmplifyUp SDK] Found", componentElements.length, "components to highlight");
       componentElements.forEach((el) => {
         const htmlEl = el;
         const componentId = htmlEl.getAttribute("data-amplifyup-component") || htmlEl.getAttribute("data-component-id");
-        if (!componentId) return;
+        const isLayoutNode = htmlEl.hasAttribute("data-node-id") || htmlEl.hasAttribute("data-amplifyup-node");
+        if (!componentId && !isLayoutNode) return;
         if (htmlEl.classList.contains("amplifyup-component-highlight")) return;
-        const component = this.componentRegistry.find((c) => c.component_id === componentId);
+        const component = componentId ? this.componentRegistry.find((c) => c.component_id === componentId) : void 0;
         htmlEl.classList.add("amplifyup-component-highlight");
-        htmlEl.setAttribute("data-component-id", componentId);
-        htmlEl.setAttribute("data-component-name", component?.component_name || componentId);
+        if (componentId) {
+          htmlEl.setAttribute("data-component-id", componentId);
+          htmlEl.setAttribute("data-component-name", component?.component_name || componentId);
+        }
         const hierarchy = this.buildComponentHierarchy(htmlEl);
         const handleClick = (e) => {
           e.stopPropagation();
           this.sendSelectionMessage(htmlEl, hierarchy);
-          if (window.parent && window.parent !== window) {
+          if (componentId && window.parent && window.parent !== window) {
             window.parent.postMessage({ type: "CHECK_COMPONENT_DELETABLE", componentId }, "*");
           }
         };
@@ -3351,6 +3361,15 @@ Available Console Commands:
         htmlEl.classList.add("amplifyup-slot-highlight");
         const hierarchy = this.buildComponentHierarchy(htmlEl);
         const handleClick = (e) => {
+          const clickTarget = e.target;
+          if (htmlEl.getAttribute("data-slot-source") === "page" && clickTarget?.closest) {
+            const nested = clickTarget.closest(
+              "[data-node-id], [data-amplifyup-node], [data-amplifyup-component], [data-component-id]"
+            );
+            if (nested && nested !== htmlEl && htmlEl.contains(nested)) {
+              return;
+            }
+          }
           e.stopPropagation();
           this.sendSelectionMessage(htmlEl, hierarchy, isEmpty);
         };
@@ -3685,13 +3704,31 @@ function htmlHasVisualChrome(html) {
   );
 }
 function canInlineEdit(name, value) {
-  if (isLikelyNonTextFieldName(name)) return false;
+  if (!name || isLikelyNonTextFieldName(name)) return false;
   if (value !== void 0 && value !== null && typeof value === "object") {
     return false;
   }
   if (typeof value === "boolean") return false;
   return true;
 }
+function canInlineEditRichText(name, value) {
+  if (!name || isLikelyNonTextFieldName(name)) return false;
+  if (typeof value === "boolean") return false;
+  if (value !== void 0 && value !== null && typeof value === "object" && !Array.isArray(value)) {
+    return false;
+  }
+  return true;
+}
+function inferEditName(explicitName, contextProps, sourceValue) {
+  if (explicitName) return explicitName;
+  if (!contextProps) return "";
+  const keys = Object.keys(contextProps).filter(
+    (key) => Object.is(contextProps[key], sourceValue)
+  );
+  if (keys.length === 1) return keys[0];
+  if (keys.length === 0 || isComposerEmptyText(sourceValue)) return "";
+  return keys[0];
+}
 function subscribeComposerEdit(onStoreChange) {
   if (typeof window === "undefined") return () => {
   };
@@ -3886,9 +3923,11 @@ function ComposerInlineHtml({
   const finishEdit = () => {
     const el = elRef.current;
     if (!el) return;
-    const next = (el.innerText ?? "").replace(/\u00a0/g, " ").replace(/\n+$/g, "");
-    if (next.trim() === sourceTextRef.current) return;
-    commitComposerField(layoutNodeId, componentId, name, next.trim());
+    const nextHtml = el.innerHTML;
+    const nextText = (el.innerText ?? "").replace(/\u00a0/g, " ").replace(/\n+$/g, "").trim();
+    if (nextText === sourceTextRef.current && nextHtml === html) return;
+    const commitValue = htmlHasVisualChrome(html) || /<[a-z][\s\S]*>/i.test(html) ? nextHtml : nextText;
+    commitComposerField(layoutNodeId, componentId, name, commitValue);
   };
   return React__default.default.createElement(Tag, {
     ref: elRef,
@@ -3930,15 +3969,10 @@ function formatFieldValue(value) {
 }
 function warnProjectionProps(component, name, hasExplicitValue) {
   if (process.env.NODE_ENV === "production") return;
-  if (hasExplicitValue && name) {
-    console.warn(
-      `[AmplifyUp SDK] ${component}: pass either value={\u2026} or deprecated name="\u2026", not both. Prefer value={\u2026} and omit name.`
-    );
-    return;
-  }
+  if (hasExplicitValue) return;
   if (name) {
     console.warn(
-      `[AmplifyUp SDK] ${component} \`name\` is deprecated and will be removed. Prefer value={${name}} from your component props and omit name.`
+      `[AmplifyUp SDK] ${component} \`name\` is deprecated and will be removed. Prefer value={${name}} from your component props.`
     );
   }
 }
@@ -3978,7 +4012,7 @@ function Field(props) {
   const composerEdit = useComposerEditMode();
   const hasExplicitValue = hasOwnProp(props, "value");
   const sourceValue = hasExplicitValue ? value : name ? context?.props?.[name] : void 0;
-  const editName = hasExplicitValue ? "" : name || "";
+  const editName = inferEditName(name, context?.props, sourceValue);
   const fieldValue = useFieldOverlay(
     context?.layoutNodeId,
     editName,
@@ -3992,6 +4026,20 @@ function Field(props) {
     return fallback ? /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: fallback }) : null;
   }
   if (render) {
+    if (composerEdit && editName && context && canInlineEdit(editName, fieldValue)) {
+      return /* @__PURE__ */ jsxRuntime.jsx(
+        ComposerInlineField,
+        {
+          name: editName,
+          value: fieldValue,
+          fallback,
+          className,
+          render,
+          layoutNodeId: context.layoutNodeId,
+          componentId: context.componentId
+        }
+      );
+    }
     return /* @__PURE__ */ jsxRuntime.jsx("span", { className, style: { display: "contents" }, children: render(fieldValue) });
   }
   if (Array.isArray(fieldValue)) {
@@ -4045,7 +4093,7 @@ function RichText(props) {
   const hasValueProp = hasOwnProp(props, "value");
   const hasExplicitValue = hasValueProp || childrenValue !== void 0;
   const sourceValue = hasValueProp ? value : childrenValue !== void 0 ? childrenValue : name ? context?.props?.[name] : void 0;
-  const editName = hasExplicitValue ? "" : name || "";
+  const editName = inferEditName(name, context?.props, sourceValue);
   const fieldValue = useFieldOverlay(
     context?.layoutNodeId,
     editName,
@@ -4058,7 +4106,7 @@ function RichText(props) {
     return fallback ? /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: fallback }) : null;
   }
   warnProjectionProps("RichText", name, hasExplicitValue);
-  const canEdit = !!editName && !!context && canInlineEdit(editName, fieldValue);
+  const canEdit = !!context && canInlineEditRichText(editName, fieldValue);
   if (isComposerEmptyText(fieldValue)) {
     if (composerEdit && canEdit && !isReactNodeFallback(fallback) && !classNameIsBlock(className)) {
       return /* @__PURE__ */ jsxRuntime.jsx(
@@ -4090,17 +4138,6 @@ function RichText(props) {
   if (!html) {
     return fallback ? /* @__PURE__ */ jsxRuntime.jsx(Tag, { className, children: fallback }) : null;
   }
-  if (composerEdit && htmlHasVisualChrome(html)) {
-    return /* @__PURE__ */ jsxRuntime.jsx(
-      Tag,
-      {
-        className,
-        "data-amplifyup-field": editName || void 0,
-        "data-amplifyup-node-id": context?.layoutNodeId || void 0,
-        dangerouslySetInnerHTML: { __html: html }
-      }
-    );
-  }
   if (composerEdit && canEdit) {
     return /* @__PURE__ */ jsxRuntime.jsx(
       ComposerInlineHtml,
@@ -4141,7 +4178,7 @@ function Image(props) {
   const sourceValue = hasExplicitValue ? value : name ? context?.props?.[name] : void 0;
   const fieldValue = useFieldOverlay(
     context?.layoutNodeId,
-    hasExplicitValue ? "" : name || "",
+    inferEditName(name, context?.props, sourceValue),
     sourceValue
   );
   warnProjectionProps("Image", name, hasExplicitValue);
@@ -4575,23 +4612,32 @@ function AmplifyRendererInner({
       }
     }
     const slotsToPass = Object.keys(slotChildren).length > 0 ? slotChildren : void 0;
-    return /* @__PURE__ */ jsxRuntime.jsx("div", { "data-node-id": node.id, "data-amplifyup-node": "", children: /* @__PURE__ */ jsxRuntime.jsx(
-      ComponentRenderBoundary,
+    return /* @__PURE__ */ jsxRuntime.jsx(
+      "div",
       {
-        componentId: node.componentId,
-        nodeId: node.id,
+        "data-node-id": node.id,
+        "data-amplifyup-node": "",
+        "data-component-id": node.componentId,
+        "data-amplifyup-component": node.componentId,
         children: /* @__PURE__ */ jsxRuntime.jsx(
-          LiveNodeRender,
+          ComponentRenderBoundary,
           {
-            nodeId: node.id,
             componentId: node.componentId,
-            props: nodeRenderProps(node),
-            slots: slotsToPass,
-            renderComponent
+            nodeId: node.id,
+            children: /* @__PURE__ */ jsxRuntime.jsx(
+              LiveNodeRender,
+              {
+                nodeId: node.id,
+                componentId: node.componentId,
+                props: nodeRenderProps(node),
+                slots: slotsToPass,
+                renderComponent
+              }
+            )
           }
         )
       }
-    ) });
+    );
   };
   const rawTree = pageConfig.layoutTree;
   const layoutTree = Array.isArray(rawTree) ? rawTree : rawTree && typeof rawTree === "object" && rawTree.componentId ? [rawTree] : [];
@@ -4605,9 +4651,9 @@ function AmplifyRendererInner({
       "data-amplifyup-slot": "main",
       "data-slot-source": "page",
       "data-slot-empty": layoutTree.length === 0 ? "true" : void 0,
-      children: layoutTree.map((node) => /* @__PURE__ */ jsxRuntime.jsx("div", { children: renderNode(node) }, node.id))
+      children: layoutTree.map((node) => /* @__PURE__ */ jsxRuntime.jsx(React.Fragment, { children: renderNode(node) }, node.id))
     }
-  ) : layoutTree.map((node) => /* @__PURE__ */ jsxRuntime.jsx("div", { children: renderNode(node) }, node.id)) });
+  ) : layoutTree.map((node) => /* @__PURE__ */ jsxRuntime.jsx(React.Fragment, { children: renderNode(node) }, node.id)) });
 }
 var AmplifyRenderer = React.memo(AmplifyRendererInner);
 function defaultPreviewCanvas() {