@uniweb/runtime 1.5.0 → 1.5.2

package/dist/ssr.js

@@ -450,6 +450,13 @@ function headerOverlay(page) {
 function overlayBoxProps(props) {
   return { ...props || {}, style: { ...props?.style || {}, height: 0, minHeight: 0 }, "data-uw-header": "over" };
 }
+function headerAreaProps(wrapper, overlay) {
+  const { viewTransitionName, ...style } = wrapper?.style || {};
+  const inner = viewTransitionName ? { style: { viewTransitionName } } : null;
+  const base = { ...wrapper || {}, style };
+  if (overlay) return { outer: overlayBoxProps(base), inner };
+  return { outer: Object.keys(style).length ? base : { ...base, style: { display: "contents" } }, inner };
+}
 function underHeaderProps(overlay) {
   return {
     style: { [HEADER_HEIGHT]: `var(${MEASURED_HEADER_HEIGHT}, ${overlay.height})` },
@@ -517,13 +524,6 @@ function documentTitle(pageTitle, siteName) {
   const title = String(pageTitle);
   return siteName ? `${title} | ${siteName}` : title;
 }
-const startPages = /* @__PURE__ */ new WeakMap();
-function recordStartPage(website) {
-  if (website && !startPages.has(website)) startPages.set(website, website.activePage);
-}
-function restoreStartPage(website) {
-  if (startPages.has(website)) website.activePage = startPages.get(website);
-}
 function resolvePage(website, route) {
   return website.getPage(route);
 }
@@ -649,8 +649,11 @@ function renderLayout(page, website) {
   const layers = resolveLayoutLayers(areaNames, layoutMeta?.layers, sticky);
   const overlay = headerOverlay(page);
   const wrapArea = (name, element) => {
-    let props = areaWrapperProps(name, transitions, layers, RemoteLayout ? sticky[name] : null);
-    if (overlay && RemoteLayout && name === "header") props = overlayBoxProps(props);
+    const props = areaWrapperProps(name, transitions, layers, RemoteLayout ? sticky[name] : null);
+    if (RemoteLayout && name === "header") {
+      const { outer, inner } = headerAreaProps(props, overlay);
+      return React.createElement("div", outer, inner ? React.createElement("div", inner, element) : element);
+    }
     return props ? React.createElement("div", props, element) : element;
   };
   const bodyElement = bodyBlocks ? wrapArea("body", renderBlocks(bodyBlocks, { stickySelf: "section" })) : null;
@@ -697,7 +700,6 @@ function initPrerender(content, foundation, extensionsOrOptions, maybeOptions) {
   } } = options;
   onProgress("Initializing runtime...");
   const uniweb = createUniweb(content, foundation, extensions);
-  recordStartPage(uniweb.activeWebsite);
   if (content.config?.base && uniweb.activeWebsite?.setBasePath) {
     uniweb.activeWebsite.setBasePath(content.config.base);
   }
@@ -778,7 +780,7 @@ function classifyRenderError(err) {
   };
 }
 function renderPage(page, website) {
-  if (page !== website.getNotFoundPage()) website.setActivePage(page.route);
+  website.setActivePage(page);
   if (page.hasContent?.() && page.getBodyBlocks().length === 0) {
     return {
       error: {
@@ -1429,8 +1431,6 @@ function createPageRenderer({ website, shell }) {
     if (!resolved) return { outcome: "notFound", html: null, page: null, error: null };
     const page = typeof resolved.getRenderableSelf === "function" ? resolved.getRenderableSelf() : resolved;
     const missing = !named || page?.notFound === true;
-    restoreStartPage(website);
-    if (typeof target === "string") website.setActivePage(target);
     const icons = /* @__PURE__ */ new Map();
     let result;
     try {