@beyondwork/docx-react-component 1.0.100 → 1.0.101

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@beyondwork/docx-react-component",
   "publisher": "beyondwork",
-  "version": "1.0.100",
+  "version": "1.0.101",
   "description": "Embeddable React Word (docx) editor with review, comments, tracked changes, and round-trip OOXML fidelity.",
   "type": "module",
   "sideEffects": [

package/src/runtime/document-runtime.ts

@@ -294,6 +294,7 @@ import type {
   ParagraphNode,
   SectionProperties,
   SubPartsCatalog,
+  TocCachedEntry,
   TocRegion,
 } from "../model/canonical-document.ts";
 import {
@@ -7550,14 +7551,16 @@ function refreshDocumentTableOfContents(
         : parseTocLevelRange(field.instruction);
     const entries = navigation.headings
       .filter((heading) => heading.level >= levelRange.from && heading.level <= levelRange.to)
-      .map((heading) => {
+      .map((heading, index) => {
         const bookmarkName = bookmarkNameByOffset.get(heading.offset);
-        return {
+        const entry: RuntimeTocEntry = {
           level: heading.level,
           text: heading.text,
           pageIndex: heading.pageIndex,
           ...(bookmarkName ? { bookmarkName } : {}),
         };
+        const cachedPageText = resolveCachedTocPageText(selectedRegion, entry, index);
+        return cachedPageText ? { ...entry, pageText: cachedPageText } : entry;
       });
     if (resultEntries.length === 0) {
       resultEntries = entries;
@@ -7657,6 +7660,7 @@ type RuntimeTocEntry = {
   level: number;
   text: string;
   pageIndex: number;
+  pageText?: string;
   bookmarkName?: string;
 };
 
@@ -7688,11 +7692,54 @@ function buildTocRefreshResult(
       level: entry.level,
       text: entry.text,
       pageIndex: entry.pageIndex,
+      ...(entry.pageText ? { pageText: entry.pageText } : {}),
       source: "generated",
     })),
   };
 }
 
+function resolveCachedTocPageText(
+  region: TocRegion | undefined,
+  entry: RuntimeTocEntry,
+  index: number,
+): string | undefined {
+  if (!region || region.cachedEntries.length === 0) {
+    return undefined;
+  }
+  const indexed = region.cachedEntries[index];
+  if (indexed?.pageText && cachedTocEntryMatchesRuntimeEntry(indexed, entry)) {
+    return indexed.pageText;
+  }
+  if (entry.bookmarkName) {
+    const bookmarkMatch = region.cachedEntries.find(
+      (cached) =>
+        cached.bookmarkName === entry.bookmarkName &&
+        cached.pageText &&
+        cached.level === entry.level,
+    );
+    if (bookmarkMatch?.pageText) {
+      return bookmarkMatch.pageText;
+    }
+  }
+  return undefined;
+}
+
+function cachedTocEntryMatchesRuntimeEntry(
+  cached: TocCachedEntry,
+  entry: RuntimeTocEntry,
+): boolean {
+  return cached.level === entry.level &&
+    normalizeTocEntryPageReuseText(cached.text) === normalizeTocEntryPageReuseText(entry.text);
+}
+
+function normalizeTocEntryPageReuseText(text: string): string {
+  return text
+    .replace(/\s+/gu, " ")
+    .trim()
+    .replace(/^(\d+(?:\.\d+)*\.?)\s+/u, "$1")
+    .toLowerCase();
+}
+
 function tocPageTextToPageIndex(pageText: string | undefined): number {
   const value = Number.parseInt(pageText ?? "", 10);
   return Number.isFinite(value) && value > 0 ? value - 1 : 0;
@@ -7873,7 +7920,7 @@ function buildTocEntryInlineNodes(
     children.push({ type: "text", text: entry.text });
   }
   children.push({ type: "tab" });
-  const displayed = resolveDisplayPageNumber?.(entry.pageIndex);
+  const displayed = entry.pageText ?? resolveDisplayPageNumber?.(entry.pageIndex);
   children.push({
     type: "text",
     text: String(displayed ?? entry.pageIndex + 1),
@@ -8056,7 +8103,7 @@ function buildInlineNodesFromDisplayText(text: string): InlineNode[] {
  * resolver, falls back to the raw `pageIndex + 1` (pre-P5 behavior).
  */
 function buildTocInlineNodes(
-  entries: ReadonlyArray<{ level: number; text: string; pageIndex: number; bookmarkName?: string }>,
+  entries: ReadonlyArray<{ level: number; text: string; pageIndex: number; pageText?: string; bookmarkName?: string }>,
   resolveDisplayPageNumber?: (pageIndex: number) => number | null,
 ): InlineNode[] {
   const children: InlineNode[] = [];
@@ -8071,7 +8118,7 @@ function buildTocInlineNodes(
       children.push({ type: "text", text: entry.text });
     }
     children.push({ type: "tab" });
-    const displayed = resolveDisplayPageNumber?.(entry.pageIndex);
+    const displayed = entry.pageText ?? resolveDisplayPageNumber?.(entry.pageIndex);
     children.push({
       type: "text",
       text: String(displayed ?? entry.pageIndex + 1),
@@ -8085,7 +8132,7 @@ function buildTocInlineNodes(
 
 /** Test-only export of `buildTocInlineNodes` (P5 unit tests). */
 export function __buildTocInlineNodes(
-  entries: ReadonlyArray<{ level: number; text: string; pageIndex: number; bookmarkName?: string }>,
+  entries: ReadonlyArray<{ level: number; text: string; pageIndex: number; pageText?: string; bookmarkName?: string }>,
   resolveDisplayPageNumber?: (pageIndex: number) => number | null,
 ): InlineNode[] {
   return buildTocInlineNodes(entries, resolveDisplayPageNumber);