@amplifyup/sdk 0.1.54 → 0.1.56

package/dist/{query-L7zSmLFX.d.ts → query-BqApXxQi.d.ts}

@@ -1,4 +1,4 @@
-import { i as AmplifyUpTarget } from './types-DpTzUg1C.js';
+import { i as AmplifyUpTarget } from './types-Db_eLrfU.js';
 
 /**
  * On-request variant selection (tier 3).

package/dist/{query-CWFb7rSm.d.mts → query-DaJlqU-Z.d.mts}

@@ -1,4 +1,4 @@
-import { i as AmplifyUpTarget } from './types-DpTzUg1C.mjs';
+import { i as AmplifyUpTarget } from './types-Db_eLrfU.mjs';
 
 /**
  * On-request variant selection (tier 3).

package/dist/react.d.mts

@@ -1,9 +1,9 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { P as PageConfig, c as AmplifyUpConfig, e as AmplifyPageContextInput, C as ContentSource, A as AmplifyContentMeta } from './types-DpTzUg1C.mjs';
-export { Z as ZoneConfig } from './types-DpTzUg1C.mjs';
-import React, { ReactNode } from 'react';
+import { P as PageConfig, c as AmplifyUpConfig, e as AmplifyPageContextInput, C as ContentSource, A as AmplifyContentMeta } from './types-Db_eLrfU.mjs';
+export { Z as ZoneConfig } from './types-Db_eLrfU.mjs';
+import React__default, { ReactNode } from 'react';
 export { AmplifyRenderer } from './AmplifyRenderer.mjs';
-export { Q as QueryContentError, e as QueryContentOptions, k as QueryFilter, l as QueryFilterOp, i as QueryPagination, h as QueryResult, m as QuerySort, j as QuerySpec, S as SelectVariantsError, a as SelectVariantsOptions, b as SelectVariantsResult, n as nextPageSpec, q as queryContent, d as searchSpec, s as selectVariants } from './query-CWFb7rSm.mjs';
+export { Q as QueryContentError, e as QueryContentOptions, k as QueryFilter, l as QueryFilterOp, i as QueryPagination, h as QueryResult, m as QuerySort, j as QuerySpec, S as SelectVariantsError, a as SelectVariantsOptions, b as SelectVariantsResult, n as nextPageSpec, q as queryContent, d as searchSpec, s as selectVariants } from './query-DaJlqU-Z.mjs';
 export { i as isComposerPreview, a as isPreviewRequest, b as isWorkingContentRequest } from './preview-_vHmzRen.mjs';
 
 type RenderComponentContext = {
@@ -90,14 +90,14 @@ 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;
     className?: string;
     render?: (value: any) => ReactNode;
-}): string | number | true | Iterable<React.ReactNode> | react_jsx_runtime.JSX.Element | null;
+}): string | number | true | Iterable<React__default.ReactNode> | react_jsx_runtime.JSX.Element | null;
 /**
  * RichText - Renders a markdown (or HTML string) value as formatted HTML.
  *
@@ -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;
@@ -154,7 +154,7 @@ declare function Image(props: {
      */
     name?: string;
     alt?: string;
