@bobfrankston/rmfmail 1.1.237 → 1.1.239

package/client/compose/compose.bundle.js

@@ -2699,20 +2699,14 @@ function showSuggestionsMenu2(parentDoc, x, y, items) {
   }, 0);
 }
 function replaceMarker(editor2, marker, replacement) {
-  const doc = editor2.getDoc();
-  const range = doc.createRange();
-  range.selectNode(marker);
-  const sel = doc.getSelection();
-  if (!sel)
-    return;
-  sel.removeAllRanges();
-  sel.addRange(range);
   try {
-    if (!doc.execCommand("insertText", false, replacement)) {
-      range.deleteContents();
-      range.insertNode(doc.createTextNode(replacement));
-    }
+    editor2.focus();
+    editor2.selection.select(marker);
+    editor2.insertContent(editor2.dom.encode(replacement));
   } catch {
+    const doc = editor2.getDoc();
+    const range = doc.createRange();
+    range.selectNode(marker);
     range.deleteContents();
     range.insertNode(doc.createTextNode(replacement));
   }
@@ -5220,6 +5214,7 @@ document.getElementById("btn-attach")?.addEventListener("click", () => {
   fileInput?.click();
 });
 var wordEditId = null;
+var extEditHintClose = null;
 {
   const isAndroid = window.mailxapi?.platform === "android" || window.parent?.mailxapi?.platform === "android";
   if (isAndroid) {
@@ -5357,6 +5352,7 @@ function showExternalEditHint(editorLabel) {
   const close = () => {
     backdrop.remove();
     document.removeEventListener("keydown", onKey, true);
+    extEditHintClose = null;
   };
   const onKey = (e) => {
     if (e.key === "Escape") {
@@ -5367,14 +5363,13 @@ function showExternalEditHint(editorLabel) {
   };
   document.addEventListener("keydown", onKey, true);
   panel.querySelector("#mailx-extedit-hint-ok")?.addEventListener("click", close);
-  backdrop.addEventListener("mousedown", (e) => {
-    if (e.target === backdrop) close();
-  });
+  extEditHintClose = close;
 }
 onEvent((ev) => {
   if (ev?.type !== "wordEditUpdated") return;
   if (!wordEditId || ev.editId !== wordEditId) return;
   try {
+    extEditHintClose?.();
     editor.setHtml(ev.html || "");
     showDraftStatus("Reloaded edits from external editor.", false);
     scheduleDraftSave();