@beyondwork/docx-react-component 1.0.128 → 1.0.129

package/dist/{chunk-4YJVRIUB.js → chunk-Q3QYGKFE.js}

@@ -1068,7 +1068,7 @@ function parseNumberingXml(xml, context) {
         abstractDefinitions[abstractNumberingId] = {
           abstractNumberingId,
           ...context?.partPath !== void 0 ? { sourceRef: createNumberingSourceRef(context.partPath, "abstractNum", rawId, childXmlPath) } : {},
-          levels: readLevels(child),
+          levels: readLevels(child, context, childXmlPath, rawId),
           ...nsid ? { nsid } : {},
           ...multiLevelType ? { multiLevelType } : {},
           ...tplc ? { tplc } : {},
@@ -1089,7 +1089,7 @@ function parseNumberingXml(xml, context) {
           numberingInstanceId,
           ...context?.partPath !== void 0 ? { sourceRef: createNumberingSourceRef(context.partPath, "num", rawId, childXmlPath) } : {},
           abstractNumberingId: toCanonicalAbstractNumberingId(rawAbstractId),
-          overrides: readOverrides(child)
+          overrides: readOverrides(child, context, childXmlPath, rawId)
         };
         break;
       }
@@ -1110,6 +1110,16 @@ function createNumberingSourceRef(partPath, element, rawId, xmlPath) {
     ...xmlPath !== void 0 ? { xmlPath } : {}
   };
 }
