@bobfrankston/rmfmail 1.2.114 → 1.2.116

package/client/compose/compose.bundle.js

@@ -4124,6 +4124,17 @@ function getFromAccountId() {
 function getFromAddress() {
   return fromInput.value.trim();
 }
+function smartTab(current) {
+  const fields = [toInput, ccInput, bccInput, subjectInput];
+  const currentIdx = fields.indexOf(current);
+  for (let i = currentIdx + 1; i < fields.length; i++) {
+    if (!fields[i].value.trim() && fields[i].offsetParent !== null) {
+      fields[i].focus();
+      return;
+    }
+  }
+  editor.focus();
+}
 function showAutocompleteContextMenu(e, row) {
   showContextMenu(e.clientX, e.clientY, [
     {
@@ -4370,6 +4381,14 @@ function setupAutocomplete(input) {
 setupAutocomplete(toInput);
 setupAutocomplete(ccInput);
 setupAutocomplete(bccInput);
+for (const field of [toInput, ccInput, bccInput, subjectInput]) {
+  field.addEventListener("keydown", (e) => {
+    const ke = e;
+    if (ke.key !== "Tab" || ke.shiftKey || ke.ctrlKey || ke.altKey || ke.defaultPrevented) return;
+    ke.preventDefault();
+    smartTab(field);
+  });
+}
 function splitRecipients(s) {
   const raw = [];
   let cur = "", inQuote = false;
@@ -5083,10 +5102,15 @@ document.getElementById("btn-attach")?.addEventListener("click", () => {
 var wordEditId = null;
 var extEditHintClose = null;
 {
-  const isAndroid = window.mailxapi?.platform === "android" || window.parent?.mailxapi?.platform === "android";
+  let parentPlatform;
+  try {
+    parentPlatform = window.parent?.mailxapi?.platform;
+  } catch {
+  }
+  const isAndroid = /Android/i.test(navigator.userAgent) || window.mailxapi?.platform === "android" || parentPlatform === "android";
   if (isAndroid) {
     const btn = document.getElementById("btn-edit-in-word");
-    if (btn) btn.hidden = true;
+    if (btn) btn.style.display = "none";
   }
 }
 document.getElementById("btn-edit-in-word")?.addEventListener("click", async () => {