@bobfrankston/rmfmail 1.2.229 → 1.2.231

package/client/compose/compose.bundle.js

@@ -1983,18 +1983,74 @@ var init_spellcheck_core = __esm({
   }
 });
 
-// client/compose/edit-commands.js
-var edit_commands_exports = {};
-__export(edit_commands_exports, {
-  runClipboardCommand: () => runClipboardCommand,
-  runFormatCommand: () => runFormatCommand,
-  standardEditItems: () => standardEditItems
-});
-function isTinyEditor(ne) {
+// client/components/edit-menu.js
+function isTinyEngine(ne) {
   return !!ne && typeof ne.execCommand === "function" && !!ne.selection;
 }
+function describeEditTarget(target) {
+  const none = { el: null, editable: false, selection: "", canRead: true, isField: false };
+  const node = target;
+  if (!node)
+    return { ...none, selection: pageSelection() };
+  const start = node.nodeType === Node.ELEMENT_NODE ? node : node.parentElement;
+  if (!start)
+    return { ...none, selection: pageSelection() };
+  const field = start.closest("input, textarea");
+  if (field) {
+    const type = (field instanceof HTMLInputElement ? field.type : "text").toLowerCase();
+    if (!TEXTUAL_INPUT_TYPES.has(type))
+      return { ...none, selection: pageSelection() };
+    const s = field.selectionStart ?? 0, e = field.selectionEnd ?? 0;
+    return {
+      el: field,
+      editable: !field.readOnly && !field.disabled,
+      selection: e > s ? field.value.slice(s, e) : "",
+      canRead: type !== "password",
+      isField: true
+    };
+  }
+  const ce = start.closest("[contenteditable]");
+  const editable = !!ce && ce.isContentEditable;
+  return { el: ce || start, editable, selection: pageSelection(), canRead: true, isField: false };
+}
+function pageSelection() {
+  try {
+    return window.getSelection()?.toString() || "";
+  } catch {
+    return "";
+  }
+}
+function escapeHtml(s) {
+  return s.replace(/[&<>]/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;" })[c]);
+}
+async function readClipboard() {
+  let html = "", text = "";
+  if (navigator.clipboard?.read) {
+    for (const item of await navigator.clipboard.read()) {
+      if (item.types.includes("text/html"))
+        html = await (await item.getType("text/html")).text();
+      if (item.types.includes("text/plain"))
+        text = await (await item.getType("text/plain")).text();
+    }
+    if (!html && !text)
+      text = await navigator.clipboard.readText();
+  } else {
+    text = await navigator.clipboard.readText();
+  }
+  return { html, text };
+}
+async function writeClipboard(text, html) {
+  if (html && typeof ClipboardItem === "function" && navigator.clipboard?.write) {
+    await navigator.clipboard.write([new ClipboardItem({
+      "text/html": new Blob([html], { type: "text/html" }),
+      "text/plain": new Blob([text], { type: "text/plain" })
+    })]);
+    return;
+  }
+  await navigator.clipboard.writeText(text);
+}
 function expandToWord(ne) {
-  if (isTinyEditor(ne)) {
+  if (isTinyEngine(ne)) {
     try {
       if (ne.selection.isCollapsed() && typeof ne.selection.expand === "function") {
         ne.selection.expand({ type: "word" });
@@ -2017,24 +2073,59 @@ function expandToWord(ne) {
       ne.setSelection(a, b - a);
   }
 }
-function escapeHtml(s) {
-  return s.replace(/[&<>]/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;" })[c]);
+function replaceFieldSelection(field, text) {
+  const s = field.selectionStart ?? field.value.length;
+  const e = field.selectionEnd ?? field.value.length;
+  field.value = field.value.slice(0, s) + text + field.value.slice(e);
+  field.selectionStart = field.selectionEnd = s + text.length;
+  field.dispatchEvent(new Event("input", { bubbles: true }));
 }
-async function runClipboardCommand(ne, id) {
-  const isTiny = isTinyEditor(ne);
+async function runClipboard(ctx, id) {
+  if (ctx.engine)
+    return runEngineClipboard(ctx.engine, id);
+  const info = describeEditTarget(ctx.target);
   if (id === "paste") {
-    let html2 = "";
-    let text2 = "";
-    if (navigator.clipboard?.read) {
-      for (const item of await navigator.clipboard.read()) {
-        if (item.types.includes("text/html"))
-          html2 = await (await item.getType("text/html")).text();
-        if (item.types.includes("text/plain"))
-          text2 = await (await item.getType("text/plain")).text();
-      }
-    } else {
-      text2 = await navigator.clipboard.readText();
+    if (!info.editable || !info.el)
+      throw new Error("nothing here accepts a paste");
+    const { html, text } = await readClipboard();
+    if (info.isField) {
+      if (!text && !html)
+        return;
+      replaceFieldSelection(info.el, text || stripHtml(html));
+      return;
     }
+    const content = html || (text ? escapeHtml(text).replace(/\r?\n/g, "<br>") : "");
+    if (!content)
+      return;
+    insertHtmlAtSelection(info.el, content);
+    return;
+  }
+  if (!info.canRead)
+    throw new Error("this field's contents can't be copied");
+  if (!info.selection)
+    return;
+  if (info.isField) {
+    await writeClipboard(info.selection);
+  } else {
+    await writeClipboard(info.selection, selectionHtml());
+  }
+  if (id !== "cut")
+    return;
+  if (!info.editable)
+    throw new Error("this text is read-only \u2014 copied instead of cut");
+  if (info.isField) {
+    replaceFieldSelection(info.el, "");
+    return;
+  }
+  try {
+    window.getSelection()?.deleteFromDocument();
+  } catch {
+  }
+}
+async function runEngineClipboard(ne, id) {
+  const isTiny = isTinyEngine(ne);
+  if (id === "paste") {
+    const { html: html2, text: text2 } = await readClipboard();
     const content = html2 || (text2 ? escapeHtml(text2).replace(/\r?\n/g, "<br>") : "");
     if (!content)
       return;
@@ -2050,24 +2141,17 @@ async function runClipboardCommand(ne, id) {
     throw new Error("editor doesn't support paste");
   }
   expandToWord(ne);
-  let html = "";
-  let text = "";
+  let html = "", text = "";
   if (isTiny) {
     html = ne.selection.getContent({ format: "html" });
     text = ne.selection.getContent({ format: "text" });
   } else {
-    text = window.getSelection()?.toString() || "";
+    text = pageSelection();
+    html = selectionHtml();
   }
   if (!text && !html)
     return;
-  if (html && typeof ClipboardItem === "function" && navigator.clipboard?.write) {
-    await navigator.clipboard.write([new ClipboardItem({
-      "text/html": new Blob([html], { type: "text/html" }),
-      "text/plain": new Blob([text], { type: "text/plain" })
-    })]);
-  } else {
-    await navigator.clipboard.writeText(text);
-  }
+  await writeClipboard(text, html || void 0);
   if (id !== "cut")
     return;
   if (isTiny) {
@@ -2080,10 +2164,132 @@ async function runClipboardCommand(ne, id) {
       ne.deleteText(sel.index, sel.length);
   }
 }
+function selectionHtml() {
+  try {
+    const sel = window.getSelection();
+    if (!sel || sel.rangeCount === 0 || sel.isCollapsed)
+      return "";
+    const div = document.createElement("div");
+    div.appendChild(sel.getRangeAt(0).cloneContents());
+    return div.innerHTML;
+  } catch {
+    return "";
+  }
+}
+function stripHtml(html) {
+  const div = document.createElement("div");
+  div.innerHTML = html;
+  return div.textContent || "";
+}
+function insertHtmlAtSelection(host, html) {
+  const sel = window.getSelection();
+  const frag = document.createRange().createContextualFragment(html);
+  if (!sel || sel.rangeCount === 0) {
+    host?.appendChild(frag);
+    return;
+  }
+  const range = sel.getRangeAt(0);
+  range.deleteContents();
+  const last = frag.lastChild;
+  range.insertNode(frag);
+  if (last) {
+    range.setStartAfter(last);
+    range.collapse(true);
+    sel.removeAllRanges();
+    sel.addRange(range);
+  }
+}
+function selectAll(info) {
+  if (info.isField && info.el) {
+    info.el.select();
+    return;
+  }
+  const host = info.el;
+  if (!host)
+    return;
+  const range = document.createRange();
+  range.selectNodeContents(host);
+  const sel = window.getSelection();
+  sel?.removeAllRanges();
+  sel?.addRange(range);
+}
+function editMenuItems(ctx, opts = {}) {
+  const report = opts.onError || ((m) => console.warn(`[edit-menu] ${m}`));
+  const info = ctx.engine ? { el: null, editable: true, selection: pageSelection(), canRead: true, isField: false } : describeEditTarget(ctx.target);
+  if (!ctx.engine && !info.editable && !info.selection)
+    return [];
+  const run = (id) => () => {
+    void runClipboard(ctx, id).catch((e) => {
+      const key = id === "cut" ? "Ctrl+X" : id === "copy" ? "Ctrl+C" : "Ctrl+V";
+      const what = id[0].toUpperCase() + id.slice(1);
+      report(`${what} failed: ${e?.message || e}. ${key} still works.`);
+    });
+  };
+  const hasSel = !!ctx.engine || !!info.selection;
+  const items = [
+    { label: "Cut", action: run("cut"), disabled: !info.editable || !hasSel || !info.canRead },
+    { label: "Copy", action: run("copy"), disabled: !hasSel || !info.canRead },
+    { label: "Paste", action: run("paste"), disabled: !info.editable }
+  ];
+  if (opts.selectAll !== false && !ctx.engine) {
+    items.push({ label: "Select all", action: () => selectAll(info) });
+  }
+  return items;
+}
+var TEXTUAL_INPUT_TYPES;
+var init_edit_menu = __esm({
+  "client/components/edit-menu.js"() {
+    "use strict";
+    TEXTUAL_INPUT_TYPES = /* @__PURE__ */ new Set([
+      "text",
+      "search",
+      "email",
+      "url",
+      "tel",
+      "number",
+      "password",
+      ""
+    ]);
+  }
+});
+
+// client/compose/edit-commands.js
+var edit_commands_exports = {};
+__export(edit_commands_exports, {
+  runFormatCommand: () => runFormatCommand,
+  standardEditItems: () => standardEditItems
+});
+function isTinyEditor(ne) {
+  return !!ne && typeof ne.execCommand === "function" && !!ne.selection;
+}
+function expandToWord2(ne) {
+  if (isTinyEditor(ne)) {
+    try {
+      if (ne.selection.isCollapsed() && typeof ne.selection.expand === "function") {
+        ne.selection.expand({ type: "word" });
+      }
+    } catch {
+    }
+    return;
+  }
+  if (ne && typeof ne.getSelection === "function" && typeof ne.setSelection === "function") {
+    const sel = ne.getSelection();
+    if (!sel || sel.length > 0)
+      return;
+    const text = ne.getText();
+    let a = sel.index, b = sel.index;
+    while (a > 0 && /\S/.test(text[a - 1]))
+      a--;
+    while (b < text.length && /\S/.test(text[b]))
+      b++;
+    if (b > a)
+      ne.setSelection(a, b - a);
+  }
+}
 function runFormatCommand(ne, id) {
   if (!ne)
     return;
-  expandToWord(ne);
+  expandToWord2(ne);
   if (isTinyEditor(ne)) {
     const cmd = {
       bold: "Bold",
@@ -2129,20 +2335,11 @@ function runFormatCommand(ne, id) {
   }
 }
 function standardEditItems(getEditor, opts = {}) {
-  const report = opts.onError || ((m) => console.warn(`[edit-commands] ${m}`));
-  const clip = (id) => () => {
-    void runClipboardCommand(getEditor(), id).catch((e) => {
-      const key = id === "cut" ? "Ctrl+X" : id === "copy" ? "Ctrl+C" : "Ctrl+V";
-      report(`${id[0].toUpperCase()}${id.slice(1)} failed: ${e?.message || e}. ${key} still works.`);
-    });
-  };
   const fmt = (id) => () => runFormatCommand(getEditor(), id);
   const items = [
     { label: "", action: () => {
     }, separator: true },
-    { label: "Cut", action: clip("cut") },
-    { label: "Copy", action: clip("copy") },
-    { label: "Paste", action: clip("paste") },
+    ...editMenuItems({ engine: getEditor() }, { onError: opts.onError }),
     { label: "", action: () => {
     }, separator: true },
     { label: "Bold", action: fmt("bold") },
@@ -2162,6 +2359,7 @@ function standardEditItems(getEditor, opts = {}) {
 var init_edit_commands = __esm({
   "client/compose/edit-commands.js"() {
     "use strict";
+    init_edit_menu();
   }
 });
 
@@ -4620,6 +4818,7 @@ init_api_client();
 init_edit_commands();
 
 // client/components/context-menu.js
+init_edit_menu();
 var activeMenu = null;
 var dismissListener = null;
 var escapeListener = null;
@@ -4684,8 +4883,15 @@ function openSubmenu(parentRow, items) {
   sub.style.top = `${Math.max(4, top)}px`;
   activeSubmenu = sub;
 }
-function showContextMenu(x, y, items) {
+function showContextMenu(x, y, items, opts = {}) {
   closeContextMenu();
+  if (opts.editTarget !== void 0 || opts.editEngine) {
+    const edit = editMenuItems({ target: opts.editTarget, engine: opts.editEngine }, { onError: opts.onEditError });
+    if (edit.length > 0) {
+      items = items.length > 0 ? [...edit, { label: "", action: () => {
+      }, separator: true }, ...items] : edit;
+    }
+  }
   const menu = document.createElement("div");
   menu.className = "ctx-menu";
   for (const item of items) {
@@ -5129,43 +5335,8 @@ for (const el of [toInput, ccInput, bccInput]) {
       items.push({ label: `Copy address: ${addr.email}`, action: () => {
         void navigator.clipboard.writeText(addr.email);
       } });
-      items.push({ label: "", action: () => {
-      }, separator: true });
     }
-    const selText = () => el.value.slice(el.selectionStart ?? 0, el.selectionEnd ?? 0);
-    const replaceSelection = (text) => {
-      const s = el.selectionStart ?? el.value.length, en = el.selectionEnd ?? el.value.length;
-      el.value = el.value.slice(0, s) + text + el.value.slice(en);
-      el.selectionStart = el.selectionEnd = s + text.length;
-      el.dispatchEvent(new Event("input", { bubbles: true }));
-    };
-    items.push({ label: "Cut", action: async () => {
-      const t = selText();
-      if (t) {
-        try {
-          await navigator.clipboard.writeText(t);
-        } catch {
-        }
-        replaceSelection("");
-      }
-    } });
-    items.push({ label: "Copy", action: async () => {
-      const t = selText();
-      if (t) {
-        try {
-          await navigator.clipboard.writeText(t);
-        } catch {
-        }
-      }
-    } });
-    items.push({ label: "Paste", action: async () => {
-      try {
-        replaceSelection(await navigator.clipboard.readText());
-      } catch {
-      }
-    } });
-    items.push({ label: "Select all", action: () => el.select() });
-    showContextMenu(me.clientX, me.clientY, items);
+    showContextMenu(me.clientX, me.clientY, items, { editTarget: el });
   });
 }
 var knownAccounts = [];