@ohhwells/bridge 0.1.29-next.21 → 0.1.29-next.24

package/dist/index.cjs

@@ -5466,6 +5466,15 @@ function getHrefKeyFromElement(el) {
   if (!key) return null;
   return { anchor, key };
 }
+function isNavbarButton(el) {
+  return Boolean(el.closest('[data-ohw-role="navbar-button"]'));
+}
+function clearHrefKeyHover(anchor) {
+  anchor.removeAttribute("data-ohw-hovered");
+  anchor.querySelectorAll("[data-ohw-hovered]").forEach((el) => {
+    el.removeAttribute("data-ohw-hovered");
+  });
+}
 function collectSections() {
   return collectSectionsFromDom();
 }
@@ -5627,19 +5636,24 @@ function GlowFrame({ rect, elRef }) {
     }
   );
 }
-function calcToolbarPos(rect, parentScroll) {
+function calcToolbarPos(rect, parentScroll, approxW = 330) {
   const GAP = 8;
   const APPROX_H = 36;
-  const APPROX_W = 330;
+  const APPROX_W = approxW;
   const canvasTopInIframe = parentScroll != null ? parentScroll.headerH - parentScroll.iframeOffsetTop : 0;
   const visibleTop = rect.top - canvasTopInIframe;
   const visibleBottom = rect.bottom - canvasTopInIframe;
   const isTall = rect.height > APPROX_H + GAP;
+  const spaceAbove = rect.top - (canvasTopInIframe + GAP);
+  const fitsAbove = spaceAbove >= APPROX_H + GAP;
   let top;
   let transform;
-  if (visibleTop > 0 || !isTall) {
+  if ((visibleTop > 0 || !isTall) && fitsAbove) {
     top = rect.top - GAP;
     transform = "translateX(-50%) translateY(-100%)";
+  } else if (visibleTop > 0 || !isTall) {
+    top = rect.bottom + GAP;
+    transform = "translateX(-50%)";
   } else if (visibleBottom > APPROX_H + GAP) {
     top = canvasTopInIframe + GAP;
     transform = "translateX(-50%)";
@@ -5651,16 +5665,114 @@ function calcToolbarPos(rect, parentScroll) {
   const left = Math.max(GAP + APPROX_W / 2, Math.min(rawLeft, window.innerWidth - GAP - APPROX_W / 2));
   return { top, left, transform };
 }
+var EDIT_LINK_ICON = /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("svg", { width: "16", height: "16", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2.5", strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true, children: [
+  /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("path", { d: "M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71" }),
+  /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("path", { d: "M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71" })
+] });
 function FloatingToolbar({
   rect,
   parentScroll,
   elRef,
+  variant = "rich-text",
   onCommand,
   activeCommands,
   showEditLink,
   onEditLink
 }) {
-  const { top, left, transform } = calcToolbarPos(rect, parentScroll);
+  const approxW = variant === "link-action" ? 120 : 330;
+  const { top, left, transform } = calcToolbarPos(rect, parentScroll, approxW);
+  if (variant === "link-action") {
+    return /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(
+      "div",
+      {
+        ref: elRef,
+        "data-ohw-toolbar": "",
+        style: {
+          position: "fixed",
+          top,
+          left,
+          transform,
+          zIndex: 2147483647,
+          background: "#fff",
+          border: "1px solid #E7E5E4",
+          borderRadius: 6,
+          boxShadow: "0px 2px 4px -2px rgba(0,0,0,.1),0px 4px 6px -1px rgba(0,0,0,.1)",
+          display: "flex",
+          alignItems: "center",
+          padding: 4,
+          gap: 6,
+          fontFamily: "sans-serif",
+          pointerEvents: "auto",
+          whiteSpace: "nowrap"
+        },
+        onMouseDown: (e) => e.stopPropagation(),
+        children: [
+          /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+            "button",
+            {
+              type: "button",
+              title: "Edit link",
+              onMouseDown: (e) => {
+                e.preventDefault();
+                e.stopPropagation();
+                onEditLink?.();
+              },
+              onClick: (e) => {
+                e.preventDefault();
+                e.stopPropagation();
+              },
+              onMouseEnter: (e) => {
+                e.currentTarget.style.background = "#F5F5F4";
+              },
+              onMouseLeave: (e) => {
+                e.currentTarget.style.background = "transparent";
+              },
+              style: {
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+                border: "none",
+                background: "transparent",
+                borderRadius: 4,
+                cursor: "pointer",
+                color: "#1C1917",
+                flexShrink: 0,
+                padding: 6
+              },
+              children: EDIT_LINK_ICON
+            }
+          ),
+          /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("span", { style: { display: "block", width: 1, height: 24, background: "#E7E5E4", flexShrink: 0 } }),
+          /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+            "button",
+            {
+              type: "button",
+              title: "Coming soon",
+              disabled: true,
+              style: {
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+                border: "none",
+                background: "transparent",
+                borderRadius: 4,
+                cursor: "not-allowed",
+                color: "#A8A29E",
+                flexShrink: 0,
+                padding: 6,
+                opacity: 0.6
+              },
+              children: /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("svg", { width: "16", height: "16", viewBox: "0 0 24 24", fill: "currentColor", "aria-hidden": true, children: [
+                /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("circle", { cx: "5", cy: "12", r: "1.5" }),
+                /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("circle", { cx: "12", cy: "12", r: "1.5" }),
+                /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("circle", { cx: "19", cy: "12", r: "1.5" })
+              ] })
+            }
+          )
+        ]
+      }
+    );
+  }
   return /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(
     "div",
     {
@@ -5768,10 +5880,7 @@ function FloatingToolbar({
               flexShrink: 0,
               padding: 6
             },
-            children: /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("svg", { width: "16", height: "16", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2.5", strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true, children: [
-              /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("path", { d: "M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71" }),
-              /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("path", { d: "M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71" })
-            ] })
+            children: EDIT_LINK_ICON
           }
         ) : null
       ]
@@ -5862,6 +5971,7 @@ function OhhwellsBridge() {
   const [fetchState, setFetchState] = (0, import_react5.useState)("idle");
   const autoSaveTimers = (0, import_react5.useRef)(/* @__PURE__ */ new Map());
   const activeElRef = (0, import_react5.useRef)(null);
+  const selectedElRef = (0, import_react5.useRef)(null);
   const originalContentRef = (0, import_react5.useRef)(null);
   const activeStateElRef = (0, import_react5.useRef)(null);
   const parentScrollRef = (0, import_react5.useRef)(null);
@@ -5877,6 +5987,10 @@ function OhhwellsBridge() {
   });
   const deactivateRef = (0, import_react5.useRef)(() => {
   });
+  const selectRef = (0, import_react5.useRef)(() => {
+  });
+  const deselectRef = (0, import_react5.useRef)(() => {
+  });
   const refreshActiveCommandsRef = (0, import_react5.useRef)(() => {
   });
   const postToParentRef = (0, import_react5.useRef)(postToParent);
@@ -5884,9 +5998,13 @@ function OhhwellsBridge() {
   const sectionsLoadedRef = (0, import_react5.useRef)(false);
   const pendingScheduleConfigRequests = (0, import_react5.useRef)([]);
   const [toolbarRect, setToolbarRect] = (0, import_react5.useState)(null);
+  const [toolbarVariant, setToolbarVariant] = (0, import_react5.useState)("none");
+  const toolbarVariantRef = (0, import_react5.useRef)("none");
+  toolbarVariantRef.current = toolbarVariant;
   const [toggleState, setToggleState] = (0, import_react5.useState)(null);
   const [maxBadge, setMaxBadge] = (0, import_react5.useState)(null);
   const [activeCommands, setActiveCommands] = (0, import_react5.useState)(/* @__PURE__ */ new Set());
+  const [sectionGap, setSectionGap] = (0, import_react5.useState)(null);
   const [toolbarShowEditLink, setToolbarShowEditLink] = (0, import_react5.useState)(false);
   const [linkPopover, setLinkPopover] = (0, import_react5.useState)(null);
   const [sitePages, setSitePages] = (0, import_react5.useState)([]);
@@ -5953,7 +6071,6 @@ function OhhwellsBridge() {
     if (!useFixtures) postToParent({ type: "ow:request-site-pages" });
     return () => window.removeEventListener("message", onSitePages);
   }, [isEditMode, postToParent]);
-  const [sectionGap, setSectionGap] = (0, import_react5.useState)(null);
   (0, import_react5.useEffect)(() => {
     if (!isEditMode || shouldUseDevFixtures()) return;
     void loadAllSectionsManifest().then((manifest) => {
@@ -5963,7 +6080,7 @@ function OhhwellsBridge() {
   }, [isEditMode]);
   (0, import_react5.useEffect)(() => {
     const update = () => {
-      const el = activeElRef.current;
+      const el = activeElRef.current ?? selectedElRef.current;
       if (el) setToolbarRect(el.getBoundingClientRect());
       setToggleState((prev) => {
         if (!prev || !activeStateElRef.current) return prev;
@@ -6031,19 +6148,41 @@ function OhhwellsBridge() {
     }
     el.removeAttribute("contenteditable");
     activeElRef.current = null;
-    setToolbarRect(null);
+    if (!selectedElRef.current) {
+      setToolbarRect(null);
+      setToolbarVariant("none");
+    }
     setMaxBadge(null);
     setActiveCommands(/* @__PURE__ */ new Set());
     setToolbarShowEditLink(false);
     postToParent({ type: "ow:exit-edit" });
   }, [postToParent]);
+  const deselect = (0, import_react5.useCallback)(() => {
+    selectedElRef.current = null;
+    if (!activeElRef.current) {
+      setToolbarRect(null);
+      setToolbarVariant("none");
+    }
+  }, []);
+  const select = (0, import_react5.useCallback)((anchor) => {
+    if (!isNavbarButton(anchor)) return;
+    if (activeElRef.current) deactivate();
+    selectedElRef.current = anchor;
+    clearHrefKeyHover(anchor);
+    setToolbarVariant("link-action");
+    setToolbarRect(anchor.getBoundingClientRect());
+    setToolbarShowEditLink(false);
+    setActiveCommands(/* @__PURE__ */ new Set());
+  }, [deactivate]);
   const activate = (0, import_react5.useCallback)((el) => {
     if (activeElRef.current === el) return;
+    selectedElRef.current = null;
     deactivate();
     if (hoveredImageRef.current) {
       hoveredImageRef.current = null;
       postToParentRef.current({ type: "ow:image-unhover" });
     }
+    setToolbarVariant("rich-text");
     el.setAttribute("contenteditable", "true");
     el.removeAttribute("data-ohw-hovered");
     activeElRef.current = el;
@@ -6056,6 +6195,8 @@ function OhhwellsBridge() {
   }, [deactivate, postToParent]);
   activateRef.current = activate;
   deactivateRef.current = deactivate;
+  selectRef.current = select;
+  deselectRef.current = deselect;
   (0, import_react5.useLayoutEffect)(() => {
     if (!subdomain || isEditMode) {
       setFetchState("done");
@@ -6269,6 +6410,7 @@ function OhhwellsBridge() {
         if (editable.dataset.ohwEditable === "link") {
           e.preventDefault();
           e.stopPropagation();
+          deselectRef.current();
           deactivateRef.current();
           bumpLinkPopoverGrace();
           setLinkPopoverRef.current({
@@ -6284,11 +6426,31 @@ function OhhwellsBridge() {
           postToParentRef.current({ type: "ow:image-pick", key: editable.dataset.ohwKey ?? "" });
           return;
         }
+        const hrefCtx = getHrefKeyFromElement(editable);
+        if (hrefCtx && isNavbarButton(hrefCtx.anchor)) {
+          e.preventDefault();
+          e.stopPropagation();
+          const { anchor: anchor2 } = hrefCtx;
+          if (selectedElRef.current === anchor2) {
+            activateRef.current(editable);
+            return;
+          }
+          selectRef.current(anchor2);
+          return;
+        }
         e.preventDefault();
         e.stopPropagation();
         activateRef.current(editable);
         return;
       }
+      const hrefAnchor = target.closest("[data-ohw-href-key]");
+      if (hrefAnchor && isNavbarButton(hrefAnchor)) {
+        e.preventDefault();
+        e.stopPropagation();
+        if (selectedElRef.current === hrefAnchor) return;
+        selectRef.current(hrefAnchor);
+        return;
+      }
       if (activeElRef.current) {
         const sel = window.getSelection();
         if (sel && !sel.isCollapsed) {
@@ -6303,15 +6465,22 @@ function OhhwellsBridge() {
         const hrefCtx = getHrefKeyFromElement(activeElRef.current);
         if (hrefCtx && (hrefCtx.anchor === target || hrefCtx.anchor.contains(target))) return;
       }
+      if (linkPopoverOpenRef.current && selectedElRef.current) {
+        const selected = selectedElRef.current;
+        if (selected === target || selected.contains(target)) return;
+      }
       if (linkPopoverOpenRef.current) {
         setLinkPopoverRef.current(null);
         return;
       }
+      deselectRef.current();
       deactivateRef.current();
     };
     const handleMouseOver = (e) => {
       const editable = e.target.closest("[data-ohw-editable]");
       if (!editable) return;
+      const selected = selectedElRef.current;
+      if (selected && (selected === editable || selected.contains(editable))) return;
       if (editable.dataset.ohwEditable !== "image" && editable.dataset.ohwEditable !== "bg-image" && !editable.hasAttribute("contenteditable")) {
         editable.setAttribute("data-ohw-hovered", "");
       }
@@ -6798,6 +6967,7 @@ function OhhwellsBridge() {
         setLinkPopoverRef.current(null);
         return;
       }
+      deselectRef.current();
       deactivateRef.current();
     };
     window.addEventListener("message", handleDeactivate);
@@ -6806,6 +6976,10 @@ function OhhwellsBridge() {
         setLinkPopoverRef.current(null);
         return;
       }
+      if (e.key === "Escape" && selectedElRef.current && !activeElRef.current) {
+        deselectRef.current();
+        return;
+      }
       if (e.key !== "Escape") return;
       const el = activeElRef.current;
       if (el && originalContentRef.current !== null) {
@@ -6815,13 +6989,16 @@ function OhhwellsBridge() {
           postToParentRef.current({ type: "ow:change", nodes: [{ key, text: originalContentRef.current }] });
         }
       }
+      deselectRef.current();
       deactivateRef.current();
     };
     const handleScroll = () => {
-      if (activeElRef.current) {
-        const r2 = activeElRef.current.getBoundingClientRect();
+      const focusEl = activeElRef.current ?? selectedElRef.current;
+      if (focusEl) {
+        const r2 = focusEl.getBoundingClientRect();
         applyToolbarPos(r2);
-        setMaxBadge((prev) => prev ? { ...prev, rect: r2 } : null);
+        setToolbarRect(r2);
+        setMaxBadge((prev) => prev && activeElRef.current ? { ...prev, rect: r2 } : prev);
       }
       if (activeStateElRef.current) {
         const rect = activeStateElRef.current.getBoundingClientRect();
@@ -6946,8 +7123,9 @@ function OhhwellsBridge() {
     };
     const applyToolbarPos = (rect) => {
       const ps = parentScrollRef.current;
+      const approxW = toolbarVariantRef.current === "link-action" ? 120 : 330;
       if (toolbarElRef.current) {
-        const { top, left, transform } = calcToolbarPos(rect, ps);
+        const { top, left, transform } = calcToolbarPos(rect, ps, approxW);
         toolbarElRef.current.style.top = `${top}px`;
         toolbarElRef.current.style.left = `${left}px`;
         toolbarElRef.current.style.transform = transform;
@@ -6962,7 +7140,8 @@ function OhhwellsBridge() {
       if (e.data?.type !== "ow:parent-scroll") return;
       const { iframeOffsetTop, headerH, canvasH } = e.data;
       parentScrollRef.current = { iframeOffsetTop, headerH, canvasH };
-      if (activeElRef.current) applyToolbarPos(activeElRef.current.getBoundingClientRect());
+      const focusEl = activeElRef.current ?? selectedElRef.current;
+      if (focusEl) applyToolbarPos(focusEl.getBoundingClientRect());
     };
     const handleClickAt = (e) => {
       if (e.data?.type !== "ow:click-at") return;
@@ -7140,6 +7319,18 @@ function OhhwellsBridge() {
       rect: hrefCtx.anchor.getBoundingClientRect()
     });
   }, []);
+  const openLinkPopoverForSelected = (0, import_react5.useCallback)(() => {
+    const anchor = selectedElRef.current;
+    if (!anchor) return;
+    const key = anchor.getAttribute("data-ohw-href-key");
+    if (!key) return;
+    bumpLinkPopoverGrace();
+    setLinkPopover({
+      key,
+      target: getLinkHref(anchor),
+      rect: anchor.getBoundingClientRect()
+    });
+  }, []);
   const handleLinkPopoverSubmit = (0, import_react5.useCallback)(
     (target) => {
       if (!linkPopover) return;
@@ -7157,9 +7348,10 @@ function OhhwellsBridge() {
     /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(import_jsx_runtime16.Fragment, { children: [
       toolbarRect && /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(import_jsx_runtime16.Fragment, { children: [
         /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(GlowFrame, { rect: toolbarRect, elRef: glowElRef }),
-        /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+        toolbarVariant === "rich-text" && /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
           FloatingToolbar,
           {
+            variant: "rich-text",
             rect: toolbarRect,
             parentScroll: parentScrollRef.current,
             elRef: toolbarElRef,
@@ -7168,6 +7360,18 @@ function OhhwellsBridge() {
             showEditLink,
             onEditLink: openLinkPopoverForActive
           }
+        ),
+        toolbarVariant === "link-action" && /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+          FloatingToolbar,
+          {
+            variant: "link-action",
+            rect: toolbarRect,
+            parentScroll: parentScrollRef.current,
+            elRef: toolbarElRef,
+            onCommand: handleCommand,
+            activeCommands,
+            onEditLink: openLinkPopoverForSelected
+          }
         )
       ] }),
       maxBadge && /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(
@@ -7205,6 +7409,31 @@ function OhhwellsBridge() {
           onStateChange: handleStateChange
         }
       ),
+      sectionGap && /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(
+        "div",
+        {
+          "data-ohw-section-insert-line": "",
+          className: "fixed left-0 w-full z-2147483646 flex items-center pointer-events-none",
+          style: { top: sectionGap.y, transform: "translateY(-50%)" },
+          children: [
+            /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("div", { className: "flex-1 bg-primary", style: { height: 3 } }),
+            /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+              Badge,
+              {
+                className: "px-8 py-1 bg-primary hover:bg-primary text-primary-foreground text-xs font-medium shrink-0 rounded-full cursor-pointer pointer-events-auto",
+                onClick: () => {
+                  window.parent.postMessage(
+                    { type: "ow:add-section", insertAfter: sectionGap.insertAfter, insertBefore: sectionGap.insertBefore },
+                    "*"
+                  );
+                },
+                children: "Add Section"
+              }
+            ),
+            /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("div", { className: "flex-1 bg-primary", style: { height: 3 } })
+          ]
+        }
+      ),
       linkPopover ? /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
         LinkPopover,
         {