@ohhwells/bridge 0.1.42-next.102 → 0.1.42-next.104

package/dist/index.cjs

@@ -7306,18 +7306,28 @@ function buildRootNavDropSlots() {
     });
     return slots;
   }
+  const edgeGap = (() => {
+    if (items.length < 2) return 32;
+    const a = items[0].getBoundingClientRect();
+    const b = items[1].getBoundingClientRect();
+    return Math.max(0, b.left - a.right);
+  })();
   for (let i = 0; i <= items.length; i++) {
     let left;
     let top;
     let height;
     if (i === 0) {
       const first = items[0].getBoundingClientRect();
-      left = first.left - barThickness / 2;
+      left = first.left - edgeGap / 2 - barThickness / 2;
       top = first.top;
       height = first.height;
     } else if (i === items.length) {
       const last = items[items.length - 1].getBoundingClientRect();
-      left = last.right - barThickness / 2;
+      const lastGap = items.length >= 2 ? Math.max(
+        0,
+        last.left - items[items.length - 2].getBoundingClientRect().right
+      ) : edgeGap;
+      left = last.right + lastGap / 2 - barThickness / 2;
       top = last.top;
       height = last.height;
     } else {
@@ -7344,18 +7354,28 @@ function buildChildNavDropSlots(parentHrefKey) {
   const slots = [];
   const barThickness = 3;
   if (children.length === 0) return slots;
+  const edgeGap = (() => {
+    if (children.length < 2) return 16;
+    const a = children[0].getBoundingClientRect();
+    const b = children[1].getBoundingClientRect();
+    return Math.max(0, b.top - a.bottom);
+  })();
   for (let i = 0; i <= children.length; i++) {
     let top;
     let width;
     let left;
     if (i === 0) {
       const first = children[0].getBoundingClientRect();
-      top = first.top - barThickness / 2;
+      top = first.top - edgeGap / 2 - barThickness / 2;
       left = first.left;
       width = first.width;
     } else if (i === children.length) {
       const last = children[children.length - 1].getBoundingClientRect();
-      top = last.bottom - barThickness / 2;
+      const lastGap = children.length >= 2 ? Math.max(
+        0,
+        last.top - children[children.length - 2].getBoundingClientRect().bottom
+      ) : edgeGap;
+      top = last.bottom + lastGap / 2 - barThickness / 2;
       left = last.left;
       width = last.width;
     } else {
@@ -7407,12 +7427,6 @@ function hitTestNavDropSlot(clientX, clientY, draggedHrefKey) {
   }
   return best?.slot ?? null;
 }
-function siblingRectsForNavDrag(draggedEl, activeParentId) {
-  if (activeParentId) {
-    return listNavChildren(activeParentId).filter((el) => el !== draggedEl).map((el) => el.getBoundingClientRect());
-  }
-  return listReorderableNavItems().filter((el) => el !== draggedEl).map((el) => el.getBoundingClientRect());
-}
 
 // src/useNavItemDrag.ts
 var import_react8 = require("react");
@@ -7461,8 +7475,7 @@ function useNavItemDrag({
         session.lastClientY = clientY;
       }
       session.activeSlot = activeSlot;
-      const parentId = activeSlot?.parentId ?? null;
-      setSiblingHintRects(siblingRectsForNavDrag(session.draggedEl, parentId));
+      setSiblingHintRects([]);
       const slots = buildAllNavDropSlots(session.hrefKey);
       setNavDropSlots(slots);
       const activeIdx = activeSlot ? slots.findIndex(
@@ -9480,21 +9493,11 @@ function OhhwellsBridge() {
       session.lastClientY = clientY;
     }
     session.activeSlot = activeSlot;
+    setSiblingHintRects([]);
     if (session.kind === "link") {
-      const columns2 = listFooterColumns();
-      const focusCols = /* @__PURE__ */ new Set([session.sourceColumnIndex]);
-      if (activeSlot) focusCols.add(activeSlot.columnIndex);
-      const siblingRects = [];
-      columns2.forEach((col, i) => {
-        if (!focusCols.has(i)) return;
-        for (const link of listFooterLinksInColumn(col)) {
-          if (link === dragged) continue;
-          siblingRects.push(link.getBoundingClientRect());
-        }
-      });
-      setSiblingHintRects(siblingRects);
+      const columns = listFooterColumns();
       const slots2 = [];
-      columns2.forEach((col, i) => {
+      columns.forEach((col, i) => {
         slots2.push(...buildLinkDropSlots(col, i));
       });
       setFooterDropSlots(slots2);
@@ -9502,8 +9505,6 @@ function OhhwellsBridge() {
       setActiveFooterDropIndex(activeIdx2 >= 0 ? activeIdx2 : null);
       return;
     }
-    const columns = listFooterColumns();
-    setSiblingHintRects(columns.filter((col) => col !== dragged).map((col) => col.getBoundingClientRect()));
     const slots = buildColumnDropSlots();
     setFooterDropSlots(slots);
     const activeIdx = activeSlot ? slots.findIndex((s) => s.insertIndex === activeSlot.insertIndex) : -1;
@@ -12111,7 +12112,7 @@ function OhhwellsBridge() {
         }
       ),
       siblingHintRect && !linkPopover && !isItemDragging && siblingHintRects.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(ItemInteractionLayer, { rect: siblingHintRect, state: "sibling-hint" }),
-      siblingHintRects.length > 0 && !linkPopover && siblingHintRects.map((rect, i) => /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(ItemInteractionLayer, { rect, state: "sibling-hint" }, `sibling-hint-${i}`)),
+      siblingHintRects.length > 0 && !linkPopover && !isItemDragging && siblingHintRects.map((rect, i) => /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(ItemInteractionLayer, { rect, state: "sibling-hint" }, `sibling-hint-${i}`)),
       isItemDragging && draggedItemRect && selectedElRef.current !== footerDragRef.current?.draggedEl && selectedElRef.current !== navDragRef.current?.draggedEl && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(ItemInteractionLayer, { rect: draggedItemRect, state: "dragging" }),
       isItemDragging && footerDropSlots.map((slot, i) => /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
         "div",