@ohhwells/bridge 0.1.42-next.82 → 0.1.42-next.83

package/dist/index.cjs

@@ -4353,7 +4353,8 @@ var CustomToolbar = React4.forwardRef(({ className, onMouseDown, ...props }, ref
     ref,
     "data-ohw-toolbar": "",
     className: cn(
-      "inline-flex items-center gap-1 rounded-lg border border-border bg-background p-0.5 font-sans whitespace-nowrap shadow-[0px_2px_4px_-2px_rgba(0,0,0,0.1),0px_4px_6px_-1px_rgba(0,0,0,0.1)]",
+      // Figma: bg background, radius 8, gap-1, p-0.5, shadow-md — no border
+      "inline-flex h-8 items-center gap-1 rounded-[var(--radius,0.5rem)] bg-background p-0.5 font-sans whitespace-nowrap shadow-md",
       className
     ),
     onMouseDown: (e) => {
@@ -4381,8 +4382,8 @@ var CustomToolbarButton = React4.forwardRef(
       ref,
       type,
       className: cn(
-        "inline-flex shrink-0 items-center justify-center rounded p-1.5 transition-colors",
-        active ? "bg-primary text-primary-foreground" : "bg-transparent text-foreground hover:bg-muted disabled:cursor-not-allowed disabled:text-muted-foreground disabled:opacity-60",
+        "inline-flex size-7 shrink-0 items-center justify-center rounded-[calc(var(--radius,0.5rem)-2px)] text-foreground transition-colors",
+        active ? "bg-primary text-primary-foreground" : "bg-transparent hover:bg-muted disabled:cursor-not-allowed disabled:text-muted-foreground disabled:opacity-60",
         className
       ),
       ...props
@@ -4409,37 +4410,33 @@ function Tooltip({ ...props }) {
 function TooltipTrigger({ ...props }) {
   return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_radix_ui3.Tooltip.Trigger, { "data-slot": "tooltip-trigger", ...props });
 }
-var arrowClassBySide = {
-  top: "before:bottom-0 before:left-1/2 before:-translate-x-1/2 before:translate-y-1/2",
-  bottom: "before:top-0 before:left-1/2 before:-translate-x-1/2 before:-translate-y-1/2",
-  left: "before:right-0 before:top-1/2 before:-translate-y-1/2 before:translate-x-1/2",
-  right: "before:left-0 before:top-1/2 before:-translate-y-1/2 before:-translate-x-1/2"
-};
 function TooltipContent({
   className,
-  sideOffset = 6,
+  sideOffset = 3,
   side = "bottom",
   children,
+  hideArrow,
   ...props
 }) {
-  const resolvedSide = side ?? "bottom";
-  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_radix_ui3.Tooltip.Portal, { children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_radix_ui3.Tooltip.Portal, { children: /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(
     import_radix_ui3.Tooltip.Content,
     {
       "data-slot": "tooltip-content",
       side,
       sideOffset,
       className: cn(
-        "relative z-[2147483647] w-fit max-w-xs rounded-md bg-foreground px-3 py-1.5 text-xs text-background shadow-md",
-        'before:pointer-events-none before:absolute before:size-2 before:rotate-45 before:bg-foreground before:content-[""]',
-        arrowClassBySide[resolvedSide],
-        "animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95",
+        "z-[2147483647] inline-flex w-fit max-w-xs items-center rounded-md bg-foreground px-3 py-1.5 text-xs text-background",
+        "origin-[var(--radix-tooltip-content-transform-origin)] animate-in fade-in-0 zoom-in-95",
+        "data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95",
         "data-[side=bottom]:slide-in-from-top-2 data-[side=top]:slide-in-from-bottom-2",
         "data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2",
         className
       ),
       ...props,
-      children
+      children: [
+        children,
+        !hideArrow && /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_radix_ui3.Tooltip.Arrow, { className: "z-[2147483647] size-2.5 translate-y-[calc(-50%-2px)] rotate-45 rounded-[2px] bg-foreground fill-foreground" })
+      ]
     }
   ) });
 }
@@ -4456,7 +4453,7 @@ function ToolbarActionTooltip({
   const button = /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(CustomToolbarButton, { type: "button", "aria-label": label, disabled, ...buttonProps, children });
   return /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(Tooltip, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(TooltipTrigger, { asChild: true, children: disabled ? /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("span", { className: "inline-flex", children: button }) : button }),
-    /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(TooltipContent, { side, children: label })
+    /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(TooltipContent, { side, sideOffset: 3, children: label })
   ] });
 }
 function ItemActionToolbar({
@@ -4466,6 +4463,8 @@ function ItemActionToolbar({
   editLinkDisabled = false,
   addItemDisabled = true,
   moreDisabled = true,
+  showAddItem = true,
+  showMore = true,
   tooltipSide = "bottom"
 }) {
   return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(TooltipProvider, { delayDuration: 0, children: /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(CustomToolbar, { children: [
@@ -4490,8 +4489,7 @@ function ItemActionToolbar({
         children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(import_lucide_react2.Link, { className: "size-4 shrink-0", "aria-hidden": true })
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(CustomToolbarDivider, {}),
-    /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
+    showAddItem ? /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
       ToolbarActionTooltip,
       {
         label: "Add item",
@@ -4507,9 +4505,8 @@ function ItemActionToolbar({
         },
         children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(import_lucide_react2.Plus, { className: "size-4 shrink-0", "aria-hidden": true })
       }
-    ),
-    /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(CustomToolbarDivider, {}),
-    /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
+    ) : null,
+    showMore ? /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
       ToolbarActionTooltip,
       {
         label: "More",
@@ -4525,15 +4522,19 @@ function ItemActionToolbar({
         },
         children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(import_lucide_react2.MoreHorizontal, { className: "size-4 shrink-0", "aria-hidden": true })
       }
-    )
+    ) : null
   ] }) });
 }
 
 // src/ui/item-interaction-layer.tsx
+var React5 = __toESM(require("react"), 1);
 var import_jsx_runtime9 = require("react/jsx-runtime");
 var PRIMARY = "var(--ohw-primary, #0885FE)";
-var FOCUS_RING = "0 0 0 4px rgba(8, 133, 254, 0.12)";
+var FOCUS_RING = `0 0 0 4px color-mix(in srgb, ${PRIMARY} 12%, transparent)`;
 var DRAG_SHADOW = "0px 4px 6px -1px rgba(0, 0, 0, 0.1), 0px 2px 4px -2px rgba(0, 0, 0, 0.1)";
+var TOOLBAR_EDGE_MARGIN = 4;
+var SELECTION_CHROME_GAP = 4;
+var TOOLBAR_STROKE_GAP = 4;
 function getChromeStyle(state) {
   switch (state) {
     case "hover":
@@ -4561,6 +4562,59 @@ function getChromeStyle(state) {
       return {};
   }
 }
+function ClampedToolbarSlot({
+  placement,
+  children
+}) {
+  const slotRef = React5.useRef(null);
+  React5.useLayoutEffect(() => {
+    const slot = slotRef.current;
+    if (!slot) return;
+    const clamp = () => {
+      const toolbar = slot.firstElementChild;
+      if (!toolbar) return;
+      const w = toolbar.offsetWidth;
+      if (w <= 0) return;
+      const parent = slot.offsetParent;
+      if (!parent) return;
+      const parentRect = parent.getBoundingClientRect();
+      const centerX = parentRect.left + parentRect.width / 2;
+      const half = w / 2;
+      const clampedCenter = Math.max(
+        TOOLBAR_EDGE_MARGIN + half,
+        Math.min(centerX, window.innerWidth - TOOLBAR_EDGE_MARGIN - half)
+      );
+      const offsetX = clampedCenter - centerX;
+      slot.style.transform = `translateX(calc(-50% + ${offsetX}px))`;
+    };
+    clamp();
+    const ro = new ResizeObserver(clamp);
+    ro.observe(slot);
+    if (slot.firstElementChild) ro.observe(slot.firstElementChild);
+    window.addEventListener("resize", clamp);
+    return () => {
+      ro.disconnect();
+      window.removeEventListener("resize", clamp);
+    };
+  }, [placement, children]);
+  return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
+    "div",
+    {
+      ref: slotRef,
+      className: cn(
+        "pointer-events-auto absolute left-1/2",
+        placement === "top" ? "bottom-full" : "top-full"
+      ),
+      style: {
+        marginBottom: placement === "top" ? TOOLBAR_STROKE_GAP : void 0,
+        marginTop: placement === "bottom" ? TOOLBAR_STROKE_GAP : void 0,
+        transform: "translateX(-50%)"
+      },
+      "data-ohw-item-toolbar-anchor": placement,
+      children
+    }
+  );
+}
 function ItemInteractionLayer({
   rect,
   state,
@@ -4573,7 +4627,7 @@ function ItemInteractionLayer({
   onDragHandleDragEnd,
   onItemPointerDown,
   onItemClick,
-  chromeGap = 6,
+  chromeGap = SELECTION_CHROME_GAP,
   className
 }) {
   if (state === "default") return null;
@@ -4648,33 +4702,19 @@ function ItemInteractionLayer({
             )
           }
         ),
-        showToolbar && state === "active-top" && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
-          "div",
-          {
-            className: "pointer-events-auto absolute bottom-full left-1/2 mb-2 -translate-x-1/2",
-            "data-ohw-item-toolbar-anchor": "top",
-            children: toolbar
-          }
-        ),
-        showToolbar && state === "active-bottom" && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
-          "div",
-          {
-            className: "pointer-events-auto absolute left-1/2 top-full mt-2 -translate-x-1/2",
-            "data-ohw-item-toolbar-anchor": "bottom",
-            children: toolbar
-          }
-        )
+        showToolbar && state === "active-top" && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(ClampedToolbarSlot, { placement: "top", children: toolbar }),
+        showToolbar && state === "active-bottom" && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(ClampedToolbarSlot, { placement: "bottom", children: toolbar })
       ]
     }
   );
 }
 
 // src/ui/MediaOverlay.tsx
