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

package/dist/index.cjs

@@ -8174,7 +8174,7 @@ 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-column]");
+  const explicit = item.closest("[data-ohw-footer-col], [data-ohw-footer-column]");
   if (explicit) return explicit;
   const footer = item.closest("footer");
   if (!footer) return null;
@@ -8191,7 +8191,7 @@ function isNavigationRoot(el) {
 function isInferredFooterGroup(el) {
   const footer = el.closest("footer");
   if (!footer || el === footer) return false;
-  if (el.hasAttribute("data-ohw-footer-column")) return true;
+  if (el.hasAttribute("data-ohw-footer-col") || el.hasAttribute("data-ohw-footer-column")) return true;
   return countFooterNavItems(el) >= 2;
 }
 function isNavigationContainer(el) {
@@ -8201,7 +8201,7 @@ function isNavbarLinksContainer(el) {
   return el.hasAttribute("data-ohw-nav-container");
 }
 function getFooterColumn(el) {
-  return el.closest("[data-ohw-footer-column]");
+  return el.closest("[data-ohw-footer-col], [data-ohw-footer-column]");
 }
 function resolveFooterColumnSelectionTarget(target, clientX, clientY) {
   if (getNavigationItemAnchor(target)) return null;
@@ -8225,7 +8225,7 @@ function isPointOverNavigation(x, y) {
 function findHoveredNavOrFooterContainer(x, y) {
   const candidates = [
     ...document.querySelectorAll("[data-ohw-nav-container]"),
-    ...document.querySelectorAll("[data-ohw-footer-column]")
+    ...listFooterColumns()
   ];
   for (const container of candidates) {
     const r2 = container.getBoundingClientRect();
@@ -8272,7 +8272,7 @@ function getNavigationSelectionParent(el) {
     if (footerGroup) return footerGroup;
     return getNavigationRoot(el);
   }
-  if (el.hasAttribute("data-ohw-nav-container") || el.hasAttribute("data-ohw-footer-column") || isInferredFooterGroup(el)) {
+  if (el.hasAttribute("data-ohw-nav-container") || el.hasAttribute("data-ohw-footer-col") || el.hasAttribute("data-ohw-footer-column") || isInferredFooterGroup(el)) {
     return getNavigationRoot(el);
   }
   return null;
@@ -10207,15 +10207,15 @@ function OhhwellsBridge() {
         return;
       }
       if (toolbarVariantRef.current !== "select-frame") {
-        const frameContainer = target.closest("[data-ohw-nav-container]") ?? target.closest("[data-ohw-footer-col]") ?? target.closest("[data-ohw-footer-column]");
-        if (frameContainer && !getNavigationItemAnchor(target)) {
-          hoveredNavContainerRef.current = frameContainer;
-          setHoveredNavContainerRect(frameContainer.getBoundingClientRect());
+        const navContainer = target.closest("[data-ohw-nav-container]");
+        if (navContainer && !getNavigationItemAnchor(target)) {
+          hoveredNavContainerRef.current = navContainer;
+          setHoveredNavContainerRect(navContainer.getBoundingClientRect());
           hoveredItemElRef.current = null;
           setHoveredItemRect(null);
           return;
         }
-        if (!target.closest("[data-ohw-nav-container], [data-ohw-footer-col], [data-ohw-footer-column]")) {
+        if (!target.closest("[data-ohw-nav-container]")) {
           hoveredNavContainerRef.current = null;
           setHoveredNavContainerRect(null);
         }
@@ -10257,19 +10257,21 @@ function OhhwellsBridge() {
     };
     const handleMouseOut = (e) => {
       const target = e.target;
-      if (target.closest("[data-ohw-nav-container], [data-ohw-footer-column]")) {
+      if (target.closest("[data-ohw-nav-container], [data-ohw-footer-col], [data-ohw-footer-column]")) {
         const related2 = e.relatedTarget instanceof Element ? e.relatedTarget : null;
-        if (related2?.closest("[data-ohw-nav-container], [data-ohw-footer-column], [data-ohw-navbar-container-chrome], [data-ohw-navbar-add-button]")) {
+        if (related2?.closest("[data-ohw-nav-container], [data-ohw-footer-col], [data-ohw-footer-column], [data-ohw-navbar-container-chrome], [data-ohw-navbar-add-button]")) {
           return;
         }
         hoveredNavContainerRef.current = null;
         setHoveredNavContainerRect(null);
       }
-      const footerCol = target.closest("[data-ohw-footer-col]");
+      const footerCol = target.closest("[data-ohw-footer-col]") ?? target.closest("[data-ohw-footer-column]");
       if (footerCol && hoveredItemElRef.current === footerCol) {
         const related2 = e.relatedTarget instanceof Element ? e.relatedTarget : null;
         if (related2?.closest("[data-ohw-drag-handle-container], [data-ohw-item-interaction]")) return;
-        if (related2?.closest("[data-ohw-footer-col]") === footerCol) return;
+        if (related2?.closest("[data-ohw-footer-col], [data-ohw-footer-column]") === footerCol) {
+          return;
+        }
         hoveredItemElRef.current = null;
         setHoveredItemRect(null);
         return;
@@ -10407,14 +10409,12 @@ function OhhwellsBridge() {
       if (toolbarVariantRef.current === "select-frame") {
         hoveredNavContainerRef.current = null;
         setHoveredNavContainerRect(null);
-        return;
       }
-      const frameContainers = [
-        ...document.querySelectorAll("[data-ohw-nav-container]"),
-        ...document.querySelectorAll("[data-ohw-footer-column]")
-      ];
-      let overFrame = null;
-      for (const container of frameContainers) {
+      const navContainers = Array.from(
+        document.querySelectorAll("[data-ohw-nav-container]")
+      );
+      const footerColumns = listFooterColumns();
+      for (const container of [...navContainers, ...footerColumns]) {
         const containerRect = container.getBoundingClientRect();
         const overContainer = x >= containerRect.left && x <= containerRect.right && y >= containerRect.top && y <= containerRect.bottom;
         if (!overContainer) continue;
@@ -10433,21 +10433,51 @@ function OhhwellsBridge() {
             clearHrefKeyHover(navItemHit);
             hoveredItemElRef.current = navItemHit;
             setHoveredItemRect(navItemHit.getBoundingClientRect());
+          } else if (hoveredItemElRef.current === navItemHit) {
+            hoveredItemElRef.current = null;
+            setHoveredItemRect(null);
           }
           return;
         }
-        overFrame = container;
-        break;
       }
-      if (!overFrame) {
+      if (toolbarVariantRef.current !== "select-frame") {
+        for (const container of navContainers) {
+          const containerRect = container.getBoundingClientRect();
+          const overContainer = x >= containerRect.left && x <= containerRect.right && y >= containerRect.top && y <= containerRect.bottom;
+          if (!overContainer) continue;
+          if (isPointOverNavItem(container, x, y)) continue;
+          hoveredNavContainerRef.current = container;
+          setHoveredNavContainerRect(container.getBoundingClientRect());
+          hoveredItemElRef.current = null;
+          setHoveredItemRect(null);
+          return;
+        }
+        hoveredNavContainerRef.current = null;
+        setHoveredNavContainerRect(null);
+      } else {
         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);
+          }
+          return;
+        }
+        hoveredItemElRef.current = column;
+        setHoveredItemRect(column.getBoundingClientRect());
         return;
       }
-      hoveredNavContainerRef.current = overFrame;
-      setHoveredNavContainerRect(overFrame.getBoundingClientRect());
-      hoveredItemElRef.current = null;
-      setHoveredItemRect(null);
+      if (hoveredItemElRef.current?.hasAttribute("data-ohw-footer-col") || hoveredItemElRef.current?.hasAttribute("data-ohw-footer-column")) {
+        hoveredItemElRef.current = null;
+        setHoveredItemRect(null);
+      }
     };
     const probeImageAt = (clientX, clientY, isDragOver = false, fromParentViewport = false) => {
       if (linkPopoverOpenRef.current) {
@@ -10468,6 +10498,10 @@ function OhhwellsBridge() {
       }
       hoveredNavContainerRef.current = null;
       setHoveredNavContainerRect(null);
+      if (hoveredItemElRef.current?.hasAttribute("data-ohw-footer-col") || hoveredItemElRef.current?.hasAttribute("data-ohw-footer-column")) {
+        hoveredItemElRef.current = null;
+        setHoveredItemRect(null);
+      }
       const toggleEl = document.querySelector("[data-ohw-state-toggle]");
       if (toggleEl) {
         const tr = toggleEl.getBoundingClientRect();
@@ -11336,7 +11370,7 @@ function OhhwellsBridge() {
         }
       }
       const footerColumn = findHoveredNavOrFooterContainer(clientX, clientY);
-      if (footerColumn?.hasAttribute("data-ohw-footer-column")) {
+      if (footerColumn?.hasAttribute("data-ohw-footer-col") || footerColumn?.hasAttribute("data-ohw-footer-column")) {
         selectFrameRef.current(footerColumn);
         return;
       }