wordinweb 0.1.8 → 0.1.9

package/dist/index.js

@@ -6111,23 +6111,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 +6161,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 +6169,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 = [];
@@ -10833,6 +10951,7 @@ var __incrStats = {
   resumePage: -1,
   convergedBlock: -1,
   convergedPage: -1,
+  pageShift: 0,
   blocksLaid: 0,
   fallbackReason: ""
 };
@@ -10933,6 +11052,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;
@@ -11025,6 +11145,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;
@@ -11231,6 +11353,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,
@@ -11367,9 +11490,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 +11521,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 +11580,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));
+    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 +11648,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 +11661,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 +11758,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 +11816,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 +11875,7 @@ var Engine = class {
         points,
         pages: outInternal,
         bookmarks: mergedBookmarks,
+        bookmarkPageIndices: mergedBookmarkPageIndices,
         modelVersion: this.doc.modelVersion,
         seqCounters: this.seqCounters,
         seqAssigned: this.seqAssigned,
@@ -11964,6 +12217,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 +12257,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;
@@ -13523,6 +13778,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);
             }
           }
         }
@@ -16905,7 +17161,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 +17177,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 +17200,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 +17232,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,
@@ -18475,6 +18749,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 +18770,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 +18780,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) => {
@@ -20538,7 +20815,7 @@ function setDrawingWordArtText(doc, drawing, text) {
   doc.refresh();
   return true;
 }
-function insertInkAt(doc, caretT, points, color = "#202124", widthPx = 2, opacity = 1) {
+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 +20892,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;
 }
 
@@ -21651,7 +21928,11 @@ 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;
@@ -22009,7 +22290,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();
@@ -22270,6 +22551,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 +22560,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() {
@@ -23034,6 +23324,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 +23339,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 +23375,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);
@@ -24518,14 +24821,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 +24997,97 @@ 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 afterSources = [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 = split.after;
+    for (let i = 1; i < lineCount; i++) {
+      if (this.suggesting) 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;
+      this.caret = { t, run: caret.run, offset: 0 };
+    }
+    const reparsed = this.host.doc.reparseDirectBodyParagraphSplits(split.before, afterSources);
+    if (reparsed) {
+      for (const child4 of reparsed[reparsed.length - 1].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 +25390,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 +25411,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 +25644,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. */
@@ -29822,7 +30226,7 @@ function DocxView({
         comments: showComments,
         onDeleteComment,
         onReplyComment,
-        onViewportChange: () => editor?.afterRender()
+        onViewportChange: () => editor?.afterViewportChange()
       }, prev ?? void 0);
       container.scrollTop = scrollTop;
       container.scrollLeft = scrollLeft;