@ohhwells/bridge 0.1.42-next.89 → 0.1.42-next.90

package/dist/index.cjs

@@ -8142,6 +8142,11 @@ function getNavigationItemAnchor(el) {
 function isNavigationItem(el) {
   return getNavigationItemAnchor(el) !== null;
 }
+function listNavigationItems() {
+  return Array.from(
+    document.querySelectorAll("nav [data-ohw-href-key], footer [data-ohw-href-key]")
+  ).filter((el) => isNavigationItem(el));
+}
 function getNavigationItemReorderState(anchor) {
   if (isNavbarButton2(anchor)) return { key: null, disabled: false };
   return getReorderHandleStateFromAnchor(anchor);
@@ -8277,6 +8282,18 @@ function getNavigationSelectionParent(el) {
   }
   return null;
 }
+function collectNavigationItemSiblingHintRects(selected) {
+  if (!isNavigationItem(selected)) return [];
+  const footerColumn = getFooterColumn(selected);
+  if (footerColumn) {
+    return listFooterLinksInColumn(footerColumn).filter((link) => link !== selected).map((link) => link.getBoundingClientRect());
+  }
+  const navContainer = selected.closest("[data-ohw-nav-container], [data-ohw-nav-drawer]");
+  if (navContainer) {
+    return Array.from(navContainer.querySelectorAll("[data-ohw-href-key]")).filter((el) => isNavigationItem(el) && el !== selected).map((el) => el.getBoundingClientRect());
+  }
+  return listNavigationItems().filter((el) => el !== selected).map((el) => el.getBoundingClientRect());
+}
 function placeCaretAtPoint(el, x, y) {
   const selection = window.getSelection();
   if (!selection) return;
@@ -9162,6 +9179,7 @@ function OhhwellsBridge() {
       setIsFooterFrameSelection(false);
       setToolbarVariant("link-action");
       setToolbarRect(link.getBoundingClientRect());
+      setSiblingHintRects(collectNavigationItemSiblingHintRects(link));
       return;
     }
     const colAttr = selectedFooterColAttrRef.current;
@@ -9188,6 +9206,7 @@ function OhhwellsBridge() {
     setReorderDragDisabled(disabled);
     setToolbarVariant("link-action");
     setToolbarRect(navAnchor.getBoundingClientRect());
+    setSiblingHintRects(collectNavigationItemSiblingHintRects(navAnchor));
     setToolbarShowEditLink(false);
     setActiveCommands(/* @__PURE__ */ new Set());
   }, [markSelected]);
@@ -9553,7 +9572,7 @@ function OhhwellsBridge() {
     hoveredItemElRef.current = null;
     siblingHintElRef.current = null;
     setSiblingHintRect(null);
-    setSiblingHintRects([]);
+    setSiblingHintRects(collectNavigationItemSiblingHintRects(anchor));
     setIsItemDragging(false);
     const { key, disabled } = getNavigationItemReorderState(anchor);
     setReorderHrefKey(key);
@@ -10206,7 +10225,8 @@ function OhhwellsBridge() {
         setHoveredNavContainerRect(null);
         return;
       }
-      if (toolbarVariantRef.current !== "select-frame") {
+      const itemSelected = toolbarVariantRef.current === "link-action" && Boolean(selectedElRef.current && isNavigationItem(selectedElRef.current));
+      if (toolbarVariantRef.current !== "select-frame" && !itemSelected) {
         const navContainer = target.closest("[data-ohw-nav-container]");
         if (navContainer && !getNavigationItemAnchor(target)) {
           hoveredNavContainerRef.current = navContainer;
@@ -10219,6 +10239,9 @@ function OhhwellsBridge() {
           hoveredNavContainerRef.current = null;
           setHoveredNavContainerRect(null);
         }
+      } else if (itemSelected) {
+        hoveredNavContainerRef.current = null;
+        setHoveredNavContainerRect(null);
       }
       const navAnchor = getNavigationItemAnchor(target);
       if (navAnchor) {
@@ -10235,7 +10258,7 @@ function OhhwellsBridge() {
       if (footerCol) {
         hoveredNavContainerRef.current = null;
         setHoveredNavContainerRect(null);
-        if (selectedElRef.current === footerCol) return;
+        if (itemSelected || selectedElRef.current === footerCol) return;
         hoveredItemElRef.current = footerCol;
         setHoveredItemRect(footerCol.getBoundingClientRect());
         return;
@@ -10406,7 +10429,8 @@ function OhhwellsBridge() {
       }
     };
     const probeNavigationHoverAt = (x, y) => {
-      if (toolbarVariantRef.current === "select-frame") {
+      const itemSelected = toolbarVariantRef.current === "link-action" && Boolean(selectedElRef.current && isNavigationItem(selectedElRef.current));
+      if (toolbarVariantRef.current === "select-frame" || itemSelected) {
         hoveredNavContainerRef.current = null;
         setHoveredNavContainerRect(null);
       }
@@ -10440,7 +10464,7 @@ function OhhwellsBridge() {
           return;
         }
       }
-      if (toolbarVariantRef.current !== "select-frame") {
+      if (toolbarVariantRef.current !== "select-frame" && !itemSelected) {
         for (const container of navContainers) {
           const containerRect = container.getBoundingClientRect();
           const overContainer = x >= containerRect.left && x <= containerRect.right && y >= containerRect.top && y <= containerRect.bottom;
@@ -10458,21 +10482,23 @@ function OhhwellsBridge() {
         hoveredNavContainerRef.current = null;
         setHoveredNavContainerRect(null);
       }
-      for (const column of footerColumns) {
-        const containerRect = column.getBoundingClientRect();
-        const overContainer = x >= containerRect.left && x <= containerRect.right && y >= containerRect.top && y <= containerRect.bottom;
-        if (!overContainer) continue;
-        if (isPointOverNavItem(column, x, y)) continue;
-        if (selectedElRef.current === column) {
-          if (hoveredItemElRef.current === column) {
-            hoveredItemElRef.current = null;
-            setHoveredItemRect(null);
+      if (!itemSelected) {
+        for (const column of footerColumns) {
+          const containerRect = column.getBoundingClientRect();
+          const overContainer = x >= containerRect.left && x <= containerRect.right && y >= containerRect.top && y <= containerRect.bottom;
+          if (!overContainer) continue;
+          if (isPointOverNavItem(column, x, y)) continue;
+          if (selectedElRef.current === column) {
+            if (hoveredItemElRef.current === column) {
+              hoveredItemElRef.current = null;
+              setHoveredItemRect(null);
+            }
+            return;
           }
+          hoveredItemElRef.current = column;
+          setHoveredItemRect(column.getBoundingClientRect());
           return;
         }
-        hoveredItemElRef.current = column;
-        setHoveredItemRect(column.getBoundingClientRect());
-        return;
       }
       if (hoveredItemElRef.current?.hasAttribute("data-ohw-footer-col") || hoveredItemElRef.current?.hasAttribute("data-ohw-footer-column")) {
         hoveredItemElRef.current = null;
@@ -11122,10 +11148,14 @@ function OhhwellsBridge() {
         setSiblingHintRect(siblingHintElRef.current.getBoundingClientRect());
       }
       const selected = selectedElRef.current;
-      if (selected && !footerDragRef.current && (selected.hasAttribute("data-ohw-footer-col") || Boolean(selected.closest("footer") && isInferredFooterGroup(selected)))) {
-        setSiblingHintRects(
-          listFooterColumns().filter((column) => column !== selected).map((column) => column.getBoundingClientRect())
-        );
+      if (selected && !footerDragRef.current && !navDragRef.current) {
+        if (selected.hasAttribute("data-ohw-footer-col") || Boolean(selected.closest("footer") && isInferredFooterGroup(selected))) {
+          setSiblingHintRects(
+            listFooterColumns().filter((column) => column !== selected).map((column) => column.getBoundingClientRect())
+          );
+        } else if (isNavigationItem(selected)) {
+          setSiblingHintRects(collectNavigationItemSiblingHintRects(selected));
+        }
       }
       if (footerDragRef.current) {
         const session = footerDragRef.current;