@ohhwells/bridge 0.1.42-next.91 → 0.1.42-next.93

package/dist/index.cjs

@@ -4491,6 +4491,19 @@ var DRAG_SHADOW = "0px 4px 6px -1px rgba(0, 0, 0, 0.1), 0px 2px 4px -2px rgba(0,
 var TOOLBAR_EDGE_MARGIN = 4;
 var SELECTION_CHROME_GAP = 4;
 var TOOLBAR_STROKE_GAP = 4;
+function getChromeZIndex(state) {
+  switch (state) {
+    case "active-top":
+    case "active-bottom":
+    case "dragging":
+      return 2147483644;
+    case "hover":
+    case "sibling-hint":
+      return 2147483643;
+    default:
+      return 2147483642;
+  }
+}
 function getChromeStyle(state) {
   switch (state) {
     case "hover":
@@ -4606,7 +4619,7 @@ function ItemInteractionLayer({
         left: rect.left - chromeGap,
         width: rect.width + chromeGap * 2,
         height: rect.height + chromeGap * 2,
-        zIndex: 2147483646
+        zIndex: getChromeZIndex(state)
       },
       children: [
         /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
@@ -8996,6 +9009,16 @@ function OhhwellsBridge() {
       return;
     }
     document.documentElement.setAttribute("data-ohw-link-popover-open", "");
+    hoveredItemElRef.current = null;
+    setHoveredItemRect(null);
+    hoveredNavContainerRef.current = null;
+    setHoveredNavContainerRect(null);
+    siblingHintElRef.current = null;
+    setSiblingHintRect(null);
+    setSiblingHintRects([]);
+    if (selectedElRef.current || toolbarVariantRef.current !== "none") {
+      deselectRef.current();
+    }
     if (hoveredImageRef.current) {
       hoveredImageRef.current = null;
       hoveredImageHasTextOverlapRef.current = false;
@@ -9992,6 +10015,21 @@ function OhhwellsBridge() {
         outline: none !important;
         outline-offset: 0 !important;
       }
+      /* Editor chrome owns selection \u2014 suppress native focus rings on nav/footer items. */
+      nav [data-ohw-href-key]:focus,
+      nav [data-ohw-href-key]:focus-visible,
+      nav [data-ohw-href-key]:focus-within,
+      footer [data-ohw-href-key]:focus,
+      footer [data-ohw-href-key]:focus-visible,
+      footer [data-ohw-href-key]:focus-within,
+      nav [data-ohw-href-key] [data-ohw-editable]:focus,
+      nav [data-ohw-href-key] [data-ohw-editable]:focus-visible,
+      footer [data-ohw-href-key] [data-ohw-editable]:focus,
+      footer [data-ohw-href-key] [data-ohw-editable]:focus-visible {
+        outline: none !important;
+        outline-offset: 0 !important;
+        box-shadow: none !important;
+      }
       /* Text edit wins over grab/default (must beat [data-ohw-can-drag] *). */
       [data-ohw-editing],
       [data-ohw-editing] *,
@@ -11863,8 +11901,8 @@ function OhhwellsBridge() {
           onVideoSettingsChange: handleVideoSettingsChange
         }
       ),
-      siblingHintRect && !isItemDragging && siblingHintRects.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(ItemInteractionLayer, { rect: siblingHintRect, state: "sibling-hint" }),
-      siblingHintRects.map((rect, i) => /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(ItemInteractionLayer, { rect, state: "sibling-hint" }, `sibling-hint-${i}`)),
+      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}`)),
       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",
@@ -11909,8 +11947,9 @@ function OhhwellsBridge() {
         `nav-drop-${slot.direction}-${slot.parentId ?? "root"}-${slot.insertIndex}-${i}`
       )),
       hoveredNavContainerRect && toolbarVariant !== "select-frame" && !linkPopover && !isItemDragging && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(ItemInteractionLayer, { rect: hoveredNavContainerRect, state: "hover" }),
+      hoveredItemRect && !linkPopover && !hoveredNavContainerRect && !isItemDragging && hoveredItemElRef.current !== selectedElRef.current && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(ItemInteractionLayer, { rect: hoveredItemRect, state: "hover" }),
       toolbarVariant === "select-frame" && toolbarRect && !linkPopover && !isItemDragging && !isFooterFrameSelection && selectedElRef.current && isNavbarLinksContainer(selectedElRef.current) && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(NavbarContainerChrome, { rect: toolbarRect, onAdd: handleAddTopLevelNavItem }),
-      toolbarRect && (toolbarVariant === "link-action" || toolbarVariant === "select-frame") && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+      toolbarRect && !linkPopover && (toolbarVariant === "link-action" || toolbarVariant === "select-frame") && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
         ItemInteractionLayer,
         {
           rect: isItemDragging && draggedItemRect && (footerDragRef.current?.wasSelected || navDragRef.current?.wasSelected) ? draggedItemRect : toolbarRect,
@@ -11937,8 +11976,7 @@ function OhhwellsBridge() {
           ) : void 0
         }
       ),
-      hoveredItemRect && !linkPopover && !hoveredNavContainerRect && !isItemDragging && hoveredItemElRef.current !== selectedElRef.current && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(ItemInteractionLayer, { rect: hoveredItemRect, state: "hover" }),
-      toolbarRect && toolbarVariant === "rich-text" && /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(import_jsx_runtime24.Fragment, { children: [
+      toolbarRect && toolbarVariant === "rich-text" && !linkPopover && /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(import_jsx_runtime24.Fragment, { children: [
         /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
           EditGlowChrome,
           {