@uniweb/runtime 1.5.1 → 1.5.3

package/dist/ssr.js

@@ -436,13 +436,11 @@ function areaWrapperProps(region, transitions, layers, sticky = null) {
   if (!style) return null;
   return sticky ? { style, "data-uw-sticky": "area" } : { style };
 }
-const HEADER_HEIGHT = "--uw-header-height";
-const MEASURED_HEADER_HEIGHT = "--uw-header-measured";
+const DECLARED_HEADER_HEIGHT = "--uw-header-declared";
 function headerOverlay(page) {
   const first = page?.getBodyBlocks?.()?.[0];
-  if (!first?.underHeader) return null;
-  const header = page.getLayoutAreas?.()?.header;
-  if (!Array.isArray(header) || header.length === 0) return null;
+  if (!first?.liesUnderHeader?.()) return null;
+  const header = page.getLayoutAreas().header;
   const heights = header.map((block) => block?.height).filter(Boolean);
   const height = heights.length === 0 ? "0px" : heights.length === 1 ? heights[0] : `calc(${heights.join(" + ")})`;
   return { height };
@@ -450,9 +448,16 @@ 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})` },
+    style: { [DECLARED_HEADER_HEIGHT]: overlay.height },
     "data-uw-under-header": ""
   };
 }
@@ -642,8 +647,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;