-} & Omit<React.ImgHTMLAttributes<HTMLImageElement>, 'src' | 'alt' | 'name'>): react_jsx_runtime.JSX.Element | null;
+} & Omit<React__default.ImgHTMLAttributes<HTMLImageElement>, 'src' | 'alt' | 'name'>): react_jsx_runtime.JSX.Element | null;
 
 interface AmplifyUpContextType {
     pageConfig: PageConfig | null;

package/dist/react.d.ts

@@ -1,9 +1,9 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { P as PageConfig, c as AmplifyUpConfig, e as AmplifyPageContextInput, C as ContentSource, A as AmplifyContentMeta } from './types-DpTzUg1C.js';
-export { Z as ZoneConfig } from './types-DpTzUg1C.js';
-import React, { ReactNode } from 'react';
+import { P as PageConfig, c as AmplifyUpConfig, e as AmplifyPageContextInput, C as ContentSource, A as AmplifyContentMeta } from './types-Db_eLrfU.js';
+export { Z as ZoneConfig } from './types-Db_eLrfU.js';
+import React__default, { ReactNode } from 'react';
 export { AmplifyRenderer } from './AmplifyRenderer.js';
-export { Q as QueryContentError, e as QueryContentOptions, k as QueryFilter, l as QueryFilterOp, i as QueryPagination, h as QueryResult, m as QuerySort, j as QuerySpec, S as SelectVariantsError, a as SelectVariantsOptions, b as SelectVariantsResult, n as nextPageSpec, q as queryContent, d as searchSpec, s as selectVariants } from './query-L7zSmLFX.js';
+export { Q as QueryContentError, e as QueryContentOptions, k as QueryFilter, l as QueryFilterOp, i as QueryPagination, h as QueryResult, m as QuerySort, j as QuerySpec, S as SelectVariantsError, a as SelectVariantsOptions, b as SelectVariantsResult, n as nextPageSpec, q as queryContent, d as searchSpec, s as selectVariants } from './query-BqApXxQi.js';
 export { i as isComposerPreview, a as isPreviewRequest, b as isWorkingContentRequest } from './preview-_vHmzRen.js';
 
 type RenderComponentContext = {
@@ -90,14 +90,14 @@ 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;
     className?: string;
     render?: (value: any) => ReactNode;
-}): string | number | true | Iterable<React.ReactNode> | react_jsx_runtime.JSX.Element | null;
+}): string | number | true | Iterable<React__default.ReactNode> | react_jsx_runtime.JSX.Element | null;
 /**
  * RichText - Renders a markdown (or HTML string) value as formatted HTML.
  *
@@ -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;
@@ -154,7 +154,7 @@ declare function Image(props: {
      */
     name?: string;
     alt?: string;
