wordinweb 0.1.8 → 0.1.10

package/dist/index.js

@@ -3955,10 +3955,12 @@ function parseRun(r, ctx, field, suppressedObjects) {
       case "endnoteReference": {
         const id = intAttr(el16, "id");
         if (id !== void 0) {
+          const customMark = attr(el16, "customMarkFollows");
           run.content.push({
             kind: "noteRef",
             noteType: ln === "footnoteReference" ? "footnote" : "endnote",
-            id
+            id,
+            customMarkFollows: customMark !== void 0 && customMark !== "0" && customMark !== "false" && customMark !== "off"
           });
         }
         break;
@@ -4361,6 +4363,7 @@ function parseDrawing(drawing, ctx) {
     const rot = intAttr(xfrm, "rot");
     const lnEl = child(spPr, "ln");
     const strokeColor = lnEl && !child(lnEl, "noFill") ? fillColorOf(lnEl) : void 0;
+    const fill = child(spPr, "noFill") ? void 0 : fillColorOf(spPr) ?? styleFillOf(textboxEl);
     const bodyPr = child(textboxEl, "bodyPr");
     const insetOf = (name, dflt) => {
       const v = bodyPr ? intAttr(bodyPr, name) : void 0;
@@ -4404,7 +4407,7 @@ function parseDrawing(drawing, ctx) {
         vAlign: vAlignOf(posV),
         blocks: txbxContent ? parseBlocks(txbxContent, ctx) : [],
         ...textboxChainId !== void 0 ? { chainId: textboxChainId, chainSeq: textboxChainSeq ?? 0 } : {},
-        ...fillColorOf(spPr) ? { fill: fillColorOf(spPr) } : {},
+        ...fill ? { fill } : {},
         ...strokeColor ? { stroke: { color: strokeColor, weight: Math.max(emuToPx(intAttr(lnEl, "w") ?? 0), 0.75) } } : {},
         textAnchor: anchorAttr === "ctr" ? "middle" : anchorAttr === "b" ? "bottom" : anchorAttr === "t" ? "top" : void 0,
         insets: {
@@ -6111,23 +6114,49 @@ var DocxDocument = class _DocxDocument {
     }
     this._modelVersion++;
   }
-  /**
-   * Reparse the two direct body paragraphs created by Enter without rebuilding
-   * the complete document model. This deliberately covers only the simple
-   * single-section body case used by incremental pagination; structural
-   * containers, revisions, bookmarks, and section breaks use refresh().
-   */
+  /** Reparse the two sibling body-story paragraphs created by Enter without
+   * rebuilding the complete document model. Paragraphs nested in table cells
+   * are included because legal documents spend most of their body inside
+   * tables; revisions, bookmarks, fields, and section breaks use refresh(). */
   reparseDirectBodyParagraphSplit(beforeSource, afterSource) {
-    if (this.sections.length !== 1) return null;
-    const body = child(this.docRoot, "body");
-    if (!body) return null;
-    const beforeIndex = body.children.indexOf(beforeSource);
-    if (beforeIndex < 0 || body.children[beforeIndex + 1] !== afterSource) return null;
-    if (localName(beforeSource.name) !== "p" || localName(afterSource.name) !== "p") return null;
-    const blocks = this.sections[0].blocks;
-    if (blocks.some((block) => block.src === afterSource)) return null;
-    const blockIndex = blocks.findIndex((block) => block.type === "paragraph" && block.src === beforeSource);
-    if (blockIndex < 0) return null;
+    const parsed = this.reparseDirectBodyParagraphSplits(beforeSource, [afterSource]);
+    return parsed ? { before: parsed[0], after: parsed[1] } : null;
+  }
+  /** Reparse a body paragraph plus several new siblings created by
+   * click-and-type without rebuilding the complete document model. */
+  reparseDirectBodyParagraphSplits(beforeSource, afterSources) {
+    if (afterSources.length === 0) return null;
+    const parent = this.findParentOf(beforeSource);
+    if (!parent) return null;
+    const beforeIndex = parent.children.indexOf(beforeSource);
+    if (beforeIndex < 0 || afterSources.some((source, i) => parent.children[beforeIndex + i + 1] !== source)) {
+      return null;
+    }
+    if (localName(beforeSource.name) !== "p" || afterSources.some((source) => localName(source.name) !== "p")) {
+      return null;
+    }
+    const findBlockList = (blocks2) => {
+      const index = blocks2.findIndex((block) => block.type === "paragraph" && block.src === beforeSource);
+      if (index >= 0) return { blocks: blocks2, index };
+      for (const block of blocks2) {
+        if (block.type !== "table") continue;
+        for (const row of block.rows) {
+          for (const cell of row.cells) {
+            const found = findBlockList(cell.blocks);
+            if (found) return found;
+          }
+        }
+      }
+      return null;
+    };
+    let location = null;
+    for (const section of this.sections) {
+      location = findBlockList(section.blocks);
+      if (location) break;
+    }
+    if (!location) return null;
+    const { blocks, index: blockIndex } = location;
+    if (afterSources.some((source) => blocks.some((block) => block.src === source))) return null;
     const old = blocks[blockIndex];
     if (old.type !== "paragraph" || old.sectionBreak) return null;
     const unsafe = (element) => {
@@ -6135,7 +6164,7 @@ var DocxDocument = class _DocxDocument {
       if (name === "sectPr" || name === "bookmarkStart" || name === "bookmarkEnd" || name === "fldChar" || name === "instrText" || name === "fldSimple" || name === "sdt" || name === "ins" || name === "del" || name.startsWith("move") || name.endsWith("PrChange")) return true;
       return element.children.some(unsafe);
     };
-    if (unsafe(beforeSource) || unsafe(afterSource)) return null;
+    if (unsafe(beforeSource) || afterSources.some(unsafe)) return null;
     const readPart = (part) => this.readXmlOptional(part);
     const ctx = {
       ...this.ctxBase,
@@ -6143,11 +6172,103 @@ var DocxDocument = class _DocxDocument {
       readPart,
       independentTextboxStories: true
     };
-    const before = parseParagraph(beforeSource, ctx);
-    const after = parseParagraph(afterSource, ctx);
-    if (before.revisionHidden || after.revisionHidden || before.sectionBreak || after.sectionBreak) return null;
-    blocks.splice(blockIndex, 1, before, after);
-    return { before, after };
+    const parsed = [beforeSource, ...afterSources].map((source) => parseParagraph(source, ctx));
+    if (parsed.some((paragraph) => paragraph.revisionHidden || paragraph.sectionBreak)) return null;
+    blocks.splice(blockIndex, 1, ...parsed);
+    return parsed;
+  }
+  /** Reparse one retained body-story paragraph after a structural edit that
+   * leaves its surrounding block list unchanged, such as inserting ink. */
+  reparseBodyParagraph(source) {
+    if (localName(source.name) !== "p") return null;
+    const findBlockList = (blocks) => {
+      const index = blocks.findIndex((block) => block.type === "paragraph" && block.src === source);
+      if (index >= 0) return { blocks, index };
+      for (const block of blocks) {
+        if (block.type !== "table") continue;
+        for (const row of block.rows) {
+          for (const cell of row.cells) {
+            const found = findBlockList(cell.blocks);
+            if (found) return found;
+          }
+        }
+      }
+      return null;
+    };
+    let location = null;
+    for (const section of this.sections) {
+      location = findBlockList(section.blocks);
+      if (location) break;
+    }
+    if (!location) return null;
+    const old = location.blocks[location.index];
+    if (old.type !== "paragraph" || old.sectionBreak) return null;
+    const unsafe = (element) => {
+      const name = localName(element.name);
+      if (name === "sectPr" || name === "bookmarkStart" || name === "bookmarkEnd") return true;
+      return element.children.some(unsafe);
+    };
+    if (unsafe(source)) return null;
+    const paragraph = parseParagraph(source, {
+      ...this.ctxBase,
+      rels: this.documentRels,
+      readPart: (part) => this.readXmlOptional(part),
+      independentTextboxStories: true
+    });
+    if (paragraph.revisionHidden || paragraph.sectionBreak) return null;
+    location.blocks[location.index] = paragraph;
+    return paragraph;
+  }
+  /** Reparse two sibling body-story paragraphs after Backspace/Delete merged
+   * their XML into one. Keeps the parsed model generation stable so long
+   * documents can use incremental layout instead of repaginating in full. */
+  reparseDirectBodyParagraphMerge(beforeSource, afterSource, survivorSource) {
+    if (survivorSource !== beforeSource && survivorSource !== afterSource) return null;
+    if (localName(beforeSource.name) !== "p" || localName(afterSource.name) !== "p") return null;
+    const parent = this.findParentOf(survivorSource);
+    if (!parent || parent.children.includes(survivorSource === beforeSource ? afterSource : beforeSource)) return null;
+    const findBlockList = (blocks2) => {
+      const index2 = blocks2.findIndex(
+        (block, i) => block.type === "paragraph" && block.src === beforeSource && blocks2[i + 1]?.type === "paragraph" && blocks2[i + 1].src === afterSource
+      );
+      if (index2 >= 0) return { blocks: blocks2, index: index2 };
+      for (const block of blocks2) {
+        if (block.type !== "table") continue;
+        for (const row of block.rows) {
+          for (const cell of row.cells) {
+            const found = findBlockList(cell.blocks);
+            if (found) return found;
+          }
+        }
+      }
+      return null;
+    };
+    let location = null;
+    for (const section of this.sections) {
+      location = findBlockList(section.blocks);
+      if (location) break;
+    }
+    if (!location) return null;
+    const { blocks, index } = location;
+    const before = blocks[index];
+    const after = blocks[index + 1];
+    if (before.type !== "paragraph" || after.type !== "paragraph" || before.sectionBreak || after.sectionBreak) return null;
+    const unsafe = (element) => {
+      const name = localName(element.name);
+      if (name === "sectPr" || name === "bookmarkStart" || name === "bookmarkEnd" || name === "fldChar" || name === "instrText" || name === "fldSimple" || name === "sdt" || name === "ins" || name === "del" || name.startsWith("move") || name.endsWith("PrChange")) return true;
+      return element.children.some(unsafe);
+    };
+    if (unsafe(beforeSource) || unsafe(afterSource)) return null;
+    const readPart = (part) => this.readXmlOptional(part);
+    const merged = parseParagraph(survivorSource, {
+      ...this.ctxBase,
+      rels: this.documentRels,
+      readPart,
+      independentTextboxStories: true
+    });
+    if (merged.revisionHidden || merged.sectionBreak) return null;
+    blocks.splice(index, 2, merged);
+    return merged;
   }
   deriveComments() {
     const out = [];
@@ -7974,7 +8095,10 @@ var WORD_FONT_METRICS = {
   // baselines 118.80 + n x 20.00; first attempt baked the multiple into the
   // profile and over-pitched every line by 1.08x).
   mangal: { asc: 1.245, desc: 0.4399, gap: 0 },
-  latha: { asc: 0.9266, desc: 0.3369, gap: 0 }
+  latha: { asc: 0.9266, desc: 0.3369, gap: 0 },
+  // Word substitutes Lao text to DokChampa. Its hhea box is 2850/-1117 at
+  // 2048 UPEM; this is also the line profile Word uses in the reference PDF.
+  "noto sans lao looped": { asc: 1.391602, desc: 0.54541, gap: 0 }
 };
 var QUARTER_PT_PX = 1 / 3;
 function quantizeQuarterPt(px) {
@@ -9066,6 +9190,7 @@ var JUSTIFY_MAX_COMPRESS = 0.25;
 var JUSTIFY_STRETCH_FACTOR = 0.5;
 var TAMIL_GLYPH_SCALE = 0.735;
 var TAMIL_BASELINE_DY_EM = 0.136;
+var LAO_GLYPH_SCALE = 1.048;
 var KASHIDA_LOW_EM = 0;
 var KASHIDA_MEDIUM_EM = 0.032;
 var KASHIDA_HIGH_EM = 0.04;
@@ -9420,6 +9545,7 @@ function breakParagraphImpl(doc, measurer, para, contentWidth, fields, numbering
         href: atom.href,
         src: atom.src ? { ...atom.src, offset: atom.src.offset + sliceOff } : void 0,
         metricsFont: atom.metricsFont,
+        metricsStrut: atom.metricsStrut,
         rtl: atom.rtl,
         rtlLevel: levelOf(atom.rtl)
       });
@@ -9543,6 +9669,44 @@ function breakParagraphImpl(doc, measurer, para, contentWidth, fields, numbering
           if (found) target = stop.pos - pre;
         }
       }
+      if (doc.compatibilityMode < 15 && stop.align === "left" && !bidiPara && curLineWidth > 0) {
+        let nextAtom = ai + 1;
+        let probeX = Math.max(target, x + 2);
+        while (atoms[nextAtom]?.kind === "tab") {
+          let probeStop = nextTabStop(
+            probeX + offset,
+            props.tabs,
+            contentWidth - indentRight,
+            doc.defaultTabStop
+          );
+          if (opts?.inTableCell) {
+            let guard = 0;
+            while (probeStop.align === "decimal" && guard++ < 8) {
+              probeStop = nextTabStop(
+                probeStop.pos,
+                props.tabs,
+                contentWidth - indentRight,
+                doc.defaultTabStop
+              );
+            }
+          }
+          if (probeStop.align !== "left") break;
+          probeX = Math.max(probeStop.pos - offset, probeX + 2);
+          nextAtom++;
+        }
+        let firstWordWidth = 0;
+        for (let j = nextAtom; j < atoms.length; j++) {
+          const a = atoms[j];
+          if (a.kind !== "frag") break;
+          firstWordWidth += a.width;
+        }
+        const lineEnd2 = lineStartX(lineIndex) + availFor(lineIndex);
+        if (firstWordWidth > 0 && probeX + firstWordWidth > lineEnd2 + 0.01) {
+          flush(false, false);
+          ai--;
+          continue;
+        }
+      }
       const aligned = (stop.align === "right" || stop.align === "decimal") && !bidiPara;
       if (aligned && curLineWidth > 0 && x > target + 0.75) {
         flush(false, false);
@@ -9808,7 +9972,7 @@ function breakParagraphImpl(doc, measurer, para, contentWidth, fields, numbering
     }
     const padL = bdrPad && (!sameBdrAtom(atoms[ai - 1], atom) || curLineWidth === 0) ? bdrPad : 0;
     x += padL;
-    cur.push({ x, width: atom.width, text: atom.text, props: atom.props, font: atom.font, href: atom.href, src: atom.src, noteId: atom.noteId, metricsFont: atom.metricsFont, breakAfter: atom.breakAfter, pageRef: atom.pageRef, rtl: atom.rtl, rtlLevel: levelOf(atom.rtl), ruby: atom.ruby });
+    cur.push({ x, width: atom.width, text: atom.text, props: atom.props, font: atom.font, href: atom.href, src: atom.src, noteId: atom.noteId, metricsFont: atom.metricsFont, metricsStrut: atom.metricsStrut, breakAfter: atom.breakAfter, pageRef: atom.pageRef, rtl: atom.rtl, rtlLevel: levelOf(atom.rtl), ruby: atom.ruby });
     curLineWidth += padL + atom.width + bdrPadR;
     x += atom.width + bdrPadR;
     if (atom.text.trim().length > 0) prevContentCJK = fragIsCJK;
@@ -9965,6 +10129,7 @@ function finishLine(spans, width, props, measurer, fallbackFamily, para, doc, is
   let maxBorderedAscent = 0;
   let maxBorderedDescent = 0;
   let tallestTextIsEa = false;
+  let metricsStrutHeight = 0;
   const consider = (font, imageHeight, objRaise = 0, descShift = 0) => {
     if (imageHeight !== void 0) {
       maxAscent = Math.max(maxAscent, imageHeight + objRaise);
@@ -10005,7 +10170,7 @@ function finishLine(spans, width, props, measurer, fallbackFamily, para, doc, is
   };
   let metricSpans = spans.filter((s) => !(s.text === "	" && !s.leader));
   const solidSpans = metricSpans.filter(
-    (s) => s.image || s.drawing || s.math || s.leader || s.text === void 0 || !/^[ \t]*$/.test(s.text)
+    (s) => s.metricsStrut || s.image || s.drawing || s.math || s.leader || s.text === void 0 || !/^[ \t]*$/.test(s.text)
   );
   if (solidSpans.length > 0) metricSpans = solidSpans;
   if (metricSpans.some((s) => s.numLabel) && metricSpans.some((s) => !s.numLabel)) {
@@ -10038,7 +10203,13 @@ function finishLine(spans, width, props, measurer, fallbackFamily, para, doc, is
     const lineHasObject = metricSpans.some((s) => s.image || s.drawing);
     for (const s of metricSpans) {
       let textMetrics;
-      if (s.image || s.drawing) {
+      if (s.metricsStrut) {
+        metricsStrutHeight = Math.max(
+          metricsStrutHeight,
+          measurer.metrics(s.metricsFont ?? s.font).lineHeight
+        );
+        consider(s.metricsFont ?? s.font);
+      } else if (s.image || s.drawing) {
         const objectMetrics = measurer.metrics(s.metricsFont ?? s.font);
         const objectHeight = s.image?.height ?? s.drawing.height;
         const objRaise = s.props.raise ?? 0;
@@ -10093,6 +10264,14 @@ function finishLine(spans, width, props, measurer, fallbackFamily, para, doc, is
   const commonLower = metricSpans.length > 0 && metricSpans.every(
     (s) => !s.image && !s.drawing && !s.math && (s.props.raise ?? 0) < 0
   ) ? Math.min(...metricSpans.map((s) => -s.props.raise)) : 0;
+  if (metricsStrutHeight > 0) {
+    for (const s of spans) {
+      if (s.metricsStrut || s.image || s.drawing || s.math) continue;
+      const spanHeight = measurer.metrics(s.font).lineHeight;
+      const paintDY = Math.max(0, (metricsStrutHeight - spanHeight) / 2);
+      if (paintDY > 0) s.font = { ...s.font, paintDY: (s.font.paintDY ?? 0) + paintDY };
+    }
+  }
   const natural = Math.max(maxNatural, maxAscent + maxDescent, minLineHeight ?? 0);
   let height = natural;
   let baselineH;
@@ -10253,11 +10432,22 @@ function resolveBidiRtl(text) {
 function buildAtoms(doc, para, measurer, fields, fallbackFamily, gridPitch) {
   const atoms = [];
   const anchors = [];
+  const stylelessOleParagraph = doc.styles.defaultRPr.font === void 0 && doc.styles.defaultRPr.size === void 0 && para.children.some((child4) => {
+    const runs = child4.type === "run" ? [child4] : child4.runs;
+    return runs.some(
+      (run) => run.content.some(
+        (content) => content.kind === "image" && content.embeddedObject !== void 0
+      )
+    );
+  });
   const bidiPara = doc.effectiveParaProps(para).bidi === true;
   const kashidaKind = doc.effectiveParaProps(para).justifyKind;
   const kashidaEm = kashidaKind === "highKashida" ? KASHIDA_HIGH_EM : kashidaKind === "mediumKashida" ? KASHIDA_MEDIUM_EM : kashidaKind === "lowKashida" ? KASHIDA_LOW_EM : 0;
   const pushRun = (run, href) => {
-    const baseProps = doc.effectiveRunProps(para, run.props);
+    let baseProps = doc.effectiveRunProps(para, run.props);
+    if (stylelessOleParagraph && baseProps.size === void 0) {
+      baseProps = { ...baseProps, size: 16 };
+    }
     if (baseProps.vanish) return;
     const font = fontOf(baseProps, fallbackFamily);
     let props = kashidaEm > 0 && baseProps.rtl ? { ...baseProps, letterSpacing: (baseProps.letterSpacing ?? 0) + kashidaEm * font.size } : baseProps;
@@ -10327,6 +10517,20 @@ function buildAtoms(doc, para, measurer, fields, fallbackFamily, gridPitch) {
             });
             break;
           }
+          if (!text && /^\s*SEQ\b/i.test(content.instruction) && /\\h(\s|$)/i.test(content.instruction)) {
+            atoms.push({
+              kind: "frag",
+              text: "",
+              props,
+              font,
+              width: 0,
+              href,
+              src: { run, t: null, offset: 0 },
+              metricsFont: vertMetricsFont,
+              metricsStrut: true
+            });
+            break;
+          }
           if (text) pushStyled(displayText(text, props), props, font, href, { run, t: null, offset: 0 }, vertMetricsFont);
           break;
         }
@@ -10371,7 +10575,7 @@ function buildAtoms(doc, para, measurer, fields, fallbackFamily, gridPitch) {
           break;
         }
         case "noteRef": {
-          const text = content.self ? fields.selfNoteMark?.() ?? "" : fields.noteMark?.(content.noteType, content.id) ?? "";
+          const text = content.self ? fields.selfNoteMark?.() ?? "" : content.customMarkFollows ? "" : fields.noteMark?.(content.noteType, content.id) ?? "";
           if (!text) break;
           const markProps = props.verticalAlign ? props : { ...props, verticalAlign: "superscript" };
           const markFont = fontOf(markProps, fallbackFamily);
@@ -10427,6 +10631,7 @@ function buildAtoms(doc, para, measurer, fields, fallbackFamily, gridPitch) {
     const hasLao = /[຀-໿]/.test(text);
     const indicFace = hasDeva && !hasTamil && !hasLao ? "Mangal" : hasTamil && !hasDeva && !hasLao ? "Latha" : hasLao && !hasDeva && !hasTamil ? "Noto Sans Lao Looped" : null;
     if (indicFace && font.family.toLowerCase() !== indicFace.toLowerCase()) {
+      const scriptProps = indicFace === "Noto Sans Lao Looped" ? { ...props, textScale: (props.textScale ?? 1) * LAO_GLYPH_SCALE } : props;
       const indicScale = indicFace === "Latha" ? TAMIL_GLYPH_SCALE : 1;
       const indicFont = indicScale === 1 ? { ...font, family: indicFace } : {
         ...font,
@@ -10446,7 +10651,7 @@ function buildAtoms(doc, para, measurer, fields, fallbackFamily, gridPitch) {
         const seg = text.slice(i2, j);
         const src = srcBase ? { ...srcBase, offset: srcBase.offset + i2 } : void 0;
         if (isSpace) pushText(seg, props, font, href, src, metricsFont);
-        else pushText(seg, props, indicFont, href, src, indicMetrics);
+        else pushText(seg, scriptProps, indicFont, href, src, indicMetrics);
         i2 = j;
       }
       return;
@@ -10669,8 +10874,8 @@ function resolveField(instruction, cachedResult, ctx, fieldKey) {
     }
     case "SEQ": {
       const ident = instr.split(/\s+/)[1];
-      if (ident && ctx.seq && fieldKey) return ctx.seq(ident, fieldKey, instr);
-      return cachedResult || "";
+      const value = ident && ctx.seq && fieldKey ? ctx.seq(ident, fieldKey, instr) : cachedResult || "";
+      return /\\h(\s|$)/i.test(instr) ? "" : value;
     }
     case "REF": {
       const bookmark = instr.split(/\s+/)[1];
@@ -10833,6 +11038,7 @@ var __incrStats = {
   resumePage: -1,
   convergedBlock: -1,
   convergedPage: -1,
+  pageShift: 0,
   blocksLaid: 0,
   fallbackReason: ""
 };
@@ -10892,6 +11098,7 @@ var MULTI_COL_NOTE_SEP_RESERVE = 26;
 var NOTE_SEP_LEN = 192;
 var NOTE_SEP_GAP = 4.4;
 var ROW_OVERHANG_TOL = 3;
+var CUSTOM_NOTE_BANNER_OVERHANG = 3;
 var CHICAGO = ["*", "\u2020", "\u2021", "\xA7"];
 var AUTO_PARA_SPACING_PX = 14 * (96 / 72);
 var FRAME_WRAP_HSPACE_PX = 6 * (96 / 72);
@@ -10933,6 +11140,7 @@ var Engine = class {
     this.trailingSectionBreakMarkGap = 0;
     /** Bookmark name -> formatted display page number (PAGEREF rewrite). */
     this.bookmarkPages = /* @__PURE__ */ new Map();
+    this.bookmarkPageIndices = /* @__PURE__ */ new Map();
     /** STYLEREF page-awareness: styleIds whose paragraphs a header/footer STYLEREF
      * references (null until precomputed; empty set = no STYLEREF, tracking off). */
     this.styleRefTrack = null;
@@ -10998,6 +11206,7 @@ var Engine = class {
     /** Vertical flow already consumed in the current later-column pre-banner
      * slot. It reduces the below-banner capacity by the same amount. */
     this.bannerSlotUsed = 0;
+    this.customNoteBannerFit = false;
     /** True while a section-level tbRl vertical flow is being laid: paragraphs
      * re-establish the vertical grid after embedded Western runs (see
      * breakParagraph's verticalGridResync). */
@@ -11025,6 +11234,8 @@ var Engine = class {
     this.incrConvergeBlockIdx = -1;
     this.incrConvergePageIdx = -1;
     this.incrConvergeItemDelta = 0;
+    this.incrConvergePrevPointPageIdx = -1;
+    this.incrPageShift = 0;
     /** New block indices are old indices plus this value after a structural
      * split, so convergence compares the same semantic suffix boundary. */
     this.incrBlockDelta = 0;
@@ -11113,7 +11324,7 @@ var Engine = class {
       const contentWidth = page.sp.pageWidth - page.sp.marginLeft - page.sp.marginRight - page.sp.gutter;
       const header = this.doc.headers.get(page.headerRel ?? "");
       const footer = this.doc.footers.get(page.footerRel ?? "");
-      const headerHeight = this.measureHeaderFooter(header, page, contentWidth, this.pageFieldFrameOverlay(header));
+      const headerHeight = this.measureHeaderFooter(header, page, contentWidth, this.pageFieldFrameOverlay(header), true);
       const footerHeight = this.measureHeaderFooter(footer, page, contentWidth, this.pageFieldFrameOverlay(footer));
       if (headerHeight !== page.headerHeight || footerHeight !== page.footerHeight) return null;
     }
@@ -11213,6 +11424,7 @@ var Engine = class {
     if (this.pages.length === 0) {
       this.sp = sections[0]?.props ?? {};
     }
+    this.applyOpeningFlowOverlap();
     this.placeEndnotes();
     this.emitFootnoteAreas();
     this.emitColumnSeparators();
@@ -11231,6 +11443,7 @@ var Engine = class {
         points: this.incrPoints,
         pages: this.pages,
         bookmarks: this.bookmarkPages,
+        bookmarkPageIndices: this.bookmarkPageIndices,
         modelVersion: this.doc.modelVersion,
         seqCounters: this.seqCounters,
         seqAssigned: this.seqAssigned,
@@ -11240,6 +11453,43 @@ var Engine = class {
     }
     return result;
   }
+  /** Some document-opening empty paragraphs reserve a second mark line for
+   * pagination while the following content paints over it on page one. Keep
+   * the reservation in flow so later page breaks stay unchanged, then lift
+   * only the painted first-page body. */
+  applyOpeningFlowOverlap() {
+    const opening = this.doc.sections[0]?.blocks[0];
+    const next = this.doc.sections[0]?.blocks[1];
+    const page = this.pages[0];
+    if (!page || page.openingFlowOverlapApplied || opening?.type !== "paragraph" || opening.sectionBreak || paragraphHasContent(opening)) {
+      return;
+    }
+    const beforeNegativeTable = next?.type === "table" && (next.props.indent ?? 0) < 0;
+    const header = this.doc.headers.get(page.headerRel ?? "");
+    const headerAnchors = header?.blocks.flatMap(
+      (block) => block.type === "paragraph" ? this.collectAnchors(block) : []
+    ) ?? [];
+    const beforeParagraphUnderUnwrappedHeader = next?.type === "paragraph" && page.headerGrown === true && headerAnchors.length > 0 && headerAnchors.every(
+      (shape) => !("wrap" in shape) || shape.wrap === void 0 || shape.wrap === "none"
+    );
+    if (!beforeNegativeTable && !beforeParagraphUnderUnwrappedHeader) return;
+    const firstBodyItem = page.items.findIndex(
+      (item) => item.kind !== "text" || item.text.length > 0
+    );
+    if (firstBodyItem < 0) return;
+    const paraProps = this.doc.effectiveParaProps(opening);
+    const markProps = this.doc.effectiveRunProps(opening, paraProps.markRunProps ?? {});
+    let overlap = this.measurer.metrics(
+      fontOf(markProps, this.doc.styles.defaultRPr.font ?? "Calibri")
+    ).lineHeight;
+    if (beforeParagraphUnderUnwrappedHeader) {
+      overlap += paraProps.spacingAfter ?? 0;
+    }
+    for (let i = firstBodyItem; i < page.items.length; i++) {
+      offsetItem(page.items[i], 0, -overlap);
+    }
+    page.openingFlowOverlapApplied = true;
+  }
   /** Whether this document is in the envelope the incremental path handles:
    * one section, no notes, single column, upright flow, no line numbering /
    * mirror margins / vertical alignment, and no positioned/floating content or
@@ -11367,9 +11617,13 @@ var Engine = class {
     });
     if (this.incrPrevPoints && blockIdx > this.incrFirstDirty) {
       const pp = this.incrPrevPoints.get(blockIdx);
-      if (pp && pp.pageCount === globalPageIdx && this.statesMatch(pp.state)) {
+      const pageShift = pp ? globalPageIdx - pp.pageCount : 0;
+      if (pp && this.statesMatch(pp.state, pageShift)) {
         __incrStats.convergedBlock = blockIdx;
         __incrStats.convergedPage = globalPageIdx;
+        __incrStats.pageShift = pageShift;
+        this.incrPageShift = pageShift;
+        this.incrConvergePrevPointPageIdx = pp.pageCount;
         this.incrPoints.push(snapshot());
         const reuseWholePage = p.items.length === 0 && pp.pageItemCount === 0 && Math.abs(this.y - p.bodyTop) < 1e-6;
         if (reuseWholePage) {
@@ -11394,9 +11648,9 @@ var Engine = class {
   /** True when the current engine state at a clean page top exactly matches a
    * prev-layout capture point — i.e. the relaid tail has re-converged and the
    * rest of the layout is guaranteed identical. */
-  statesMatch(s) {
+  statesMatch(s, pageShift = 0) {
     const p = this.cur;
-    if (this.col !== s.col || this.y !== s.y || this.sectionFirstPagePhys !== s.sectionFirstPagePhys || this.lastParaSpacingAfter !== s.lastParaSpacingAfter || this.lastParaAfterPad !== s.lastParaAfterPad || this.lastParaWasEmpty !== s.lastParaWasEmpty || this.trailingSectionBreakMarkGap !== s.trailingSectionBreakMarkGap || this.suppressNextSpaceBefore !== s.suppressNextSpaceBefore || this.docGridDropBefore !== s.docGridDropBefore || this.gridResyncPending !== s.gridResyncPending || this.verticalGridFlow !== s.verticalGridFlow || this.bannerSlotUsed !== s.bannerSlotUsed || p.physIndex !== s.page.physIndex || p.displayNumber !== s.page.displayNumber || p.bodyTop !== s.page.bodyTop || p.bodyBottom !== s.page.bodyBottom) {
+    if (this.col !== s.col || this.y !== s.y || this.sectionFirstPagePhys !== s.sectionFirstPagePhys || this.lastParaSpacingAfter !== s.lastParaSpacingAfter || this.lastParaAfterPad !== s.lastParaAfterPad || this.lastParaWasEmpty !== s.lastParaWasEmpty || this.trailingSectionBreakMarkGap !== s.trailingSectionBreakMarkGap || this.suppressNextSpaceBefore !== s.suppressNextSpaceBefore || this.docGridDropBefore !== s.docGridDropBefore || this.gridResyncPending !== s.gridResyncPending || this.verticalGridFlow !== s.verticalGridFlow || this.bannerSlotUsed !== s.bannerSlotUsed || p.physIndex !== s.page.physIndex + pageShift || p.displayNumber !== s.page.displayNumber + pageShift || p.bodyTop !== s.page.bodyTop || p.bodyBottom !== s.page.bodyBottom) {
       return false;
     }
     if (this.seenNumIds.size !== s.seenNumIds.length) return false;
@@ -11453,11 +11707,60 @@ var Engine = class {
     this.counters = new Map(s.counters.map(([k, v]) => [k, [...v]]));
     this.seenNumIds = new Set(s.seenNumIds);
   }
+  bodyHasPageField(el16 = this.doc.docRoot) {
+    const name = el16.name.includes(":") ? el16.name.slice(el16.name.indexOf(":") + 1) : el16.name;
+    const instruction = name === "instrText" ? el16.text : name === "fldSimple" ? el16.attrs["w:instr"] ?? "" : "";
+    if (/\bPAGE\b/i.test(instruction)) return true;
+    return el16.children.some((child4) => this.bodyHasPageField(child4));
+  }
+  /** Clone a retained suffix page onto its new physical/display number. Body
+   * items and page-border items stay identical; headers and footers are removed
+   * so the final pass can rebuild PAGE fields against the shifted number. */
+  shiftRetainedPage(page, pageShift) {
+    if (page.hfStart === void 0) return null;
+    const physIndex = page.physIndex + pageShift;
+    const displayNumber = page.displayNumber + pageShift;
+    const isFirstOfSection = physIndex === this.sectionFirstPagePhys;
+    const useEven = this.doc.evenAndOddHeaders && displayNumber % 2 === 0;
+    const headerRel = page.sp.titlePage && isFirstOfSection ? page.sp.headerRefs.first : useEven ? page.sp.headerRefs.even : page.sp.headerRefs.default;
+    const footerRel = page.sp.titlePage && isFirstOfSection ? page.sp.footerRefs.first : useEven ? page.sp.footerRefs.even : page.sp.footerRefs.default;
+    const shifted = {
+      ...page,
+      items: page.items.slice(0, page.hfStart),
+      physIndex,
+      displayNumber,
+      headerRel,
+      footerRel,
+      hfStart: void 0,
+      colXs: [...page.colXs],
+      colWidths: [...page.colWidths],
+      footnotes: page.footnotes.map((note) => ({ ...note, items: [...note.items] })),
+      footnoteH: [...page.footnoteH],
+      bands: page.bands.map((band) => ({
+        ...band,
+        colXs: [...band.colXs],
+        colWidths: [...band.colWidths],
+        bottoms: [...band.bottoms]
+      }))
+    };
+    if (headerRel === page.headerRel && footerRel === page.footerRel) return shifted;
+    this.sp = shifted.sp;
+    const contentWidth = shifted.sp.pageWidth - shifted.sp.marginLeft - shifted.sp.marginRight - shifted.sp.gutter;
+    const header = this.doc.headers.get(headerRel ?? "");
+    const footer = this.doc.footers.get(footerRel ?? "");
+    const headerHeight = this.measureHeaderFooter(header, shifted, contentWidth, this.pageFieldFrameOverlay(header), true);
+    const footerHeight = this.measureHeaderFooter(footer, shifted, contentWidth, this.pageFieldFrameOverlay(footer));
+    if (headerHeight !== page.headerHeight || footerHeight !== page.footerHeight) return null;
+    shifted.headerHeight = headerHeight;
+    shifted.footerHeight = footerHeight;
+    return shifted;
+  }
   /** Attempt an incremental layout; return null (and leave a discarded, dirty
    * engine) if reuse can't be proven safe, so the caller does a full layout in a
    * fresh engine. */
   runIncremental(prev, dirtyHint, dirtySource) {
     __incrStats.fallbackReason = "";
+    __incrStats.pageShift = 0;
     const fallback = (reason) => {
       __incrStats.fallbackReason = reason;
       const perf2 = globalThis.__dxwPerf;
@@ -11472,11 +11775,12 @@ var Engine = class {
     const blocks = this.doc.sections[0].blocks;
     let newSigs = null;
     let firstDirty = 0;
-    if (dirtyHint && blocks.length === inc.sigs.length + 1) {
+    if (dirtyHint && blocks.length > inc.sigs.length) {
+      const delta = blocks.length - inc.sigs.length;
       const inserted = blocks.findIndex((block) => block.src === dirtyHint);
-      const changed = inserted - 1;
+      const changed = inserted - delta;
       if (changed >= 0) {
-        let hashed = 2;
+        let hashed = delta + 1;
         let neighborsOk = true;
         if (changed > 0) {
           hashed++;
@@ -11484,21 +11788,47 @@ var Engine = class {
         }
         if (neighborsOk && inserted < blocks.length - 1) {
           hashed++;
-          neighborsOk = this.blockSig(blocks[inserted + 1]) === inc.sigs[inserted];
+          neighborsOk = this.blockSig(blocks[inserted + 1]) === inc.sigs[changed + 1];
         }
         if (neighborsOk) {
           newSigs = inc.sigs.slice();
           newSigs[changed] = this.blockSig(blocks[changed]);
-          newSigs.splice(inserted, 0, this.blockSig(blocks[inserted]));
+          newSigs.splice(changed + 1, 0, ...blocks.slice(changed + 1, inserted + 1).map((block) => this.blockSig(block)));
           firstDirty = changed;
           __incrStats.hintFastPath = true;
           __incrStats.blocksHashed = hashed;
           __incrStats.firstDirty = changed;
-          this.incrBlockDelta = 1;
+          this.incrBlockDelta = delta;
           this.incrBlockShiftAfter = changed;
         }
       }
     }
+    if (newSigs === null && dirtyHint && blocks.length === inc.sigs.length - 1) {
+      const changed = blocks.findIndex((block) => block.src === dirtyHint);
+      if (changed >= 0) {
+        let hashed = 1;
+        let neighborsOk = true;
+        if (changed > 0) {
+          hashed++;
+          neighborsOk = this.blockSig(blocks[changed - 1]) === inc.sigs[changed - 1];
+        }
+        if (neighborsOk && changed < blocks.length - 1) {
+          hashed++;
+          neighborsOk = this.blockSig(blocks[changed + 1]) === inc.sigs[changed + 2];
+        }
+        if (neighborsOk) {
+          newSigs = inc.sigs.slice();
+          newSigs[changed] = this.blockSig(blocks[changed]);
+          newSigs.splice(changed + 1, 1);
+          firstDirty = changed;
+          __incrStats.hintFastPath = true;
+          __incrStats.blocksHashed = hashed;
+          __incrStats.firstDirty = changed;
+          this.incrBlockDelta = -1;
+          this.incrBlockShiftAfter = changed + 1;
+        }
+      }
+    }
     if (newSigs === null && dirtyHint && blocks.length === inc.sigs.length) {
       const d = blocks.findIndex((b) => b.src === dirtyHint);
       if (d >= 0) {
@@ -11555,19 +11885,47 @@ var Engine = class {
     __incrStats.resumePage = rp.pageCount;
     __incrStats.convergedBlock = -1;
     __incrStats.convergedPage = -1;
+    __incrStats.pageShift = 0;
     __incrStats.blocksLaid = 0;
     this.restoreIncrState(rp.state, inc.pages[rp.pageCount].items.slice(0, rp.pageItemCount));
     this.layoutBlocks(blocks, rp.blockIdx);
     if (this.incrAbort) return fallback("layout-abort");
     const suffixStart = this.incrConvergePrevPageIdx >= 0 ? this.incrConvergePrevPageIdx : inc.pages.length;
-    const totalPages = prefixCount + this.pages.length + (inc.pages.length - suffixStart);
-    if (totalPages !== prev.totalPages) return fallback("page-count");
+    const middleCount = this.pages.length;
+    const hasRetainedSuffix = suffixStart < inc.pages.length;
+    const pageShift = hasRetainedSuffix ? prefixCount + middleCount - suffixStart : 0;
+    if (hasRetainedSuffix && pageShift !== this.incrPageShift) return fallback("page-shift");
+    if (pageShift !== 0 && this.bodyHasPageField()) return fallback("body-page-field-shift");
+    const shiftedSuffix = [];
+    if (pageShift !== 0) {
+      for (const page of inc.pages.slice(suffixStart)) {
+        const shifted = this.shiftRetainedPage(page, pageShift);
+        if (!shifted) return fallback("shifted-header-footer");
+        shiftedSuffix.push(shifted);
+      }
+    }
     const mergedBookmarks = new Map(inc.bookmarks);
-    const movedBookmarks = /* @__PURE__ */ new Set();
+    const mergedBookmarkPageIndices = new Map(inc.bookmarkPageIndices);
+    if (pageShift !== 0) {
+      for (const [name, oldPageIndex] of inc.bookmarkPageIndices) {
+        if (oldPageIndex < suffixStart) continue;
+        const page = inc.pages[oldPageIndex];
+        if (!page) continue;
+        mergedBookmarkPageIndices.set(name, oldPageIndex + pageShift);
+        mergedBookmarks.set(
+          name,
+          formatNumber(page.displayNumber + pageShift, PAGE_FMT[page.sp.pageNumberFormat ?? "decimal"] ?? "decimal")
+        );
+      }
+    }
     for (const [name, page] of this.bookmarkPages) {
-      if (inc.bookmarks.get(name) !== page) movedBookmarks.add(name);
       mergedBookmarks.set(name, page);
     }
+    for (const [name, pageIndex] of this.bookmarkPageIndices) mergedBookmarkPageIndices.set(name, pageIndex);
+    const movedBookmarks = /* @__PURE__ */ new Set();
+    for (const [name, page] of mergedBookmarks) {
+      if (inc.bookmarks.get(name) !== page) movedBookmarks.add(name);
+    }
     const pageRefUpdates = [];
     if (movedBookmarks.size > 0) {
       for (const page of inc.pages) {
@@ -11585,32 +11943,53 @@ var Engine = class {
     this.placeEndnotes();
     this.emitFootnoteAreas();
     this.emitColumnSeparators();
-    this.finalizeHeadersFooters();
     this.bookmarkPages = mergedBookmarks;
-    this.rewritePageRefs(this.pages);
+    this.bookmarkPageIndices = mergedBookmarkPageIndices;
     this.applySectionVAlign();
+    if (pageShift !== 0) {
+      for (let i = 0; i < middleCount; i++) this.emitPageBorders(this.pages[i]);
+      this.pages.push(...shiftedSuffix);
+      this.finalizeHeadersFooters(false);
+    } else {
+      this.finalizeHeadersFooters();
+    }
+    this.rewritePageRefs(this.pages);
     if (this.incrAbort) return fallback("postpass-abort");
-    const middle = this.pages.map((p) => laidOutPage(p));
+    const middle = this.pages.slice(0, middleCount).map((p) => laidOutPage(p));
     let structuralPrefixEnd = prefixCount;
     if (dirtySource) {
-      const dirtyMiddleIdx = this.pages.findIndex(
+      const dirtyMiddleIdx = this.pages.slice(0, middleCount).findIndex(
         (page) => page.items.some((item) => item.kind === "text" && item.src?.t === dirtySource)
       );
       if (dirtyMiddleIdx > 0) structuralPrefixEnd += dirtyMiddleIdx;
     }
-    const outPages = prev.pages.slice(0, prefixCount).concat(middle, prev.pages.slice(suffixStart));
-    const outInternal = inc.pages.slice(0, prefixCount).concat(this.pages, inc.pages.slice(suffixStart));
-    const samePageTail = this.incrConvergeBlockIdx >= 0 ? inc.points.filter(
-      (pt) => pt.pageCount === this.incrConvergePageIdx && shiftedBlockIdx(pt.blockIdx) > this.incrConvergeBlockIdx
-    ).map((pt) => ({
+    const outPages = prev.pages.slice(0, prefixCount).concat(
+      pageShift !== 0 ? this.pages.map((page) => laidOutPage(page)) : middle.concat(prev.pages.slice(suffixStart))
+    );
+    const outInternal = inc.pages.slice(0, prefixCount).concat(
+      pageShift !== 0 ? this.pages : this.pages.concat(inc.pages.slice(suffixStart))
+    );
+    const shiftPoint = (pt, itemDelta = 0) => ({
       ...pt,
       blockIdx: shiftedBlockIdx(pt.blockIdx),
-      pageItemCount: pt.pageItemCount + this.incrConvergeItemDelta
-    })) : [];
+      pageCount: pt.pageCount + pageShift,
+      pageItemCount: pt.pageItemCount + itemDelta,
+      state: {
+        ...pt.state,
+        page: {
+          ...pt.state.page,
+          physIndex: pt.state.page.physIndex + pageShift,
+          displayNumber: pt.state.page.displayNumber + pageShift
+        }
+      }
+    });
+    const samePageTail = this.incrConvergeBlockIdx >= 0 ? inc.points.filter(
+      (pt) => pt.pageCount === this.incrConvergePrevPointPageIdx && shiftedBlockIdx(pt.blockIdx) > this.incrConvergeBlockIdx
+    ).map((pt) => shiftPoint(pt, this.incrConvergeItemDelta)) : [];
     const points = inc.points.filter((pt) => pt.pageCount < prefixCount).concat(
       this.incrPoints,
       samePageTail,
-      inc.points.filter((pt) => pt.pageCount >= suffixStart).map((pt) => ({ ...pt, blockIdx: shiftedBlockIdx(pt.blockIdx) }))
+      inc.points.filter((pt) => pt.pageCount >= suffixStart).map((pt) => shiftPoint(pt))
     );
     const perf = globalThis.__dxwPerf;
     if (perf) perf.incr = { ...__incrStats };
@@ -11623,6 +12002,7 @@ var Engine = class {
         points,
         pages: outInternal,
         bookmarks: mergedBookmarks,
+        bookmarkPageIndices: mergedBookmarkPageIndices,
         modelVersion: this.doc.modelVersion,
         seqCounters: this.seqCounters,
         seqAssigned: this.seqAssigned,
@@ -11746,8 +12126,8 @@ var Engine = class {
       displayNumber,
       headerHeight: 0,
       footerHeight: 0,
-      bodyTop: Math.abs(sp.marginTop),
-      bandTop: Math.abs(sp.marginTop),
+      bodyTop: sp.marginTop,
+      bandTop: sp.marginTop,
       softTop: !sectionStart,
       bodyBottom: sp.pageHeight - Math.abs(sp.marginBottom),
       colXs,
@@ -11771,13 +12151,17 @@ var Engine = class {
     }
     const header = this.doc.headers.get(page.headerRel ?? "");
     const footer = this.doc.footers.get(page.footerRel ?? "");
-    const headerH = this.measureHeaderFooter(header, page, contentWidth, this.pageFieldFrameOverlay(header));
+    const headerH = this.measureHeaderFooter(header, page, contentWidth, this.pageFieldFrameOverlay(header), true);
     const footerOverlay = this.pageFieldFrameOverlay(footer);
     const footerH = this.measureHeaderFooter(footer, page, contentWidth, footerOverlay);
     page.headerHeight = headerH;
     page.footerHeight = footerH;
     if (sp.marginTop >= 0) {
-      page.bodyTop = Math.max(sp.marginTop, headerH > 0 ? sp.headerDistance + headerH : 0);
+      const headerBodyHeight = this.doc.compatibilityMode < 15 && header?.blocks.every((block) => block.type === "paragraph" && !paragraphHasContent(block)) ? ptToPx(7) : headerH;
+      page.bodyTop = Math.max(
+        sp.marginTop,
+        headerBodyHeight > 0 ? sp.headerDistance + headerBodyHeight : 0
+      );
       page.bandTop = page.bodyTop;
       page.headerGrown = page.bodyTop > sp.marginTop;
     }
@@ -11964,6 +12348,7 @@ var Engine = class {
       counters: new Map(Array.from(this.counters, ([k, v]) => [k, [...v]])),
       seenNumIds: new Set(this.seenNumIds),
       bookmarkPages: new Map(this.bookmarkPages),
+      bookmarkPageIndices: new Map(this.bookmarkPageIndices),
       placedFootnotes: new Set(this.placedFootnotes),
       lnCounter: this.lnCounter,
       lnLastPage: this.lnLastPage,
@@ -12003,6 +12388,7 @@ var Engine = class {
     this.counters = s.counters;
     this.seenNumIds = s.seenNumIds;
     this.bookmarkPages = s.bookmarkPages;
+    this.bookmarkPageIndices = s.bookmarkPageIndices;
     this.placedFootnotes = s.placedFootnotes;
     this.lnCounter = s.lnCounter;
     this.lnLastPage = s.lnLastPage;
@@ -12015,7 +12401,7 @@ var Engine = class {
     if (this.col + 1 < this.cur.colXs.length) {
       this.col++;
       this.y = this.columnStartY(this.col);
-      this.bannerSlotUsed = 0;
+      this.bannerSlotUsed = this.cur.bannerTop !== void 0 ? this.cur.openingColumnReserve ?? 0 : 0;
       this.lastParaSpacingAfter = 0;
       this.lastParaAfterPad = 0;
       this.lastParaAfterPad = 0;
@@ -12352,7 +12738,7 @@ var Engine = class {
             const runs = c.type === "run" ? [c] : c.runs;
             for (const r of runs) {
               for (const rc of r.content) {
-                if (rc.kind !== "noteRef" || rc.self) continue;
+                if (rc.kind !== "noteRef" || rc.self || rc.customMarkFollows) continue;
                 if (rc.noteType === "footnote" && this.doc.footnotes.has(rc.id) && !this.footnoteNumbers.has(rc.id)) {
                   this.footnoteNumbers.set(rc.id, fnStart + fn++);
                 } else if (rc.noteType === "endnote" && this.doc.endnotes.has(rc.id) && !this.endnoteNumbers.has(rc.id)) {
@@ -12865,6 +13251,20 @@ var Engine = class {
   }
   placeParagraph(para, prev, next, siblings, index) {
     const props = this.doc.effectiveParaProps(para);
+    const detachedFootnotes = customFootnoteAnchorIds(para);
+    if (detachedFootnotes && next?.type === "paragraph") {
+      const nextProps2 = this.doc.effectiveParaProps(next);
+      const nextFrame = nextProps2.frame ? this.resolveFrame(nextProps2.frame) : void 0;
+      if (nextFrame?.wrap === "notBeside" && nextFrame.w !== void 0 && this.cur.colXs.length > 1 && nextFrame.w > this.colWidth + 1) {
+        for (const id of detachedFootnotes) this.registerFootnote(id, this.cur);
+        const markProps = this.doc.effectiveRunProps(para, props.markRunProps ?? {});
+        this.cur.openingColumnReserve = this.measurer.metrics(
+          fontOf(markProps, this.doc.styles.defaultRPr.font ?? "Calibri")
+        ).lineHeight;
+        this.customNoteBannerFit = true;
+        return;
+      }
+    }
     if (this.consumedFrames.has(para)) return;
     if (props.frame && !props.dropCap && this.cur.physIndex !== -1) {
       const fr = this.resolveFrame(props.frame);
@@ -12997,12 +13397,18 @@ var Engine = class {
     if (breakBeforeForced && !(isLeadingPageBreak && keepSpBeforeAtPageTop)) dropSpaceBefore = true;
     if (this.docGridDropBefore) {
       if (props.snapToGrid === false && this.sp.docGridLinePitch) {
-        const reduction = 2 * this.sp.docGridLinePitch;
+        const reduction = (props.spacingBefore ?? 0) > 0 ? 4 * this.sp.docGridLinePitch : 2 * this.sp.docGridLinePitch;
+        this.cur.bodyTop -= reduction;
+        this.y -= reduction;
+      } else if (para.props.styleId === "Heading1" && this.sp.docGridLinePitch) {
+        const reduction = 3 * this.sp.docGridLinePitch - ptToPx(1.5);
         this.cur.bodyTop -= reduction;
         this.y -= reduction;
+        dropSpaceBefore = true;
+      } else {
+        dropSpaceBefore = true;
       }
       this.docGridDropBefore = false;
-      dropSpaceBefore = true;
     }
     const rawSpacingBefore = dropSpaceBefore ? 0 : props.spacingBefore ?? 0;
     let paraTopEstimate = this.y + rawSpacingBefore;
@@ -13176,7 +13582,7 @@ var Engine = class {
     const nextProps = nextPara ? this.doc.effectiveParaProps(nextPara) : void 0;
     const nextLeadBreak = nextPara ? leadingBreakOf(nextPara) : void 0;
     let legacyBreakChain = false;
-    if (lines.length > 0 && this.pageIsEmptyAtCursor() && this.doc.compatibilityMode < 15 && this.sp.docGridType === "default" && props.keepNext && nextPara && nextProps?.keepNext && nextLeadBreak?.type === "page") {
+    if (lines.length > 0 && this.pageIsEmptyAtCursor() && this.doc.compatibilityMode < 15 && this.sp.docGridType === "default" && !this.cur.footerRel && props.keepNext && nextPara && nextProps?.keepNext && nextLeadBreak?.type === "page") {
       const breakProps = this.doc.effectiveRunProps(nextPara, nextLeadBreak.run.props);
       const breakFont = fontOf(breakProps, this.doc.styles.defaultRPr.font ?? "Calibri");
       let breakHeight = this.measurer.metrics(breakFont).lineHeight;
@@ -13347,6 +13753,7 @@ var Engine = class {
       let simCol = this.col;
       let simOnCurrentPage = true;
       let simBannerUsed = this.bannerSlotUsed;
+      const paragraphOverhang = this.customNoteBannerFit ? CUSTOM_NOTE_BANNER_OVERHANG : 0;
       const updateBottom = () => {
         bottom = simOnCurrentPage && this.balanceBottom !== void 0 && simCol + 1 < this.cur.colXs.length ? this.balanceBottom - simBannerUsed : this.cur.bodyBottom - (simOnCurrentPage ? this.footnoteReserve(this.cur, simCol) + simBannerUsed : 0);
       };
@@ -13369,16 +13776,17 @@ var Engine = class {
         }
       };
       const nextSimColumn = () => {
-        simBannerUsed = 0;
         simNotes = 0;
         simNoted.clear();
         if (simCol + 1 < this.cur.colXs.length) {
           simCol++;
           simY = simOnCurrentPage ? this.columnStartY(simCol) : this.cur.bodyTop;
+          simBannerUsed = simOnCurrentPage && this.cur.bannerTop !== void 0 ? this.cur.openingColumnReserve ?? 0 : 0;
         } else {
           simCol = 0;
           simOnCurrentPage = false;
           simY = this.cur.bodyTop;
+          simBannerUsed = 0;
         }
         updateBottom();
       };
@@ -13397,7 +13805,7 @@ var Engine = class {
         const noteAdd = lineNoteHeights(lines[li]);
         const baseNotes = simOnCurrentPage ? this.cur.footnoteH[simCol] ?? 0 : 0;
         const simSep = simNotes + noteAdd > 0 && baseNotes === 0 ? this.noteSeparatorReserve(this.cur) : 0;
-        const overflowsHere = !postTablePageBreak && (simBalancing ? simY > bottom + 0.01 : simY + lines[li].fitHeight + (li === lines.length - 1 ? keepNextTail : 0) > bottom - simNotes - noteAdd - simSep + 0.01);
+        const overflowsHere = !postTablePageBreak && (simBalancing ? simY > bottom + 0.01 : simY + lines[li].fitHeight + (li === lines.length - 1 ? keepNextTail : 0) > bottom - simNotes - noteAdd - simSep + paragraphOverhang + 0.01);
         if (overflowsHere && li === segStart && segStart === 0 && onPartialPage && !simBalancing) {
           breaks2.add(0);
           segStart = 0;
@@ -13483,7 +13891,7 @@ var Engine = class {
       const pendingNotes = this.pendingNoteHeight(line2);
       const balancing = this.balanceBottom !== void 0 && this.col + 1 < this.cur.colXs.length;
       const balBottomBased = balancing && this.colWidth < 40;
-      const overflow = !postTablePageBreak && (balancing ? (balBottomBased ? this.y + line2.fitHeight : this.y) > this.bodyBottom + 0.01 : this.y + line2.fitHeight > this.bodyBottom - pendingNotes + 0.01) && !this.pageIsEmptyAtCursor();
+      const overflow = !postTablePageBreak && (balancing ? (balBottomBased ? this.y + line2.fitHeight : this.y) > this.bodyBottom + 0.01 : this.y + line2.fitHeight > this.bodyBottom - pendingNotes + (this.customNoteBannerFit ? CUSTOM_NOTE_BANNER_OVERHANG : 0) + 0.01) && !this.pageIsEmptyAtCursor();
       if ((planned || overflow) && li > fragStartLine) {
         closeFragment(li, false);
         this.nextColumn();
@@ -13523,6 +13931,7 @@ var Engine = class {
           for (const bm of para.bookmarks) {
             if (!this.bookmarkPages.has(bm)) {
               this.bookmarkPages.set(bm, formatNumber(pg.displayNumber, PAGE_FMT[pg.sp.pageNumberFormat ?? "decimal"] ?? "decimal"));
+              this.bookmarkPageIndices.set(bm, pg.physIndex - 1);
             }
           }
         }
@@ -14150,13 +14559,35 @@ var Engine = class {
           y = Math.max(y, pendingPageFrame.bottom);
           pendingPageFrame = null;
         }
-        y = this.layoutTableInFrame(block, fake, 0, y, width, fields);
+        y = this.layoutTableInFrame(block, fake, 0, y, width, fields, inCell === true);
         framePrevAfter = 0;
       }
     }
     if (pendingPageFrame) y = Math.max(y, pendingPageFrame.bottom);
+    const itemBottom = (item) => {
+      if (item.kind === "text") return (item.glyphTop ?? item.lineTop) + item.lineHeight;
+      if (item.kind === "rect" || item.kind === "image" || item.kind === "path" || item.kind === "drawingHit") {
+        return item.y + item.height;
+      }
+      if (item.kind === "edge") return Math.max(item.y1, item.y2);
+      if (item.kind === "wordart" || item.kind === "warptext") return item.y + item.height;
+      return 0;
+    };
+    const headerBandBottom = this.sp.marginTop - (origin?.y ?? 0);
+    const paintedHeaderBottom = items.reduce((bottom, item) => {
+      const itemEnd = itemBottom(item);
+      return "behind" in item && item.behind && itemEnd <= headerBandBottom + 0.01 ? Math.max(bottom, itemEnd) : bottom;
+    }, 0);
+    const wrappedBottom = (this.floats.get(fake) ?? []).reduce(
+      (bottom, float) => Math.max(bottom, float.y1 - (origin?.y ?? 0)),
+      0
+    );
     this.floats.delete(fake);
-    return { items, height: y + pageFramePhantomH };
+    return {
+      items,
+      height: y + pageFramePhantomH,
+      contentBottom: Math.max(y + pageFramePhantomH, paintedHeaderBottom, wrappedBottom)
+    };
   }
   /**
    * Emit floating shapes anchored at (textX, textY). Coordinates in the shape
@@ -14562,7 +14993,7 @@ var Engine = class {
       page.items.push(it);
     }
   }
-  measureHeaderFooter(hf, page, contentWidth, overlayPageFrame = false) {
+  measureHeaderFooter(hf, page, contentWidth, overlayPageFrame = false, reserveBodyClearance = false) {
     if (!hf || hf.blocks.length === 0) return 0;
     const fields = {
       pageNumber: () => page.displayNumber,
@@ -14571,10 +15002,25 @@ var Engine = class {
     };
     const snapshot = new Map(Array.from(this.counters, ([k, v]) => [k, [...v]]));
     const seenSnapshot = new Set(this.seenNumIds);
-    const { height } = this.layoutFrame(hf.blocks, contentWidth, fields, void 0, false, overlayPageFrame);
+    const origin = reserveBodyClearance ? { x: page.sp.marginLeft + page.sp.gutter, y: page.sp.headerDistance } : void 0;
+    const { height, contentBottom } = this.layoutFrame(
+      hf.blocks,
+      contentWidth,
+      fields,
+      origin,
+      false,
+      overlayPageFrame
+    );
     this.counters = snapshot;
     this.seenNumIds = seenSnapshot;
-    return height;
+    const anchors = hf.blocks.flatMap(
+      (block) => block.type === "paragraph" ? this.collectAnchors(block) : []
+    );
+    const hasOnlyUnwrappedAnchors = anchors.length > 0 && anchors.every(
+      (shape) => !("wrap" in shape) || shape.wrap === void 0 || shape.wrap === "none"
+    );
+    const complexHeader = anchors.length > 0 || hf.blocks.some((block) => block.type === "table");
+    return reserveBodyClearance ? Math.max(height, contentBottom) + (!hasOnlyUnwrappedAnchors && complexHeader ? ptToPx(22.5) : 0) : height;
   }
   pageFieldFrameOverlay(hf) {
     if (!hf) return false;
@@ -14636,7 +15082,10 @@ var Engine = class {
         const measured = this.layoutFrame(footer.blocks, contentWidth, fields, void 0, false, overlayPageFrame);
         this.counters = snapshot;
         this.seenNumIds = seenSnapshot;
-        const top = sp.pageHeight - sp.footerDistance - measured.height;
+        const legacyPageFrame = this.doc.compatibilityMode < 15 && footer.blocks.some(
+          (block) => block.type === "paragraph" && this.doc.effectiveParaProps(block).frame?.vAnchor === "page"
+        );
+        const top = sp.pageHeight - sp.footerDistance - (legacyPageFrame ? 0 : measured.height);
         snapshot = new Map(Array.from(this.counters, ([k, v]) => [k, [...v]]));
         seenSnapshot = new Set(this.seenNumIds);
         this.hfMarginVTop = page.bodyTop;
@@ -15015,7 +15464,14 @@ var Engine = class {
       if (cell.props.margins?.top !== void 0) topPad = Math.max(topPad, cell.props.margins.top);
       if (cell.props.margins?.bottom !== void 0) bottomPad = Math.max(bottomPad, cell.props.margins.bottom);
     }
-    if (row.props.heightRule === "exact") return trHeight + topPad;
+    if (row.props.heightRule === "exact") {
+      return this.doc.compatibilityMode < 15 ? trHeight : trHeight + topPad;
+    }
+    if (this.doc.compatibilityMode < 15) {
+      const legacyBottomPad = bottomPad >= ptToPx(1) ? bottomPad : 0;
+      const legacyTopPad = row.props.heightRule === "atLeast" && (row.props.height ?? 0) >= ptToPx(30) ? Math.max(topPad - ptToPx(0.25), 0) : topPad;
+      return Math.max(contentHeight, trHeight + legacyTopPad + legacyBottomPad);
+    }
     const borderPad = this.rowBorderShare(tbl, ri);
     return Math.max(contentHeight, trHeight + topPad + bottomPad + borderPad);
   }
@@ -15235,7 +15691,7 @@ var Engine = class {
       };
       let guard = 0;
       const noteReserve = this.rowNoteHeight(laid) + this.footnoteReserve(this.cur, this.col);
-      const overhang = noteReserve > 0 || row.props.cantSplit || row.props.heightRule === "exact" ? 0 : ROW_OVERHANG_TOL;
+      const overhang = noteReserve > 0 || row.props.heightRule === "exact" ? 0 : row.props.cantSplit ? this.doc.compatibilityMode < 15 && (row.props.heightRule !== "atLeast" || (row.props.height ?? 0) >= ptToPx(2)) ? this.cur.footerHeight : 0 : ROW_OVERHANG_TOL;
       while (this.y + rowHeight > this.bodyBottom - this.rowNoteHeight(laid) + overhang + 0.01 && guard++ < 50) {
         const atColumnTop = this.pageIsEmptyAtCursor() || this.y <= this.cur.bodyTop + this.rowBorderWidths(tbl, ri).top / 2 + 0.01;
         const cantSplitHolds = row.props.cantSplit === true && (rowHeight <= this.cur.bodyBottom - this.cur.bodyTop + 0.01 || !atColumnTop);
@@ -15454,9 +15910,9 @@ var Engine = class {
       });
     }
   }
-  layoutTableInFrame(tbl, fake, x0, y, width, fields) {
+  layoutTableInFrame(tbl, fake, x0, y, width, fields, nested) {
     this.ensureTableBorders(tbl);
-    const widths = this.resolveGridWidths(tbl, width, true);
+    const widths = this.resolveGridWidths(tbl, width, nested);
     const saveY = this.y;
     const saveCur = this.cur;
     const saveCol = this.col;
@@ -15722,6 +16178,7 @@ var Engine = class {
     }
     let maxH = 0;
     let measuredContentH = 0;
+    const effectiveBottomPad = (bottom) => this.doc.compatibilityMode < 15 && row.props.heightRule === "atLeast" && (row.props.height ?? 0) < ptToPx(2) && (bottom ?? 0) >= ptToPx(2) ? (bottom ?? 0) / 2 : bottom ?? 0;
     for (let ci = 0; ci < row.cells.length; ci++) {
       const cell = row.cells[ci];
       const { x, width: w, margins: m } = geometry[ci];
@@ -15741,7 +16198,7 @@ var Engine = class {
         true
       );
       for (const it of items) offsetItem(it, m.left ?? 0, m.top ?? 0);
-      const cellHeight = height + (m.top ?? 0) + (m.bottom ?? 0);
+      const cellHeight = height + (m.top ?? 0) + effectiveBottomPad(m.bottom);
       cells[ci] = { items, height: cellHeight, x, width: w, cellIdx: ci };
       measuredContentH = Math.max(measuredContentH, height);
       maxH = Math.max(maxH, cellHeight);
@@ -15785,7 +16242,7 @@ var Engine = class {
           it.rotate = { deg, ox: centerX - it.x, oy: centerY - top };
         }
       }
-      const cellHeight = frameWidth + (m.top ?? 0) + (m.bottom ?? 0);
+      const cellHeight = frameWidth + (m.top ?? 0) + effectiveBottomPad(m.bottom);
       cells[ci] = { items, height: cellHeight, x, width: w, cellIdx: ci, rotated: true };
       maxH = Math.max(maxH, cellHeight);
     }
@@ -15934,6 +16391,24 @@ var Engine = class {
     }
   }
 };
+function customFootnoteAnchorIds(p) {
+  const ids = [];
+  for (const child4 of p.children) {
+    const runs = child4.type === "run" ? [child4] : child4.runs;
+    for (const run of runs) {
+      for (const content of run.content) {
+        if (content.kind === "text") {
+          if (content.text.trim().length > 0) return void 0;
+        } else if (content.kind === "noteRef" && content.noteType === "footnote" && !content.self && content.customMarkFollows) {
+          ids.push(content.id);
+        } else {
+          return void 0;
+        }
+      }
+    }
+  }
+  return ids.length > 0 ? ids : void 0;
+}
 function isEmptyParagraph(p) {
   for (const child4 of p.children) {
     const runs = child4.type === "run" ? [child4] : child4.runs;
@@ -16905,7 +17380,7 @@ function renderToDom(doc, layout, container, options = {}, prev) {
       renderComments(doc, root, handle.bindings, zoom, options.onDeleteComment, options.onReplyComment);
     }
   };
-  const wantedPages = () => {
+  const wantedPages = (overscan = 2) => {
     const wanted = /* @__PURE__ */ new Set();
     const top = container.scrollTop;
     const bottom = top + Math.max(container.clientHeight, 1);
@@ -16921,15 +17396,15 @@ function renderToDom(doc, layout, container, options = {}, prev) {
       y = pageBottom + gap;
     }
     if (first < 0) first = last = Math.max(0, pages.length - 1);
-    for (let i = Math.max(0, first - 2); i <= Math.min(pages.length - 1, last + 2); i++) wanted.add(i);
+    for (let i = Math.max(0, first - overscan); i <= Math.min(pages.length - 1, last + overscan); i++) wanted.add(i);
     for (let i = 0; i < pages.length; i++) {
       if (pages[i].mounted && pages[i].el.querySelector("[data-dxw-caret], .dxw-sel")) wanted.add(i);
     }
     return wanted;
   };
-  const syncViewport = (notify, force = false) => {
+  const syncViewport = (notify, force = false, overscan = 2) => {
     if (!virtualized) return;
-    const wanted = wantedPages();
+    const wanted = wantedPages(overscan);
     let changed = false;
     for (const i of wanted) {
       if (pages[i].mounted) continue;
@@ -16944,14 +17419,30 @@ function renderToDom(doc, layout, container, options = {}, prev) {
     }
     if (!changed && !force) return;
     refreshBindings();
-    redrawComments();
+    if (drawComments || force) redrawComments();
     if (notify) options.onViewportChange?.();
   };
+  let settleTimer;
+  let syncedScrollTop = container.scrollTop;
+  let pendingOverscan = 2;
   const scheduleViewport = () => {
+    const fast = Math.abs(container.scrollTop - syncedScrollTop) > Math.max(container.clientHeight, 1) * 2;
+    if (fast) {
+      pendingOverscan = 0;
+      if (settleTimer !== void 0) clearTimeout(settleTimer);
+      settleTimer = setTimeout(() => {
+        settleTimer = void 0;
+        syncedScrollTop = container.scrollTop;
+        syncViewport(true);
+      }, 80);
+    }
     if (frame) return;
     frame = requestAnimationFrame(() => {
       frame = 0;
-      syncViewport(true);
+      const overscan = pendingOverscan;
+      pendingOverscan = 2;
+      syncedScrollTop = container.scrollTop;
+      syncViewport(true, false, overscan);
     });
   };
   const stopVirtualizer = () => {
@@ -16960,6 +17451,8 @@ function renderToDom(doc, layout, container, options = {}, prev) {
     window.removeEventListener("resize", scheduleViewport);
     if (frame) cancelAnimationFrame(frame);
     frame = 0;
+    if (settleTimer !== void 0) clearTimeout(settleTimer);
+    settleTimer = void 0;
   };
   handle = {
     root,
@@ -17683,6 +18176,11 @@ function renderItem(doc, item, urls) {
       hit.dataset.dxwDrawing = "1";
       if (item.ink) hit.dataset.dxwInk = "1";
       if (item.smartArt) hit.dataset.dxwSmartArt = "1";
+      if (item.height < 12) {
+        const target = document.createElement("div");
+        target.style.cssText = `position:absolute;left:0;top:${-(12 - item.height) / 2}px;width:100%;height:12px;cursor:move;`;
+        hit.appendChild(target);
+      }
       return hit;
     }
     case "edge": {
@@ -18142,6 +18640,10 @@ function renderText(item) {
     el16.style.alignItems = "flex-end";
     el16.style.whiteSpace = "pre";
     el16.style.font = cssFont(item.font);
+    if (item.font.paintDY) {
+      const transform = el16.style.transform;
+      el16.style.transform = `${transform ? `${transform} ` : ""}translateY(${item.font.paintDY}px)`;
+    }
   }
   if (item.rtl) {
     el16.style.direction = "rtl";
@@ -18205,7 +18707,8 @@ function renderEdge(x1, y1, x2, y2, border, rotate) {
   }
   const horizontal = Math.abs(y2 - y1) < 0.01;
   const dpr = typeof window !== "undefined" ? window.devicePixelRatio || 1 : 1;
-  const w = Math.max(1 / dpr, Math.round(border.width * dpr) / dpr);
+  const declaredWidth = border.rawWidth !== void 0 && border.rawWidth < 0.25 ? border.rawWidth : border.width;
+  const w = Math.max(1 / dpr, Math.round(declaredWidth * dpr) / dpr);
   const snap = (v) => Math.round(v * dpr) / dpr;
   const place = border.space === 0 ? snap : (v) => v;
   const dashPattern = border.style === "dashed" || border.style === "dotDash" || border.style === "dotDotDash" ? [3, 1] : border.style === "dotted" ? [1, 1] : null;
@@ -18475,6 +18978,10 @@ function mergeParagraphBackward(doc, pEl) {
   if (idx <= 0) return false;
   const prev = parent.children[idx - 1];
   if (localName(prev.name) !== "p") return false;
+  const finishMerge = (survivor) => {
+    if (!doc.reparseDirectBodyParagraphMerge(prev, pEl, survivor)) doc.refresh();
+    return true;
+  };
   const visible = [];
   const collect = (el16) => {
     for (const c of el16.children) {
@@ -18492,6 +18999,7 @@ function mergeParagraphBackward(doc, pEl) {
     if (type === "page" || type === "column") {
       if (visible.length === 1) {
         parent.children.splice(idx - 1, 1);
+        return finishMerge(pEl);
       } else {
         last.parent.children.splice(last.parent.children.indexOf(last.el), 1);
       }
@@ -18501,14 +19009,12 @@ function mergeParagraphBackward(doc, pEl) {
   }
   if (visible.length === 0) {
     parent.children.splice(idx - 1, 1);
-    doc.refresh();
-    return true;
+    return finishMerge(pEl);
   }
   const moved = pEl.children.filter((c) => localName(c.name) !== "pPr");
   prev.children.push(...moved);
   parent.children.splice(idx, 1);
-  doc.refresh();
-  return true;
+  return finishMerge(prev);
 }
 function firstTextOf(pEl) {
   const walk2 = (el16) => {
@@ -20423,23 +20929,44 @@ function insertShapeAt(doc, caretT, preset, text = "") {
   if (!caretRun || !parent || localName(caretRun.name) !== "r") return null;
   const w = prefixOf8(caretRun);
   const id = String(doc.nextDrawingId());
-  const width = preset === "textBox" ? 240 : 192;
-  const height = preset === "textBox" ? 72 : 96;
+  const isLine = preset === "line";
+  const width = isLine ? 240 : preset === "textBox" ? 240 : 192;
+  const height = isLine ? 2 : preset === "textBox" ? 72 : 96;
   const cx = String(Math.round(width * EMU_PER_PX4));
   const cy = String(Math.round(height * EMU_PER_PX4));
   const geometry = preset === "roundedRectangle" ? "roundRect" : preset === "rectangle" || preset === "textBox" ? "rect" : preset;
   const isTextBox = preset === "textBox";
-  const shapeName = isTextBox ? `Text Box ${id}` : `Shape ${id}`;
+  const shapeName = isLine ? `Line ${id}` : isTextBox ? `Text Box ${id}` : `Shape ${id}`;
   const spPr = [
-    el6("a:xfrm", {}, [el6("a:off", { x: "0", y: "0" }), el6("a:ext", { cx, cy })]),
+    el6("a:xfrm", {}, [
+      el6("a:off", { x: "0", y: "0" }),
+      el6("a:ext", { cx, cy })
+    ]),
     el6("a:prstGeom", { prst: geometry }, [el6("a:avLst")]),
-    isTextBox ? el6("a:noFill") : el6("a:solidFill", {}, [el6("a:srgbClr", { val: "4472C4" })]),
-    el6("a:ln", { w: "12700" }, [el6("a:solidFill", {}, [el6("a:srgbClr", { val: isTextBox ? "404040" : "2F5597" })])])
+    isTextBox || isLine ? el6("a:noFill") : el6("a:solidFill", {}, [el6("a:srgbClr", { val: "4472C4" })]),
+    el6("a:ln", { w: "12700" }, [el6("a:solidFill", {}, [el6("a:srgbClr", { val: isTextBox || isLine ? "404040" : "2F5597" })])])
   ];
   const textRun = el6(`${w}r`, {}, [
     el6(`${w}rPr`, {}, [el6(`${w}color`, { [`${w}val`]: isTextBox ? "202124" : "FFFFFF" }), el6(`${w}sz`, { [`${w}val`]: "22" })]),
     el6(`${w}t`, { "xml:space": "preserve" }, [], text)
   ]);
+  const shapeChildren = isLine ? [
+    el6("wps:cNvCnPr", {}, [el6("a:cxnSpLocks", { noChangeShapeType: "1" })]),
+    el6("wps:spPr", { bwMode: "auto" }, spPr),
+    el6("wps:bodyPr")
+  ] : [
+    el6("wps:cNvSpPr", isTextBox ? { txBox: "1" } : {}),
+    el6("wps:spPr", {}, spPr),
+    el6("wps:txbx", {}, [
+      el6(`${w}txbxContent`, {}, [
+        el6(`${w}p`, {}, [
+          el6(`${w}pPr`, {}, [el6(`${w}jc`, { [`${w}val`]: isTextBox ? "left" : "center" })]),
+          textRun
+        ])
+      ])
+    ]),
+    el6("wps:bodyPr", { rot: "0", anchor: isTextBox ? "t" : "ctr" }, [el6("a:noAutofit")])
+  ];
   const drawing = el6(`${w}drawing`, {}, [
     el6("wp:anchor", {
       "xmlns:wp": NS_WP3,
@@ -20459,24 +20986,12 @@ function insertShapeAt(doc, caretT, preset, text = "") {
       el6("wp:positionV", { relativeFrom: "paragraph" }, [el6("wp:posOffset", {}, [], "0")]),
       el6("wp:extent", { cx, cy }),
       el6("wp:effectExtent", { l: "0", t: "0", r: "0", b: "0" }),
-      el6("wp:wrapSquare", { wrapText: "bothSides" }),
+      isLine ? el6("wp:wrapNone") : el6("wp:wrapSquare", { wrapText: "bothSides" }),
       el6("wp:docPr", { id, name: shapeName }),
       el6("wp:cNvGraphicFramePr"),
       el6("a:graphic", { "xmlns:a": NS_A3 }, [
         el6("a:graphicData", { uri: NS_WPS }, [
-          el6("wps:wsp", { "xmlns:wps": NS_WPS }, [
-            el6("wps:cNvSpPr", { txBox: "1" }),
-            el6("wps:spPr", {}, spPr),
-            el6("wps:txbx", {}, [
-              el6(`${w}txbxContent`, {}, [
-                el6(`${w}p`, {}, [
-                  el6(`${w}pPr`, {}, [el6(`${w}jc`, { [`${w}val`]: isTextBox ? "left" : "center" })]),
-                  textRun
-                ])
-              ])
-            ]),
-            el6("wps:bodyPr", { rot: "0", anchor: isTextBox ? "t" : "ctr" }, [el6("a:noAutofit")])
-          ])
+          el6("wps:wsp", { "xmlns:wps": NS_WPS }, shapeChildren)
         ])
       ])
     ])
@@ -20538,7 +21053,26 @@ function setDrawingWordArtText(doc, drawing, text) {
   doc.refresh();
   return true;
 }
-function insertInkAt(doc, caretT, points, color = "#202124", widthPx = 2, opacity = 1) {
+function drawingLineStyle(drawing) {
+  const line2 = descendant3(drawing, "ln");
+  if (!line2) return null;
+  const color = descendant3(line2, "srgbClr")?.attrs.val ?? "000000";
+  const width = Math.max((parseInt(line2.attrs.w ?? "0", 10) || 0) / EMU_PER_PX4, 0.75);
+  return { color: `#${color.toUpperCase()}`, width };
+}
+function setDrawingLineStyle(doc, drawing, color, widthPx) {
+  const line2 = descendant3(drawing, "ln");
+  if (!line2) return false;
+  line2.attrs.w = String(Math.max(1, Math.round(widthPx * EMU_PER_PX4)));
+  line2.children = line2.children.filter((child4) => {
+    const name = localName(child4.name);
+    return name !== "solidFill" && name !== "noFill";
+  });
+  line2.children.unshift(el6("a:solidFill", {}, [el6("a:srgbClr", { val: color.replace(/^#/, "").toUpperCase() })]));
+  doc.refresh();
+  return true;
+}
+function insertInkAt(doc, caretT, points, color = "#202124", widthPx = 2, opacity = 1, refreshModel = true) {
   if (points.length < 2) return null;
   const caretRun = doc.findParentOf(caretT);
   const parent = caretRun && doc.findParentOf(caretRun);
@@ -20615,7 +21149,7 @@ function insertInkAt(doc, caretT, points, color = "#202124", widthPx = 2, opacit
     ])
   ]);
   parent.children.splice(parent.children.indexOf(caretRun) + 1, 0, el6(`${w}r`, {}, [drawing]));
-  doc.refresh();
+  if (refreshModel) doc.refresh();
   return drawing;
 }
 
@@ -20946,6 +21480,111 @@ function deleteWatermark(doc, shapeEl) {
   return true;
 }
 
+// ../core/src/edit/dialog.ts
+var dialogSequence = 0;
+function requestTextInputDialog(anchor, options) {
+  const doc = anchor.ownerDocument;
+  const win = doc.defaultView;
+  return new Promise((resolve) => {
+    const id = `dxw-input-dialog-${++dialogSequence}`;
+    const previousFocus = doc.activeElement instanceof HTMLElement ? doc.activeElement : null;
+    const backdrop = doc.createElement("div");
+    backdrop.className = "dxw-input-dialog-backdrop";
+    backdrop.dataset.dxwInputDialog = "";
+    backdrop.style.cssText = "position:fixed;inset:0;z-index:var(--dxw-dialog-z-index,1000);display:grid;place-items:center;padding:16px;box-sizing:border-box;background:var(--dxw-dialog-backdrop,rgba(32,33,36,.38));";
+    if (win) {
+      const computed = win.getComputedStyle(anchor);
+      for (const property of [
+        "--dxw-toolbar-fg",
+        "--dxw-toolbar-border",
+        "--dxw-toolbar-muted",
+        "--dxw-accent",
+        "--dxw-accent-fg",
+        "--dxw-popover-bg",
+        "--dxw-popover-shadow",
+        "--dxw-dialog-backdrop",
+        "--dxw-dialog-z-index",
+        "--dxw-dialog-width",
+        "--dxw-dialog-radius",
+        "--dxw-dialog-field-bg"
+      ]) {
+        const value = computed.getPropertyValue(property);
+        if (value) backdrop.style.setProperty(property, value);
+      }
+    }
+    const form = doc.createElement("form");
+    form.className = "dxw-input-dialog";
+    form.setAttribute("role", "dialog");
+    form.setAttribute("aria-modal", "true");
+    form.setAttribute("aria-labelledby", id);
+    form.style.cssText = "width:min(var(--dxw-dialog-width,420px),calc(100vw - 32px));box-sizing:border-box;display:grid;gap:10px;padding:16px;border:1px solid var(--dxw-toolbar-border,#dadce0);border-radius:var(--dxw-dialog-radius,10px);color:var(--dxw-toolbar-fg,#3c4043);background:var(--dxw-popover-bg,#fff);box-shadow:var(--dxw-popover-shadow,0 8px 28px rgba(0,0,0,.24));font:13px system-ui,sans-serif;";
+    const title = doc.createElement("strong");
+    title.id = id;
+    title.className = "dxw-input-dialog-title";
+    title.textContent = options.title;
+    title.style.cssText = "font-size:15px;line-height:1.35;";
+    form.appendChild(title);
+    const label = doc.createElement("label");
+    label.className = "dxw-input-dialog-label";
+    label.textContent = options.label ?? options.title;
+    label.style.cssText = "display:grid;gap:5px;color:var(--dxw-toolbar-muted,#5f6368);font-size:12px;";
+    const field = options.multiline ? doc.createElement("textarea") : doc.createElement("input");
+    field.className = "dxw-input-dialog-field";
+    field.value = options.value ?? "";
+    field.placeholder = options.placeholder ?? "";
+    field.setAttribute("aria-label", options.label ?? options.title);
+    if (field instanceof HTMLTextAreaElement) field.rows = 4;
+    field.style.cssText = "width:100%;min-height:34px;box-sizing:border-box;padding:7px 9px;border:1px solid var(--dxw-toolbar-border,#dadce0);border-radius:6px;outline:none;color:var(--dxw-toolbar-fg,#3c4043);background:var(--dxw-dialog-field-bg,var(--dxw-popover-bg,#fff));font:13px system-ui,sans-serif;resize:vertical;";
+    label.appendChild(field);
+    form.appendChild(label);
+    const actions = doc.createElement("div");
+    actions.className = "dxw-input-dialog-actions";
+    actions.style.cssText = "display:flex;justify-content:flex-end;gap:7px;";
+    const cancel = doc.createElement("button");
+    cancel.type = "button";
+    cancel.className = "dxw-input-dialog-cancel";
+    cancel.textContent = "Cancel";
+    cancel.style.cssText = "min-height:32px;padding:0 12px;border:1px solid var(--dxw-toolbar-border,#dadce0);border-radius:7px;color:var(--dxw-toolbar-fg,#3c4043);background:var(--dxw-popover-bg,#fff);cursor:pointer;font:600 12px system-ui,sans-serif;";
+    const submit = doc.createElement("button");
+    submit.type = "submit";
+    submit.className = "dxw-input-dialog-submit";
+    submit.textContent = options.submitLabel ?? "Apply";
+    submit.style.cssText = "min-height:32px;padding:0 14px;border:1px solid transparent;border-radius:7px;color:var(--dxw-accent-fg,#fff);background:var(--dxw-accent,#1a73e8);cursor:pointer;font:600 12px system-ui,sans-serif;";
+    actions.append(cancel, submit);
+    form.appendChild(actions);
+    backdrop.appendChild(form);
+    doc.body.appendChild(backdrop);
+    let finished = false;
+    const finish = (value) => {
+      if (finished) return;
+      finished = true;
+      doc.removeEventListener("keydown", onKeyDown, true);
+      backdrop.remove();
+      previousFocus?.focus({ preventScroll: true });
+      resolve(value);
+    };
+    const onKeyDown = (event) => {
+      if (event.key === "Escape") {
+        event.preventDefault();
+        finish(null);
+      }
+    };
+    doc.addEventListener("keydown", onKeyDown, true);
+    backdrop.addEventListener("mousedown", (event) => {
+      if (event.target === backdrop) finish(null);
+    });
+    cancel.addEventListener("click", () => finish(null));
+    form.addEventListener("submit", (event) => {
+      event.preventDefault();
+      finish(field.value);
+    });
+    requestAnimationFrame(() => {
+      field.focus({ preventScroll: true });
+      field.select();
+    });
+  });
+}
+
 // ../core/src/edit/grapheme.ts
 var segmenter = null;
 var segmenterTried = false;
@@ -21651,10 +22290,15 @@ var _DocxEditor = class _DocxEditor {
     this.selection = null;
     this.selectionRects = [];
     this.selectedAll = false;
-    /** A click-and-type placement below a float has already recorded the undo
+    /** Header/footer membership for hit-testing and caret movement. Rebuilt only
+     * when refresh() replaces the parsed model; header/footer trees are tiny. */
+    this.regionModelVersion = -1;
+    this.headerFooterElements = /* @__PURE__ */ new WeakSet();
+    /** A click-and-type placement in body whitespace has already recorded the undo
      * snapshot that the following text insertion belongs to. */
     this.pendingClickTypeCheckpoint = false;
     this.clickTypeCheckpointUntil = 0;
+    this.textContextMenu = null;
     /** True while a drag-selection is in progress (checked by onMouseUp, which
      * bubbles from the container BEFORE the document-level drag-end listener). */
     this.dragSelecting = false;
@@ -22009,7 +22653,7 @@ var _DocxEditor = class _DocxEditor {
         this.hfPage = null;
       }
       if (caret && region === "body" && !onGlyph && e.detail === 1 && !e.shiftKey) {
-        caret = this.extendCaretBelowFloatingTable(caret, e.clientX, e.clientY) ?? caret;
+        caret = this.extendCaretBelowFloatingTable(caret, e.clientX, e.clientY) ?? this.extendCaretIntoBodyWhitespace(caret, e.clientX, e.clientY) ?? caret;
       }
       if (caret && e.shiftKey) {
         const anchor = this.anchorPoint();
@@ -22044,6 +22688,102 @@ var _DocxEditor = class _DocxEditor {
     };
     /** Which part tree the element lives in: document body or header/footer. */
     this.mathEditorEl = null;
+    this.dismissTextContextMenu = () => {
+      this.textContextMenu?.remove();
+      this.textContextMenu = null;
+      document.removeEventListener("mousedown", this.onContextMenuDocumentMouseDown);
+    };
+    this.onContextMenuDocumentMouseDown = (event) => {
+      if (!this.textContextMenu?.contains(event.target)) this.dismissTextContextMenu();
+    };
+    this.onContextMenu = (event) => {
+      const target = event.target;
+      if (!target?.closest('[data-dxw-item-kind="text"]')) return;
+      const caret = this.caretFromPoint(event.clientX, event.clientY);
+      if (!caret || this.regionOf(caret.t) === "hf" !== this.inHeaderFooter) return;
+      event.preventDefault();
+      event.stopPropagation();
+      this.dismissTextContextMenu();
+      if (!this.hasSelection()) {
+        this.caret = caret;
+        this.selectWordAt(caret);
+      }
+      const menu = document.createElement("div");
+      menu.dataset.dxwTextContextMenu = "1";
+      menu.setAttribute("role", "menu");
+      menu.style.cssText = `position:fixed;left:${event.clientX}px;top:${event.clientY}px;z-index:2147483647;min-width:210px;padding:5px;background:#fff;border:1px solid #dadce0;border-radius:8px;box-shadow:0 4px 18px rgba(0,0,0,.2);font:13px system-ui,sans-serif;color:#202124;`;
+      const isApplePlatform = /Mac|iPhone|iPad/.test(navigator.platform);
+      const mod = isApplePlatform ? "\u2318" : "Ctrl+";
+      const item = (label, shortcut, disabled, action) => {
+        const button = document.createElement("button");
+        button.type = "button";
+        button.disabled = disabled;
+        button.setAttribute("role", "menuitem");
+        button.style.cssText = `display:flex;width:100%;align-items:center;justify-content:space-between;gap:24px;border:0;border-radius:5px;padding:7px 9px;background:transparent;color:${disabled ? "#9aa0a6" : "#202124"};cursor:${disabled ? "default" : "pointer"};`;
+        const name = document.createElement("span");
+        name.textContent = label;
+        const keys = document.createElement("span");
+        keys.textContent = shortcut;
+        keys.style.color = "#5f6368";
+        keys.style.fontSize = "11px";
+        button.append(name, keys);
+        button.addEventListener("mouseenter", () => {
+          if (!button.disabled) button.style.background = "#f1f3f4";
+        });
+        button.addEventListener("mouseleave", () => {
+          button.style.background = "transparent";
+        });
+        button.addEventListener("click", () => {
+          if (button.disabled) return;
+          this.dismissTextContextMenu();
+          action();
+        });
+        menu.appendChild(button);
+      };
+      const separator = () => {
+        const line2 = document.createElement("div");
+        line2.style.cssText = "height:1px;background:#e8eaed;margin:4px 2px;";
+        menu.appendChild(line2);
+      };
+      const selectedText = selectionTextLogical(this.host.doc, this.getSelectionSegments());
+      const clipboard = navigator.clipboard;
+      const copy = () => clipboard.writeText(selectedText);
+      item("Copy", `${mod}C`, !selectedText || !clipboard?.writeText, () => void copy());
+      item("Cut", `${mod}X`, !selectedText || !clipboard?.writeText, () => {
+        void copy().then(() => {
+          this.host.history?.checkpoint();
+          this.removeSelectedText();
+          this.commit();
+        });
+      });
+      item("Paste", `${mod}V`, !clipboard?.readText, () => {
+        void clipboard.readText().then((text) => {
+          if (text) this.insertText(text);
+        });
+      });
+      separator();
+      item("Bold", `${mod}B`, !selectedText, () => this.host.onFormatShortcut?.("bold"));
+      item("Italic", `${mod}I`, !selectedText, () => this.host.onFormatShortcut?.("italic"));
+      item("Underline", `${mod}U`, !selectedText, () => this.host.onFormatShortcut?.("underline"));
+      separator();
+      item("Link\u2026", `${mod}K`, !selectedText, () => this.host.onTextCommand?.("link"));
+      item("New comment\u2026", isApplePlatform ? "\u2318\u2325A" : "Ctrl+Alt+M", !selectedText, () => this.host.onTextCommand?.("comment"));
+      item("Bulleted list", `${mod}Shift+L`, false, () => this.host.onTextCommand?.("bullet"));
+      item("Numbered list", `${mod}Shift+7`, false, () => this.host.onTextCommand?.("number"));
+      separator();
+      item("Align left", `${mod}L`, false, () => this.host.onTextCommand?.("alignLeft"));
+      item("Center", `${mod}E`, false, () => this.host.onTextCommand?.("alignCenter"));
+      item("Align right", `${mod}R`, false, () => this.host.onTextCommand?.("alignRight"));
+      item("Justify", `${mod}J`, false, () => this.host.onTextCommand?.("justify"));
+      separator();
+      item("Select all", `${mod}A`, false, () => this.selectAll());
+      document.body.appendChild(menu);
+      const rect = menu.getBoundingClientRect();
+      menu.style.left = `${Math.max(6, Math.min(event.clientX, window.innerWidth - rect.width - 6))}px`;
+      menu.style.top = `${Math.max(6, Math.min(event.clientY, window.innerHeight - rect.height - 6))}px`;
+      this.textContextMenu = menu;
+      setTimeout(() => document.addEventListener("mousedown", this.onContextMenuDocumentMouseDown), 0);
+    };
     // ---------- keyboard ----------
     this.onKeyDown = (e) => {
       if (this.composing || e.isComposing || e.keyCode === 229) return;
@@ -22051,6 +22791,11 @@ var _DocxEditor = class _DocxEditor {
         this.pendingClickTypeCheckpoint = false;
         this.clickTypeCheckpointUntil = 0;
       }
+      if (this.textContextMenu) {
+        if (e.key === "Escape") e.preventDefault();
+        this.dismissTextContextMenu();
+        if (e.key === "Escape") return;
+      }
       if (e.key === "Escape" && this.drawingTool) {
         e.preventDefault();
         this.setDrawingTool(null);
@@ -22165,6 +22910,12 @@ var _DocxEditor = class _DocxEditor {
         }
       }
       const meta = e.metaKey || e.ctrlKey;
+      const isApplePlatform = /Mac|iPhone|iPad/.test(navigator.platform);
+      if (isApplePlatform ? e.metaKey && e.altKey && e.key.toLowerCase() === "a" : e.ctrlKey && e.altKey && e.key.toLowerCase() === "m") {
+        e.preventDefault();
+        if (this.hasSelection()) this.host.onTextCommand?.("comment");
+        return;
+      }
       if (meta && e.altKey && /^[0-6]$/.test(e.key)) {
         e.preventDefault();
         this.host.onStyleShortcut?.(e.key === "0" ? null : `Heading${e.key}`);
@@ -22184,14 +22935,36 @@ var _DocxEditor = class _DocxEditor {
           }
           return;
         }
-        if (e.key.startsWith("Arrow")) {
+        if (!e.shiftKey && k === "k") {
           e.preventDefault();
-          const extend = e.shiftKey;
-          if (e.key === "ArrowLeft" || e.key === "ArrowRight") {
-            this.moveFocus((pt) => this.lineEdgePoint(pt, e.key === "ArrowLeft" ? "start" : "end"), extend);
-          } else {
-            this.moveFocus((pt) => this.paragraphPoint(pt, e.key === "ArrowUp" ? -1 : 1), extend);
-          }
+          if (this.hasSelection()) this.host.onTextCommand?.("link");
+          return;
+        }
+        if (e.shiftKey && (k === "l" || k === "8")) {
+          e.preventDefault();
+          this.host.onTextCommand?.("bullet");
+          return;
+        }
+        if (e.shiftKey && k === "7") {
+          e.preventDefault();
+          this.host.onTextCommand?.("number");
+          return;
+        }
+        if (!e.shiftKey && (k === "l" || k === "e" || k === "r" || k === "j")) {
+          e.preventDefault();
+          this.host.onTextCommand?.(
+            k === "l" ? "alignLeft" : k === "e" ? "alignCenter" : k === "r" ? "alignRight" : "justify"
+          );
+          return;
+        }
+        if (e.key.startsWith("Arrow")) {
+          e.preventDefault();
+          const extend = e.shiftKey;
+          if (e.key === "ArrowLeft" || e.key === "ArrowRight") {
+            this.moveFocus((pt) => this.lineEdgePoint(pt, e.key === "ArrowLeft" ? "start" : "end"), extend);
+          } else {
+            this.moveFocus((pt) => this.paragraphPoint(pt, e.key === "ArrowUp" ? -1 : 1), extend);
+          }
           this.revealCaret();
           return;
         }
@@ -22270,6 +23043,7 @@ var _DocxEditor = class _DocxEditor {
   /** Focus the hidden text target (keeps IME working); falls back to the
    * container if the textarea is not attached yet. */
   focusText() {
+    if (!this.imeEl.isConnected) this.host.container.appendChild(this.imeEl);
     if (this.imeEl.isConnected) this.imeEl.focus({ preventScroll: true });
     else this.host.container.focus({ preventScroll: true });
   }
@@ -22278,6 +23052,14 @@ var _DocxEditor = class _DocxEditor {
     this.applyHfChrome();
     this.paintSelection();
     this.positionCaret();
+    if (this.caret || this.selection) this.focusText();
+  }
+  /** Repaint only state affected by virtualized page mounts. Scrolling keeps
+   * the current focus and skips header/footer mode notifications in body mode. */
+  afterViewportChange() {
+    if (this.inHeaderFooter) this.applyHfChrome();
+    if (this.selection) this.paintSelection();
+    if (this.caret) this.positionCaret();
   }
   // ---------- owned selection ----------
   hasSelection() {
@@ -22810,6 +23592,7 @@ var _DocxEditor = class _DocxEditor {
     c.addEventListener("copy", this.onCopy);
     c.addEventListener("cut", this.onCut);
     c.addEventListener("paste", this.onPaste);
+    c.addEventListener("contextmenu", this.onContextMenu);
     c.addEventListener("dragover", this.onDragOver);
     c.addEventListener("drop", this.onDrop);
     this.applyHfChrome();
@@ -22829,8 +23612,10 @@ var _DocxEditor = class _DocxEditor {
     c.removeEventListener("copy", this.onCopy);
     c.removeEventListener("cut", this.onCut);
     c.removeEventListener("paste", this.onPaste);
+    c.removeEventListener("contextmenu", this.onContextMenu);
     c.removeEventListener("dragover", this.onDragOver);
     c.removeEventListener("drop", this.onDrop);
+    this.dismissTextContextMenu();
     this.dismissSuggestionPopover();
     this.setDrawingTool(null);
     this.deselectInkGroup();
@@ -23034,6 +23819,12 @@ var _DocxEditor = class _DocxEditor {
     const page = target.closest?.(".dxw-page");
     const surface = page?.firstElementChild;
     if (!page || !surface || !surface.contains(target)) return false;
+    const zoom = this.host.zoom ?? 1;
+    const rect = surface.getBoundingClientRect();
+    const localY = (e.clientY - rect.top) / zoom;
+    const bodyTop = parseFloat(page.dataset.bodyTop ?? "0");
+    const bodyBottom = parseFloat(page.dataset.bodyBottom ?? "0");
+    if (localY < bodyTop || localY > bodyBottom) return false;
     this.deselectInkGroup();
     if (tool.kind === "eraser") return this.startInkEraser(e, page, tool.size);
     if (tool.kind === "lasso") return this.startInkLasso(e, page, surface);
@@ -23043,8 +23834,6 @@ var _DocxEditor = class _DocxEditor {
     this.deselectImage();
     this.deselectWordArt();
     this.hideCaret();
-    const zoom = this.host.zoom ?? 1;
-    const rect = surface.getBoundingClientRect();
     const pointAt = (clientX, clientY) => ({
       x: Math.max(0, Math.min((clientX - rect.left) / zoom, rect.width / zoom)),
       y: Math.max(0, Math.min((clientY - rect.top) / zoom, rect.height / zoom))
@@ -23081,9 +23870,18 @@ var _DocxEditor = class _DocxEditor {
       if (points.length < 2) return;
       const anchor = this.nearestCaret(e.clientX, e.clientY, "body") ?? this.nearestCaret(up.clientX, up.clientY, "body");
       if (!anchor) return;
+      const paragraph = paragraphOf(this.host.doc, anchor.t);
+      const dirtyBlock = topLevelBlockOf(this.host.doc, anchor.t) ?? paragraph ?? void 0;
       this.host.history?.checkpoint();
-      if (insertInkAt(this.host.doc, anchor.t, points, tool.color, tool.width, tool.kind === "highlighter" ? 0.45 : 1)) {
-        this.host.rerender(void 0, "global");
+      if (insertInkAt(this.host.doc, anchor.t, points, tool.color, tool.width, tool.kind === "highlighter" ? 0.45 : 1, false)) {
+        const reparsed = paragraph ? this.host.doc.reparseBodyParagraph(paragraph) : null;
+        if (reparsed) {
+          invalidateParagraphSignature(paragraph);
+          this.host.rerender(dirtyBlock, "local", anchor.t);
+        } else {
+          this.host.doc.refresh();
+          this.host.rerender(void 0, "global");
+        }
       }
     };
     document.addEventListener("mousemove", onMove);
@@ -23687,23 +24485,73 @@ var _DocxEditor = class _DocxEditor {
     };
     extra("Alt", "Alternative text", () => {
       const cur = imageAltText(src);
-      const next = window.prompt("Alternative text", cur);
-      if (next === null) return;
-      this.host.history?.checkpoint();
-      if (setImageAltText(this.host.doc, src, next)) this.host.rerender();
-      this.deselectImage();
+      void requestTextInputDialog(this.host.container, {
+        title: "Alternative text",
+        label: "Describe this object for screen readers",
+        value: cur
+      }).then((next) => {
+        if (next === null) return;
+        this.host.history?.checkpoint();
+        if (setImageAltText(this.host.doc, src, next)) this.host.rerender();
+        this.deselectImage();
+      });
     });
     extra("Size", "Exact size (px)", () => {
       const curW = parseFloat(el16.style.width) || 0;
       const curH = parseFloat(el16.style.height) || 0;
       const cur = `${Math.round(curW)}x${Math.round(curH)}`;
-      const next = window.prompt("Size in px (width x height)", cur);
-      const m = next && /^\s*(\d+)\s*[x×]\s*(\d+)\s*$/i.exec(next);
-      if (!m) return;
-      this.host.history?.checkpoint();
-      if (resizeDrawing(this.host.doc, src, parseInt(m[1], 10), parseInt(m[2], 10))) this.host.rerender();
-      this.deselectImage();
+      void requestTextInputDialog(this.host.container, {
+        title: "Exact size",
+        label: "Width \xD7 height in pixels",
+        value: cur,
+        placeholder: "640 \xD7 360"
+      }).then((next) => {
+        const match = next && /^\s*(\d+)\s*[x×]\s*(\d+)\s*$/i.exec(next);
+        if (!match) return;
+        this.host.history?.checkpoint();
+        if (resizeDrawing(this.host.doc, src, parseInt(match[1], 10), parseInt(match[2], 10))) this.host.rerender();
+        this.deselectImage();
+      });
+    });
+    extra("Position", "Exact page position (px)", () => {
+      const curX = parseFloat(el16.style.left) || 0;
+      const curY = parseFloat(el16.style.top) || 0;
+      void requestTextInputDialog(this.host.container, {
+        title: "Page position",
+        label: "X, Y in pixels",
+        value: `${Math.round(curX)}, ${Math.round(curY)}`,
+        placeholder: "120, 80"
+      }).then((next) => {
+        const match = next && /^\s*(-?\d+(?:\.\d+)?)\s*,\s*(-?\d+(?:\.\d+)?)\s*$/.exec(next);
+        if (!match) return;
+        this.host.history?.checkpoint();
+        if (!isFloatingDrawing(src)) setImageWrap(this.host.doc, src, "square", { x: 0, y: 0 });
+        if (setFloatingPagePosition(this.host.doc, src, parseFloat(match[1]), parseFloat(match[2]))) {
+          this.host.rerender();
+          this.reselectImage(src);
+        }
+      });
     });
+    if (kind === "drawing") {
+      extra("Outline", "Outline color and weight", () => {
+        const style = drawingLineStyle(src);
+        if (!style) return;
+        void requestTextInputDialog(this.host.container, {
+          title: "Outline",
+          label: "Color and width in pixels",
+          value: `${style.color}, ${Number(style.width.toFixed(2))}`,
+          placeholder: "#1a73e8, 1.5"
+        }).then((next) => {
+          const match = next && /^\s*#?([0-9a-f]{6})\s*,\s*(\d+(?:\.\d+)?)\s*$/i.exec(next);
+          if (!match) return;
+          this.host.history?.checkpoint();
+          if (setDrawingLineStyle(this.host.doc, src, `#${match[1]}`, parseFloat(match[2]))) {
+            this.host.rerender();
+            this.reselectImage(src);
+          }
+        });
+      });
+    }
     if (kind === "drawing" && isDrawingWordArt(src)) {
       extra("Edit text", "Edit WordArt text", () => this.editDrawingWordArt(src));
     }
@@ -23857,13 +24705,17 @@ var _DocxEditor = class _DocxEditor {
     };
     button("Edit text", "Edit watermark text", () => {
       const cur = wordArtText(src);
-      const next = window.prompt("Watermark text", cur);
-      if (next === null || next === cur) return;
-      this.host.history?.checkpoint();
-      if (setWordArtText(this.host.doc, src, next)) {
-        this.host.rerender();
-        this.reselectWordArt(src);
-      }
+      void requestTextInputDialog(this.host.container, {
+        title: "Watermark text",
+        value: cur
+      }).then((next) => {
+        if (next === null || next === cur) return;
+        this.host.history?.checkpoint();
+        if (setWordArtText(this.host.doc, src, next)) {
+          this.host.rerender();
+          this.reselectWordArt(src);
+        }
+      });
     });
     const sep1 = document.createElement("span");
     sep1.style.cssText = "width:1px;background:#dadce0;margin:2px 2px;";
@@ -23875,15 +24727,20 @@ var _DocxEditor = class _DocxEditor {
     bar.appendChild(sep2);
     button("Rotate", "Set rotation (degrees)", () => {
       const cur = wordArtRotation(src);
-      const next = window.prompt("Rotation (degrees clockwise)", String(cur));
-      if (next === null) return;
-      const deg = parseFloat(next);
-      if (!Number.isFinite(deg)) return;
-      this.host.history?.checkpoint();
-      if (setWordArtRotation(this.host.doc, src, deg)) {
-        this.host.rerender();
-        this.reselectWordArt(src);
-      }
+      void requestTextInputDialog(this.host.container, {
+        title: "Watermark rotation",
+        label: "Degrees clockwise",
+        value: String(cur)
+      }).then((next) => {
+        if (next === null) return;
+        const degrees = parseFloat(next);
+        if (!Number.isFinite(degrees)) return;
+        this.host.history?.checkpoint();
+        if (setWordArtRotation(this.host.doc, src, degrees)) {
+          this.host.rerender();
+          this.reselectWordArt(src);
+        }
+      });
     });
     const sep3 = document.createElement("span");
     sep3.style.cssText = "width:1px;background:#dadce0;margin:2px 2px;";
@@ -24518,14 +25375,19 @@ var _DocxEditor = class _DocxEditor {
     return caretAt(t, 0);
   }
   regionOf(t) {
-    let cur = t;
-    let root;
-    while (cur) {
-      root = cur;
-      cur = this.host.doc.findParentOf(cur);
+    if (this.regionModelVersion !== this.host.doc.modelVersion) {
+      this.headerFooterElements = /* @__PURE__ */ new WeakSet();
+      const visit = (element) => {
+        this.headerFooterElements.add(element);
+        for (const child4 of element.children) visit(child4);
+      };
+      for (const root of this.host.doc.revisionRoots()) {
+        const name = localName(root.name);
+        if (name === "hdr" || name === "ftr") visit(root);
+      }
+      this.regionModelVersion = this.host.doc.modelVersion;
     }
-    const ln = root ? localName(root.name) : "";
-    return ln === "hdr" || ln === "ftr" ? "hf" : "body";
+    return this.headerFooterElements.has(t) ? "hf" : "body";
   }
   /**
    * Snap to the closest character boundary on the clicked line — makes
@@ -24689,6 +25551,103 @@ var _DocxEditor = class _DocxEditor {
     this.host.rerender(void 0, "global");
     return caret;
   }
+  /** Word-style click-and-type: clicking below the final body line on a page
+   * creates the intervening empty paragraphs so vertical arrows visit every
+   * visible line instead of jumping across synthetic paragraph spacing. */
+  extendCaretIntoBodyWhitespace(caret, x, y) {
+    const handle = this.host.getHandle();
+    const page = document.elementFromPoint(x, y)?.closest(".dxw-page");
+    const surface = page?.firstElementChild;
+    if (!handle || !page || !surface) return null;
+    const rect = surface.getBoundingClientRect();
+    const zoom = this.host.zoom ?? 1;
+    const ly = (y - rect.top) / zoom;
+    const bodyTop = parseFloat(page.dataset.bodyTop ?? "0");
+    const bodyBottom = parseFloat(page.dataset.bodyBottom ?? "0");
+    if (ly < bodyTop || ly > bodyBottom) return null;
+    const paragraph = paragraphOf(this.host.doc, caret.t);
+    const parent = paragraph ? this.host.doc.findParentOf(paragraph) : void 0;
+    if (!paragraph || !parent || localName(parent.name) !== "body") return null;
+    const endText = lastTextOf(paragraph);
+    if (!endText) return null;
+    const binding = (handle.bindingsByText.get(endText) ?? []).filter((candidate) => candidate.el.parentElement === surface && candidate.item.src).sort((a, b) => b.item.lineTop - a.item.lineTop)[0];
+    if (!binding) return null;
+    const lineHeight = Math.max(1, binding.item.lineHeight);
+    if (ly <= binding.item.lineTop + lineHeight / 2) return null;
+    const hasLaterLine = handle.bindings.some(
+      (candidate) => candidate.el.parentElement === surface && candidate.item.src?.t && this.regionOf(candidate.item.src.t) === "body" && candidate.item.lineTop > binding.item.lineTop + lineHeight / 2
+    );
+    if (hasLaterLine) return null;
+    const lineCount = Math.max(1, Math.round((ly - binding.item.lineTop) / lineHeight));
+    this.host.history?.checkpoint();
+    this.caret = {
+      t: endText,
+      run: binding.item.src.run,
+      offset: endText.text.length,
+      bias: endText.text.length > 0 ? "end" : void 0
+    };
+    const split = this.splitParagraphCore();
+    if (!split) return null;
+    const hasPageBreak = (element) => localName(element.name) === "br" && attr(element, "type") === "page" || element.children.some(hasPageBreak);
+    const insertBeforeTrailingBreak = hasPageBreak(split.after);
+    const afterSources = insertBeforeTrailingBreak ? [] : [split.after];
+    const w = split.after.name.includes(":") ? split.after.name.slice(0, split.after.name.indexOf(":") + 1) : "";
+    const templatePPr = split.after.children.find((child4) => localName(child4.name) === "pPr");
+    const templateRun = split.after.children.find(
+      (child4) => localName(child4.name) === "r" && child4.children.includes(this.caret.t)
+    );
+    const templateRPr = templateRun?.children.find((child4) => localName(child4.name) === "rPr");
+    let previous = insertBeforeTrailingBreak ? split.before : split.after;
+    let caretSource = split.after;
+    for (let i = 1; i < lineCount; i++) {
+      if (this.suggesting && previous !== split.before) markParagraphGlyph(previous, "ins", this.revMeta());
+      const t = {
+        name: this.caret.t.name,
+        attrs: { ...this.caret.t.attrs, "xml:space": "preserve" },
+        children: [],
+        text: ""
+      };
+      const run = {
+        name: templateRun?.name ?? `${w}r`,
+        attrs: { ...templateRun?.attrs ?? {} },
+        children: [...templateRPr ? [cloneXml(templateRPr)] : [], t],
+        text: ""
+      };
+      const paragraph2 = {
+        name: split.after.name,
+        attrs: {},
+        children: [...templatePPr ? [cloneXml(templatePPr)] : [], run],
+        text: ""
+      };
+      const previousIndex = parent.children.indexOf(previous);
+      parent.children.splice(previousIndex + 1, 0, paragraph2);
+      afterSources.push(paragraph2);
+      previous = paragraph2;
+      caretSource = paragraph2;
+      this.caret = { t, run: caret.run, offset: 0 };
+    }
+    if (insertBeforeTrailingBreak) afterSources.push(split.after);
+    const reparsed = this.host.doc.reparseDirectBodyParagraphSplits(split.before, afterSources);
+    if (reparsed) {
+      const caretParagraph = reparsed[afterSources.indexOf(caretSource) + 1];
+      for (const child4 of caretParagraph.children) {
+        const runs = child4.type === "run" ? [child4] : child4.runs;
+        const run = runs.find(
+          (candidate) => candidate.content.some((content) => content.kind === "text" && content.srcT === this.caret.t)
+        );
+        if (run) {
+          this.caret.run = run;
+          break;
+        }
+      }
+      invalidateParagraphSignature(split.before);
+      for (const source of afterSources) invalidateParagraphSignature(source);
+    }
+    this.pendingClickTypeCheckpoint = true;
+    this.commit(false, "local", !!reparsed);
+    this.focusText();
+    return this.caret;
+  }
   caretFromPoint(x, y) {
     const doc = document;
     let node = null;
@@ -24991,7 +25950,8 @@ var _DocxEditor = class _DocxEditor {
           if (mergeParagraphBackward(this.host.doc, pEl)) {
             const target = junction && paragraphOf(this.host.doc, junction) ? junction : caret.t;
             this.caret = { t: target, run: caret.run, offset: target === junction ? target.text.length : 0 };
-            this.commit();
+            invalidateParagraphSignature(paragraphOf(this.host.doc, target) ?? pEl);
+            this.commit(false, "local", true);
           }
           return;
         }
@@ -25011,7 +25971,10 @@ var _DocxEditor = class _DocxEditor {
           const next = siblingParagraph(this.host.doc, pEl, 1);
           if (!next) return;
           this.host.history?.checkpoint();
-          if (mergeParagraphBackward(this.host.doc, next)) this.commit();
+          if (mergeParagraphBackward(this.host.doc, next)) {
+            invalidateParagraphSignature(pEl);
+            this.commit(false, "local", true);
+          }
           return;
         }
         if (!this.stepToNeighbor(1)) return;
@@ -25241,6 +26204,7 @@ var _DocxEditor = class _DocxEditor {
       invalidateParagraphSignature(split.after);
     }
     this.commit(false, "local", !!reparsed);
+    this.focusText();
   }
   /** Split the paragraph at the caret without history or commit — shared by
    * Enter and multi-line paste. */
@@ -26983,7 +27947,8 @@ function detectMissingFonts(layout) {
   for (const page of layout.pages) {
     for (const item of page.items) {
       if (item.kind !== "text" || !item.text.trim()) continue;
-      const primary = item.font.family.split(",")[0].trim().replace(/^"|"$/g, "");
+      const requested = item.font.family.split(",")[0].trim().replace(/^"|"$/g, "");
+      const primary = normalizeFamily(requested, item.font.bold, item.font.italic).family;
       if (!primary || GENERIC.has(primary.toLowerCase())) continue;
       const existing = samples.get(primary);
       if (!existing || !/[^-ɏ]/.test(existing) && /[^-ɏ]/.test(item.text)) {
@@ -27115,15 +28080,6 @@ var btnStyle = (active) => ({
   padding: "0 5px",
   color: T.fg
 });
-var selectStyle = {
-  height: 26,
-  border: "1px solid transparent",
-  background: "transparent",
-  borderRadius: 4,
-  fontSize: 13,
-  color: T.fg,
-  cursor: "pointer"
-};
 var PAGE_SIZES = [
   { value: "letter", label: "Letter", description: '8.5" \xD7 11"', width: 8.5, height: 11 },
   { value: "legal", label: "Legal", description: '8.5" \xD7 14"', width: 8.5, height: 14 },
@@ -27227,6 +28183,264 @@ function HighlightIcon({ color }) {
     /* @__PURE__ */ jsx("rect", { x: "2", y: "13.5", width: "12", height: "2.5", rx: "0.5", fill: color })
   ] });
 }
+function ToolbarMenuSelect({
+  value,
+  options,
+  onChange,
+  placeholder = "Choose\u2026",
+  title,
+  ariaLabel,
+  triggerAriaLabel,
+  width,
+  menuWidth,
+  className,
+  style
+}) {
+  const [open, setOpen] = useState(false);
+  const [position, setPosition] = useState({ left: 8, top: 8, width: menuWidth ?? 180, maxHeight: 320 });
+  const rootRef = useRef(null);
+  const triggerRef = useRef(null);
+  const menuRef = useRef(null);
+  const keyboardOpen = useRef(null);
+  const id = useId();
+  const selected = options.find((option) => option.value === value);
+  useLayoutEffect(() => {
+    if (!open) return;
+    const update = () => {
+      const trigger = triggerRef.current;
+      if (!trigger) return;
+      const rect = trigger.getBoundingClientRect();
+      const nextWidth = Math.min(
+        window.innerWidth - 16,
+        menuWidth ?? Math.max(rect.width, menuRef.current?.scrollWidth ?? 180)
+      );
+      const below = window.innerHeight - rect.bottom - 8;
+      const above = rect.top - 8;
+      const placeAbove = below < 140 && above > below;
+      const maxHeight = Math.max(96, Math.min(320, placeAbove ? above : below));
+      const shownHeight = Math.min(menuRef.current?.scrollHeight ?? maxHeight, maxHeight);
+      setPosition({
+        left: Math.max(8, Math.min(rect.left, window.innerWidth - nextWidth - 8)),
+        top: placeAbove ? Math.max(8, rect.top - shownHeight - 4) : rect.bottom + 4,
+        width: nextWidth,
+        maxHeight
+      });
+    };
+    update();
+    const frame = requestAnimationFrame(() => {
+      update();
+      if (!keyboardOpen.current) return;
+      const items = menuRef.current?.querySelectorAll('[role="option"]');
+      const item = keyboardOpen.current === "last" ? items?.[items.length - 1] : items?.[0];
+      item?.focus({ preventScroll: true });
+      keyboardOpen.current = null;
+    });
+    const close = (event) => {
+      if (!rootRef.current?.contains(event.target)) setOpen(false);
+    };
+    const keydown = (event) => {
+      if (event.key === "Escape") {
+        setOpen(false);
+        requestAnimationFrame(() => triggerRef.current?.focus({ preventScroll: true }));
+      }
+    };
+    document.addEventListener("mousedown", close);
+    document.addEventListener("keydown", keydown);
+    window.addEventListener("resize", update);
+    window.addEventListener("scroll", update, true);
+    return () => {
+      cancelAnimationFrame(frame);
+      document.removeEventListener("mousedown", close);
+      document.removeEventListener("keydown", keydown);
+      window.removeEventListener("resize", update);
+      window.removeEventListener("scroll", update, true);
+    };
+  }, [open, menuWidth]);
+  const pick = (next) => {
+    const option = options.find((item) => item.value === next);
+    if (!option || option.disabled) return;
+    onChange(next);
+    setOpen(false);
+  };
+  const onMenuKeyDown = (event) => {
+    const items = menuRef.current ? Array.from(menuRef.current.querySelectorAll('[role="option"]:not(:disabled)')) : [];
+    const current = items.indexOf(document.activeElement);
+    let next = current;
+    if (event.key === "ArrowDown") next = current < 0 ? 0 : (current + 1) % items.length;
+    else if (event.key === "ArrowUp") next = current < 0 ? items.length - 1 : (current - 1 + items.length) % items.length;
+    else if (event.key === "Home") next = 0;
+    else if (event.key === "End") next = items.length - 1;
+    else if ((event.key === "Enter" || event.key === " ") && current >= 0) {
+      event.preventDefault();
+      items[current].click();
+      return;
+    } else if (event.key === "Escape" || event.key === "Tab") {
+      event.preventDefault();
+      setOpen(false);
+      requestAnimationFrame(() => triggerRef.current?.focus({ preventScroll: true }));
+      return;
+    } else return;
+    event.preventDefault();
+    items[next]?.focus({ preventScroll: true });
+  };
+  let previousGroup;
+  return /* @__PURE__ */ jsxs(
+    "span",
+    {
+      ref: rootRef,
+      className: `dxw-menu-select${className ? ` ${className}` : ""}`,
+      "data-dxw-menu-select": "",
+      style: { position: "relative", display: "inline-flex", width },
+      children: [
+        /* @__PURE__ */ jsxs(
+          "select",
+          {
+            tabIndex: -1,
+            title,
+            "aria-label": ariaLabel,
+            "aria-hidden": "true",
+            value,
+            onChange: (event) => pick(event.target.value),
+            "data-dxw-native-bridge": "",
+            style: {
+              position: "absolute",
+              width: 1,
+              height: 1,
+              inset: 0,
+              opacity: 0,
+              pointerEvents: "none"
+            },
+            children: [
+              !options.some((option) => option.value === value) && /* @__PURE__ */ jsx("option", { value: "", children: String(placeholder) }),
+              options.map((option) => /* @__PURE__ */ jsx("option", { value: option.value, disabled: option.disabled, children: String(option.label) }, option.value))
+            ]
+          }
+        ),
+        /* @__PURE__ */ jsxs(
+          "button",
+          {
+            ref: triggerRef,
+            type: "button",
+            "aria-haspopup": "listbox",
+            "aria-expanded": open,
+            "aria-controls": open ? id : void 0,
+            "aria-label": triggerAriaLabel,
+            "data-tip": title,
+            className: "dxw-menu-select-trigger",
+            "data-dxw-menu-select-trigger": "",
+            onMouseDown: (event) => event.preventDefault(),
+            onClick: () => setOpen(!open),
+            onKeyDown: (event) => {
+              if (!open && (event.key === "Enter" || event.key === " " || event.key === "ArrowDown" || event.key === "ArrowUp")) {
+                event.preventDefault();
+                keyboardOpen.current = event.key === "ArrowUp" ? "last" : "first";
+                setOpen(true);
+              }
+            },
+            style: {
+              width: "100%",
+              minWidth: 0,
+              height: "var(--dxw-select-height, 26px)",
+              border: "1px solid var(--dxw-select-border, transparent)",
+              borderRadius: "var(--dxw-select-radius, 4px)",
+              background: "var(--dxw-select-bg, transparent)",
+              color: "var(--dxw-select-fg, var(--dxw-toolbar-fg, #3c4043))",
+              padding: "var(--dxw-select-padding, 0 6px)",
+              display: "inline-flex",
+              alignItems: "center",
+              justifyContent: "space-between",
+              gap: 6,
+              cursor: "pointer",
+              font: "var(--dxw-select-font, 13px system-ui, sans-serif)",
+              ...style
+            },
+            children: [
+              /* @__PURE__ */ jsx("span", { style: { minWidth: 0, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap", fontFamily: selected?.fontFamily }, children: selected?.label ?? placeholder }),
+              /* @__PURE__ */ jsx("span", { "aria-hidden": "true", className: "dxw-menu-select-chevron", style: { flexShrink: 0, fontSize: 10 }, children: "\u2304" })
+            ]
+          }
+        ),
+        open && /* @__PURE__ */ jsx(
+          "div",
+          {
+            ref: menuRef,
+            id,
+            role: "listbox",
+            "aria-label": ariaLabel ?? title,
+            className: "dxw-menu-select-menu",
+            "data-dxw-menu-select-menu": "",
+            onMouseDown: (event) => event.preventDefault(),
+            onKeyDown: onMenuKeyDown,
+            style: {
+              position: "fixed",
+              left: position.left,
+              top: position.top,
+              zIndex: "var(--dxw-toolbar-z-index, 100)",
+              width: position.width,
+              maxHeight: `min(var(--dxw-select-menu-max-height, 320px), ${position.maxHeight}px)`,
+              overflowY: "auto",
+              overscrollBehavior: "contain",
+              boxSizing: "border-box",
+              padding: "var(--dxw-select-menu-padding, 5px)",
+              border: "1px solid var(--dxw-select-menu-border, var(--dxw-toolbar-border, #dadce0))",
+              borderRadius: "var(--dxw-select-menu-radius, 8px)",
+              background: "var(--dxw-select-menu-bg, var(--dxw-popover-bg, #fff))",
+              boxShadow: "var(--dxw-select-menu-shadow, var(--dxw-popover-shadow, 0 4px 16px rgba(0,0,0,.15)))"
+            },
+            children: options.map((option) => {
+              const groupChanged = option.group !== previousGroup;
+              previousGroup = option.group;
+              const active = option.value === value;
+              return /* @__PURE__ */ jsxs(Fragment, { children: [
+                groupChanged && option.group && /* @__PURE__ */ jsx("div", { className: "dxw-menu-select-group", style: { padding: "6px 8px 3px", color: T.muted, font: "600 10.5px system-ui, sans-serif" }, children: option.group }),
+                /* @__PURE__ */ jsxs(
+                  "button",
+                  {
+                    type: "button",
+                    role: "option",
+                    "aria-selected": active,
+                    disabled: option.disabled,
+                    tabIndex: -1,
+                    className: "dxw-menu-select-option",
+                    "data-dxw-menu-select-option": option.value,
+                    onMouseDown: (event) => event.preventDefault(),
+                    onClick: () => pick(option.value),
+                    style: {
+                      width: "100%",
+                      minHeight: 30,
+                      border: 0,
+                      borderRadius: 6,
+                      padding: "5px 8px",
+                      display: "flex",
+                      alignItems: "center",
+                      gap: 8,
+                      background: active ? T.activeBg : "transparent",
+                      color: option.disabled ? T.muted : T.fg,
+                      textAlign: "left",
+                      cursor: option.disabled ? "default" : "pointer",
+                      font: "13px system-ui, sans-serif",
+                      fontFamily: option.fontFamily
+                    },
+                    onMouseEnter: (event) => {
+                      if (!active && !option.disabled) event.currentTarget.style.background = T.hoverBg;
+                    },
+                    onMouseLeave: (event) => {
+                      if (!active) event.currentTarget.style.background = "transparent";
+                    },
+                    children: [
+                      /* @__PURE__ */ jsx("span", { style: { flex: 1 }, children: option.label }),
+                      active && /* @__PURE__ */ jsx("span", { "aria-hidden": "true", style: { color: T.accent, fontWeight: 700 }, children: "\u2713" })
+                    ]
+                  }
+                )
+              ] }, option.value);
+            })
+          }
+        )
+      ]
+    }
+  );
+}
 function ActionMenu({
   label,
   title,
@@ -27234,22 +28448,21 @@ function ActionMenu({
   onPick,
   width
 }) {
-  return /* @__PURE__ */ jsxs(
-    "select",
+  return /* @__PURE__ */ jsx(
+    ToolbarMenuSelect,
     {
       title,
+      triggerAriaLabel: title,
       value: "",
-      onMouseDown: (e) => e.stopPropagation(),
-      onChange: (e) => {
-        if (e.target.value) onPick(e.target.value);
-      },
-      style: { ...selectStyle, width },
-      children: [
-        /* @__PURE__ */ jsx("option", { value: "", disabled: true, children: label }),
-        groups.map(
-          (g, i) => g.label ? /* @__PURE__ */ jsx("optgroup", { label: g.label, children: g.items.map(([v, t]) => /* @__PURE__ */ jsx("option", { value: v, children: t }, v)) }, i) : g.items.map(([v, t]) => /* @__PURE__ */ jsx("option", { value: v, children: t }, v))
-        )
-      ]
+      placeholder: label,
+      width,
+      menuWidth: Math.max(width ?? 0, 190),
+      options: groups.flatMap((group) => group.items.map(([value, text]) => ({
+        value,
+        label: text,
+        group: group.label
+      }))),
+      onChange: onPick
     }
   );
 }
@@ -27329,6 +28542,183 @@ function HighlightMenu({ current, onPick }) {
     )
   ] });
 }
+var COLOR_SWATCHES = [
+  "#000000",
+  "#434343",
+  "#666666",
+  "#999999",
+  "#b7b7b7",
+  "#cccccc",
+  "#d9d9d9",
+  "#ffffff",
+  "#980000",
+  "#ff0000",
+  "#ff9900",
+  "#ffff00",
+  "#00ff00",
+  "#00ffff",
+  "#4a86e8",
+  "#0000ff",
+  "#9900ff",
+  "#ff00ff",
+  "#e6b8af",
+  "#f4cccc",
+  "#fce5cd",
+  "#fff2cc",
+  "#d9ead3",
+  "#d0e0e3",
+  "#c9daf8",
+  "#cfe2f3",
+  "#d9d2e9",
+  "#ead1dc",
+  "#a61c00",
+  "#cc0000",
+  "#e69138",
+  "#6aa84f"
+];
+function normalizedColor(value) {
+  const match = /^#?([0-9a-f]{3}|[0-9a-f]{6})$/i.exec(value.trim());
+  if (!match) return null;
+  const digits = match[1].length === 3 ? match[1].split("").map((digit) => digit + digit).join("") : match[1];
+  return `#${digits.toLowerCase()}`;
+}
+function ColorMenu({
+  current,
+  title,
+  trigger,
+  onPick
+}) {
+  const [open, setOpen] = useState(false);
+  const [custom, setCustom] = useState(current);
+  const [position, setPosition] = useState({ left: 8, top: 8 });
+  const rootRef = useRef(null);
+  const triggerRef = useRef(null);
+  const menuRef = useRef(null);
+  const valid = normalizedColor(custom);
+  useLayoutEffect(() => {
+    if (!open) return;
+    setCustom(current);
+    const update = () => {
+      const rect = triggerRef.current?.getBoundingClientRect();
+      if (!rect) return;
+      const width = Math.min(236, window.innerWidth - 16);
+      const menuHeight = menuRef.current?.offsetHeight ?? 188;
+      const top = window.innerHeight - rect.bottom >= menuHeight + 8 ? rect.bottom + 4 : Math.max(8, rect.top - menuHeight - 4);
+      setPosition({ left: Math.max(8, Math.min(rect.left, window.innerWidth - width - 8)), top });
+    };
+    update();
+    const frame = requestAnimationFrame(update);
+    const close = (event) => {
+      if (!rootRef.current?.contains(event.target)) setOpen(false);
+    };
+    const keydown = (event) => {
+      if (event.key === "Escape") {
+        setOpen(false);
+        requestAnimationFrame(() => triggerRef.current?.focus({ preventScroll: true }));
+      }
+    };
+    document.addEventListener("mousedown", close);
+    document.addEventListener("keydown", keydown);
+    window.addEventListener("resize", update);
+    window.addEventListener("scroll", update, true);
+    return () => {
+      cancelAnimationFrame(frame);
+      document.removeEventListener("mousedown", close);
+      document.removeEventListener("keydown", keydown);
+      window.removeEventListener("resize", update);
+      window.removeEventListener("scroll", update, true);
+    };
+  }, [open, current]);
+  const pick = (value) => {
+    onPick(value);
+    setOpen(false);
+  };
+  return /* @__PURE__ */ jsxs("span", { ref: rootRef, className: "dxw-color-control", style: { position: "relative", display: "inline-flex" }, children: [
+    /* @__PURE__ */ jsx(
+      "button",
+      {
+        ref: triggerRef,
+        type: "button",
+        title,
+        "aria-haspopup": "dialog",
+        "aria-expanded": open,
+        className: "dxw-color-trigger",
+        "data-dxw-color-trigger": "",
+        style: { ...btnStyle(open), display: "inline-flex", alignItems: "center", gap: 5 },
+        onMouseDown: (event) => event.preventDefault(),
+        onClick: () => setOpen(!open),
+        children: trigger
+      }
+    ),
+    open && /* @__PURE__ */ jsxs(
+      "div",
+      {
+        ref: menuRef,
+        role: "dialog",
+        "aria-label": title,
+        className: "dxw-color-menu",
+        "data-dxw-color-menu": "",
+        onMouseDown: (event) => event.stopPropagation(),
+        style: {
+          position: "fixed",
+          left: position.left,
+          top: position.top,
+          zIndex: "var(--dxw-toolbar-z-index, 100)",
+          width: "min(var(--dxw-color-menu-width, 236px), calc(100vw - 16px))",
+          boxSizing: "border-box",
+          padding: 8,
+          border: `1px solid ${T.border}`,
+          borderRadius: 8,
+          background: T.popoverBg,
+          boxShadow: T.popoverShadow
+        },
+        children: [
+          /* @__PURE__ */ jsx("div", { className: "dxw-color-swatches", style: { display: "grid", gridTemplateColumns: "repeat(8, 1fr)", gap: 4 }, children: COLOR_SWATCHES.map((color) => /* @__PURE__ */ jsx(
+            "button",
+            {
+              type: "button",
+              title: color,
+              "aria-label": `Choose ${color}`,
+              className: "dxw-color-swatch",
+              "data-dxw-color": color,
+              onMouseDown: (event) => event.preventDefault(),
+              onClick: () => pick(color),
+              style: {
+                width: 23,
+                height: 23,
+                padding: 0,
+                borderRadius: 4,
+                cursor: "pointer",
+                border: color.toLowerCase() === current.toLowerCase() ? `2px solid ${T.accent}` : `1px solid ${T.border}`,
+                background: color
+              }
+            },
+            color
+          )) }),
+          /* @__PURE__ */ jsxs("div", { style: { display: "flex", alignItems: "center", gap: 6, marginTop: 8 }, children: [
+            /* @__PURE__ */ jsx("span", { "aria-hidden": "true", style: { width: 24, height: 24, borderRadius: 4, border: `1px solid ${T.border}`, background: valid ?? current, flexShrink: 0 } }),
+            /* @__PURE__ */ jsx(
+              "input",
+              {
+                "aria-label": "Custom hex color",
+                className: "dxw-color-value",
+                value: custom,
+                onChange: (event) => setCustom(event.target.value),
+                onKeyDown: (event) => {
+                  if (event.key === "Enter" && valid) pick(valid);
+                },
+                spellCheck: false,
+                placeholder: "#1a73e8",
+                style: { minWidth: 0, flex: 1, height: 28, boxSizing: "border-box", border: `1px solid ${T.border}`, borderRadius: 5, padding: "3px 6px", color: T.fg, background: T.popoverBg }
+              }
+            ),
+            /* @__PURE__ */ jsx("button", { type: "button", disabled: !valid, onClick: () => valid && pick(valid), style: pillBtn, children: "Apply" })
+          ] })
+        ]
+      }
+    )
+  ] });
+}
 function BulletListIcon() {
   return /* @__PURE__ */ jsxs("svg", { style: icon, viewBox: "0 0 16 16", fill: "none", stroke: "currentColor", strokeWidth: "1.4", children: [
     /* @__PURE__ */ jsx("circle", { cx: "3", cy: "4", r: "1.1", fill: "currentColor", stroke: "none" }),
@@ -27691,7 +29081,18 @@ function CrossReferenceMenu({ api }) {
   return /* @__PURE__ */ jsxs("span", { ref: rootRef, style: { position: "relative", display: "inline-block" }, children: [
     /* @__PURE__ */ jsx("button", { title: "Insert cross-reference", style: btnStyle(open), onMouseDown: (event) => event.preventDefault(), onClick: () => setOpen(!open), children: "Cross-reference" }),
     open && /* @__PURE__ */ jsx("div", { style: { position: "absolute", top: 28, left: 0, zIndex: 100, width: 260, padding: 10, background: T.popoverBg, border: `1px solid ${T.border}`, borderRadius: 8, boxShadow: T.popoverShadow }, children: bookmarks.length === 0 ? /* @__PURE__ */ jsx("div", { style: { color: T.muted, fontSize: 12 }, children: "Add a bookmark first, then reference its text or page." }) : /* @__PURE__ */ jsxs(Fragment2, { children: [
-      /* @__PURE__ */ jsx("select", { value: selected, onChange: (event) => setBookmark(event.target.value), style: { ...selectStyle, width: "100%", borderColor: T.border }, children: bookmarks.map((name) => /* @__PURE__ */ jsx("option", { value: name, children: name }, name)) }),
+      /* @__PURE__ */ jsx(
+        ToolbarMenuSelect,
+        {
+          value: selected,
+          ariaLabel: "Bookmark to reference",
+          width: "100%",
+          menuWidth: 240,
+          options: bookmarks.map((name) => ({ value: name, label: name })),
+          onChange: setBookmark,
+          style: { borderColor: T.border }
+        }
+      ),
       /* @__PURE__ */ jsxs("div", { style: { display: "flex", justifyContent: "flex-end", gap: 6, marginTop: 8 }, children: [
         /* @__PURE__ */ jsx("button", { style: { ...pillBtn, background: T.popoverBg, color: T.fg }, onClick: () => insert("page"), children: "Page number" }),
         /* @__PURE__ */ jsx("button", { style: pillBtn, onClick: () => insert("text"), children: "Bookmark text" })
@@ -27798,6 +29199,7 @@ function SymbolMenu({ api }) {
   ] });
 }
 var SHAPES = [
+  ["line", "Line", "\u2015"],
   ["rectangle", "Rectangle", "\u25AD"],
   ["roundedRectangle", "Rounded rectangle", "\u25A2"],
   ["ellipse", "Ellipse", "\u25EF"],
@@ -27969,12 +29371,23 @@ function ChartMenu({ api }) {
   return /* @__PURE__ */ jsxs("span", { ref: rootRef, style: { position: "relative", display: "inline-block" }, children: [
     /* @__PURE__ */ jsx("button", { title: "Insert or edit chart", style: btnStyle(open), onMouseDown: (event) => event.preventDefault(), onClick: () => setOpen(!open), children: "Chart" }),
     open && /* @__PURE__ */ jsxs("div", { style: { position: "absolute", top: 28, right: 0, zIndex: 100, width: 320, padding: 10, display: "grid", gap: 7, background: T.popoverBg, border: `1px solid ${T.border}`, borderRadius: 8, boxShadow: T.popoverShadow }, children: [
-      /* @__PURE__ */ jsxs("select", { "aria-label": "Chart type", value: type, onChange: (event) => setType(event.target.value), style: fieldStyle, children: [
-        /* @__PURE__ */ jsx("option", { value: "column", children: "Column" }),
-        /* @__PURE__ */ jsx("option", { value: "bar", children: "Bar" }),
-        /* @__PURE__ */ jsx("option", { value: "line", children: "Line" }),
-        /* @__PURE__ */ jsx("option", { value: "pie", children: "Pie" })
-      ] }),
+      /* @__PURE__ */ jsx(
+        ToolbarMenuSelect,
+        {
+          value: type,
+          ariaLabel: "Chart type",
+          width: "100%",
+          menuWidth: 300,
+          options: [
+            { value: "column", label: "Column" },
+            { value: "bar", label: "Bar" },
+            { value: "line", label: "Line" },
+            { value: "pie", label: "Pie" }
+          ],
+          onChange: (value) => setType(value),
+          style: fieldStyle
+        }
+      ),
       /* @__PURE__ */ jsx("input", { "aria-label": "Chart title", value: title, onChange: (event) => setTitle(event.target.value), placeholder: "Chart title", style: fieldStyle }),
       /* @__PURE__ */ jsx("input", { "aria-label": "Chart categories", value: categories, onChange: (event) => setCategories(event.target.value), placeholder: "Q1, Q2, Q3, Q4", style: fieldStyle }),
       /* @__PURE__ */ jsx("textarea", { "aria-label": "Chart series", rows: 3, value: series, onChange: (event) => setSeries(event.target.value), style: { ...fieldStyle, resize: "vertical" } }),
@@ -28007,12 +29420,23 @@ function SmartArtMenu({ api }) {
   return /* @__PURE__ */ jsxs("span", { ref: rootRef, style: { position: "relative", display: "inline-block" }, children: [
     /* @__PURE__ */ jsx("button", { title: "Insert or edit SmartArt", style: btnStyle(open), onMouseDown: (event) => event.preventDefault(), onClick: () => setOpen(!open), children: "SmartArt" }),
     open && /* @__PURE__ */ jsxs("div", { style: { position: "absolute", top: 28, right: 0, zIndex: 100, width: 280, padding: 10, display: "grid", gap: 7, background: T.popoverBg, border: `1px solid ${T.border}`, borderRadius: 8, boxShadow: T.popoverShadow }, children: [
-      /* @__PURE__ */ jsxs("select", { "aria-label": "SmartArt layout", value: layout, onChange: (event) => setLayout(event.target.value), style: fieldStyle, children: [
-        /* @__PURE__ */ jsx("option", { value: "process", children: "Process" }),
-        /* @__PURE__ */ jsx("option", { value: "cycle", children: "Cycle" }),
-        /* @__PURE__ */ jsx("option", { value: "hierarchy", children: "Hierarchy" }),
-        /* @__PURE__ */ jsx("option", { value: "list", children: "List" })
-      ] }),
+      /* @__PURE__ */ jsx(
+        ToolbarMenuSelect,
+        {
+          value: layout,
+          ariaLabel: "SmartArt layout",
+          width: "100%",
+          menuWidth: 260,
+          options: [
+            { value: "process", label: "Process" },
+            { value: "cycle", label: "Cycle" },
+            { value: "hierarchy", label: "Hierarchy" },
+            { value: "list", label: "List" }
+          ],
+          onChange: (value) => setLayout(value),
+          style: fieldStyle
+        }
+      ),
       /* @__PURE__ */ jsx("textarea", { "aria-label": "SmartArt items", rows: 5, value: items, onChange: (event) => setItems(event.target.value), style: { ...fieldStyle, resize: "vertical" } }),
       /* @__PURE__ */ jsx("div", { style: { color: T.muted, font: "11.5px system-ui, sans-serif" }, children: "One diagram item per line." }),
       /* @__PURE__ */ jsx("button", { disabled: !items.trim(), onClick: submit, style: { border: 0, borderRadius: 6, padding: "7px 10px", background: items.trim() ? T.accent : T.border, color: T.accentFg, cursor: items.trim() ? "pointer" : "default", font: "600 12px system-ui, sans-serif" }, children: "Insert or update SmartArt" })
@@ -28070,19 +29494,18 @@ function DrawTab({ api }) {
     /* @__PURE__ */ jsx(Btn, { label: "Eraser", title: "Stroke eraser", active: active === "eraser", onClick: () => api?.setDrawingTool({ kind: "eraser", size: 14 }) }),
     /* @__PURE__ */ jsx(Btn, { label: "Lasso", title: "Lasso ink", active: active === "lasso", onClick: () => api?.setDrawingTool({ kind: "lasso" }) }),
     /* @__PURE__ */ jsx(Sep, {}),
-    /* @__PURE__ */ jsxs("label", { title: "Pen color", style: { display: "inline-flex", alignItems: "center", gap: 5, color: T.fg, font: "12px system-ui, sans-serif" }, children: [
-      "Color",
-      /* @__PURE__ */ jsx(
-        "input",
-        {
-          "aria-label": "Pen color",
-          type: "color",
-          value: color,
-          onChange: (event) => activate(active === "highlighter" ? "highlighter" : "pen", event.target.value, width),
-          style: { width: 28, height: 24, padding: 1, border: `1px solid ${T.border}`, borderRadius: 4, background: "transparent" }
-        }
-      )
-    ] }),
+    /* @__PURE__ */ jsx(
+      ColorMenu,
+      {
+        current: color,
+        title: "Pen color",
+        trigger: /* @__PURE__ */ jsxs(Fragment2, { children: [
+          /* @__PURE__ */ jsx("span", { style: { font: "12px system-ui, sans-serif" }, children: "Color" }),
+          /* @__PURE__ */ jsx("span", { "aria-hidden": "true", style: { width: 18, height: 18, borderRadius: 4, border: `1px solid ${T.border}`, background: color } })
+        ] }),
+        onPick: (value) => activate(active === "highlighter" ? "highlighter" : "pen", value, width)
+      }
+    ),
     /* @__PURE__ */ jsx(
       ActionMenu,
       {
@@ -28660,9 +30083,8 @@ function MarginMenu({
       "input",
       {
         "aria-label": `${label} margin (inches)`,
-        type: "number",
-        min: "0",
-        step: "0.01",
+        type: "text",
+        inputMode: "decimal",
         required: true,
         autoFocus: side === "top",
         value: values[side],
@@ -28787,9 +30209,8 @@ function PageSizeMenu({
       "input",
       {
         "aria-label": `Page ${side} (inches)`,
-        type: "number",
-        min: "0.01",
-        step: "0.01",
+        type: "text",
+        inputMode: "decimal",
         required: true,
         autoFocus: side === "width",
         value: values[side],
@@ -28887,19 +30308,20 @@ function LayoutTab({ api, showArrange }) {
       "data-dxw-layout-ribbon": "",
       style: { display: "flex", flex: "1 1 640px", minWidth: 0, alignItems: "center", flexWrap: "wrap", gap: 2 },
       children: [
-        /* @__PURE__ */ jsxs(
-          "select",
+        /* @__PURE__ */ jsx(
+          ToolbarMenuSelect,
           {
             title: "Apply layout changes to",
-            "aria-label": "Apply layout changes to",
+            ariaLabel: "Apply layout changes to",
             value: scope,
-            onMouseDown: (e) => e.stopPropagation(),
-            onChange: (e) => setScope(e.target.value),
-            style: { ...selectStyle, width: 118, maxWidth: "100%" },
-            children: [
-              /* @__PURE__ */ jsx("option", { value: "document", children: "Whole document" }),
-              /* @__PURE__ */ jsx("option", { value: "section", children: "This section" })
-            ]
+            width: 118,
+            menuWidth: 170,
+            options: [
+              { value: "document", label: "Whole document" },
+              { value: "section", label: "This section" }
+            ],
+            onChange: (value) => setScope(value),
+            style: { maxWidth: "100%" }
           }
         ),
         /* @__PURE__ */ jsx(Sep, {}),
@@ -29126,42 +30548,44 @@ function DocxToolbar({
     if (on("styles"))
       groups.push({
         key: "styles",
-        node: /* @__PURE__ */ jsxs(
-          "select",
+        node: /* @__PURE__ */ jsx(
+          ToolbarMenuSelect,
           {
             title: "Paragraph style",
             value: curStyle ?? "__normal",
-            onMouseDown: (e) => e.stopPropagation(),
-            onChange: (e) => {
-              if (e.target.value) {
-                api?.setParagraphStyle(e.target.value === "__normal" ? null : e.target.value);
+            width: 92,
+            menuWidth: 190,
+            options: [
+              { value: "__normal", label: "Normal" },
+              ...(api?.listParagraphStyles() ?? []).filter((style2) => !/^normal$/i.test(style2.name)).map((style2) => ({ value: style2.id, label: style2.name })),
+              ...curStyle !== null && !(api?.listParagraphStyles() ?? []).some((style2) => style2.id === curStyle) ? [{ value: curStyle, label: api?.document.styles.byId.get(curStyle)?.name ?? curStyle }] : []
+            ],
+            onChange: (value) => {
+              if (value) {
+                api?.setParagraphStyle(value === "__normal" ? null : value);
                 setCurStyle(api?.getParagraphStyleId?.() ?? null);
               }
-            },
-            style: { ...selectStyle, width: 92 },
-            children: [
-              /* @__PURE__ */ jsx("option", { value: "__normal", children: "Normal" }),
-              (api?.listParagraphStyles() ?? []).filter((s) => !/^normal$/i.test(s.name)).map((s) => /* @__PURE__ */ jsx("option", { value: s.id, children: s.name }, s.id)),
-              curStyle !== null && !(api?.listParagraphStyles() ?? []).some((s) => s.id === curStyle) && /* @__PURE__ */ jsx("option", { value: curStyle, children: api?.document.styles.byId.get(curStyle)?.name ?? curStyle })
-            ]
+            }
           }
         )
       });
     if (on("font"))
       groups.push({
         key: "font",
-        node: /* @__PURE__ */ jsxs(
-          "select",
+        node: /* @__PURE__ */ jsx(
+          ToolbarMenuSelect,
           {
             title: "Font",
             value: fmt?.fontFamily ?? "",
-            onMouseDown: (e) => e.stopPropagation(),
-            onChange: (e) => e.target.value && apply({ fontFamily: e.target.value }),
-            style: { ...selectStyle, width: 130 },
-            children: [
-              /* @__PURE__ */ jsx("option", { value: "", disabled: true, children: "Font" }),
-              (fmt?.fontFamily && !detectFonts().includes(fmt.fontFamily) ? [fmt.fontFamily, ...detectFonts()] : detectFonts()).map((f) => /* @__PURE__ */ jsx("option", { value: f, style: { fontFamily: f }, children: f }, f))
-            ]
+            placeholder: "Font",
+            width: 130,
+            menuWidth: 210,
+            options: (fmt?.fontFamily && !detectFonts().includes(fmt.fontFamily) ? [fmt.fontFamily, ...detectFonts()] : detectFonts()).map((font) => ({
+              value: font,
+              label: font,
+              fontFamily: font
+            })),
+            onChange: (value) => value && apply({ fontFamily: value })
           }
         )
       });
@@ -29169,18 +30593,16 @@ function DocxToolbar({
       groups.push({
         key: "size",
         node: /* @__PURE__ */ jsxs(Fragment2, { children: [
-          /* @__PURE__ */ jsxs(
-            "select",
+          /* @__PURE__ */ jsx(
+            ToolbarMenuSelect,
             {
               title: "Font size",
-              value: fmt?.fontSizePt ?? "",
-              onMouseDown: (e) => e.stopPropagation(),
-              onChange: (e) => e.target.value && apply({ fontSizePt: parseFloat(e.target.value) }),
-              style: { ...selectStyle, width: 58 },
-              children: [
-                /* @__PURE__ */ jsx("option", { value: "", disabled: true, children: "Size" }),
-                SIZES.map((s) => /* @__PURE__ */ jsx("option", { value: s, children: s }, s))
-              ]
+              value: fmt?.fontSizePt === void 0 ? "" : String(fmt.fontSizePt),
+              placeholder: "Size",
+              width: 58,
+              menuWidth: 92,
+              options: SIZES.map((size) => ({ value: String(size), label: String(size) })),
+              onChange: (value) => value && apply({ fontSizePt: parseFloat(value) })
             }
           ),
           /* @__PURE__ */ jsx(Sep, {})
@@ -29237,19 +30659,15 @@ function DocxToolbar({
     if (on("color"))
       groups.push({
         key: "color",
-        node: /* @__PURE__ */ jsxs("label", { title: "Text color", style: { display: "inline-flex", alignItems: "center", cursor: "pointer" }, children: [
-          /* @__PURE__ */ jsx("span", { style: { fontSize: 13, borderBottom: `3px solid ${fmt?.color && fmt.color !== "auto" ? fmt.color : "#000"}`, padding: "0 3px", color: T.fg }, children: "A" }),
-          /* @__PURE__ */ jsx(
-            "input",
-            {
-              type: "color",
-              value: fmt?.color && fmt.color !== "auto" ? fmt.color : "#000000",
-              onMouseDown: (e) => e.stopPropagation(),
-              onChange: (e) => apply({ color: e.target.value }),
-              style: { width: 0, height: 0, opacity: 0, border: "none", padding: 0 }
-            }
-          )
-        ] })
+        node: /* @__PURE__ */ jsx(
+          ColorMenu,
+          {
+            current: fmt?.color && fmt.color !== "auto" ? fmt.color : "#000000",
+            title: "Text color",
+            trigger: /* @__PURE__ */ jsx("span", { style: { fontSize: 13, borderBottom: `3px solid ${fmt?.color && fmt.color !== "auto" ? fmt.color : "#000"}`, padding: "0 3px", color: T.fg }, children: "A" }),
+            onPick: (value) => apply({ color: value })
+          }
+        )
       });
     if (on("highlight"))
       groups.push({
@@ -29822,7 +31240,7 @@ function DocxView({
         comments: showComments,
         onDeleteComment,
         onReplyComment,
-        onViewportChange: () => editor?.afterRender()
+        onViewportChange: () => editor?.afterViewportChange()
       }, prev ?? void 0);
       container.scrollTop = scrollTop;
       container.scrollLeft = scrollLeft;
@@ -29921,19 +31339,23 @@ function DocxView({
             "Calibri",
             "Calibri Light",
             "Tahoma",
-            "Franklin Gothic Medium",
-            // Complex-script faces gate layout too (advances must be real
-            // before line breaking): Mangal (Devanagari), Latha (Tamil),
-            // Noto Sans Lao Looped (Lao — bundled OFL webfont).
-            "Mangal",
-            "Latha",
-            "Noto Sans Lao Looped"
+            "Franklin Gothic Medium"
           ];
           for (const fam of latin) {
             for (const variant of ["", "italic ", "bold ", "bold italic "]) {
               loads.push(document.fonts.load(`${variant}16px "${fam}"`).catch(() => []));
             }
           }
+          const complex = [
+            ["Mangal", "\u0905"],
+            ["Latha", "\u0B85"],
+            ["Noto Sans Lao Looped", "\u0E81"]
+          ];
+          for (const [fam, sample] of complex) {
+            for (const variant of ["", "bold "]) {
+              loads.push(document.fonts.load(`${variant}16px "${fam}"`, sample).catch(() => []));
+            }
+          }
           loads.push(document.fonts.load('16px "Cambria Math"').catch(() => []));
           const cjk = [
             "MS Mincho",
@@ -29949,7 +31371,7 @@ function DocxView({
           ];
           for (const fam of cjk) {
             for (const variant of ["", "bold "]) {
-              loads.push(document.fonts.load(`${variant}16px "${fam}"`).catch(() => []));
+              loads.push(document.fonts.load(`${variant}16px "${fam}"`, "A\u6F22").catch(() => []));
             }
           }
           await Promise.all(loads);
@@ -29996,7 +31418,39 @@ function DocxView({
             else if (formatted.length > 0) editor?.selectRanges(formatted);
             document.dispatchEvent(new CustomEvent("dxw-selection"));
           },
-          onStyleShortcut: (styleId) => applyStyleShortcut?.(styleId)
+          onStyleShortcut: (styleId) => applyStyleShortcut?.(styleId),
+          onTextCommand: (command) => {
+            const current = apiRef.current;
+            if (!current) return;
+            if (command === "link") {
+              const anchor = containerRef.current;
+              if (!anchor) return;
+              void requestTextInputDialog(anchor, {
+                title: "Link address",
+                label: "URL",
+                value: current.getLinkAt() ?? "https://"
+              }).then((next) => {
+                if (next !== null) current.setLink(next.trim() || null);
+              });
+            } else if (command === "comment") {
+              const anchor = containerRef.current;
+              if (!anchor) return;
+              void requestTextInputDialog(anchor, {
+                title: "New comment",
+                label: "Comment",
+                submitLabel: "Comment",
+                multiline: true
+              }).then((text) => {
+                if (text?.trim()) current.addComment(text.trim());
+              });
+            } else if (command === "bullet" || command === "number") {
+              current.toggleList(command);
+            } else {
+              current.setAlignment(
+                command === "alignLeft" ? "left" : command === "alignCenter" ? "center" : command === "alignRight" ? "right" : "justify"
+              );
+            }
+          }
         };
         editor = new DocxEditor(editorConfig);
         editor.attach();
@@ -30615,7 +32069,8 @@ function DocxView({
           alignItems: "center"
         },
         children: [
-          /* @__PURE__ */ jsx2("span", { style: { font: "600 11.5px system-ui, sans-serif", color: "#5f6368", padding: "0 4px" }, children: "Header & footer" }),
+          /* @__PURE__ */ jsx2("span", { style: { font: "600 11.5px system-ui, sans-serif", color: "#5f6368", padding: "0 4px" }, children: "Header & footer \xB7 repeats on pages" }),
+          hotBtn("Line", "Insert a reusable line in the repeating page layer", () => apiRef.current?.insertShape("line")),
           hotBtn("Page number", "Insert a dynamic page number at the caret", () => apiRef.current?.insertPageNumber("page")),
           hotBtn("Page X of Y", "Insert 'Page X of Y' at the caret", () => apiRef.current?.insertPageNumber("pageOfTotal")),
           hotBtn("Close", "Return to the document body", () => {
@@ -30631,6 +32086,7 @@ export {
   DocxDocument,
   DocxToolbar,
   DocxView,
+  ToolbarMenuSelect,
   layoutDocument,
   printPages,
   renderToDom