-var React6 = __toESM(require("react"), 1);
+var React7 = __toESM(require("react"), 1);
 var import_lucide_react3 = require("lucide-react");
 
 // src/ui/button.tsx
-var React5 = __toESM(require("react"), 1);
+var React6 = __toESM(require("react"), 1);
 var import_radix_ui4 = require("radix-ui");
 var import_jsx_runtime10 = require("react/jsx-runtime");
 var buttonVariants = cva(
@@ -4697,7 +4737,7 @@ var buttonVariants = cva(
     }
   }
 );
-var Button = React5.forwardRef(
+var Button = React6.forwardRef(
   ({ className, variant, size, asChild = false, ...props }, ref) => {
     const Comp = asChild ? import_radix_ui4.Slot.Root : "button";
     return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
@@ -4749,7 +4789,7 @@ function MediaOverlay({
   onVideoSettingsChange
 }) {
   const { rect } = hover;
-  const skeletonRef = React6.useRef(null);
+  const skeletonRef = React7.useRef(null);
   const isVideo = hover.elementType === "video";
   const autoplay = hover.videoAutoplay ?? true;
   const muted = hover.videoMuted ?? true;
@@ -4761,7 +4801,7 @@ function MediaOverlay({
     height: rect.height,
     zIndex: 2147483646
   };
-  React6.useEffect(() => {
+  React7.useEffect(() => {
     if (!isUploading || !fadingOut || !skeletonRef.current) return;
     const anim = skeletonRef.current.animate([{ opacity: 1 }, { opacity: 0 }], {
       duration: MEDIA_UPLOAD_FADE_MS,
@@ -5218,7 +5258,7 @@ function scrollToHashSectionWhenReady(behavior = "smooth") {
 var import_react7 = require("react");
 
 // src/ui/dialog.tsx
-var React7 = __toESM(require("react"), 1);
+var React8 = __toESM(require("react"), 1);
 var import_radix_ui5 = require("radix-ui");
 var import_lucide_react5 = require("lucide-react");
 var import_jsx_runtime13 = require("react/jsx-runtime");
@@ -5246,7 +5286,7 @@ function DialogOverlay({
     }
   );
 }
-var DialogContent = React7.forwardRef(
+var DialogContent = React8.forwardRef(
   ({ className, children, showCloseButton = true, container, ...props }, ref) => {
     const positionMode = container ? "absolute" : "fixed";
     return /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)(DialogPortal, { container: container ?? void 0, children: [
@@ -5301,7 +5341,7 @@ function DialogFooter({
     }
   );
 }
-var DialogTitle = React7.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
+var DialogTitle = React8.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
   import_radix_ui5.Dialog.Title,
   {
     ref,
@@ -5313,7 +5353,7 @@ var DialogTitle = React7.forwardRef(({ className, ...props }, ref) => /* @__PURE
   }
 ));
 DialogTitle.displayName = import_radix_ui5.Dialog.Title.displayName;
-var DialogDescription = React7.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
+var DialogDescription = React8.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
   import_radix_ui5.Dialog.Description,
   {
     ref,
@@ -5418,9 +5458,9 @@ function SectionTreeItem({
 var import_react4 = require("react");
 
 // src/ui/input.tsx
-var React8 = __toESM(require("react"), 1);
+var React9 = __toESM(require("react"), 1);
 var import_jsx_runtime16 = require("react/jsx-runtime");
-var Input = React8.forwardRef(
+var Input = React9.forwardRef(
   ({ className, type, ...props }, ref) => {
     return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
       "input",
@@ -6537,9 +6577,19 @@ function insertNavbarItemDom(index, href, label, afterAnchor) {
   }
   return primary;
 }
+function getNavbarLinkKeysInContainer(container) {
+  return Array.from(container.querySelectorAll("[data-ohw-href-key]")).filter(isNavbarLinkItem).map((el) => el.getAttribute("data-ohw-href-key")).filter((key) => Boolean(key));
+}
 function applyNavOrderToContainer(container, order) {
+  const desired = order.filter((key, i) => order.indexOf(key) === i);
+  const current = getNavbarLinkKeysInContainer(container);
+  const extras = current.filter((key) => !desired.includes(key));
+  const expected = [...desired.filter((key) => current.includes(key)), ...extras];
+  if (current.length === expected.length && current.every((key, i) => key === expected[i])) {
+    return;
+  }
   const seen = /* @__PURE__ */ new Set();
-  for (const hrefKey of order) {
+  for (const hrefKey of desired) {
     if (seen.has(hrefKey)) continue;
     seen.add(hrefKey);
     const el = findCounterpartByHrefKey(hrefKey, container);
@@ -7068,7 +7118,7 @@ function NavbarContainerChrome({
 }
 
 // src/ui/drop-indicator.tsx
-var React9 = __toESM(require("react"), 1);
+var React10 = __toESM(require("react"), 1);
 var import_jsx_runtime23 = require("react/jsx-runtime");
 var dropIndicatorVariants = cva(
   "ov-gap-line pointer-events-none shrink-0 transition-opacity duration-150",
@@ -7091,7 +7141,7 @@ var dropIndicatorVariants = cva(
     }
   }
 );
-var DropIndicator = React9.forwardRef(
+var DropIndicator = React10.forwardRef(
   ({ className, direction, state, ...props }, ref) => {
     return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
       "div",
@@ -7374,6 +7424,19 @@ function isDragHandleDisabled(el) {
     return raw === "true" || raw === "";
   });
 }
+function canDragNavigationItem(anchor) {
+  const { key, disabled } = getNavigationItemReorderState(anchor);
+  return Boolean(key) && !disabled;
+}
+function syncNavigationDragCursorAttrs() {
+  document.querySelectorAll("nav [data-ohw-href-key], footer [data-ohw-href-key]").forEach((el) => {
+    if (!isNavigationItem(el) || !canDragNavigationItem(el)) {
+      el.removeAttribute("data-ohw-can-drag");
+      return;
+    }
+    el.setAttribute("data-ohw-can-drag", "");
+  });
+}
 function collectEditableNodes(extraContent) {
   const nodes = Array.from(document.querySelectorAll("[data-ohw-editable]")).map((el) => {
     if (el.dataset.ohwEditable === "image") {
@@ -7571,18 +7634,20 @@ function getNavigationRoot(el) {
   if (explicit) return explicit;
   return el.closest("nav, footer, aside");
 }
+function countFooterNavItems(el) {
+  return Array.from(el.querySelectorAll("[data-ohw-href-key]")).filter(isNavigationItem).length;
+}
 function findFooterItemGroup(item) {
+  const explicit = item.closest("[data-ohw-footer-col]");
+  if (explicit) return explicit;
   const footer = item.closest("footer");
   if (!footer) return null;
   let node = item.parentElement;
   while (node && node !== footer) {
-    const hasDirectNavItems = Array.from(
-      node.querySelectorAll(":scope > [data-ohw-href-key]")
-    ).some(isNavigationItem);
-    if (hasDirectNavItems) return node;
+    if (countFooterNavItems(node) >= 2) return node;
     node = node.parentElement;
   }
-  return null;
+  return footer;
 }
 function isNavigationRoot(el) {
   return el.hasAttribute("data-ohw-nav-root") || el.matches("nav, footer, aside");
@@ -7590,16 +7655,46 @@ function isNavigationRoot(el) {
 function isInferredFooterGroup(el) {
   const footer = el.closest("footer");
   if (!footer || el === footer) return false;
-  return Array.from(el.querySelectorAll(":scope > [data-ohw-href-key]")).some(isNavigationItem);
+  if (el.hasAttribute("data-ohw-footer-col")) return true;
+  return countFooterNavItems(el) >= 2;
 }
 function isNavigationContainer(el) {
   return el.hasAttribute("data-ohw-nav-container") || el.hasAttribute("data-ohw-footer-col") || isNavigationRoot(el) || isInferredFooterGroup(el);
 }
+function getFooterColumn(el) {
+  return el.closest("[data-ohw-footer-col]");
+}
+function resolveFooterColumnSelectionTarget(target, clientX, clientY) {
+  if (getNavigationItemAnchor(target)) return null;
+  const column = getFooterColumn(target);
+  if (!column) return null;
+  if (isPointOverNavItem(column, clientX, clientY)) return null;
+  return column;
+}
 function isPointOverNavigation(x, y) {
+  const roots = /* @__PURE__ */ new Set();
   const navRoot = document.querySelector("[data-ohw-nav-root]") ?? document.querySelector("nav");
-  if (!navRoot) return false;
-  const r2 = navRoot.getBoundingClientRect();
-  return x >= r2.left && x <= r2.right && y >= r2.top && y <= r2.bottom;
+  if (navRoot) roots.add(navRoot);
+  const footer = document.querySelector("footer");
+  if (footer) roots.add(footer);
+  for (const root of roots) {
+    const r2 = root.getBoundingClientRect();
+    if (x >= r2.left && x <= r2.right && y >= r2.top && y <= r2.bottom) return true;
+  }
+  return false;
+}
+function findHoveredNavOrFooterContainer(x, y) {
+  const candidates = [
+    ...document.querySelectorAll("[data-ohw-nav-container]"),
+    ...document.querySelectorAll("[data-ohw-footer-col]")
+  ];
+  for (const container of candidates) {
+    const r2 = container.getBoundingClientRect();
+    if (x < r2.left || x > r2.right || y < r2.top || y > r2.bottom) continue;
+    if (isPointOverNavItem(container, x, y)) continue;
+    return container;
+  }
+  return null;
 }
 function isPointOverNavItem(container, x, y) {
   return Array.from(container.querySelectorAll("[data-ohw-href-key]")).some((el) => {
@@ -7632,11 +7727,13 @@ function getNavigationSelectionParent(el) {
   if (isNavigationItem(el)) {
     const explicit = el.closest("[data-ohw-nav-container]");
     if (explicit) return explicit;
+    const footerColumn = getFooterColumn(el);
+    if (footerColumn) return footerColumn;
     const footerGroup = findFooterItemGroup(el);
     if (footerGroup) return footerGroup;
     return getNavigationRoot(el);
   }
-  if (el.hasAttribute("data-ohw-nav-container") || isInferredFooterGroup(el)) {
+  if (el.hasAttribute("data-ohw-nav-container") || el.hasAttribute("data-ohw-footer-col") || isInferredFooterGroup(el)) {
     return getNavigationRoot(el);
   }
   return null;
@@ -7805,6 +7902,9 @@ var ICONS = {
 };
 var TOOLBAR_PILL_PADDING = 2;
 var TOOLBAR_TOGGLE_GAP = 4;
+var SELECTION_CHROME_GAP2 = 4;
+var TOOLBAR_STROKE_GAP2 = 4;
+var TOOLBAR_OFFSET_FROM_ELEMENT = SELECTION_CHROME_GAP2 + TOOLBAR_STROKE_GAP2;
 var TOOLBAR_GROUPS = [
   [
     { cmd: "bold", title: "Bold" },
@@ -7828,7 +7928,7 @@ function EditGlowChrome({
   reorderHrefKey,
   dragDisabled = false
 }) {
-  const GAP = 6;
+  const GAP = SELECTION_CHROME_GAP2;
   return /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(
     "div",
     {
@@ -7852,7 +7952,7 @@ function EditGlowChrome({
               inset: 0,
               border: "2px solid var(--ohw-primary, #0885FE)",
               borderRadius: 8,
-              boxShadow: "0 0 0 4px rgba(8, 133, 254, 0.12)",
+              boxShadow: "0 0 0 4px color-mix(in srgb, var(--ohw-primary, #0885FE) 12%, transparent)",
               pointerEvents: "none"
             }
           }
@@ -7900,6 +8000,7 @@ function applyVisibleViewport(el, parentScroll) {
   el.style.top = `${top}px`;
   el.style.height = `${height}px`;
 }
+var TOOLBAR_EDGE_MARGIN2 = 4;
 function clampToolbarToClip(top, transform, rect, clip, approxH, gap) {
   const isAbove = transform.includes("translateY(-100%)");
   let visualTop = isAbove ? top - approxH : top;
@@ -7923,10 +8024,16 @@ function clampToolbarToClip(top, transform, rect, clip, approxH, gap) {
   const pinnedTop = Math.min(maxBottom - approxH, Math.max(minTop, clip.top + gap));
   return { top: pinnedTop + approxH, transform: "translateX(-50%) translateY(-100%)" };
 }
-function calcToolbarPos(rect, parentScroll, approxW = 306) {
-  const GAP = 8;
+function clampToolbarLeft(centerX, toolbarWidth) {
+  const half = toolbarWidth / 2;
+  return Math.max(
+    TOOLBAR_EDGE_MARGIN2 + half,
+    Math.min(centerX, window.innerWidth - TOOLBAR_EDGE_MARGIN2 - half)
+  );
+}
+function calcToolbarPos(rect, parentScroll, toolbarW = 306) {
+  const GAP = TOOLBAR_OFFSET_FROM_ELEMENT;
   const APPROX_H = 32;
-  const APPROX_W = approxW;
   const clip = getIframeVisibleClip(parentScroll);
   const clipTop = clip?.top ?? 0;
   const canvasTopInIframe = parentScroll != null ? parentScroll.headerH - parentScroll.iframeOffsetTop : 0;
@@ -7956,7 +8063,7 @@ function calcToolbarPos(rect, parentScroll, approxW = 306) {
     transform = clamped.transform;
   }
   const rawLeft = rect.left + rect.width / 2;
-  const left = Math.max(GAP + APPROX_W / 2, Math.min(rawLeft, window.innerWidth - GAP - APPROX_W / 2));
+  const left = clampToolbarLeft(rawLeft, toolbarW);
   return { top, left, transform };
 }
 function resolveItemInteractionState(rect, parentScroll) {
@@ -7972,11 +8079,37 @@ function FloatingToolbar({
   showEditLink,
   onEditLink
 }) {
-  const { top, left, transform } = calcToolbarPos(rect, parentScroll, 330);
+  const localRef = import_react9.default.useRef(null);
+  const [measuredW, setMeasuredW] = import_react9.default.useState(330);
+  const setRefs = import_react9.default.useCallback(
+    (node) => {
+      localRef.current = node;
+      if (typeof elRef === "function") elRef(node);
+      else if (elRef) elRef.current = node;
+      if (node) {
+        const w = node.offsetWidth;
+        if (w > 0) setMeasuredW(w);
+      }
+    },
+    [elRef]
+  );
+  import_react9.default.useLayoutEffect(() => {
+    const node = localRef.current;
+    if (!node) return;
+    const update = () => {
+      const w = node.offsetWidth;
+      if (w > 0) setMeasuredW(w);
+    };
+    update();
+    const ro = new ResizeObserver(update);
+    ro.observe(node);
+    return () => ro.disconnect();
+  }, [showEditLink, activeCommands]);
+  const { top, left, transform } = calcToolbarPos(rect, parentScroll, measuredW);
   return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
     "div",
     {
-      ref: elRef,
+      ref: setRefs,
       style: {
         position: "fixed",
         top,
@@ -8186,6 +8319,7 @@ function OhhwellsBridge() {
   const [toolbarVariant, setToolbarVariant] = (0, import_react9.useState)("none");
   const toolbarVariantRef = (0, import_react9.useRef)("none");
   toolbarVariantRef.current = toolbarVariant;
+  const [selectedIsCta, setSelectedIsCta] = (0, import_react9.useState)(false);
   const [reorderHrefKey, setReorderHrefKey] = (0, import_react9.useState)(null);
   const [reorderDragDisabled, setReorderDragDisabled] = (0, import_react9.useState)(false);
   const [toggleState, setToggleState] = (0, import_react9.useState)(null);
@@ -8380,6 +8514,7 @@ function OhhwellsBridge() {
       }
     }
     el.removeAttribute("contenteditable");
+    el.removeAttribute("data-ohw-editing");
     activeElRef.current = null;
     setReorderHrefKey(null);
     setReorderDragDisabled(false);
@@ -8392,8 +8527,15 @@ function OhhwellsBridge() {
     setToolbarShowEditLink(false);
     postToParent2({ type: "ow:exit-edit" });
   }, [postToParent2]);
+  const clearSelectedAttr = (0, import_react9.useCallback)(() => {
+    document.querySelectorAll("[data-ohw-selected]").forEach((el) => {
+      el.removeAttribute("data-ohw-selected");
+    });
+  }, []);
   const deselect = (0, import_react9.useCallback)(() => {
+    clearSelectedAttr();
     selectedElRef.current = null;
+    setSelectedIsCta(false);
     setReorderHrefKey(null);
     setReorderDragDisabled(false);
     setIsFooterFrameSelection(false);
@@ -8407,9 +8549,15 @@ function OhhwellsBridge() {
       setToolbarRect(null);
       setToolbarVariant("none");
     }
-  }, []);
+  }, [clearSelectedAttr]);
+  const markSelected = (0, import_react9.useCallback)((el) => {
+    clearSelectedAttr();
+    el.setAttribute("data-ohw-selected", "");
+  }, [clearSelectedAttr]);
   const reselectNavigationItem = (0, import_react9.useCallback)((navAnchor) => {
     selectedElRef.current = navAnchor;
+    markSelected(navAnchor);
+    setSelectedIsCta(isNavbarButton2(navAnchor));
     const { key, disabled } = getNavigationItemReorderState(navAnchor);
     setReorderHrefKey(key);
     setReorderDragDisabled(disabled);
@@ -8417,7 +8565,7 @@ function OhhwellsBridge() {
     setToolbarRect(navAnchor.getBoundingClientRect());
     setToolbarShowEditLink(false);
     setActiveCommands(/* @__PURE__ */ new Set());
-  }, []);
+  }, [markSelected]);
   const commitNavigationTextEdit = (0, import_react9.useCallback)((navAnchor) => {
     const el = activeElRef.current;
     if (!el) return;
@@ -8437,6 +8585,7 @@ function OhhwellsBridge() {
       }
     }
     el.removeAttribute("contenteditable");
+    el.removeAttribute("data-ohw-editing");
     activeElRef.current = null;
     setMaxBadge(null);
     setActiveCommands(/* @__PURE__ */ new Set());
@@ -8746,97 +8895,106 @@ function OhhwellsBridge() {
   }, []);
   reselectNavigationItemRef.current = reselectNavigationItem;
   commitNavigationTextEditRef.current = commitNavigationTextEdit;
-  const select = (0, import_react9.useCallback)(
-    (anchor) => {
-      if (!isNavigationItem(anchor)) return;
-      if (activeElRef.current) deactivate();
-      selectedElRef.current = anchor;
-      clearHrefKeyHover(anchor);
-      hoveredNavContainerRef.current = null;
-      setHoveredNavContainerRect(null);
-      setHoveredItemRect(null);
-      hoveredItemElRef.current = null;
-      siblingHintElRef.current = null;
-      setSiblingHintRect(null);
-      setSiblingHintRects([]);
-      setIsItemDragging(false);
-      const { key, disabled } = getNavigationItemReorderState(anchor);
-      setReorderHrefKey(key);
-      setReorderDragDisabled(disabled);
-      setIsFooterFrameSelection(false);
-      setToolbarVariant("link-action");
-      setToolbarRect(anchor.getBoundingClientRect());
-      setToolbarShowEditLink(false);
-      setActiveCommands(/* @__PURE__ */ new Set());
-    },
-    [deactivate]
-  );
-  const selectFrame = (0, import_react9.useCallback)(
-    (el) => {
-      if (!isNavigationContainer(el)) return;
-      if (activeElRef.current) deactivate();
-      const isFooterColumn = el.hasAttribute("data-ohw-footer-col") || Boolean(el.closest("footer") && isInferredFooterGroup(el));
-      selectedElRef.current = el;
-      clearHrefKeyHover(el);
-      hoveredNavContainerRef.current = null;
-      setHoveredNavContainerRect(null);
-      setHoveredItemRect(null);
-      hoveredItemElRef.current = null;
-      siblingHintElRef.current = null;
-      setSiblingHintRect(null);
-      setSiblingHintRects(
-        isFooterColumn ? listFooterColumns().filter((column) => column !== el).map((column) => column.getBoundingClientRect()) : []
-      );
-      setIsItemDragging(false);
+  const select = (0, import_react9.useCallback)((anchor) => {
+    if (!isNavigationItem(anchor)) return;
+    if (activeElRef.current) deactivate();
+    selectedElRef.current = anchor;
+    markSelected(anchor);
+    setSelectedIsCta(isNavbarButton2(anchor));
+    clearHrefKeyHover(anchor);
+    hoveredNavContainerRef.current = null;
+    setHoveredNavContainerRect(null);
+    setHoveredItemRect(null);
+    hoveredItemElRef.current = null;
+    siblingHintElRef.current = null;
+    setSiblingHintRect(null);
+    setSiblingHintRects([]);
+    setIsItemDragging(false);
+    const { key, disabled } = getNavigationItemReorderState(anchor);
+    setReorderHrefKey(key);
+    setReorderDragDisabled(disabled);
+    setIsFooterFrameSelection(false);
+    setToolbarVariant("link-action");
+    setToolbarRect(anchor.getBoundingClientRect());
+    setToolbarShowEditLink(false);
+    setActiveCommands(/* @__PURE__ */ new Set());
+  }, [deactivate, markSelected]);
+  const selectFrame = (0, import_react9.useCallback)((el) => {
+    if (!isNavigationContainer(el)) return;
+    if (activeElRef.current) deactivate();
+    const isFooterColumn = el.hasAttribute("data-ohw-footer-col") || Boolean(el.closest("footer") && isInferredFooterGroup(el));
+    selectedElRef.current = el;
+    markSelected(el);
+    setSelectedIsCta(false);
+    clearHrefKeyHover(el);
+    hoveredNavContainerRef.current = null;
+    setHoveredNavContainerRect(null);
+    setHoveredItemRect(null);
+    hoveredItemElRef.current = null;
+    siblingHintElRef.current = null;
+    setSiblingHintRect(null);
+    setSiblingHintRects(
+      isFooterColumn ? listFooterColumns().filter((column) => column !== el).map((column) => column.getBoundingClientRect()) : []
+    );
+    setIsItemDragging(false);
+    setReorderHrefKey(null);
+    setReorderDragDisabled(false);
+    setIsFooterFrameSelection(isFooterColumn);
+    setToolbarVariant("select-frame");
+    setToolbarRect(el.getBoundingClientRect());
+    setToolbarShowEditLink(false);
+    setActiveCommands(/* @__PURE__ */ new Set());
+  }, [deactivate, markSelected]);
+  const activate = (0, import_react9.useCallback)((el, options) => {
+    if (activeElRef.current === el) return;
+    clearSelectedAttr();
+    selectedElRef.current = null;
+    setSelectedIsCta(false);
+    deactivate();
+    if (hoveredImageRef.current) {
+      hoveredImageRef.current = null;
+      setMediaHover(null);
+      postToParentRef.current({ type: "ow:image-unhover" });
+    }
+    setToolbarVariant("rich-text");
+    siblingHintElRef.current = null;
+    setSiblingHintRect(null);
+    setSiblingHintRects([]);
+    setIsItemDragging(false);
+    setIsFooterFrameSelection(false);
+    el.setAttribute("contenteditable", "true");
+    el.setAttribute("data-ohw-editing", "");
+    el.removeAttribute("data-ohw-hovered");
+    el.closest("[data-ohw-href-key]")?.removeAttribute("data-ohw-hovered");
+    activeElRef.current = el;
+    originalContentRef.current = el.innerHTML;
+    el.focus({ preventScroll: true });
+    if (options?.caretX !== void 0 && options?.caretY !== void 0) {
+      placeCaretAtPoint(el, options.caretX, options.caretY);
+    } else {
+      const selection = window.getSelection();
+      if (selection && selection.rangeCount === 0) {
+        const range = document.createRange();
+        range.selectNodeContents(el);
+        range.collapse(false);
+        selection.removeAllRanges();
+        selection.addRange(range);
+      }
+    }
+    setToolbarShowEditLink(Boolean(getHrefKeyFromElement(el)));
+    const navAnchor = getNavigationItemAnchor(el);
+    if (navAnchor) {
       setReorderHrefKey(null);
       setReorderDragDisabled(false);
-      setIsFooterFrameSelection(isFooterColumn);
-      setToolbarVariant("select-frame");
-      setToolbarRect(el.getBoundingClientRect());
-      setToolbarShowEditLink(false);
-      setActiveCommands(/* @__PURE__ */ new Set());
-    },
-    [deactivate]
-  );
-  const activate = (0, import_react9.useCallback)(
-    (el, options) => {
-      if (activeElRef.current === el) return;
-      selectedElRef.current = null;
-      deactivate();
-      if (hoveredImageRef.current) {
-        hoveredImageRef.current = null;
-        postToParentRef.current({ type: "ow:image-unhover" });
-      }
-      setToolbarVariant("rich-text");
-      siblingHintElRef.current = null;
-      setSiblingHintRect(null);
-      setSiblingHintRects([]);
-      setIsItemDragging(false);
-      el.setAttribute("contenteditable", "true");
-      el.removeAttribute("data-ohw-hovered");
-      el.closest("[data-ohw-href-key]")?.removeAttribute("data-ohw-hovered");
-      activeElRef.current = el;
-      originalContentRef.current = el.innerHTML;
-      el.focus();
-      if (options?.caretX !== void 0 && options?.caretY !== void 0) {
-        placeCaretAtPoint(el, options.caretX, options.caretY);
-      }
-      setToolbarShowEditLink(Boolean(getHrefKeyFromElement(el)));
-      const navAnchor = getNavigationItemAnchor(el);
-      if (navAnchor) {
-        setReorderHrefKey(null);
-        setReorderDragDisabled(false);
-      } else {
-        const { key: reorderKey, disabled: reorderDisabled } = getReorderHandleState(el);
-        setReorderHrefKey(reorderKey);
-        setReorderDragDisabled(reorderDisabled);
-      }
-      setToolbarRect(getEditMeasureEl(el).getBoundingClientRect());
-      postToParent2({ type: "ow:enter-edit", key: el.dataset.ohwKey });
-      requestAnimationFrame(() => refreshActiveCommandsRef.current());
-    },
-    [deactivate, postToParent2]
-  );
+    } else {
+      const { key: reorderKey, disabled: reorderDisabled } = getReorderHandleState(el);
+      setReorderHrefKey(reorderKey);
+      setReorderDragDisabled(reorderDisabled);
+    }
+    setToolbarRect(getEditMeasureEl(el).getBoundingClientRect());
+    postToParent2({ type: "ow:enter-edit", key: el.dataset.ohwKey });
+    requestAnimationFrame(() => refreshActiveCommandsRef.current());
+  }, [clearSelectedAttr, deactivate, postToParent2]);
   activateRef.current = activate;
   deactivateRef.current = deactivate;
   selectRef.current = select;
@@ -8987,11 +9145,21 @@ function OhhwellsBridge() {
       if (!subdomain) return {};
       return contentCache.get(subdomain) ?? {};
     };
-    let applying = false;
+    const observeRoots = () => [document.querySelector("nav"), document.querySelector("footer")].filter(
+      (el) => Boolean(el)
+    );
     let rafId = null;
+    let applying = false;
+    let observer = null;
+    const attach = () => {
+      for (const root of observeRoots()) {
+        observer?.observe(root, { childList: true, subtree: true });
+      }
+    };
     const run = () => {
       if (footerDragRef.current || applying) return;
       applying = true;
+      observer?.disconnect();
       try {
         const content = contentForNav();
         reconcileNavbarItemsFromContent(content);
@@ -9001,27 +9169,24 @@ function OhhwellsBridge() {
             disableNativeHrefDrag(el);
           }
         });
+        if (isEditMode) syncNavigationDragCursorAttrs();
       } finally {
         applying = false;
+        attach();
       }
     };
-    const scheduleRun = () => {
-      if (rafId !== null) cancelAnimationFrame(rafId);
+    const schedule = () => {
+      if (applying || rafId != null) return;
       rafId = requestAnimationFrame(() => {
         rafId = null;
         run();
       });
     };
+    observer = new MutationObserver(schedule);
     run();
-    const nav = document.querySelector("nav");
-    const footer = document.querySelector("footer");
-    const observer = new MutationObserver(scheduleRun);
-    if (nav) observer.observe(nav, { childList: true, subtree: true });
-    if (footer) observer.observe(footer, { childList: true, subtree: true });
-    if (!nav && !footer) return;
     return () => {
-      observer.disconnect();
-      if (rafId !== null) cancelAnimationFrame(rafId);
+      if (rafId != null) cancelAnimationFrame(rafId);
+      observer?.disconnect();
     };
   }, [isEditMode, pathname, subdomain, fetchState]);
   (0, import_react9.useEffect)(() => {
@@ -9070,13 +9235,18 @@ function OhhwellsBridge() {
       editStylesRef.current?.forceHover.remove();
       editStylesRef.current?.stateViews.remove();
       editStylesRef.current = null;
+      document.querySelectorAll("[data-ohw-can-drag]").forEach((el) => {
+        el.removeAttribute("data-ohw-can-drag");
+      });
       return;
     }
-    if (!editStylesRef.current) {
-      const initialVh = window.innerHeight;
-      const base = document.createElement("style");
-      base.setAttribute("data-ohw-edit-style", "");
-      base.textContent = `
+    const existing = editStylesRef.current;
+    let initialVh = window.innerHeight;
+    if (existing?.base.textContent) {
+      const match = existing.base.textContent.match(/\.min-h-screen[^{]*\{[^}]*min-height:\s*(\d+)px/);
+      if (match) initialVh = parseInt(match[1], 10);
+    }
+    const baseCss = `
       html { height: auto !important; }
       body { height: auto !important; min-height: 0 !important; overflow: hidden !important; }
       .min-h-screen, .min-h-svh, .min-h-dvh { min-height: ${initialVh}px !important; }
@@ -9087,6 +9257,25 @@ function OhhwellsBridge() {
       [data-ohw-editable] {
         display: block;
       }
+      /* Body text (no item-action toolbar) \u2014 first click enters text edit \u2192 I-beam.
+         Exclude select-first nav/footer labels so grab/default on [data-ohw-href-key] can win. */
+      [data-ohw-editable]:not([contenteditable]):not([data-ohw-editable="image"]):not([data-ohw-editable="bg-image"]):not([data-ohw-editable="video"]):not([data-ohw-editable="link"]):not(:is([data-ohw-href-key] *)) {
+        cursor: text !important;
+      }
+      /* Select-first items: default arrow; grab only when drag-start is allowed (data-ohw-can-drag). */
+      [data-ohw-href-key]:not([data-ohw-selected]),
+      [data-ohw-href-key]:not([data-ohw-selected]) * {
+        cursor: default !important;
+      }
+      [data-ohw-href-key][data-ohw-can-drag]:not([data-ohw-selected]),
+      [data-ohw-href-key][data-ohw-can-drag]:not([data-ohw-selected]) * {
+        cursor: grab !important;
+      }
+      /* Selected (action-toolbar) \u2014 next click enters text edit at caret. */
+      [data-ohw-href-key][data-ohw-selected],
+      [data-ohw-href-key][data-ohw-selected] * {
+        cursor: text !important;
+      }
       /* Native <a> drag steals clicks \u2014 disable for edit links; reorder via press-to-drag / handle. */
       footer [data-ohw-href-key] {
         -webkit-user-drag: none !important;
@@ -9135,9 +9324,17 @@ function OhhwellsBridge() {
         outline: none !important;
         outline-offset: 0 !important;
       }
-      [data-ohw-editable][contenteditable] {
+      /* Text edit wins over grab/default (must beat [data-ohw-can-drag] *). */
+      [data-ohw-editing],
+      [data-ohw-editing] *,
+      [data-ohw-editable][contenteditable],
+      [data-ohw-editable][contenteditable] *,
+      nav [data-ohw-href-key] [data-ohw-editable][contenteditable],
+      nav [data-ohw-href-key] [data-ohw-editable][contenteditable] *,
+      footer [data-ohw-href-key] [data-ohw-editable][contenteditable],
+      footer [data-ohw-href-key] [data-ohw-editable][contenteditable] * {
         outline: none !important;
-        caret-color: ${PRIMARY2};
+        caret-color: ${PRIMARY2} !important;
         cursor: text !important;
       }
       [data-ohw-editable][contenteditable]::selection,
@@ -9146,6 +9343,9 @@ function OhhwellsBridge() {
       [data-ohw-editable-state][data-ohw-active-state] [data-ohw-editable] { pointer-events: auto !important; }
       [data-ohw-editable-state][data-ohw-active-state][data-ohw-editable] { pointer-events: auto !important; }
     `;
+    if (!existing) {
+      const base = document.createElement("style");
+      base.setAttribute("data-ohw-edit-style", "");
       const forceHover = document.createElement("style");
       forceHover.setAttribute("data-ohw-active-state-style", "");
       const stateViews = document.createElement("style");
@@ -9161,6 +9361,8 @@ function OhhwellsBridge() {
       document.head.appendChild(stateViews);
       editStylesRef.current = { base, forceHover, stateViews };
     }
+    editStylesRef.current.base.textContent = baseCss;
+    syncNavigationDragCursorAttrs();
     refreshStateRules();
     const handleClick = (e) => {
       if (suppressNextClickRef.current) {
@@ -9203,10 +9405,34 @@ function OhhwellsBridge() {
           selectFrameRef.current(navFromChrome);
           return;
         }
+        const footerFromChrome = resolveFooterColumnSelectionTarget(target, e.clientX, e.clientY);
+        if (footerFromChrome) {
+          e.preventDefault();
+          e.stopPropagation();
+          selectFrameRef.current(footerFromChrome);
+          return;
+        }
         e.preventDefault();
         e.stopPropagation();
         return;
       }
+      if (activeElRef.current) {
+        const active = activeElRef.current;
+        const inActive = active === target || active.contains(target);
+        const navAnchor = getNavigationItemAnchor(active);
+        const inActiveNav = Boolean(
+          navAnchor && (navAnchor === target || navAnchor.contains(target))
+        );
+        if (inActive || inActiveNav) {
+          e.preventDefault();
+          e.stopPropagation();
+          if (e.detail < 2) {
+            placeCaretAtPoint(active, e.clientX, e.clientY);
+            refreshActiveCommandsRef.current();
+          }
+          return;
+        }
+      }
       const editable = target.closest("[data-ohw-editable]");
       if (editable) {
         if (editable.dataset.ohwEditable === "link") {
@@ -9285,6 +9511,13 @@ function OhhwellsBridge() {
         selectFrameRef.current(navContainerToSelect);
         return;
       }
+      const footerColumnToSelect = resolveFooterColumnSelectionTarget(target, e.clientX, e.clientY);
+      if (footerColumnToSelect) {
+        e.preventDefault();
+        e.stopPropagation();
+        selectFrameRef.current(footerColumnToSelect);
+        return;
+      }
       const selectedContainer = selectedElRef.current;
       if (selectedContainer && isNavigationContainer(selectedContainer)) {
         const navItem = getNavigationItemAnchor(target);
@@ -9352,15 +9585,15 @@ function OhhwellsBridge() {
         return;
       }
       if (toolbarVariantRef.current !== "select-frame") {
-        const navContainer = target.closest("[data-ohw-nav-container]");
-        if (navContainer && !getNavigationItemAnchor(target)) {
-          hoveredNavContainerRef.current = navContainer;
-          setHoveredNavContainerRect(navContainer.getBoundingClientRect());
+        const frameContainer = target.closest("[data-ohw-nav-container]") ?? target.closest("[data-ohw-footer-col]");
+        if (frameContainer && !getNavigationItemAnchor(target)) {
+          hoveredNavContainerRef.current = frameContainer;
+          setHoveredNavContainerRect(frameContainer.getBoundingClientRect());
           hoveredItemElRef.current = null;
           setHoveredItemRect(null);
           return;
         }
-        if (!target.closest("[data-ohw-nav-container]")) {
+        if (!target.closest("[data-ohw-nav-container], [data-ohw-footer-col]")) {
           hoveredNavContainerRef.current = null;
           setHoveredNavContainerRect(null);
         }
@@ -9402,9 +9635,9 @@ function OhhwellsBridge() {
     };
     const handleMouseOut = (e) => {
       const target = e.target;
-      if (target.closest("[data-ohw-nav-container]")) {
+      if (target.closest("[data-ohw-nav-container], [data-ohw-footer-col]")) {
         const related2 = e.relatedTarget instanceof Element ? e.relatedTarget : null;
-        if (related2?.closest("[data-ohw-nav-container], [data-ohw-navbar-container-chrome], [data-ohw-navbar-add-button]")) {
+        if (related2?.closest("[data-ohw-nav-container], [data-ohw-footer-col], [data-ohw-navbar-container-chrome], [data-ohw-navbar-add-button]")) {
           return;
         }
         hoveredNavContainerRef.current = null;
@@ -9555,39 +9788,43 @@ function OhhwellsBridge() {
         setHoveredNavContainerRect(null);
         return;
       }
-      const navContainer = document.querySelector("[data-ohw-nav-container]");
-      if (!navContainer) {
-        hoveredNavContainerRef.current = null;
-        setHoveredNavContainerRect(null);
-        return;
-      }
-      const containerRect = navContainer.getBoundingClientRect();
-      const overContainer = x >= containerRect.left && x <= containerRect.right && y >= containerRect.top && y <= containerRect.bottom;
-      if (!overContainer) {
-        hoveredNavContainerRef.current = null;
-        setHoveredNavContainerRect(null);
-        return;
+      const frameContainers = [
+        ...document.querySelectorAll("[data-ohw-nav-container]"),
+        ...document.querySelectorAll("[data-ohw-footer-col]")
+      ];
+      let overFrame = null;
+      for (const container of frameContainers) {
+        const containerRect = container.getBoundingClientRect();
+        const overContainer = x >= containerRect.left && x <= containerRect.right && y >= containerRect.top && y <= containerRect.bottom;
+        if (!overContainer) continue;
+        const navItemHit = Array.from(
+          container.querySelectorAll("[data-ohw-href-key]")
+        ).find((el) => {
+          if (!isNavigationItem(el) || isNavbarButton2(el)) return false;
+          const itemRect = el.getBoundingClientRect();
+          return x >= itemRect.left && x <= itemRect.right && y >= itemRect.top && y <= itemRect.bottom;
+        });
+        if (navItemHit) {
+          hoveredNavContainerRef.current = null;
+          setHoveredNavContainerRect(null);
+          const selected = selectedElRef.current;
+          if (selected !== navItemHit && !selected?.contains(navItemHit)) {
+            clearHrefKeyHover(navItemHit);
+            hoveredItemElRef.current = navItemHit;
+            setHoveredItemRect(navItemHit.getBoundingClientRect());
+          }
+          return;
+        }
+        overFrame = container;
+        break;
       }
-      const navItemHit = Array.from(
-        navContainer.querySelectorAll("[data-ohw-href-key]")
-      ).find((el) => {
-        if (!isNavigationItem(el) || isNavbarButton2(el)) return false;
-        const itemRect = el.getBoundingClientRect();
-        return x >= itemRect.left && x <= itemRect.right && y >= itemRect.top && y <= itemRect.bottom;
-      });
-      if (navItemHit) {
+      if (!overFrame) {
         hoveredNavContainerRef.current = null;
         setHoveredNavContainerRect(null);
-        const selected = selectedElRef.current;
-        if (selected !== navItemHit && !selected?.contains(navItemHit)) {
-          clearHrefKeyHover(navItemHit);
-          hoveredItemElRef.current = navItemHit;
-          setHoveredItemRect(navItemHit.getBoundingClientRect());
-        }
         return;
       }
-      hoveredNavContainerRef.current = navContainer;
-      setHoveredNavContainerRect(containerRect);
+      hoveredNavContainerRef.current = overFrame;
+      setHoveredNavContainerRect(overFrame.getBoundingClientRect());
       hoveredItemElRef.current = null;
       setHoveredItemRect(null);
     };
@@ -10028,8 +10265,8 @@ function OhhwellsBridge() {
         if (sibling !== el) sibling.innerHTML = html;
       });
       const timers = autoSaveTimers.current;
-      const existing = timers.get(key);
-      if (existing) clearTimeout(existing);
+      const existing2 = timers.get(key);
+      if (existing2) clearTimeout(existing2);
       timers.set(key, setTimeout(() => {
         timers.delete(key);
         postToParentRef.current({ type: "ow:change", nodes: [{ key, text: html }] });
@@ -10073,6 +10310,7 @@ function OhhwellsBridge() {
       }
       editContentRef.current = { ...editContentRef.current, ...content };
       reconcileNavbarItemsFromContent(editContentRef.current);
+      syncNavigationDragCursorAttrs();
       reconcileFooterOrderFromContent(editContentRef.current);
       enforceLinkHrefs();
       postToParentRef.current({ type: "ow:hydrate-done" });
@@ -10094,6 +10332,48 @@ function OhhwellsBridge() {
       if (e.data?.type !== "ui:escape") return;
       if (linkPopoverOpenRef.current) {
         setLinkPopoverRef.current(null);
+        return;
+      }
+      if (activeElRef.current) {
+        const hrefCtx = getHrefKeyFromElement(activeElRef.current);
+        const navAnchor = hrefCtx ? getNavigationItemAnchor(hrefCtx.anchor) : null;
+        if (navAnchor) {
+          const el = activeElRef.current;
+          if (originalContentRef.current !== null) {
+            el.innerHTML = originalContentRef.current;
+          }
+          el.removeAttribute("contenteditable");
+          el.removeAttribute("data-ohw-editing");
+          activeElRef.current = null;
+          setMaxBadge(null);
+          setActiveCommands(/* @__PURE__ */ new Set());
+          setToolbarShowEditLink(false);
+          postToParentRef.current({ type: "ow:exit-edit" });
+          reselectNavigationItemRef.current(navAnchor);
+          return;
+        }
+        if (originalContentRef.current !== null) {
+          activeElRef.current.innerHTML = originalContentRef.current;
+          const key = activeElRef.current.dataset.ohwKey;
+          if (key) {
+            postToParentRef.current({ type: "ow:change", nodes: [{ key, text: originalContentRef.current }] });
+          }
+        }
+        deselectRef.current();
+        deactivateRef.current();
+        return;
+      }
+      if (selectedElRef.current) {
+        if (toolbarVariantRef.current === "select-frame") {
+          deselectRef.current();
+          return;
+        }
+        const parent = getNavigationSelectionParent(selectedElRef.current);
+        if (parent && isNavigationContainer(parent)) {
+          selectFrameRef.current(parent);
+        } else {
+          deselectRef.current();
+        }
       }
     };
     window.addEventListener("message", handleUiEscape);
@@ -10118,7 +10398,7 @@ function OhhwellsBridge() {
           return;
         }
         const parent = getNavigationSelectionParent(selectedElRef.current);
-        if (parent) {
+        if (parent && isNavigationContainer(parent)) {
           e.preventDefault();
           selectFrameRef.current(parent);
         } else {
@@ -10136,6 +10416,7 @@ function OhhwellsBridge() {
             el2.innerHTML = originalContentRef.current;
           }
           el2.removeAttribute("contenteditable");
+          el2.removeAttribute("data-ohw-editing");
           activeElRef.current = null;
           setMaxBadge(null);
           setActiveCommands(/* @__PURE__ */ new Set());
@@ -10397,15 +10678,15 @@ function OhhwellsBridge() {
     };
     const applyToolbarPos = (rect) => {
       const ps = parentScrollRef.current;
-      const approxW = 330;
+      const measuredW = toolbarElRef.current?.offsetWidth || 330;
       if (toolbarElRef.current) {
-        const { top, left, transform } = calcToolbarPos(rect, ps, approxW);
+        const { top, left, transform } = calcToolbarPos(rect, ps, measuredW);
         toolbarElRef.current.style.top = `${top}px`;
         toolbarElRef.current.style.left = `${left}px`;
         toolbarElRef.current.style.transform = transform;
       }
       if (glowElRef.current) {
-        const GAP = 6;
+        const GAP = SELECTION_CHROME_GAP2;
         glowElRef.current.style.top = `${rect.top - GAP}px`;
         glowElRef.current.style.left = `${rect.left - GAP}px`;
         glowElRef.current.style.width = `${rect.width + GAP * 2}px`;
@@ -10493,6 +10774,11 @@ function OhhwellsBridge() {
           return;
         }
       }
+      const footerColumn = findHoveredNavOrFooterContainer(clientX, clientY);
+      if (footerColumn?.hasAttribute("data-ohw-footer-col")) {
+        selectFrameRef.current(footerColumn);
+        return;
+      }
       deactivateRef.current();
     };
     window.addEventListener("message", handleSave);
@@ -10973,7 +11259,32 @@ function OhhwellsBridge() {
       hoveredNavContainerRect && toolbarVariant !== "select-frame" && !linkPopover && !isItemDragging && !siblingHintRect && siblingHintRects.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(ItemInteractionLayer, { rect: hoveredNavContainerRect, state: "hover" }),
       toolbarVariant === "select-frame" && toolbarRect && !linkPopover && !isItemDragging && !isFooterFrameSelection && /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(NavbarContainerChrome, { rect: toolbarRect, onAdd: handleAddTopLevelNavItem }),
       hoveredItemRect && !linkPopover && !hoveredNavContainerRect && !siblingHintRect && siblingHintRects.length === 0 && !isItemDragging && hoveredItemElRef.current !== selectedElRef.current && /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(ItemInteractionLayer, { rect: hoveredItemRect, state: "hover" }),
-      toolbarRect && (toolbarVariant === "link-action" || toolbarVariant === "select-frame") && /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(ItemInteractionLayer, { rect: isItemDragging && draggedItemRect && footerDragRef.current?.wasSelected ? draggedItemRect : toolbarRect, elRef: glowElRef, state: isItemDragging ? "dragging" : resolveItemInteractionState(toolbarRect, parentScrollRef.current), showHandle: toolbarVariant === "link-action" && Boolean(reorderHrefKey) || toolbarVariant === "select-frame" && isFooterFrameSelection, dragDisabled: reorderDragDisabled, dragHandleLabel: reorderHrefKey ? `Reorder ${reorderHrefKey}` : "Reorder item", onDragHandleDragStart: handleItemDragStart, onDragHandleDragEnd: handleItemDragEnd, onItemPointerDown: handleItemChromePointerDown, onItemClick: handleItemChromeClick, toolbar: toolbarVariant === "link-action" && !isItemDragging ? /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(ItemActionToolbar, { onEditLink: openLinkPopoverForSelected, addItemDisabled: true, editLinkDisabled: false, moreDisabled: true }) : void 0 }),
+      toolbarRect && (toolbarVariant === "link-action" || toolbarVariant === "select-frame") && /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+        ItemInteractionLayer,
+        {
+          rect: isItemDragging && draggedItemRect && footerDragRef.current?.wasSelected ? draggedItemRect : toolbarRect,
+          elRef: glowElRef,
+          state: isItemDragging ? "dragging" : resolveItemInteractionState(toolbarRect, parentScrollRef.current),
+          showHandle: toolbarVariant === "link-action" && Boolean(reorderHrefKey) || toolbarVariant === "select-frame" && isFooterFrameSelection,
+          dragDisabled: reorderDragDisabled,
+          dragHandleLabel: reorderHrefKey ? `Reorder ${reorderHrefKey}` : "Reorder item",
+          onDragHandleDragStart: handleItemDragStart,
+          onDragHandleDragEnd: handleItemDragEnd,
+          onItemPointerDown: handleItemChromePointerDown,
+          onItemClick: handleItemChromeClick,
+          toolbar: toolbarVariant === "link-action" && !isItemDragging ? /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+            ItemActionToolbar,
+            {
+              onEditLink: openLinkPopoverForSelected,
+              addItemDisabled: true,
+              editLinkDisabled: false,
+              moreDisabled: true,
+              showAddItem: !selectedIsCta,
+              showMore: !selectedIsCta
+            }
+          ) : void 0
+        }
+      ),
       toolbarRect && toolbarVariant === "rich-text" && /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(import_jsx_runtime25.Fragment, { children: [
         /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(EditGlowChrome, { rect: toolbarRect, elRef: glowElRef, reorderHrefKey, dragDisabled: reorderDragDisabled }),
         /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(FloatingToolbar, { rect: toolbarRect, parentScroll: parentScrollRef.current, elRef: toolbarElRef, onCommand: handleCommand, activeCommands, showEditLink, onEditLink: openLinkPopoverForActive })