-} & Omit<React.ImgHTMLAttributes<HTMLImageElement>, 'src' | 'alt' | 'name'>): react_jsx_runtime.JSX.Element | null;
+} & Omit<React__default.ImgHTMLAttributes<HTMLImageElement>, 'src' | 'alt' | 'name'>): react_jsx_runtime.JSX.Element | null;
 
 interface AmplifyUpContextType {
     pageConfig: PageConfig | null;

package/dist/react.js

@@ -614,6 +614,49 @@ function getPageResourceFields() {
   return pageResourceFields;
 }
 
+// src/debug.ts
+function envFlag(value) {
+  if (!value) return false;
+  const v = value.trim().toLowerCase();
+  return v === "1" || v === "true" || v === "yes";
+}
+function readAmplifyUpDebugEnv() {
+  try {
+    if (typeof process === "undefined") return false;
+    return envFlag(process.env.NEXT_PUBLIC_AMPLIFYUP_DEBUG) || envFlag(process.env.AMPLIFYUP_DEBUG);
+  } catch {
+    return false;
+  }
+}
+var configDebug;
+function setAmplifyUpDebug(enabled) {
+  configDebug = enabled;
+}
+function isAmplifyUpDebug() {
+  if (configDebug === true) return true;
+  if (configDebug === false) return false;
+  return readAmplifyUpDebugEnv();
+}
+var onceKeys = /* @__PURE__ */ new Set();
+var onceRoute = "";
+function resetOnceIfRouteChanged() {
+  const route = typeof window !== "undefined" ? window.location.pathname : "";
+  if (route === onceRoute) return;
+  onceKeys.clear();
+  onceRoute = route;
+}
+function sdkDebug(...args) {
+  if (!isAmplifyUpDebug()) return;
+  console.log(...args);
+}
+function sdkDebugOnce(key, ...args) {
+  if (!isAmplifyUpDebug()) return;
+  resetOnceIfRouteChanged();
+  if (onceKeys.has(key)) return;
+  onceKeys.add(key);
+  console.log(...args);
+}
+
 // src/edge/normalizeRoute.ts
 function normalizeRoute(route) {
   let path = String(route || "").trim();
@@ -1187,13 +1230,13 @@ var AmplifyUpSDK = class {
     }
     this.config = {
       trackingId: previewOverrides.trackingId || config.trackingId,
-      debug: config.debug ?? true,
-      // Enable debug by default
+      debug: config.debug ?? readAmplifyUpDebugEnv(),
       target: this.target,
       dev: config.dev,
       ...config.siteId ? { siteId: config.siteId } : {},
       ...config.pageContext ? { pageContext: config.pageContext } : {}
     };
+    setAmplifyUpDebug(!!this.config.debug);
     if (config.pageContext) {
       this.pendingPageContext = config.pageContext;
       this.recomputeAttachedContext();
@@ -3525,23 +3568,12 @@ function Slot({
   className
 }) {
   const context = React.useContext(ComponentContext);
-  console.log(`[Slot:${name}] Rendering slot`, {
-    hasContext: !!context,
-    availableSlotKeys: context?.slots ? Object.keys(context.slots) : [],
-    slotContent: context?.slots?.[name] ? "EXISTS" : "MISSING",
-    contextSlots: context?.slots
-  });
   if (!context) {
     console.warn(`[AmplifyUp SDK] Slot "${name}" used outside ComponentContextProvider`);
     return null;
   }
   const slotContent = context.slots?.[name];
   const isEmpty = !slotContent;
-  console.log(`[Slot:${name}] Slot state`, {
-    isEmpty,
-    hasSlotContent: !!slotContent,
-    slotContentType: slotContent ? typeof slotContent : "null"
-  });
   const isEditorMode = typeof window !== "undefined" && // Check for preview mode flag set by proxy
   (window.__AMPLIFYUP_PREVIEW_MODE__ === true || // Check URL query params
   new URLSearchParams(window.location.search).get("preview") === "true" || new URLSearchParams(window.location.search).get("visualEditor") === "true" || // Check if in iframe from orchestrator (check referrer hostname/port)
@@ -3553,17 +3585,15 @@ function Slot({
       return false;
     }
   })());
-  console.log(`[Slot:${name}] Editor mode detection`, {
-    isEditorMode,
-    isWindowDefined: typeof window !== "undefined",
-    previewModeFlag: typeof window !== "undefined" ? window.__AMPLIFYUP_PREVIEW_MODE__ : void 0,
-    urlParams: typeof window !== "undefined" ? {
-      preview: new URLSearchParams(window.location.search).get("preview"),
-      visualEditor: new URLSearchParams(window.location.search).get("visualEditor")
-    } : void 0,
-    inIframe: typeof window !== "undefined" ? window.self !== window.top : false,
-    referrer: typeof window !== "undefined" && document.referrer ? document.referrer : void 0
-  });
+  sdkDebugOnce(
+    `slot:${context.layoutNodeId || ""}:${name}`,
+    `[Slot:${name}]`,
+    {
+      isEmpty,
+      isEditorMode,
+      availableSlotKeys: context.slots ? Object.keys(context.slots) : []
+    }
+  );
   return /* @__PURE__ */ jsxRuntime.jsx(
     "div",
     {
@@ -3655,13 +3685,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 () => {
   };
@@ -3856,9 +3904,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,
@@ -3900,15 +3950,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.`
     );
   }
 }
@@ -3948,7 +3993,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,
@@ -3962,6 +4007,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)) {
@@ -4015,7 +4074,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,
@@ -4028,7 +4087,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(
@@ -4060,17 +4119,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,
@@ -4111,7 +4159,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);
@@ -4204,7 +4252,7 @@ function LiveNodeRender({
     layoutNodeId: nodeId
   }) });
 }
-function AmplifyRenderer({
+function AmplifyRendererInner({
   renderComponent,
   pageConfig: serverPageConfig,
   loadingComponent,
@@ -4346,14 +4394,22 @@ function AmplifyRenderer({
         return `${indent}- ${n.id} (${n.componentId || "?"})${slotsDesc ? "\n" + slotsDesc : ""}`;
       }).join("\n");
     };
-    console.log("[AmplifyRenderer] layoutTree received:\n%s", describeLayoutTree(layoutTree2));
+    sdkDebugOnce(
+      `layoutTree:${pageConfig?.id || ""}:${pageConfig?.route || ""}`,
+      "[AmplifyRenderer] layoutTree received:\n%s",
+      describeLayoutTree(layoutTree2)
+    );
     if (typeof window !== "undefined" && window.parent && window.parent !== window) {
       const message = {
         type: "COMPONENT_TREE",
         tree: componentTree
       };
       window.parent.postMessage(message, "*");
-      console.log("[AmplifyRenderer] Sent component tree from layoutTree:", componentTree.length, "root components");
+      sdkDebug(
+        "[AmplifyRenderer] Sent component tree from layoutTree:",
+        componentTree.length,
+        "root components"
+      );
     }
   }, [pageConfig]);
   React.useEffect(() => {
@@ -4504,7 +4560,7 @@ function AmplifyRenderer({
       );
     }
     let slotChildren = {};
-    console.log(`[AmplifyRenderer] Rendering node ${node.id} (${node.componentId})`, {
+    sdkDebugOnce(`node:${node.id}`, `[AmplifyRenderer] Rendering node ${node.id} (${node.componentId})`, {
       hasSlots: !!(node.slots && node.slots.length > 0),
       slotCount: node.slots?.length || 0,
       slots: node.slots?.map((s) => ({ slotId: s.slotId, zoneId: s.zoneId, childrenCount: s.children?.length || 0 }))
@@ -4513,30 +4569,13 @@ function AmplifyRenderer({
       for (const slot of node.slots) {
         const slotKey = `${node.id}-${slot.slotId}`;
         let childrenToRender = [];
-        console.log(`[AmplifyRenderer] Processing slot ${slot.slotId} for node ${node.id}`, {
-          slotKey,
-          hasZoneId: !!slot.zoneId,
-          hasVariants: !!slot.variants,
-          hasVariantCache: !!variantCache[slotKey],
-          directChildrenCount: slot.children?.length || 0
-        });
         if (slot.zoneId && slot.variants && variantCache[slotKey]) {
           childrenToRender = variantCache[slotKey].children;
-          console.log(`[AmplifyRenderer] Using cached variant for slot ${slot.slotId}`, {
-            variantId: variantCache[slotKey].variantId,
-            childrenCount: childrenToRender.length
-          });
         } else if (slot.zoneId && slot.variants) {
           const defaultVariant = slot.variants.find((v) => v.isDefault);
           childrenToRender = defaultVariant?.children || [];
-          console.log(`[AmplifyRenderer] Using default variant for slot ${slot.slotId}`, {
-            childrenCount: childrenToRender.length
-          });
         } else {
           childrenToRender = Array.isArray(slot.children) ? slot.children : [];
-          console.log(`[AmplifyRenderer] Using direct children for slot ${slot.slotId}`, {
-            childrenCount: childrenToRender.length
-          });
         }
         const safeChildren = Array.isArray(childrenToRender) ? childrenToRender : [];
         slotChildren[slot.slotId] = /* @__PURE__ */ jsxRuntime.jsx(
@@ -4551,10 +4590,6 @@ function AmplifyRenderer({
           },
           slot.slotId
         );
-        console.log(`[AmplifyRenderer] Created slot content for ${slot.slotId}`, {
-          slotId: slot.slotId,
-          renderedChildrenCount: childrenToRender.length
-        });
       }
     }
     const slotsToPass = Object.keys(slotChildren).length > 0 ? slotChildren : void 0;
@@ -4592,6 +4627,7 @@ function AmplifyRenderer({
     }
   ) : layoutTree.map((node) => /* @__PURE__ */ jsxRuntime.jsx("div", { children: renderNode(node) }, node.id)) });
 }
+var AmplifyRenderer = React.memo(AmplifyRendererInner);
 function defaultPreviewCanvas() {
   return /* @__PURE__ */ jsxRuntime.jsx(
     "div",
@@ -4695,6 +4731,12 @@ if (typeof window !== "undefined") {
   }
 }
 var AmplifyUpContext = React.createContext(null);
+function normalizeRoutePath2(route) {
+  if (!route) return "";
+  const path = route.split("?")[0] || "/";
+  if (path.length > 1 && path.endsWith("/")) return path.replace(/\/+$/, "");
+  return path || "/";
+}
 function AmplifyUpProvider({
   children,
   config,
@@ -4722,6 +4764,7 @@ function AmplifyUpProvider({
     }
     return currentPath;
   };
+  const loadedRouteRef = React.useRef(null);
   const nextPathname = usePathname ? usePathname() : null;
   const [pathname, setPathname] = React.useState(() => {
     if (typeof window !== "undefined") {
@@ -4755,56 +4798,46 @@ function AmplifyUpProvider({
       };
     }
   }, [nextPathname]);
-  React.useEffect(() => {
-    let cancelled = false;
-    const sdk = getSDK();
-    sdk.init({
-      ...config,
-      ...pageContext ? { pageContext } : {}
-    }).then(() => {
-      if (!cancelled) {
-        setInitialized(true);
-      }
-    }).catch((err) => {
-      if (cancelled) return;
-      console.error("Failed to initialize AmplifyUp SDK:", err);
-      setError("Failed to initialize tracking");
-      setLoading(false);
-    });
-    return () => {
-      cancelled = true;
-    };
-  }, [config.trackingId, config.target, config.debug, config.dev, config.siteId, pageContext]);
+  const pageContextKey = pageContext ? `${pageContext.resourceType}:${pageContext.key}` : "";
   React.useEffect(() => {
     if (!initialized || !pageContext) return;
     getSDK().setPageContext(pageContext);
-  }, [initialized, pageContext]);
+  }, [initialized, pageContextKey]);
   React.useEffect(() => {
-    if (!initialized) return;
     let cancelled = false;
-    const load = async () => {
+    const sdk = getSDK();
+    const run = async () => {
       try {
+        await sdk.init({
+          ...config,
+          ...pageContext ? { pageContext } : {}
+        });
+        if (cancelled) return;
+        if (pageContext) sdk.setPageContext(pageContext);
         const actualRoute = getActualRoute();
         if (!actualRoute) {
+          setInitialized(true);
           setLoading(false);
           return;
         }
-        const sdk = getSDK();
         sdk.routeChange(actualRoute);
         const preview = isComposerPreview();
         const overlay = preview || config.clientPersonalization !== false;
         if (!overlay) {
+          setInitialized(true);
           setPageConfig(null);
           setLoading(false);
           return;
         }
-        setPageConfig(null);
-        setError(null);
-        setLoading(false);
+        if (loadedRouteRef.current && loadedRouteRef.current !== actualRoute) {
+          setPageConfig(null);
+          setError(null);
+        }
         const edgeUrl = sdk.getEdgeUrl();
         const orchestratorUrl = sdk.getOrchestratorUrl();
         const trackingId = sdk.getTrackingId();
         if (!trackingId || !orchestratorUrl || !edgeUrl) {
+          setInitialized(true);
           setError("SDK not initialized");
           setLoading(false);
           return;
@@ -4840,28 +4873,37 @@ function AmplifyUpProvider({
           fetchOrchestratorPage: (route, isPreview) => sdk.fetchPageConfig(route, isPreview)
         });
         if (cancelled) return;
-        setSource(result.source);
-        setMeta(result.meta);
-        setError(result.error);
-        if (!result.pageConfig) {
-          setPageConfig({
-            id: "default",
-            route: actualRoute,
-            title: "Page Not Configured",
-            description: "This page has not been published yet.",
-            layoutTree: []
-          });
-        } else {
-          setPageConfig(result.pageConfig);
+        const nextConfig = result.pageConfig || {
+          id: "default",
+          route: actualRoute,
+          title: "Page Not Configured",
+          description: "This page has not been published yet.",
+          layoutTree: []
+        };
+        setInitialized(true);
+        setSource((prev) => prev === result.source ? prev : result.source);
+        setMeta(
+          (prev) => prev === result.meta || JSON.stringify(prev) === JSON.stringify(result.meta) ? prev : result.meta
+        );
+        setError((prev) => prev === result.error ? prev : result.error);
+        setPageConfig((prev) => {
+          if (prev && prev.id === nextConfig.id && normalizeRoutePath2(prev.route) === normalizeRoutePath2(nextConfig.route) && JSON.stringify(prev.layoutTree) === JSON.stringify(nextConfig.layoutTree)) {
+            return prev;
+          }
+          return nextConfig;
+        });
+        if (result.pageConfig) {
           sdk.applyResolvedPageData(
             result.pageConfig.pageData || null,
             result.pageConfig.route,
             extractRouteParams(result.pageConfig.route, actualRoute)
           );
         }
+        loadedRouteRef.current = actualRoute;
       } catch (err) {
         if (cancelled) return;
         console.error("Error fetching page config:", err);
+        setInitialized(true);
         setError(err instanceof Error ? err.message : "Unknown error");
         setSource(null);
         setMeta(null);
@@ -4869,11 +4911,20 @@ function AmplifyUpProvider({
         if (!cancelled) setLoading(false);
       }
     };
-    void load();
+    void run();
     return () => {
       cancelled = true;
     };
-  }, [pathname, initialized, config.clientPersonalization]);
+  }, [
+    pathname,
+    config.trackingId,
+    config.target,
+    config.debug,
+    config.dev,
+    config.siteId,
+    config.clientPersonalization,
+    pageContextKey
+  ]);
   return /* @__PURE__ */ jsxRuntime.jsx(
     AmplifyUpContext.Provider,
     {