@ohhwells/bridge 0.1.46 → 0.1.47

package/dist/index.js

@@ -6600,6 +6600,8 @@ function applyNavOrderToContainer(container, order) {
   if (current.length === expected.length && current.every((key, i) => key === expected[i])) {
     return;
   }
+  const lastCurrentLinkEl = current.length > 0 ? findCounterpartByHrefKey(current[current.length - 1], container) : null;
+  const anchor = lastCurrentLinkEl?.parentElement === container ? lastCurrentLinkEl.nextElementSibling : null;
   const seen = /* @__PURE__ */ new Set();
   for (const hrefKey of desired) {
     if (seen.has(hrefKey)) continue;
@@ -6614,7 +6616,9 @@ function applyNavOrderToContainer(container, order) {
     orderedEls.push(el);
   }
   for (const el of orderedEls) {
-    if (container.lastElementChild !== el) {
+    if (anchor) {
+      if (el.nextSibling !== anchor) container.insertBefore(el, anchor);
+    } else if (container.lastElementChild !== el) {
       container.appendChild(el);
     }
   }
@@ -6956,6 +6960,11 @@ function reconcileFooterOrderFromContent(content) {
   }
   applyFooterOrder(order);
 }
+function isRowLayoutColumn(links) {
+  if (links.length < 2) return false;
+  const firstTop = links[0].getBoundingClientRect().top;
+  return links.every((link) => Math.abs(link.getBoundingClientRect().top - firstTop) < 4);
+}
 function buildLinkDropSlots(column, columnIndex) {
   const links = listFooterLinksInColumn(column);
   const colRect = column.getBoundingClientRect();
@@ -6973,6 +6982,32 @@ function buildLinkDropSlots(column, columnIndex) {
     });
     return slots;
   }
+  if (isRowLayoutColumn(links)) {
+    for (let i = 0; i <= links.length; i++) {
+      let left;
+      if (i === 0) {
+        left = links[0].getBoundingClientRect().left - barThickness / 2;
+      } else if (i === links.length) {
+        const last = links[links.length - 1].getBoundingClientRect();
+        left = last.right - barThickness / 2;
+      } else {
+        const prev = links[i - 1].getBoundingClientRect();
+        const next = links[i].getBoundingClientRect();
+        left = (prev.right + next.left) / 2 - barThickness / 2;
+      }
+      const heightRef = i === 0 ? links[0].getBoundingClientRect() : i === links.length ? links[links.length - 1].getBoundingClientRect() : links[i].getBoundingClientRect();
+      slots.push({
+        insertIndex: i,
+        columnIndex,
+        left,
+        top: heightRef.top,
+        width: barThickness,
+        height: Math.max(heightRef.height, colRect.height * 0.8),
+        direction: "vertical"
+      });
+    }
+    return slots;
+  }
   for (let i = 0; i <= links.length; i++) {
     let top;
     if (i === 0) {
@@ -7056,8 +7091,7 @@ function hitTestLinkDropSlot(clientX, clientY, draggedHrefKey) {
       return true;
     });
     for (const slot of slots) {
-      const cy = slot.top + slot.height / 2;
-      const dist = Math.abs(clientY - cy) + (inColX ? 0 : 1e3);
+      const dist = slot.direction === "vertical" ? Math.abs(clientX - (slot.left + slot.width / 2)) : Math.abs(clientY - (slot.top + slot.height / 2));
       if (!best || dist < best.dist) best = { slot, dist };
     }
   }
@@ -7101,9 +7135,10 @@ function lockItemDuringDrag() {
   clearTextSelection();
 }
 function unlockItemDragInteraction() {
+  const wasDragging = document.documentElement.hasAttribute("data-ohw-item-dragging");
   document.documentElement.removeAttribute("data-ohw-footer-press-drag");
   document.documentElement.removeAttribute("data-ohw-item-dragging");
-  clearTextSelection();
+  if (wasDragging) clearTextSelection();
 }
 var armFooterPressDrag = armItemPressDrag;
 var lockFooterDuringDrag = lockItemDuringDrag;
@@ -7480,7 +7515,6 @@ function useNavItemDrag({
       const hrefKey = anchor?.getAttribute("data-ohw-href-key") ?? null;
       if (!anchor || !isNavbarHrefKey(hrefKey)) return;
       if (isNavbarButton3(anchor) || isDragHandleDisabled2(anchor)) return;
-      armItemPressDrag();
       navPointerDragRef.current = {
         el: anchor,
         startX: e.clientX,
@@ -7507,6 +7541,7 @@ function useNavItemDrag({
       if (dx * dx + dy * dy < THRESHOLD * THRESHOLD) return;
       e.preventDefault();
       pending.started = true;
+      armItemPressDrag();
       clearTextSelection();
       try {
         document.body.setPointerCapture(pending.pointerId);
@@ -7534,7 +7569,8 @@ function useNavItemDrag({
         }
       } catch {
       }
-      if (!pending?.started) {
+      if (!pending) return;
+      if (!pending.started) {
         unlockItemDragInteraction();
         return;
       }
@@ -7586,7 +7622,6 @@ function useNavItemDrag({
       const hrefKey = selected.getAttribute("data-ohw-href-key");
       if (!hrefKey || !isNavbarHrefKey(hrefKey)) return false;
       if (isNavbarButton3(selected) || isDragHandleDisabled2(selected)) return false;
-      armItemPressDrag();
       navPointerDragRef.current = {
         el: selected,
         startX: clientX,
@@ -8431,9 +8466,16 @@ function sanitizeHtml(html) {
       if (!SAFE_TAGS.has(el.tagName)) {
         parent.replaceChild(document.createTextNode(el.textContent ?? ""), el);
       } else {
-        const textAlign = el.style?.textAlign || el.getAttribute("align") || "";
+        const htmlEl = el;
+        const textAlign = htmlEl.style?.textAlign || el.getAttribute("align") || "";
+        const fontWeight = htmlEl.style?.fontWeight || "";
+        const fontStyle = htmlEl.style?.fontStyle || "";
+        const textDecorationLine = htmlEl.style?.textDecorationLine || htmlEl.style?.textDecoration || "";
         for (const attr of Array.from(el.attributes)) el.removeAttribute(attr.name);
-        if (textAlign) el.style.textAlign = textAlign;
+        if (textAlign) htmlEl.style.textAlign = textAlign;
+        if (fontWeight) htmlEl.style.fontWeight = fontWeight;
+        if (fontStyle) htmlEl.style.fontStyle = fontStyle;
+        if (textDecorationLine) htmlEl.style.textDecorationLine = textDecorationLine;
         walk(el);
       }
     }
@@ -8621,6 +8663,79 @@ function resolveItemInteractionState(rect, parentScroll) {
   const { transform } = calcToolbarPos(rect, parentScroll, 120);
   return transform.includes("translateY(-100%)") ? "active-top" : "active-bottom";
 }
+function resolveSelectionStartElement(sel) {
+  if (!sel || sel.rangeCount === 0) return null;
+  const range = sel.getRangeAt(0);
+  let startNode = range.startContainer;
+  if (startNode.nodeType === Node.ELEMENT_NODE) {
+    const el = startNode;
+    startNode = el.childNodes[range.startOffset] ?? el.childNodes[range.startOffset - 1] ?? el;
+  }
+  return startNode.nodeType === Node.TEXT_NODE ? startNode.parentElement : startNode;
+}
+function detectActiveFormats(startEl, activeRoot) {
+  const formats = /* @__PURE__ */ new Set();
+  const cs = getComputedStyle(startEl);
+  const weight = parseInt(cs.fontWeight, 10);
+  let hasBold = cs.fontWeight === "bold" || !Number.isNaN(weight) && weight >= 600;
+  let hasItalic = cs.fontStyle === "italic" || cs.fontStyle === "oblique";
+  let hasUnderline = false;
+  let hasStrike = false;
+  let hasUl = false;
+  let hasOl = false;
+  for (let el = startEl; el; el = el.parentElement) {
+    if (el.tagName === "B" || el.tagName === "STRONG") hasBold = true;
+    if (el.tagName === "I" || el.tagName === "EM") hasItalic = true;
+    const decoration = getComputedStyle(el).textDecorationLine;
+    if (decoration.includes("underline") || el.tagName === "U" || el.tagName === "INS") hasUnderline = true;
+    if (decoration.includes("line-through") || el.tagName === "S" || el.tagName === "STRIKE" || el.tagName === "DEL") hasStrike = true;
+    if (el.tagName === "UL") hasUl = true;
+    if (el.tagName === "OL") hasOl = true;
+    if (el === activeRoot) break;
+  }
+  if (hasBold) formats.add("bold");
+  if (hasItalic) formats.add("italic");
+  if (hasUnderline) formats.add("underline");
+  if (hasStrike) formats.add("strikeThrough");
+  if (hasUl) formats.add("insertUnorderedList");
+  if (hasOl) formats.add("insertOrderedList");
+  const block = startEl.closest("div, p, h1, h2, h3, h4, h5, h6, li, td, th") ?? startEl;
+  const align = getComputedStyle(block).textAlign;
+  if (align === "center") formats.add("justifyCenter");
+  else if (align === "right" || align === "end") formats.add("justifyRight");
+  else formats.add("justifyLeft");
+  return formats;
+}
+function setsEqual(a, b) {
+  if (a.size !== b.size) return false;
+  for (const item of a) {
+    if (!b.has(item)) return false;
+  }
+  return true;
+}
+function textOffsetInRoot(root, node, offset) {
+  const walker = document.createTreeWalker(root, NodeFilter.SHOW_TEXT);
+  let total = 0;
+  let current;
+  while (current = walker.nextNode()) {
+    if (current === node) return total + offset;
+    total += (current.textContent ?? "").length;
+  }
+  return total;
+}
+function pointAtTextOffset(root, targetOffset) {
+  const walker = document.createTreeWalker(root, NodeFilter.SHOW_TEXT);
+  let total = 0;
+  let current;
+  let last = null;
+  while (current = walker.nextNode()) {
+    const len = (current.textContent ?? "").length;
+    if (total + len >= targetOffset) return { node: current, offset: targetOffset - total };
+    total += len;
+    last = current;
+  }
+  return last ? { node: last, offset: (last.textContent ?? "").length } : null;
+}
 function FloatingToolbar({
   rect,
   parentScroll,
@@ -8813,6 +8928,7 @@ function OhhwellsBridge() {
   const [fetchState, setFetchState] = useState7("idle");
   const autoSaveTimers = useRef7(/* @__PURE__ */ new Map());
   const activeElRef = useRef7(null);
+  const pointerHeldRef = useRef7(false);
   const selectedElRef = useRef7(null);
   const selectedHrefKeyRef = useRef7(null);
   const selectedFooterColAttrRef = useRef7(null);
@@ -9499,7 +9615,6 @@ function OhhwellsBridge() {
     if (e.button !== 0) return;
     const selected = selectedElRef.current;
     if (!selected) return;
-    armFooterPressDrag();
     const hrefKey = selected.getAttribute("data-ohw-href-key");
     if (hrefKey && isFooterHrefKey(hrefKey)) {
       footerPointerDragRef.current = {
@@ -9611,6 +9726,8 @@ function OhhwellsBridge() {
     setSiblingHintRect(null);
     setSiblingHintRects([]);
     setIsItemDragging(false);
+    const preActivationSelection = window.getSelection();
+    const preservedRange = preActivationSelection && preActivationSelection.rangeCount > 0 && !preActivationSelection.isCollapsed && el.contains(preActivationSelection.getRangeAt(0).commonAncestorContainer) ? preActivationSelection.getRangeAt(0).cloneRange() : null;
     el.setAttribute("contenteditable", "true");
     el.setAttribute("data-ohw-editing", "");
     el.removeAttribute("data-ohw-hovered");
@@ -9618,7 +9735,11 @@ function OhhwellsBridge() {
     activeElRef.current = el;
     originalContentRef.current = el.innerHTML;
     el.focus({ preventScroll: true });
-    if (options?.caretX !== void 0 && options?.caretY !== void 0) {
+    if (preservedRange) {
+      const selection = window.getSelection();
+      selection?.removeAllRanges();
+      selection?.addRange(preservedRange);
+    } else if (options?.caretX !== void 0 && options?.caretY !== void 0) {
       const { caretX, caretY } = options;
       placeCaretAtPoint(el, caretX, caretY);
       requestAnimationFrame(() => {
@@ -10074,7 +10195,9 @@ function OhhwellsBridge() {
         if (inActive || inActiveNav) {
           e.preventDefault();
           e.stopPropagation();
-          if (e.detail < 2) {
+          const selection = window.getSelection();
+          const hasRangeSelection = Boolean(selection && !selection.isCollapsed);
+          if (e.detail < 2 && !hasRangeSelection) {
             placeCaretAtPoint(active, e.clientX, e.clientY);
             refreshActiveCommandsRef.current();
           }
@@ -11227,30 +11350,30 @@ function OhhwellsBridge() {
       const h = document.documentElement.scrollHeight;
       if (h > 50) postToParentRef.current({ type: "ow:height", height: h });
     };
+    let selectionChangeRaf = null;
+    const runSelectionChange = () => {
+      selectionChangeRaf = null;
+      const activeRoot = activeElRef.current;
+      if (!activeRoot) return;
+      const startEl = resolveSelectionStartElement(window.getSelection());
+      const next = startEl ? detectActiveFormats(startEl, activeRoot) : /* @__PURE__ */ new Set();
+      setActiveCommands((prev) => setsEqual(prev, next) ? prev : next);
+    };
     const handleSelectionChange = () => {
-      if (!activeElRef.current) return;
-      const next = /* @__PURE__ */ new Set();
-      for (const cmd of ["bold", "italic", "underline", "strikeThrough", "insertUnorderedList", "insertOrderedList"]) {
-        try {
-          if (document.queryCommandState(cmd)) next.add(cmd);
-        } catch {
-        }
-      }
-      const sel = window.getSelection();
-      const anchor = sel?.anchorNode;
-      if (anchor) {
-        const el = anchor.nodeType === Node.TEXT_NODE ? anchor.parentElement : anchor;
-        const block = el?.closest("div, p, h1, h2, h3, h4, h5, h6, li, td, th") ?? el;
-        if (block) {
-          const align = getComputedStyle(block).textAlign;
-          if (align === "center") next.add("justifyCenter");
-          else if (align === "right" || align === "end") next.add("justifyRight");
-          else next.add("justifyLeft");
-        }
-      }
-      setActiveCommands(next);
+      if (pointerHeldRef.current) return;
+      if (selectionChangeRaf !== null) return;
+      selectionChangeRaf = requestAnimationFrame(runSelectionChange);
+    };
+    const markPointerHeld = (e) => {
+      if (e.button !== 0) return;
+      pointerHeldRef.current = true;
     };
-    refreshActiveCommandsRef.current = handleSelectionChange;
+    const markPointerReleased = () => {
+      if (!pointerHeldRef.current) return;
+      pointerHeldRef.current = false;
+      handleSelectionChange();
+    };
+    refreshActiveCommandsRef.current = runSelectionChange;
     const handleDocMouseLeave = () => {
       hoveredImageRef.current = null;
       setMediaHover(null);
@@ -11490,7 +11613,6 @@ function OhhwellsBridge() {
       const anchor = getNavigationItemAnchor(target);
       const hrefKey = anchor?.getAttribute("data-ohw-href-key") ?? null;
       if (anchor && isFooterHrefKey(hrefKey)) {
-        armFooterPressDrag();
         footerPointerDragRef.current = {
           el: anchor,
           kind: "link",
@@ -11504,7 +11626,6 @@ function OhhwellsBridge() {
       }
       const col = target.closest("[data-ohw-footer-col]");
       if (col && !getNavigationItemAnchor(target)) {
-        armFooterPressDrag();
         footerPointerDragRef.current = {
           el: col,
           kind: "column",
@@ -11533,6 +11654,7 @@ function OhhwellsBridge() {
       if (dx * dx + dy * dy < THRESHOLD * THRESHOLD) return;
       e.preventDefault();
       pending.started = true;
+      armFooterPressDrag();
       clearTextSelection();
       try {
         document.body.setPointerCapture(pending.pointerId);
@@ -11586,7 +11708,8 @@ function OhhwellsBridge() {
         }
       } catch {
       }
-      if (!pending?.started) {
+      if (!pending) return;
+      if (!pending.started) {
         unlockFooterDragInteraction();
         return;
       }
@@ -11679,9 +11802,39 @@ function OhhwellsBridge() {
     return () => window.removeEventListener("hashchange", onHashChange);
   }, [pathname]);
   const handleCommand = useCallback4((cmd) => {
+    const el = activeElRef.current;
+    const selBefore = window.getSelection();
+    let savedOffsets = null;
+    if (el && selBefore && selBefore.rangeCount > 0 && !selBefore.isCollapsed) {
+      const r2 = selBefore.getRangeAt(0);
+      if (el.contains(r2.commonAncestorContainer)) {
+        savedOffsets = {
+          start: textOffsetInRoot(el, r2.startContainer, r2.startOffset),
+          end: textOffsetInRoot(el, r2.endContainer, r2.endOffset)
+        };
+      }
+    }
+    document.execCommand("styleWithCSS", false, true);
     document.execCommand(cmd, false);
-    activeElRef.current?.focus();
-    if (activeElRef.current) setToolbarRect(getEditMeasureEl(activeElRef.current).getBoundingClientRect());
+    if (el && document.activeElement !== el) {
+      el.focus();
+    }
+    const selAfter = window.getSelection();
+    if (el && savedOffsets && selAfter?.isCollapsed) {
+      const start = pointAtTextOffset(el, savedOffsets.start);
+      const end = pointAtTextOffset(el, savedOffsets.end);
+      if (start && end) {
+        try {
+          const range = document.createRange();
+          range.setStart(start.node, start.offset);
+          range.setEnd(end.node, end.offset);
+          selAfter.removeAllRanges();
+          selAfter.addRange(range);
+        } catch {
+        }
+      }
+    }
+    if (el) setToolbarRect(getEditMeasureEl(el).getBoundingClientRect());
     refreshActiveCommandsRef.current();
   }, []);
   const handleStateChange = useCallback4((state) => {