@bobfrankston/rmfmail 1.2.259 → 1.2.261

package/client/app.bundle.js

@@ -1653,12 +1653,15 @@ __export(message_viewer_exports, {
   getCurrentMessage: () => getCurrentMessage,
   initViewer: () => initViewer,
   invalidateParsedCache: () => invalidateParsedCache,
+  parseHighlightTerms: () => parseHighlightTerms,
   popOutCurrentMessage: () => popOutCurrentMessage,
   popOutToWindow: () => popOutToWindow,
   printCurrentMessage: () => printCurrentMessage,
   printMessage: () => printMessage,
+  refreshSearchHighlight: () => refreshSearchHighlight,
   saveCurrentMessageAsEml: () => saveCurrentMessageAsEml,
   saveCurrentMessageAsHtml: () => saveCurrentMessageAsHtml,
+  setSearchHighlightTerms: () => setSearchHighlightTerms,
   showMessage: () => showMessage,
   showPreviewBodyMenu: () => showPreviewBodyMenu,
   spawnDesktopPopout: () => spawnDesktopPopout,
@@ -2084,12 +2087,160 @@ async function translateAndShow(text) {
       status.textContent = `Translate error: ${err?.message || ""}`;
   }
 }
+function parseHighlightTerms(query) {
+  const parts = (query || "").match(/"[^"]*"|\S+/g) || [];
+  const out = [];
+  let negate = false;
+  for (const raw of parts) {
+    const part = raw.replace(/^"|"$/g, "");
+    if (/^(AND|OR)$/i.test(part))
+      continue;
+    if (/^NOT$/i.test(part)) {
+      negate = true;
+      continue;
+    }
+    if (negate) {
+      negate = false;
+      continue;
+    }
+    if (part.startsWith("-"))
+      continue;
+    const q = part.match(/^([a-z]+):(.*)$/i);
+    if (q) {
+      const [, field, value] = q;
+      if (/^subject$/i.test(field) && value)
+        out.push(value.replace(/^"|"$/g, ""));
+      continue;
+    }
+    if (part.length >= 2)
+      out.push(part);
+  }
+  return Array.from(new Set(out.map((t) => t.toLowerCase()))).sort((a, b) => b.length - a.length);
+}
+function collectHighlightRanges(doc, terms) {
+  const ranges = [];
+  const walker = doc.createTreeWalker(doc.body, NodeFilter.SHOW_TEXT, {
+    acceptNode(node) {
+      const tag = (node.parentElement?.tagName || "").toUpperCase();
+      if (tag === "SCRIPT" || tag === "STYLE" || tag === "NOSCRIPT")
+        return NodeFilter.FILTER_REJECT;
+      return node.nodeValue && node.nodeValue.trim() ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_REJECT;
+    }
+  });
+  for (let n = walker.nextNode(); n; n = walker.nextNode()) {
+    const hay = n.data.toLowerCase();
+    const taken = [];
+    for (const term of terms) {
+      let from = 0;
+      for (; ; ) {
+        const at = hay.indexOf(term, from);
+        if (at < 0)
+          break;
+        const end = at + term.length;
+        from = end;
+        if (taken.some(([s, e]) => at < e && end > s))
+          continue;
+        taken.push([at, end]);
+        const r = doc.createRange();
+        r.setStart(n, at);
+        r.setEnd(n, end);
+        ranges.push(r);
+        if (ranges.length >= HIGHLIGHT_MAX)
+          return ranges;
+      }
+    }
+  }
+  return ranges;
+}
+function applySearchHighlight(iframe, scrollToFirst = false) {
+  const doc = iframe.contentDocument;
+  const win = iframe.contentWindow;
+  if (!doc?.body || !win?.CSS?.highlights || typeof win.Highlight !== "function")
+    return 0;
+  try {
+    win.CSS.highlights.delete(HIGHLIGHT_NAME);
+    if (searchHighlightTerms.length === 0)
+      return 0;
+    const ranges = collectHighlightRanges(doc, searchHighlightTerms);
+    if (ranges.length === 0)
+      return 0;
+    win.CSS.highlights.set(HIGHLIGHT_NAME, new win.Highlight(...ranges));
+    if (scrollToFirst) {
+      const rect = ranges[0].getBoundingClientRect();
+      const h = doc.documentElement.clientHeight || 0;
+      if (rect.height > 0 && (rect.top < 0 || rect.bottom > h)) {
+        const target = (doc.scrollingElement || doc.documentElement).scrollTop + rect.top - h / 3;
+        (doc.scrollingElement || doc.documentElement).scrollTop = Math.max(0, target);
+      }
+    }
+    return ranges.length;
+  } catch {
+    return 0;
+  }
+}
+function applyHeaderHighlight() {
+  const anyWin = window;
+  if (!anyWin.CSS?.highlights || typeof anyWin.Highlight !== "function")
+    return;
+  try {
+    anyWin.CSS.highlights.delete(HIGHLIGHT_NAME);
+    const subj = document.querySelector(".mv-subject");
+    if (!subj || searchHighlightTerms.length === 0)
+      return;
+    const ranges = collectHighlightRangesIn(subj, searchHighlightTerms);
+    if (ranges.length)
+      anyWin.CSS.highlights.set(HIGHLIGHT_NAME, new anyWin.Highlight(...ranges));
+  } catch {
+  }
+}
+function collectHighlightRangesIn(root, terms) {
+  const walker = document.createTreeWalker(root, NodeFilter.SHOW_TEXT);
+  const ranges = [];
+  for (let n = walker.nextNode(); n; n = walker.nextNode()) {
+    const hay = n.data.toLowerCase();
+    for (const term of terms) {
+      let from = 0;
+      for (; ; ) {
+        const at = hay.indexOf(term, from);
+        if (at < 0)
+          break;
+        from = at + term.length;
+        const r = document.createRange();
+        r.setStart(n, at);
+        r.setEnd(n, from);
+        ranges.push(r);
+      }
+    }
+  }
+  return ranges;
+}
+function setSearchHighlightTerms(terms) {
+  const next = terms.filter(Boolean).map((t) => t.toLowerCase());
+  const same = next.length === searchHighlightTerms.length && next.every((t, i) => t === searchHighlightTerms[i]);
+  if (same)
+    return;
+  searchHighlightTerms = next;
+  applyHeaderHighlight();
+  for (const f of Array.from(document.querySelectorAll("iframe"))) {
+    applySearchHighlight(f, true);
+  }
+}
+function refreshSearchHighlight(iframe, scrollToFirst = false) {
+  if (searchHighlightTerms.length === 0)
+    return;
+  applySearchHighlight(iframe, scrollToFirst);
+  applyHeaderHighlight();
+}
 function installPreviewControls(iframe) {
   const attach = () => {
     const doc = iframe.contentDocument;
     if (!doc)
       return;
+    if (doc.__mvControlsBound)
+      return;
+    doc.__mvControlsBound = true;
     applyZoom(doc);
+    refreshSearchHighlight(iframe, true);
     doc.addEventListener("keydown", (e) => {
       const target = e.target;
       if (target && (target.isContentEditable || /^(INPUT|TEXTAREA|SELECT)$/.test(target.tagName)))
@@ -2132,10 +2283,19 @@ function installPreviewControls(iframe) {
       setZoom(previewZoom + (e.deltaY < 0 ? ZOOM_STEP : -ZOOM_STEP), doc);
     }, { passive: false });
   };
+  iframe.addEventListener("load", attach);
   if (iframe.contentDocument?.readyState === "complete")
     attach();
-  else
-    iframe.addEventListener("load", attach, { once: true });
+  queueMicrotask(() => {
+    const doc = iframe.contentDocument;
+    if (!doc)
+      return;
+    if (doc.readyState === "loading") {
+      doc.addEventListener("DOMContentLoaded", () => refreshSearchHighlight(iframe, true), { once: true });
+    } else {
+      refreshSearchHighlight(iframe, true);
+    }
+  });
 }
 function clearViewer() {
   currentMessage = null;
@@ -3144,6 +3304,8 @@ function appendTextProgressively(iframe, rest, gen) {
     const span = doc.createElement("span");
     span.innerHTML = linkifyText(chunks[i++]);
     host.appendChild(span);
+    if (i >= chunks.length)
+      refreshSearchHighlight(iframe);
     requestAnimationFrame(step);
   };
   let waits = 0;
@@ -3305,6 +3467,12 @@ ${csp}
         word-break: break-word;
     }
     blockquote { border-left: 3px solid #ccc; padding-left: 1rem; margin-left: 0; color: #666; }
+    /* Search matches. Painted by the parent through the CSS Custom Highlight
+       API (CSS.highlights) \u2014 no <mark> in the message DOM, so the letter the
+       user copies, quotes or re-renders is byte-identical to what arrived.
+       Both colors are explicit: a highlight that inherits the body color is
+       invisible against its own background in one theme or the other. */
+    ::highlight(mailx-find) { background: #ffd54a; color: #1a1a2e; }
     @media (prefers-color-scheme: dark) {
         body { color: #cdd6f4; background: #282840; }
         a { color: #89b4fa; }
@@ -3859,7 +4027,7 @@ function spawnDesktopPopout(msg, accountId) {
 function escapeHtmlLocal(s) {
   return (s || "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
-var pendingImageCopies, imageCopySeq, IMAGE_COPY_TIMEOUT_MS, currentMessage, currentAccountId, dragOutUrls, showMessageGeneration, retryCount, lastEnvelope, PARSED_CACHE_LIMIT, parsedCache, sessionAllowedRemote, recentFetchErrors, WAIT_GIVE_UP_SECS, ZOOM_KEY, ZOOM_MIN, ZOOM_MAX, ZOOM_STEP, previewZoom, RENDER_MARK_KEY, RENDER_MARK_MAX_AGE_MS, poisonedMessages, renderKey, PROGRESSIVE_TEXT_THRESHOLD, TEXT_CHUNK_BYTES;
+var pendingImageCopies, imageCopySeq, IMAGE_COPY_TIMEOUT_MS, currentMessage, currentAccountId, dragOutUrls, showMessageGeneration, retryCount, lastEnvelope, PARSED_CACHE_LIMIT, parsedCache, sessionAllowedRemote, recentFetchErrors, WAIT_GIVE_UP_SECS, ZOOM_KEY, ZOOM_MIN, ZOOM_MAX, ZOOM_STEP, previewZoom, HIGHLIGHT_NAME, HIGHLIGHT_MAX, searchHighlightTerms, RENDER_MARK_KEY, RENDER_MARK_MAX_AGE_MS, poisonedMessages, renderKey, PROGRESSIVE_TEXT_THRESHOLD, TEXT_CHUNK_BYTES;
 var init_message_viewer = __esm({
   "client/components/message-viewer.js"() {
     "use strict";
@@ -3897,6 +4065,9 @@ var init_message_viewer = __esm({
     ZOOM_MAX = 3;
     ZOOM_STEP = 0.1;
     previewZoom = clampZoom(parseFloat(localStorage.getItem(ZOOM_KEY) || "1.15"));
+    HIGHLIGHT_NAME = "mailx-find";
+    HIGHLIGHT_MAX = 2e3;
+    searchHighlightTerms = [];
     subscribeStore("*", (ev) => {
       if (ev?.kind !== "messageRemoved")
         return;
@@ -10691,6 +10862,7 @@ function renderSearchHighlight(settled) {
 }
 function updateSearchHighlight() {
   renderSearchHighlight(false);
+  setSearchHighlightTerms(parseHighlightTerms(searchInput?.value || ""));
   if (searchRegexSettleTimer) clearTimeout(searchRegexSettleTimer);
   searchRegexSettleTimer = setTimeout(() => renderSearchHighlight(true), SEARCH_REGEX_SETTLE_MS);
 }
@@ -10703,6 +10875,7 @@ var SERVER_SEARCH_DALLY_MS = 700;
 var serverSearchTimer = null;
 function doSearch(immediate = false) {
   const query = searchInput.value.trim();
+  setSearchHighlightTerms(parseHighlightTerms(query));
   if (query.length === 0) {
     if (serverSearchTimer) {
       clearTimeout(serverSearchTimer);