+function createNumberingChildSourceRef(partPath, element, sourceIdSuffix, xmlPath) {
+  if (partPath === void 0) return void 0;
+  return {
+    sourceId: `part:${partPath}#${sourceIdSuffix}`,
+    partPath,
+    storyKind: "numbering",
+    element,
+    ...xmlPath !== void 0 ? { xmlPath } : {}
+  };
+}
 function readNumPicBullet(node, numPicBulletId, context, xmlPath) {
   let widthEmu;
   let heightEmu;
@@ -1186,18 +1196,29 @@ function toCanonicalAbstractNumberingId(value) {
 function toCanonicalNumberingInstanceId(value) {
   return value.startsWith("num:") ? value : `num:${value}`;
 }
-function readLevels(abstractNode) {
+function readLevels(abstractNode, context, abstractXmlPath, rawAbstractId) {
   const levels = [];
+  let levelOrdinal = 0;
   for (const child of abstractNode.children) {
     if (child.type !== "element" || localName(child.name) !== "lvl") {
       continue;
     }
+    levelOrdinal += 1;
     const rawLevel = readStringAttr(child, "w:ilvl");
     const level = rawLevel === void 0 ? void 0 : parseInteger(rawLevel);
     if (level === void 0) {
       continue;
     }
-    const definition = readLevelDefinition(child, level);
+    const definition = readLevelDefinition(
+      child,
+      level,
+      createNumberingChildSourceRef(
+        context?.partPath,
+        "lvl",
+        `abstractNum:${rawAbstractId}:lvl:${level}`,
+        `${abstractXmlPath}/lvl[${levelOrdinal}]`
+      )
+    );
     if (!definition) {
       continue;
     }
@@ -1205,12 +1226,14 @@ function readLevels(abstractNode) {
   }
   return levels.sort((left, right) => left.level - right.level);
 }
-function readOverrides(numNode) {
+function readOverrides(numNode, context, numXmlPath, rawNumId) {
   const overrides = [];
+  let overrideOrdinal = 0;
   for (const child of numNode.children) {
     if (child.type !== "element" || localName(child.name) !== "lvlOverride") {
       continue;
     }
+    overrideOrdinal += 1;
     const rawLevel = readStringAttr(child, "w:ilvl");
     const level = rawLevel === void 0 ? void 0 : parseInteger(rawLevel);
     if (level === void 0) {
@@ -1220,8 +1243,26 @@ function readOverrides(numNode) {
     const rawStart = startOverrideNode ? readStringAttr(startOverrideNode, "w:val") : void 0;
     const startAt = rawStart === void 0 ? void 0 : parseInteger(rawStart);
     const levelDefinitionNode = findChildElementOptional(child, "lvl");
-    const levelDefinition = levelDefinitionNode ? readLevelOverrideDefinition(levelDefinitionNode, level) : void 0;
+    const overrideXmlPath = `${numXmlPath}/lvlOverride[${overrideOrdinal}]`;
+    const levelDefinition = levelDefinitionNode ? readLevelOverrideDefinition(
+      levelDefinitionNode,
+      level,
+      createNumberingChildSourceRef(
+        context?.partPath,
+        "lvl",
+        `num:${rawNumId}:lvlOverride:${level}:lvl`,
+        `${overrideXmlPath}/lvl[1]`
+      )
+    ) : void 0;
     overrides.push({
+      ...context?.partPath !== void 0 ? {
+        sourceRef: createNumberingChildSourceRef(
+          context.partPath,
+          "lvlOverride",
+          `num:${rawNumId}:lvlOverride:${level}`,
+          overrideXmlPath
+        )
+      } : {},
       level,
       ...startAt !== void 0 ? { startAt } : {},
       ...levelDefinition ? { levelDefinition } : {}
@@ -1229,7 +1270,7 @@ function readOverrides(numNode) {
   }
   return overrides.sort((left, right) => left.level - right.level);
 }
-function readLevelDefinition(levelNode, fallbackLevel) {
+function readLevelDefinition(levelNode, fallbackLevel, sourceRef) {
   const rawLevel = readStringAttr(levelNode, "w:ilvl");
   const level = rawLevel === void 0 ? fallbackLevel : parseInteger(rawLevel);
   if (level === void 0) {
@@ -1259,6 +1300,7 @@ function readLevelDefinition(levelNode, fallbackLevel) {
   const lvlPicBulletNode = findChildElementOptional(levelNode, "lvlPicBulletId");
   const picBulletId = lvlPicBulletNode ? readStringAttr(lvlPicBulletNode, "w:val") : void 0;
   return {
+    ...sourceRef ? { sourceRef } : {},
     level,
     format,
     text,
@@ -1272,7 +1314,7 @@ function readLevelDefinition(levelNode, fallbackLevel) {
     ...picBulletId !== void 0 ? { picBulletId } : {}
   };
 }
-function readLevelOverrideDefinition(levelNode, fallbackLevel) {
+function readLevelOverrideDefinition(levelNode, fallbackLevel, sourceRef) {
   const rawLevel = readStringAttr(levelNode, "w:ilvl");
   const level = rawLevel === void 0 ? fallbackLevel : parseInteger(rawLevel);
   if (level === void 0) {
@@ -1306,6 +1348,7 @@ function readLevelOverrideDefinition(levelNode, fallbackLevel) {
     return void 0;
   }
   return {
+    ...sourceRef ? { sourceRef } : {},
     level,
     ...startAt !== void 0 ? { startAt } : {},
     ...format !== void 0 ? { format } : {},

package/dist/{chunk-YHZHPXDB.js → chunk-RMRTQGW3.js}

@@ -18,7 +18,7 @@ import {
   resolveSectionVariants,
   sectionSupportsStoryTarget,
   storyTargetKey
-} from "./chunk-CXSYRB37.js";
+} from "./chunk-HUIHBBAQ.js";
 import {
   createSelectionSnapshot
 } from "./chunk-OYGMRRR7.js";
@@ -3692,6 +3692,14 @@ function paginateSectionBlocksWithSplits(section, blocks, layout, footnotes, mea
         pushPage(block.from);
         continue;
       }
+      if (isStandalonePageBreakParagraph(block)) {
+        if (columnHeight > 0) {
+          pushPage(nextBoundary);
+        } else {
+          pageStart = Math.max(pageStart, Math.min(nextBoundary, section.end));
+        }
+        break;
+      }
       const effectiveNoteHeight = estimateFootnoteReservation(
         block,
         footnotes,
@@ -3866,6 +3874,21 @@ function hasPageBreak(block) {
   }
   return nestedBlocks(block).some(hasPageBreak);
 }
+function isStandalonePageBreakParagraph(block) {
+  if (block.kind !== "paragraph") return false;
+  let sawPageBreak = false;
+  for (const segment of block.segments) {
+    if (segment.kind === "opaque_inline" && segment.label === "Page break") {
+      sawPageBreak = true;
+      continue;
+    }
+    if (segment.kind === "text" && segment.text.trim().length === 0) {
+      continue;
+    }
+    return false;
+  }
+  return sawPageBreak;
+}
 function nestedBlocks(block) {
   if (block.kind === "sdt_block") {
     return block.children;
@@ -5350,6 +5373,9 @@ function projectSurfaceBlocksToPageFragments(surface, pages, splits, columnByBlo
   for (let blockIndex = 0; blockIndex < surface.blocks.length; blockIndex += 1) {
     const block = surface.blocks[blockIndex];
     const blockPath = `main/block[${blockIndex}]`;
+    if (isStandalonePageBreakParagraph2(block)) {
+      continue;
+    }
     if (block.kind === "table") {
       const tableSliceList = splits?.tablesByBlockId.get(block.blockId);
       if (tableSliceList && tableSliceList.length > 1) {
@@ -5435,6 +5461,23 @@ function projectSurfaceBlocksToPageFragments(surface, pages, splits, columnByBlo
   }
   return byPage;
 }
+function isStandalonePageBreakParagraph2(block) {
+  if (block.kind !== "paragraph") {
+    return false;
+  }
+  let sawPageBreak = false;
+  for (const segment of block.segments) {
+    if (segment.kind === "opaque_inline" && segment.label === "Page break") {
+      sawPageBreak = true;
+      continue;
+    }
+    if (segment.kind === "text" && segment.text.trim().length === 0) {
+      continue;
+    }
+    return false;
+  }
+  return sawPageBreak;
+}
 function projectLineBoxesForPageFragments(pages, fragmentsByPageIndex, fragmentMeasurementsByPageIndex, surface) {
   const byPage = /* @__PURE__ */ new Map();
   const blocksById = surface ? new Map(surface.blocks.map((block) => [block.blockId, block])) : /* @__PURE__ */ new Map();
@@ -5947,13 +5990,11 @@ function buildBookmarkRanges(targets) {
 }
 var EMPTY_NUMBERING_INPUT_INDEX = {
   byNumberingKey: /* @__PURE__ */ new Map(),
-  byBlockPath: /* @__PURE__ */ new Map(),
-  byParagraphIndex: /* @__PURE__ */ new Map()
+  byBlockPath: /* @__PURE__ */ new Map()
 };
 function buildNumberingInputIndex(numberingInputs) {
   const byNumberingKey = /* @__PURE__ */ new Map();
   const byBlockPath = /* @__PURE__ */ new Map();
-  const byParagraph = /* @__PURE__ */ new Map();
   for (const input of numberingInputs) {
     if (!byNumberingKey.has(input.numberingKey)) {
       byNumberingKey.set(input.numberingKey, input);
@@ -5961,11 +6002,8 @@ function buildNumberingInputIndex(numberingInputs) {
     if (!byBlockPath.has(input.blockPath)) {
       byBlockPath.set(input.blockPath, input);
     }
-    if (!byParagraph.has(input.paragraphIndex)) {
-      byParagraph.set(input.paragraphIndex, input);
-    }
   }
-  return { byNumberingKey, byBlockPath, byParagraphIndex: byParagraph };
+  return { byNumberingKey, byBlockPath };
 }
 function collectBookmarkRangeLayoutFacts(fragmentId, blockPath, bookmarkRanges) {
   if (!blockPath || !bookmarkRanges || bookmarkRanges.length === 0) return [];
@@ -6085,8 +6123,7 @@ function collectNumberingLayoutFactsForBlock(block, blockPath, numberingIndex, n
     const canonical = lookupNumberingInput(
       numberingIndex,
       numberingKey,
-      context.path,
-      paragraphIndex
+      context.path
     );
     const target = findNumberingTarget(numberingTargets, context.path);
     const numberingLayoutId = numberingKey ?? [
@@ -6126,7 +6163,7 @@ function findNumberingTarget(numberingTargets, blockPath) {
   if (blockPath === void 0) return void 0;
   return numberingTargets.find((target) => target.blockPath === blockPath);
 }
-function lookupNumberingInput(numberingIndex, numberingKey, blockPath, paragraphIndex) {
+function lookupNumberingInput(numberingIndex, numberingKey, blockPath) {
   if (!numberingIndex) return void 0;
   if (numberingKey !== void 0) {
     const byKey = numberingIndex.byNumberingKey.get(numberingKey);
@@ -6136,7 +6173,7 @@ function lookupNumberingInput(numberingIndex, numberingKey, blockPath, paragraph
     const byPath = numberingIndex.byBlockPath.get(blockPath);
     if (byPath !== void 0) return byPath;
   }
-  return paragraphIndex !== void 0 ? numberingIndex.byParagraphIndex.get(paragraphIndex) : void 0;
+  return void 0;
 }
 function collectNumberingUnavailableReasons(numbering, canonical) {
   const reasons = [];
@@ -6553,7 +6590,7 @@ async function createCanvasProvider(fontLoader) {
 }
 
 // src/runtime/layout/layout-engine-version.ts
-var LAYOUT_ENGINE_VERSION = 88;
+var LAYOUT_ENGINE_VERSION = 89;
 var LAYCACHE_SCHEMA_VERSION = 12;
 
 // src/runtime/layout/layout-engine-instance.ts