@bobfrankston/rmfmail 1.2.331 → 1.2.333

package/client/compose/compose.bundle.js

@@ -3022,14 +3022,34 @@ async function createTinyMceEditor(container2, opts = {}) {
           };
           reader.readAsDataURL(file);
         });
+        const restoreBlobSrcs = (html) => html.replace(/src="(blob:[^"]+)"/g, (m, uri) => {
+          const info = ed.editorUpload?.blobCache?.getByUri?.(uri);
+          return info ? `src="data:${info.blob().type};base64,${info.base64()}"` : m;
+        });
         ed.on("GetContent", (e) => {
           if (!e?.content || typeof e.content !== "string" || !e.content.includes("blob:"))
             return;
-          e.content = e.content.replace(/src="(blob:[^"]+)"/g, (m, uri) => {
-            const info = ed.editorUpload?.blobCache?.getByUri?.(uri);
-            return info ? `src="data:${info.blob().type};base64,${info.base64()}"` : m;
-          });
+          e.content = restoreBlobSrcs(e.content);
         });
+        const copyWithImageData = (e) => {
+          if (!e?.clipboardData)
+            return;
+          let html = "";
+          try {
+            html = ed.selection.getContent({ format: "html" }) || "";
+          } catch {
+            return;
+          }
+          if (!html.includes("blob:"))
+            return;
+          e.preventDefault();
+          e.clipboardData.setData("text/html", restoreBlobSrcs(html));
+          e.clipboardData.setData("text/plain", ed.selection.getContent({ format: "text" }) || "");
+          if (e.type === "cut")
+            ed.execCommand("Delete");
+        };
+        ed.on("copy", copyWithImageData);
+        ed.on("cut", copyWithImageData);
         ed.on("OpenWindow", () => {
           requestAnimationFrame(() => requestAnimationFrame(() => {
             const ta = document.querySelector(".tox-dialog textarea");
@@ -5560,6 +5580,7 @@ async function tryEditor(type) {
       }
     } catch {
     }
+    if (ed) wirePasteImageInlining(ed, type);
     return ed;
   } catch (e) {
     logClientEvent("compose-editor-create-failed", { type, error: String(e?.message || e) });
@@ -6495,6 +6516,29 @@ function editorBodyEl() {
   return document.querySelector(".ql-editor") || document.querySelector(".tt-content .tiptap");
 }
 var INLINE_CHECKED_ATTR = "data-mailx-inline-checked";
+function wirePasteImageInlining(ed, type) {
+  const onPaste = () => {
+    const body2 = editorBodyEl();
+    if (!body2) return;
+    for (const img of Array.from(body2.querySelectorAll(`img:not([${INLINE_CHECKED_ATTR}])`))) {
+      img.setAttribute(INLINE_CHECKED_ATTR, "1");
+    }
+    setTimeout(() => {
+      void inlinePastedRemoteImages();
+    }, 50);
+    setTimeout(() => {
+      void inlinePastedRemoteImages();
+    }, 800);
+  };
+  const native = ed?.nativeEditor;
+  if (type === "tinymce" && native?.on) {
+    native.on("paste", onPaste);
+    return;
+  }
+  const body = editorBodyEl();
+  if (body) body.addEventListener("paste", onPaste);
+  else console.error("[compose] paste-image inlining not wired: no editor body");
+}
 async function inlinePastedRemoteImages() {
   const body = editorBodyEl();
   if (!body) return;
@@ -6516,7 +6560,6 @@ async function inlinePastedRemoteImages() {
 }
 function scheduleDraftSave() {
   markComposeDirty();
-  void inlinePastedRemoteImages();
   if (draftDebounceTimer) clearTimeout(draftDebounceTimer);
   draftDebounceTimer = setTimeout(() => {
     draftDebounceTimer = null;