fable-editor 1.2.7 → 1.2.8

package/dist/core/index.mjs

@@ -1917,7 +1917,7 @@ const st = "undo redo | preview print | importword revhistory | fontfamily fonts
   th: ["width", "valign"],
   table: ["width", "cellpadding", "cellspacing"]
 };
-function P(p) {
+function D(p) {
   const t = {}, e = p.getAttribute && p.getAttribute("style");
   return e && e.split(";").forEach((i) => {
     const s = i.indexOf(":");
@@ -1954,13 +1954,13 @@ function vt(p) {
       if (!l.length || l[l.length - 1].level < c) {
         const w = p.createElement(m ? "ol" : "ul");
         if (m && g && (w.style.listStyleType = g), l.length) {
-          const k = l[l.length - 1].list;
-          (k.lastElementChild || k).appendChild(w);
+          const H = l[l.length - 1].list;
+          (H.lastElementChild || H).appendChild(w);
         } else
           o.parentNode.insertBefore(w, o);
         l.push({ list: w, level: c });
       }
-      const u = p.createElement("li"), v = P(n), b = ["text-align", "direction", "unicode-bidi", "color", "font-size", "font-family", "background-color"].filter((w) => v[w]).map((w) => w + ":" + v[w]).join(";");
+      const u = p.createElement("li"), v = D(n), b = ["text-align", "direction", "unicode-bidi", "color", "font-size", "font-family", "background-color"].filter((w) => v[w]).map((w) => w + ":" + v[w]).join(";");
       for (b && u.setAttribute("style", b), n.getAttribute("dir") && u.setAttribute("dir", n.getAttribute("dir")); n.firstChild; ) u.appendChild(n.firstChild);
       l[l.length - 1].list.appendChild(u), n.remove();
     });
@@ -1975,7 +1975,7 @@ function bt(p) {
 function yt(p) {
   p.querySelectorAll("table").forEach((t) => {
     const e = t;
-    P(e)["border-collapse"] || (e.style.borderCollapse = "collapse");
+    D(e)["border-collapse"] || (e.style.borderCollapse = "collapse");
   }), p.querySelectorAll("[align]").forEach((t) => {
     const e = t, i = e.getAttribute("align").toLowerCase();
     e.tagName.toLowerCase() === "table" ? i === "center" ? (e.style.marginLeft = e.style.marginLeft || "auto", e.style.marginRight = e.style.marginRight || "auto") : i === "right" ? e.style.marginLeft = e.style.marginLeft || "auto" : i === "left" && (e.style.marginRight = e.style.marginRight || "auto") : ["left", "right", "center", "justify"].includes(i) && (e.style.textAlign = e.style.textAlign || i, Array.from(e.children).forEach((s) => {
@@ -2040,7 +2040,7 @@ function Z(p, t) {
         return;
       }
     }
-    const o = P(i), n = [];
+    const o = D(i), n = [];
     for (const [r, c] of Object.entries(o))
       ut.has(r) && (/expression|javascript|url\s*\(\s*['"]?\s*file:/i.test(c) || r === "font-weight" && /^(400|normal)$/i.test(c) || r === "font-style" && /^normal$/i.test(c) || r === "text-decoration" && /^none$/i.test(c) || n.push(r + ":" + c));
     if (n.length ? i.setAttribute("style", n.join(";")) : i.removeAttribute("style"), i.removeAttribute("class"), Z(i, t), s === "span" && !i.attributes.length) {
@@ -2084,7 +2084,7 @@ function Ct(p, t) {
       });
     });
   }), e.forEach((i, s) => {
-    const l = P(s), o = s.hasAttribute("dir"), n = s.hasAttribute("align"), r = Object.entries(i).filter(([d]) => !(d in l || (d === "direction" || d === "unicode-bidi") && o || d === "text-align" && (n || o) || (d === "background" || d === "background-color") && s.hasAttribute("bgcolor")));
+    const l = D(s), o = s.hasAttribute("dir"), n = s.hasAttribute("align"), r = Object.entries(i).filter(([d]) => !(d in l || (d === "direction" || d === "unicode-bidi") && o || d === "text-align" && (n || o) || (d === "background" || d === "background-color") && s.hasAttribute("bgcolor")));
     if (!r.length) return;
     const c = r.map(([d, m]) => d + ":" + m).join(";"), h = s.getAttribute("style");
     s.setAttribute("style", h ? c + ";" + h : c);
@@ -2114,7 +2114,7 @@ function Mt(p) {
   const t = tt(p).replace(/\r/g, ""), e = (i) => i.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
   return /\n/.test(t) ? t.split(/\n{2,}/).map((i) => `<p dir="auto">${e(i).replace(/\n/g, "<br>") || "<br>"}</p>`).join("") : e(t);
 }
-function Et(p) {
+function St(p) {
   const t = new DataView(p), e = /* @__PURE__ */ new Map();
   let i = -1;
   for (let n = p.byteLength - 22; n >= Math.max(0, p.byteLength - 22 - 65535); n--)
@@ -2141,7 +2141,7 @@ async function Q(p, t) {
   const n = new Blob([o]).stream().pipeThrough(new DecompressionStream("deflate-raw"));
   return new Uint8Array(await new Response(n).arrayBuffer());
 }
-const G = (p) => p.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;"), D = (p, t) => Array.from(p.children).filter((e) => e.localName === t), E = (p, ...t) => {
+const Y = (p) => p.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;"), P = (p, t) => Array.from(p.children).filter((e) => e.localName === t), S = (p, ...t) => {
   let e = p;
   for (const i of t) {
     if (!e) return null;
@@ -2154,11 +2154,11 @@ const G = (p) => p.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&
     if (e.localName === t) return e.value;
   return "";
 }, B = (p, t) => {
-  const e = p ? E(p, t) : null;
+  const e = p ? S(p, t) : null;
   if (!e) return !1;
   const i = T(e);
   return i !== "false" && i !== "0";
-}, Y = {
+}, G = {
   yellow: "#FFFF00",
   green: "#00FF00",
   cyan: "#00FFFF",
@@ -2175,7 +2175,7 @@ const G = (p) => p.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&
   lightGray: "#D3D3D3",
   black: "#000000",
   white: "#FFFFFF"
-}, St = {
+}, Et = {
   png: "image/png",
   jpg: "image/jpeg",
   jpeg: "image/jpeg",
@@ -2189,7 +2189,7 @@ function Lt(p) {
     t += String.fromCharCode(...p.subarray(e, e + 32768));
   return btoa(t);
 }
-class Ht {
+class kt {
   constructor(t, e, i) {
     this.rels = t, this.images = e, this.numFmt = i;
   }
@@ -2214,20 +2214,20 @@ class Ht {
     return s(0), e || "<p><br></p>";
   }
   paraList(t) {
-    const e = E(t, "pPr", "numPr");
+    const e = S(t, "pPr", "numPr");
     if (!e) return null;
-    const i = T(E(e, "numId"));
+    const i = T(S(e, "numId"));
     if (!i || i === "0") return null;
-    const s = parseInt(T(E(e, "ilvl")) || "0", 10) || 0;
+    const s = parseInt(T(S(e, "ilvl")) || "0", 10) || 0;
     return { type: this.numFmt.get(i) || "ul", ilvl: Math.min(s, 8) };
   }
   convertPara(t) {
-    const e = E(t, "pPr"), i = T(E(t, "pPr", "pStyle"));
+    const e = S(t, "pPr"), i = T(S(t, "pPr", "pStyle"));
     let s = "p";
     const l = /^Heading([1-6])$/i.exec(i);
     l ? s = "h" + l[1] : /^Title$/i.test(i) && (s = "h1");
-    const o = [], n = T(E(t, "pPr", "jc"));
-    n === "center" ? o.push("text-align:center") : n === "right" || n === "end" ? o.push("text-align:right") : (n === "both" || n === "distribute") && o.push("text-align:justify"), e && E(e, "bidi") && o.push("direction:rtl");
+    const o = [], n = T(S(t, "pPr", "jc"));
+    n === "center" ? o.push("text-align:center") : n === "right" || n === "end" ? o.push("text-align:right") : (n === "both" || n === "distribute") && o.push("text-align:justify"), e && S(e, "bidi") && o.push("direction:rtl");
     const r = this.runsOf(t), c = o.length ? ` style="${o.join(";")}"` : "";
     return `<${s}${c}>${r || "<br>"}</${s}>`;
   }
@@ -2240,25 +2240,25 @@ class Ht {
         const l = T(i, "anchor");
         !s && l && (s = "#" + l);
         const o = this.runsOf(i);
-        e += s ? `<a href="${G(s)}">${o}</a>` : o;
+        e += s ? `<a href="${Y(s)}">${o}</a>` : o;
       } else (i.localName === "smartTag" || i.localName === "ins") && (e += this.runsOf(i));
     return e;
   }
   convertRun(t) {
-    const e = E(t, "rPr");
+    const e = S(t, "rPr");
     let i = "";
     for (const d of Array.from(t.children))
-      d.localName === "t" ? i += G(d.textContent || "") : d.localName === "br" || d.localName === "cr" ? i += "<br>" : d.localName === "tab" ? i += "&emsp;" : (d.localName === "drawing" || d.localName === "pict" || d.localName === "object") && (i += this.convertImage(d));
+      d.localName === "t" ? i += Y(d.textContent || "") : d.localName === "br" || d.localName === "cr" ? i += "<br>" : d.localName === "tab" ? i += "&emsp;" : (d.localName === "drawing" || d.localName === "pict" || d.localName === "object") && (i += this.convertImage(d));
     if (!i) return "";
-    const s = [], l = T(e ? E(e, "color") : null);
+    const s = [], l = T(e ? S(e, "color") : null);
     l && l !== "auto" && s.push("color:#" + l);
-    const o = T(e ? E(e, "highlight") : null);
-    o && Y[o] && s.push("background-color:" + Y[o]);
-    const n = parseFloat(T(e ? E(e, "sz") : null));
+    const o = T(e ? S(e, "highlight") : null);
+    o && G[o] && s.push("background-color:" + G[o]);
+    const n = parseFloat(T(e ? S(e, "sz") : null));
     n && s.push("font-size:" + Math.round(n / 2 * (4 / 3)) + "px");
-    const r = e ? E(e, "rFonts") : null, c = T(r, "ascii") || T(r, "cs");
-    c && s.push(`font-family:'${c}'`), s.length && (i = `<span style="${s.join(";")}">${i}</span>`), B(e, "b") && (i = `<strong>${i}</strong>`), B(e, "i") && (i = `<em>${i}</em>`), B(e, "u") && T(E(e, "u")) !== "none" && (i = `<u>${i}</u>`), B(e, "strike") && (i = `<s>${i}</s>`);
-    const h = T(e ? E(e, "vertAlign") : null);
+    const r = e ? S(e, "rFonts") : null, c = T(r, "ascii") || T(r, "cs");
+    c && s.push(`font-family:'${c}'`), s.length && (i = `<span style="${s.join(";")}">${i}</span>`), B(e, "b") && (i = `<strong>${i}</strong>`), B(e, "i") && (i = `<em>${i}</em>`), B(e, "u") && T(S(e, "u")) !== "none" && (i = `<u>${i}</u>`), B(e, "strike") && (i = `<s>${i}</s>`);
+    const h = T(e ? S(e, "vertAlign") : null);
     return h === "superscript" ? i = `<sup>${i}</sup>` : h === "subscript" && (i = `<sub>${i}</sub>`), i;
   }
   convertImage(t) {
@@ -2278,10 +2278,10 @@ class Ht {
   }
   convertTable(t) {
     let e = '<table style="border-collapse:collapse;width:100%"><tbody>';
-    for (const i of D(t, "tr")) {
+    for (const i of P(t, "tr")) {
       e += "<tr>";
-      for (const s of D(i, "tc")) {
-        const l = parseInt(T(E(s, "tcPr", "gridSpan")) || "1", 10) || 1, o = l > 1 ? ` colspan="${l}"` : "";
+      for (const s of P(i, "tc")) {
+        const l = parseInt(T(S(s, "tcPr", "gridSpan")) || "1", 10) || 1, o = l > 1 ? ` colspan="${l}"` : "";
         let n = "";
         for (const r of Array.from(s.children))
           r.localName === "p" ? n += this.convertPara(r) : r.localName === "tbl" && (n += this.convertTable(r));
@@ -2292,8 +2292,8 @@ class Ht {
     return e + "</tbody></table>";
   }
 }
-async function kt(p) {
-  const t = p instanceof ArrayBuffer ? p : await p.arrayBuffer(), e = Et(t), i = new TextDecoder(), s = async (u) => {
+async function Ht(p) {
+  const t = p instanceof ArrayBuffer ? p : await p.arrayBuffer(), e = St(t), i = new TextDecoder(), s = async (u) => {
     const v = e.get(u);
     return v ? new DOMParser().parseFromString(i.decode(await Q(t, v)), "application/xml") : null;
   }, l = await s("word/document.xml"), o = l == null ? void 0 : l.getElementsByTagName("*");
@@ -2317,7 +2317,7 @@ async function kt(p) {
   for (const [u, v] of c) {
     const b = v.startsWith("/") ? v.slice(1) : "word/" + v.replace(/^\.\//, ""), x = e.get(b);
     if (!x) continue;
-    const C = (b.split(".").pop() || "").toLowerCase(), M = St[C];
+    const C = (b.split(".").pop() || "").toLowerCase(), M = Et[C];
     if (M)
       try {
         d.set(u, `data:${M};base64,${Lt(await Q(t, x))}`);
@@ -2329,16 +2329,16 @@ async function kt(p) {
     const u = /* @__PURE__ */ new Map(), v = Array.from(g.getElementsByTagName("*"));
     for (const b of v) {
       if (b.localName !== "abstractNum") continue;
-      const x = T(b, "abstractNumId"), C = D(b, "lvl").find((w) => T(w, "ilvl") === "0") || D(b, "lvl")[0], M = C ? T(E(C, "numFmt")) : "";
+      const x = T(b, "abstractNumId"), C = P(b, "lvl").find((w) => T(w, "ilvl") === "0") || P(b, "lvl")[0], M = C ? T(S(C, "numFmt")) : "";
       u.set(x, M === "bullet" ? "ul" : "ol");
     }
     for (const b of v) {
       if (b.localName !== "num") continue;
-      const x = T(b, "numId"), C = T(E(b, "abstractNumId"));
+      const x = T(b, "numId"), C = T(S(b, "abstractNumId"));
       m.set(x, u.get(C) || "ul");
     }
   }
-  return new Ht(r, d, m).convertBody(n);
+  return new kt(r, d, m).convertBody(n);
 }
 const At = ["nw", "ne", "sw", "se"], F = ["img-left", "img-right", "img-top", "img-center"], O = {
   "img-left": "tplimgleft",
@@ -2351,23 +2351,23 @@ const At = ["nw", "ne", "sw", "se"], F = ["img-left", "img-right", "img-top", "i
   "img-top": a.tpltop,
   "img-center": a.tplcenter
 }, qt = ".tox,.pop,.tblctx,.imgctx,.selctx,.dlg";
-let S = null, A = null, $ = 0, K = !1;
+let E = null, A = null, $ = 0, K = !1;
 function N() {
-  clearTimeout($), A = null, S && S.classList.remove("show");
+  clearTimeout($), A = null, E && E.classList.remove("show");
 }
 function Bt(p) {
   const t = p.dataset.tip;
   if (!t) return;
   A = p, clearTimeout($);
-  const e = S && S.classList.contains("show") ? 60 : 350;
+  const e = E && E.classList.contains("show") ? 60 : 350;
   $ = window.setTimeout(() => {
     if (A !== p || !document.contains(p)) return;
-    S || (S = document.createElement("div"), S.className = "etip", document.body.appendChild(S)), S.textContent = t, S.classList.add("show");
-    const i = p.getBoundingClientRect(), s = S.offsetWidth, l = S.offsetHeight;
+    E || (E = document.createElement("div"), E.className = "etip", document.body.appendChild(E)), E.textContent = t, E.classList.add("show");
+    const i = p.getBoundingClientRect(), s = E.offsetWidth, l = E.offsetHeight;
     let o = i.left + i.width / 2 - s / 2;
     o = Math.max(6, Math.min(o, innerWidth - s - 6));
     let n = i.bottom + 7;
-    n + l > innerHeight - 6 && (n = i.top - l - 7), S.style.left = o + "px", S.style.top = n + "px";
+    n + l > innerHeight - 6 && (n = i.top - l - 7), E.style.left = o + "px", E.style.top = n + "px";
   }, e);
 }
 function Nt() {
@@ -2383,11 +2383,11 @@ function Nt() {
     A && !A.contains(p.relatedTarget) && N();
   }), document.addEventListener("mousedown", N, !0), addEventListener("scroll", N, !0));
 }
-const Zt = /[\u0590-\u05FF\u0600-\u06FF\u0750-\u077F\u0780-\u07BF\u08A0-\u08FF\uFB1D-\uFB4F\uFB50-\uFDFF\uFE70-\uFEFF]/, Dt = new RegExp("\\p{L}", "u"), Pt = "p,div,li,td,th,blockquote,h1,h2,h3,h4,h5,h6,pre,figcaption";
+const Zt = /[\u0590-\u05FF\u0600-\u06FF\u0750-\u077F\u0780-\u07BF\u08A0-\u08FF\uFB1D-\uFB4F\uFB50-\uFDFF\uFE70-\uFEFF]/, Pt = new RegExp("\\p{L}", "u"), Dt = "p,div,li,td,th,blockquote,h1,h2,h3,h4,h5,h6,pre,figcaption";
 function Rt(p) {
   for (const t of p) {
     if (Zt.test(t)) return "rtl";
-    if (Dt.test(t)) return "ltr";
+    if (Pt.test(t)) return "ltr";
   }
   return null;
 }
@@ -2405,7 +2405,7 @@ function et(p) {
 }
 const I = class I {
   constructor(t) {
-    this.lang = "en", this.contentClass = "fable-content-" + I.instanceCounter++, this.contentStyleEl = null, this.savedRange = null, this.foreColor = "#000000", this.backColor = "#FACC15", this.openPop = null, this.openSubEl = null, this.popAnchor = null, this.dlgOvl = null, this.tblActive = null, this.tblCorner = null, this.tblColBars = [], this.tblCtx = null, this.tblCellMark = null, this.tblOpMark = null, this.tblOpMarkKind = null, this.imgActive = null, this.imgHandles = [], this.imgCtx = null, this.imgHideTimer = null, this.phActive = null, this.phCtx = null, this.phUploadTarget = null, this.vidActive = null, this.vidCtx = null, this.vidHideTimer = null, this.vphActive = null, this.vphCtx = null, this.vphUploadTarget = null, this.selCtx = null, this.tbrMore = null, this.tbrExpanded = !1, this.codeActive = null, this.codeCtx = null, this.tplActive = null, this.tplCtx = null, this.revisions = [], this.revTimer = null, this.draftTimer = null, this.draftStorageKey = "", this.listeners = [], this.isDestroyed = !1, this.options = {
+    this.lang = "en", this.contentClass = "fable-content-" + I.instanceCounter++, this.contentStyleEl = null, this.savedRange = null, this.foreColor = "#000000", this.backColor = "#FACC15", this.openPop = null, this.subStack = [], this.popAnchor = null, this.dlgOvl = null, this.tblActive = null, this.tblCorner = null, this.tblColBars = [], this.tblCtx = null, this.tblCellMark = null, this.tblOpMark = null, this.tblOpMarkKind = null, this.imgActive = null, this.imgHandles = [], this.imgCtx = null, this.imgHideTimer = null, this.phActive = null, this.phCtx = null, this.phUploadTarget = null, this.vidActive = null, this.vidCtx = null, this.vidHideTimer = null, this.vphActive = null, this.vphCtx = null, this.vphUploadTarget = null, this.selCtx = null, this.tbrMore = null, this.tbrExpanded = !1, this.codeActive = null, this.codeCtx = null, this.tplActive = null, this.tplCtx = null, this.revisions = [], this.revTimer = null, this.draftTimer = null, this.draftStorageKey = "", this.listeners = [], this.isDestroyed = !1, this.options = {
       target: t.target,
       language: t.language || "en",
       height: t.height ?? 302,
@@ -2477,7 +2477,7 @@ const I = class I {
   /* ---------------------------------------------------------- event binding */
   bindEvents() {
     if (this.onDoc("mousedown", (t) => {
-      this.openPop && !this.openPop.contains(t.target) && !this.popAnchor.contains(t.target) && !(this.openSubEl && this.openSubEl.contains(t.target)) && this.closePop();
+      this.openPop && !this.openPop.contains(t.target) && !this.popAnchor.contains(t.target) && !this.subContains(t.target) && this.closePop();
     }), this.onDoc("keydown", (t) => {
       t.key === "Escape" && (this.closePop(), this.closeDlg());
     }), this.onDoc("selectionchange", () => {
@@ -2532,8 +2532,10 @@ const I = class I {
       this.positionTableHandles(), this.positionImageHandles(), this.positionImgPhCtx(), this.positionTplCtx(), this.positionVphCtx(), this.positionVidCtx(), this.positionCodeCtx();
     }), this.onWin(
       "scroll",
-      () => {
-        this.closePop(), this.positionTableHandles(), this.positionImageHandles(), this.positionImgPhCtx(), this.positionTplCtx(), this.positionVphCtx(), this.positionVidCtx(), this.positionCodeCtx(), this.repositionSelToolbar();
+      (t) => {
+        var s;
+        const e = t.target;
+        e instanceof Node && ((((s = this.openPop) == null ? void 0 : s.contains(e)) ?? !1) || this.subContains(e)) || this.closePop(), this.positionTableHandles(), this.positionImageHandles(), this.positionImgPhCtx(), this.positionTplCtx(), this.positionVphCtx(), this.positionVidCtx(), this.positionCodeCtx(), this.repositionSelToolbar();
       },
       !0
     ), this.onWin("resize", () => {
@@ -2581,7 +2583,7 @@ const I = class I {
       const t = (e = this.docInput.files) == null ? void 0 : e[0];
       t && this.importWordFile(t).catch(() => alert(this.t("importfail")));
     }), this.onDoc("mousedown", (t) => {
-      this.ed.contains(t.target) || t.target === this.tblCorner || this.tblColBars.includes(t.target) || this.tblCtx && this.tblCtx.contains(t.target) || this.imgHandles.includes(t.target) || this.imgCtx && this.imgCtx.contains(t.target) || this.phCtx && this.phCtx.contains(t.target) || this.tplCtx && this.tplCtx.contains(t.target) || this.selCtx && this.selCtx.contains(t.target) || this.vphCtx && this.vphCtx.contains(t.target) || this.vidCtx && this.vidCtx.contains(t.target) || this.codeCtx && this.codeCtx.contains(t.target) || this.openPop && this.openPop.contains(t.target) || this.openSubEl && this.openSubEl.contains(t.target) || (this.clearTableHandles(), this.clearImageHandles(), this.clearImgPlaceholderSel(), this.clearTplSel(), this.clearVphPlaceholderSel(), this.clearVidHandles(), this.clearCodeSel(), this.clearSelToolbar());
+      this.ed.contains(t.target) || t.target === this.tblCorner || this.tblColBars.includes(t.target) || this.tblCtx && this.tblCtx.contains(t.target) || this.imgHandles.includes(t.target) || this.imgCtx && this.imgCtx.contains(t.target) || this.phCtx && this.phCtx.contains(t.target) || this.tplCtx && this.tplCtx.contains(t.target) || this.selCtx && this.selCtx.contains(t.target) || this.vphCtx && this.vphCtx.contains(t.target) || this.vidCtx && this.vidCtx.contains(t.target) || this.codeCtx && this.codeCtx.contains(t.target) || this.openPop && this.openPop.contains(t.target) || this.subContains(t.target) || (this.clearTableHandles(), this.clearImageHandles(), this.clearImgPlaceholderSel(), this.clearTplSel(), this.clearVphPlaceholderSel(), this.clearVidHandles(), this.clearCodeSel(), this.clearSelToolbar());
     });
   }
   on(t, e, i) {
@@ -2622,7 +2624,7 @@ const I = class I {
       if (n !== "rtl" && n !== "ltr") return;
       const r = n;
       i || (i = r), /text-align\s*:/i.test(o.getAttribute("style") || "") || t(o, `text-align:${r === "rtl" ? "right" : "left"}`);
-    }), e.querySelectorAll(Pt).forEach((o) => {
+    }), e.querySelectorAll(Dt).forEach((o) => {
       const n = (o.getAttribute("dir") || "").toLowerCase();
       if (n === "rtl" || n === "ltr") return;
       const r = Rt(et(o));
@@ -2649,7 +2651,7 @@ const I = class I {
     this.ed.focus();
   }
   async importWordFile(t) {
-    const e = await kt(t);
+    const e = await Ht(t);
     this.recordRevision(), this.setContent(e), this.recordRevision();
   }
   restoreDraft() {
@@ -2787,24 +2789,42 @@ const I = class I {
   }
   /* ---------------------------------------------------------- popups / menus */
   closeSub() {
-    var t;
-    (t = this.openSubEl) == null || t.remove(), this.openSubEl = null;
+    this.closeSubFrom(0);
+  }
+  /** Removes stacked flyouts from `level` (0 = shallowest) onward, keeping
+   *  anything shallower - e.g. hovering a sibling item inside the "Cell"
+   *  flyout should drop a deeper "Cell background" flyout but keep "Cell"
+   *  itself and the top-level popup it bridges to. */
+  closeSubFrom(t) {
+    for (; this.subStack.length > t; ) this.subStack.pop().remove();
+  }
+  /** True if `node` is inside any currently-open flyout submenu (any depth). */
+  subContains(t) {
+    return this.subStack.some((e) => e.contains(t));
+  }
+  /** 0 for the top-level popup itself; otherwise this container's depth in
+   *  the flyout stack + 1. Used to know how many deeper flyouts to close
+   *  when opening or hovering within `container`. */
+  subLevelOf(t) {
+    if (t === this.openPop) return 0;
+    const e = this.subStack.indexOf(t);
+    return e === -1 ? this.subStack.length : e + 1;
   }
   closePop() {
     var t;
     this.closeSub(), this.openPop && (this.openPop.remove(), this.openPop = null, (t = this.popAnchor) == null || t.classList.remove("open"), this.popAnchor = null, this.setOpTarget(null));
   }
   openSubFor(t, e) {
-    this.closeSub();
-    const i = document.createElement("div");
-    i.className = "pop sub", i.dir = this.dir(), t.subBuild ? t.subBuild(i) : t.sub && this.menuItems(i, t.sub), i.addEventListener("mousedown", (r) => {
-      r.target.tagName !== "INPUT" && r.preventDefault();
-    }), document.body.appendChild(i);
-    const s = e.getBoundingClientRect();
-    let o = this.dir() === "rtl" ? s.left - i.offsetWidth + 2 : s.right - 2;
-    o = Math.max(8, Math.min(o + scrollX, scrollX + innerWidth - i.offsetWidth - 8));
-    let n = s.top + scrollY - 6;
-    n = Math.max(8 + scrollY, Math.min(n, scrollY + innerHeight - i.offsetHeight - 8)), i.style.left = o + "px", i.style.top = n + "px", this.openSubEl = i;
+    const i = e.getBoundingClientRect(), s = e.closest(".pop");
+    this.closeSubFrom(s ? this.subLevelOf(s) : 0);
+    const l = document.createElement("div");
+    l.className = "pop sub", l.dir = this.dir(), t.subBuild ? t.subBuild(l) : t.sub && this.menuItems(l, t.sub), l.addEventListener("mousedown", (c) => {
+      c.target.tagName !== "INPUT" && c.preventDefault();
+    }), document.body.appendChild(l);
+    let n = this.dir() === "rtl" ? i.left - l.offsetWidth + 2 : i.right - 2;
+    n = Math.max(8, Math.min(n + scrollX, scrollX + innerWidth - l.offsetWidth - 8));
+    let r = i.top + scrollY - 6;
+    r = Math.max(8 + scrollY, Math.min(r, scrollY + innerHeight - l.offsetHeight - 8)), l.style.left = n + "px", l.style.top = r + "px", this.subStack.push(l);
   }
   popup(t, e, i) {
     if (this.openPop && this.popAnchor === t) {
@@ -2815,10 +2835,12 @@ const I = class I {
     const s = document.createElement("div");
     s.className = "pop" + (i ? " " + i : ""), s.dir = this.dir(), e(s), document.body.appendChild(s);
     const l = t.getBoundingClientRect();
-    s.style.minWidth = Math.max(160, Math.round(l.width)) + "px", s.style.top = l.bottom + scrollY + 2 + "px";
-    let n = this.dir() === "rtl" ? l.right - s.offsetWidth : l.left;
-    n = Math.max(8, Math.min(n + scrollX, scrollX + innerWidth - s.offsetWidth - 8)), s.style.left = n + "px", s.addEventListener("mousedown", (r) => {
-      r.target.tagName !== "INPUT" && r.preventDefault();
+    s.style.minWidth = Math.max(160, Math.round(l.width)) + "px";
+    let o = l.bottom + scrollY + 2;
+    o = Math.max(8 + scrollY, Math.min(o, scrollY + innerHeight - s.offsetHeight - 8)), s.style.top = o + "px";
+    let r = this.dir() === "rtl" ? l.right - s.offsetWidth : l.left;
+    r = Math.max(8, Math.min(r + scrollX, scrollX + innerWidth - s.offsetWidth - 8)), s.style.left = r + "px", s.addEventListener("mousedown", (c) => {
+      c.target.tagName !== "INPUT" && c.preventDefault();
     }), this.openPop = s, this.popAnchor = t, t.classList.add("open");
   }
   menuItems(t, e) {
@@ -2832,7 +2854,7 @@ const I = class I {
         i.action && (this.closePop(), i.action());
       }), l.addEventListener("mouseenter", () => {
         var o;
-        s ? this.openSubFor(i, l) : this.openSubEl && t !== this.openSubEl && this.closeSub(), (o = i.hover) == null || o.call(i, !0);
+        s ? this.openSubFor(i, l) : this.closeSubFrom(this.subLevelOf(t)), (o = i.hover) == null || o.call(i, !0);
       }), l.addEventListener("mouseleave", () => {
         var o;
         return (o = i.hover) == null ? void 0 : o.call(i, !1);
@@ -3211,8 +3233,8 @@ const I = class I {
    *  (the quick color chips); everything else yields one. */
   buildToolbarRegistry() {
     const t = this.tbtn(a.tableic, this.t("quicktable"), () => this.tableGrid(t)), e = {
-      undo: () => this.tbtn(a.undo, this.t("undo"), () => this.exec("undo")),
-      redo: () => this.tbtn(a.redo, this.t("redo"), () => this.exec("redo")),
+      undo: () => this.tbtn(a.undo, this.t("undo"), () => this.exec("undo"), "undo"),
+      redo: () => this.tbtn(a.redo, this.t("redo"), () => this.exec("redo"), "redo"),
       preview: () => this.tbtn(a.prevw, this.t("preview"), () => this.previewDlg()),
       print: () => this.tbtn(a.printic, this.t("print"), () => this.printDoc()),
       importword: () => this.tbtn(a.wordic, this.t("importword"), () => this.pickWordDoc()),
@@ -3554,20 +3576,20 @@ const I = class I {
     this.dialog(
       this.t("tablepropsttl"),
       (C) => {
-        const M = (w, k) => {
+        const M = (w, H) => {
           const L = document.createElement("div");
           L.style.cssText = n;
-          const H = document.createElement("span");
-          H.style.cssText = r, H.textContent = this.t(w), L.append(H, k), C.appendChild(L);
+          const k = document.createElement("span");
+          k.style.cssText = r, k.textContent = this.t(w), L.append(k, H), C.appendChild(L);
         };
         e = document.createElement("input"), e.type = "text", e.style.cssText = c, e.placeholder = "e.g. 600px or 100%", e.value = d, M("tblwidth", e), i = document.createElement("input"), i.type = "number", i.min = "0", i.style.cssText = c, i.value = String(m), M("tblcellpadding", i), s = document.createElement("input"), s.type = "number", s.min = "0", s.style.cssText = c, s.value = String(g), M("tblcellspacing", s), l = document.createElement("input"), l.type = "number", l.min = "0", l.style.cssText = c, l.value = String(u), M("tblborder", l), o = document.createElement("select"), o.style.cssText = c, [
           ["", "alignnone"],
           ["left", "alignleft"],
           ["center", "aligncenter"],
           ["right", "alignright"]
-        ].forEach(([w, k]) => {
+        ].forEach(([w, H]) => {
           const L = document.createElement("option");
-          L.value = w, L.textContent = this.t(k), w === x && (L.selected = !0), o.appendChild(L);
+          L.value = w, L.textContent = this.t(H), w === x && (L.selected = !0), o.appendChild(L);
         }), M("tblalign", o);
       },
       [
@@ -4159,17 +4181,17 @@ const I = class I {
             const w = (L = C.files) == null ? void 0 : L[0];
             if (!w) return;
             x.disabled = !0, x.textContent = this.t("uploading");
-            const k = (H) => {
-              t.value = H, x.disabled = !1, x.textContent = this.t("uploadvideo");
+            const H = (k) => {
+              t.value = k, x.disabled = !1, x.textContent = this.t("uploadvideo");
             };
             if (this.videoUploadHandler)
-              this.videoUploadHandler(w).then(k).catch((H) => {
+              this.videoUploadHandler(w).then(H).catch((k) => {
                 var _;
-                x.disabled = !1, x.textContent = this.t("uploadfailed"), (_ = this.onVideoUploadError) == null || _.call(this, H, w);
+                x.disabled = !1, x.textContent = this.t("uploadfailed"), (_ = this.onVideoUploadError) == null || _.call(this, k, w);
               });
             else {
-              const H = new FileReader();
-              H.onload = () => k(H.result), H.readAsDataURL(w);
+              const k = new FileReader();
+              k.onload = () => H(k.result), k.readAsDataURL(w);
             }
           }), b.append(t, x, C), t.style.flex = "1", v.appendChild(n("vidsource", b));
           const M = document.createElement("div");