@ohhwells/bridge 0.1.38-next.70 → 0.1.38-next.71

package/dist/index.js

@@ -7531,7 +7531,7 @@ function isInferredFooterGroup(el) {
   return Array.from(el.querySelectorAll(":scope > [data-ohw-href-key]")).some(isNavigationItem);
 }
 function isNavigationContainer(el) {
-  return el.hasAttribute("data-ohw-nav-container") || isNavigationRoot(el) || isInferredFooterGroup(el);
+  return el.hasAttribute("data-ohw-nav-container") || el.hasAttribute("data-ohw-footer-col") || isNavigationRoot(el) || isInferredFooterGroup(el);
 }
 function isPointOverNavigation(x, y) {
   const navRoot = document.querySelector("[data-ohw-nav-root]") ?? document.querySelector("nav");
@@ -8480,6 +8480,53 @@ function OhhwellsBridge() {
         movedColumnIndex = Math.max(0, Math.min(adjusted, nextOrder.length - 1));
       }
       clearFooterDragVisuals();
+      const applySelectionAfterDrop = () => {
+        if (!wasSelected) {
+          deselectRef.current();
+          return;
+        }
+        if (hrefKey) {
+          const link = document.querySelector(
+            `footer [data-ohw-href-key="${CSS.escape(hrefKey)}"]`
+          );
+          if (link && isNavigationItem(link)) {
+            selectRef.current(link);
+            return;
+          }
+        }
+        if (movedColumnIndex !== null && nextOrder) {
+          const colKeys = nextOrder[movedColumnIndex] ?? [];
+          let column = null;
+          for (const key of colKeys) {
+            const link = document.querySelector(
+              `footer [data-ohw-href-key="${CSS.escape(key)}"]`
+            );
+            if (link) {
+              column = findFooterColumnForLink(link);
+              if (column) break;
+            }
+          }
+          if (!column) column = listFooterColumns()[movedColumnIndex] ?? null;
+          if (column && isNavigationContainer(column)) {
+            selectFrameRef.current(column);
+            return;
+          }
+        }
+        if (document.body.contains(draggedEl)) {
+          if (isNavigationItem(draggedEl)) {
+            selectRef.current(draggedEl);
+            return;
+          }
+          if (isNavigationContainer(draggedEl)) {
+            selectFrameRef.current(draggedEl);
+            return;
+          }
+        }
+        deselectRef.current();
+      };
+      if (!wasSelected) {
+        deselectRef.current();
+      }
       if (nextOrder) {
         const orderJson = JSON.stringify(nextOrder);
         editContentRef.current = {
@@ -8488,31 +8535,20 @@ function OhhwellsBridge() {
         };
         applyFooterOrder(nextOrder);
         document.querySelectorAll("footer [data-ohw-href-key]").forEach(disableNativeHrefDrag);
+        postToParentRef.current({
+          type: "ow:change",
+          nodes: [{ key: FOOTER_ORDER_KEY, text: orderJson }]
+        });
         requestAnimationFrame(() => {
           if (editContentRef.current[FOOTER_ORDER_KEY] === orderJson) {
             applyFooterOrder(nextOrder);
             document.querySelectorAll("footer [data-ohw-href-key]").forEach(disableNativeHrefDrag);
           }
+          requestAnimationFrame(applySelectionAfterDrop);
         });
-        postToParentRef.current({
-          type: "ow:change",
-          nodes: [{ key: FOOTER_ORDER_KEY, text: orderJson }]
-        });
-      }
-      if (!wasSelected) {
-        deselectRef.current();
         return;
       }
-      const still = (hrefKey ? document.querySelector(
-        `footer [data-ohw-href-key="${CSS.escape(hrefKey)}"]`
-      ) : null) ?? (movedColumnIndex !== null ? listFooterColumns()[movedColumnIndex] ?? null : null) ?? (document.body.contains(draggedEl) ? draggedEl : null);
-      if (still && isNavigationItem(still)) {
-        selectRef.current(still);
-      } else if (still && isNavigationContainer(still)) {
-        selectFrameRef.current(still);
-      } else {
-        deselectRef.current();
-      }
+      applySelectionAfterDrop();
     },
     [clearFooterDragVisuals]
   );