oasis-editor 0.0.111 → 0.0.113

package/dist/{index-mocSBySQ.js → index-DSDwe-yy.js}

@@ -2539,7 +2539,7 @@ function OasisEditorAppLazy(props = {}) {
     onCleanup(() => {
       cancelled = true;
     });
-    import("./OasisEditorApp-MEaOb4ut.js").then((m) => {
+    import("./OasisEditorApp-BKPrQtm5.js").then((m) => {
       cancelled = true;
       setProgress(1);
       setTimeout(() => setApp(() => m.OasisEditorApp), 180);
@@ -16271,6 +16271,30 @@ class PaginationTrack {
     return this.pages;
   }
 }
+function paginateSegments(track, sourceId, segmenter) {
+  var _a, _b;
+  let segmentIndex = 0;
+  while (segmenter.hasMore()) {
+    const segmentId = `${sourceId}:segment:${segmentIndex}`;
+    const remaining = track.currentMaxHeight - track.height;
+    let block = segmenter.fit(segmentId, remaining);
+    if (block === null && track.blocks.length > 0) {
+      (_a = segmenter.onBeforeFlush) == null ? void 0 : _a.call(segmenter);
+      track.flush();
+      continue;
+    }
+    if (block === null) {
+      block = segmenter.force(segmentId);
+    }
+    track.blocks.push(block);
+    track.height += block.estimatedHeight;
+    (_b = segmenter.onAfterPush) == null ? void 0 : _b.call(segmenter, block, segmentIndex);
+    segmentIndex += 1;
+    if (segmenter.hasMore()) {
+      track.flush();
+    }
+  }
+}
 const TEXT_BOX_AUTOFIT_SAFETY_PX$1 = 2;
 const PARAGRAPH_FIT_HEIGHT_TOLERANCE_PX = 1.5;
 function registerParagraphFloatingExclusions(options) {
@@ -16457,93 +16481,13 @@ function paginateParagraphBlock(track, params, sourceBlock, nextBlock, index) {
     return;
   }
   let startLineIndex = 0;
-  let segmentIndex = 0;
-  while (startLineIndex < paragraphLayout.lines.length) {
-    const remainingHeight = track.currentMaxHeight - track.height;
-    let lineEndIndex = startLineIndex;
-    let segmentHeight = 0;
-    while (lineEndIndex < paragraphLayout.lines.length) {
-      const candidateLines = paragraphLayout.lines.slice(
-        startLineIndex,
-        lineEndIndex + 1
-      );
-      const candidateHeight = getParagraphSegmentHeight(
-        sourceBlock,
-        candidateLines,
-        startLineIndex === 0,
-        lineEndIndex === paragraphLayout.lines.length - 1,
-        styles,
-        !collapseWithPrevious
-      );
-      const candidateFitHeight = getParagraphSegmentFitHeight(
-        sourceBlock,
-        candidateHeight,
-        lineEndIndex === paragraphLayout.lines.length - 1,
-        styles
-      );
-      if (candidateFitHeight > remainingHeight + PARAGRAPH_FIT_HEIGHT_TOLERANCE_PX && lineEndIndex === startLineIndex && track.blocks.length > 0) {
-        break;
-      }
-      if (candidateFitHeight > remainingHeight + PARAGRAPH_FIT_HEIGHT_TOLERANCE_PX && lineEndIndex > startLineIndex) {
-        break;
-      }
-      segmentHeight = candidateHeight;
-      lineEndIndex += 1;
-    }
-    if (lineEndIndex === startLineIndex && track.blocks.length > 0) {
-      if (contextualAdjustedPreviousBlock && contextualAdjustedAmount > 0) {
-        contextualAdjustedPreviousBlock.estimatedHeight += contextualAdjustedAmount;
-        track.height += contextualAdjustedAmount;
-        contextualAdjustedPreviousBlock = void 0;
-        contextualAdjustedAmount = 0;
-      }
-      collapseWithPrevious = false;
-      track.flush();
-      continue;
-    }
-    if (lineEndIndex === startLineIndex) {
-      lineEndIndex = Math.min(paragraphLayout.lines.length, startLineIndex + 1);
-      segmentHeight = getParagraphSegmentHeight(
-        sourceBlock,
-        paragraphLayout.lines.slice(startLineIndex, lineEndIndex),
-        startLineIndex === 0,
-        lineEndIndex === paragraphLayout.lines.length,
-        styles,
-        !collapseWithPrevious
-      );
-    }
-    if (lineEndIndex < paragraphLayout.lines.length) {
-      const widowOrphanAdjusted = applyWidowOrphanControl(
-        sourceBlock,
-        paragraphLayout.lines,
-        startLineIndex,
-        lineEndIndex,
-        styles,
-        !collapseWithPrevious,
-        true,
-        track.blocks.length > 0
-      );
-      lineEndIndex = widowOrphanAdjusted.endLineIndexExclusive;
-      segmentHeight = widowOrphanAdjusted.height;
-      if (lineEndIndex === startLineIndex) {
-        if (contextualAdjustedPreviousBlock && contextualAdjustedAmount > 0) {
-          contextualAdjustedPreviousBlock.estimatedHeight += contextualAdjustedAmount;
-          track.height += contextualAdjustedAmount;
-          contextualAdjustedPreviousBlock = void 0;
-          contextualAdjustedAmount = 0;
-        }
-        collapseWithPrevious = false;
-        track.flush();
-        continue;
-      }
-    }
+  const buildSegmentBlock = (originalStart, lineEndIndex, segmentHeight, segmentId) => {
     const segmentLayout = createParagraphSegmentLayout(
       paragraphLayout,
-      startLineIndex,
+      originalStart,
       lineEndIndex
     );
-    const segmentId = `${sourceBlock.id}:segment:${segmentIndex}`;
-    const isWholeParagraphSegment = startLineIndex === 0 && lineEndIndex === paragraphLayout.lines.length;
+    const isWholeParagraphSegment = originalStart === 0 && lineEndIndex === paragraphLayout.lines.length;
     const rawMeasuredHeight = getParagraphMeasuredHeight(
       measuredHeights,
       sourceBlock.id,
@@ -16552,8 +16496,8 @@ function paginateParagraphBlock(track, params, sourceBlock, nextBlock, index) {
       segmentHeight
     );
     const hasMeasuredHeight = (measuredHeights == null ? void 0 : measuredHeights[segmentId]) !== void 0 || isWholeParagraphSegment && (measuredHeights == null ? void 0 : measuredHeights[sourceBlock.id]) !== void 0;
-    const measuredHeight = collapseWithPrevious && startLineIndex === 0 && hasMeasuredHeight ? Math.max(0, rawMeasuredHeight - (paragraphStyle.spacingBefore ?? 0)) : rawMeasuredHeight;
-    track.blocks.push({
+    const measuredHeight = collapseWithPrevious && originalStart === 0 && hasMeasuredHeight ? Math.max(0, rawMeasuredHeight - (paragraphStyle.spacingBefore ?? 0)) : rawMeasuredHeight;
+    return {
       blockId: segmentId,
       sourceBlockId: sourceBlock.id,
       blockType: sourceBlock.type,
@@ -16562,23 +16506,111 @@ function paginateParagraphBlock(track, params, sourceBlock, nextBlock, index) {
       estimatedHeight: measuredHeight,
       layout: segmentLayout,
       sourceBlock
-    });
-    track.height += measuredHeight;
-    if (startLineIndex === 0) {
-      registerParagraphFloatingExclusions({
-        track,
-        layout: segmentLayout,
-        blockTop: track.height - measuredHeight + (paragraphStyle.spacingBefore ?? 0),
-        params,
-        resolveTextBoxHeight
-      });
-    }
-    startLineIndex = lineEndIndex;
-    segmentIndex += 1;
-    if (startLineIndex < paragraphLayout.lines.length) {
-      track.flush();
+    };
+  };
+  paginateSegments(track, sourceBlock.id, {
+    hasMore: () => startLineIndex < paragraphLayout.lines.length,
+    fit(segmentId, remaining) {
+      const originalStart = startLineIndex;
+      let lineEndIndex = originalStart;
+      let segmentHeight = 0;
+      while (lineEndIndex < paragraphLayout.lines.length) {
+        const candidateLines = paragraphLayout.lines.slice(
+          originalStart,
+          lineEndIndex + 1
+        );
+        const candidateHeight = getParagraphSegmentHeight(
+          sourceBlock,
+          candidateLines,
+          originalStart === 0,
+          lineEndIndex === paragraphLayout.lines.length - 1,
+          styles,
+          !collapseWithPrevious
+        );
+        const candidateFitHeight = getParagraphSegmentFitHeight(
+          sourceBlock,
+          candidateHeight,
+          lineEndIndex === paragraphLayout.lines.length - 1,
+          styles
+        );
+        if (candidateFitHeight > remaining + PARAGRAPH_FIT_HEIGHT_TOLERANCE_PX && lineEndIndex === originalStart && track.blocks.length > 0) {
+          break;
+        }
+        if (candidateFitHeight > remaining + PARAGRAPH_FIT_HEIGHT_TOLERANCE_PX && lineEndIndex > originalStart) {
+          break;
+        }
+        segmentHeight = candidateHeight;
+        lineEndIndex += 1;
+      }
+      if (lineEndIndex === originalStart) return null;
+      if (lineEndIndex < paragraphLayout.lines.length) {
+        const widowOrphanAdjusted = applyWidowOrphanControl(
+          sourceBlock,
+          paragraphLayout.lines,
+          originalStart,
+          lineEndIndex,
+          styles,
+          !collapseWithPrevious,
+          true,
+          track.blocks.length > 0
+        );
+        lineEndIndex = widowOrphanAdjusted.endLineIndexExclusive;
+        segmentHeight = widowOrphanAdjusted.height;
+        if (lineEndIndex === originalStart) return null;
+      }
+      const block = buildSegmentBlock(
+        originalStart,
+        lineEndIndex,
+        segmentHeight,
+        segmentId
+      );
+      startLineIndex = lineEndIndex;
+      return block;
+    },
+    force(segmentId) {
+      const originalStart = startLineIndex;
+      const lineEndIndex = Math.min(
+        paragraphLayout.lines.length,
+        originalStart + 1
+      );
+      const segmentHeight = getParagraphSegmentHeight(
+        sourceBlock,
+        paragraphLayout.lines.slice(originalStart, lineEndIndex),
+        originalStart === 0,
+        lineEndIndex === paragraphLayout.lines.length,
+        styles,
+        !collapseWithPrevious
+      );
+      const block = buildSegmentBlock(
+        originalStart,
+        lineEndIndex,
+        segmentHeight,
+        segmentId
+      );
+      startLineIndex = lineEndIndex;
+      return block;
+    },
+    onBeforeFlush() {
+      if (contextualAdjustedPreviousBlock && contextualAdjustedAmount > 0) {
+        contextualAdjustedPreviousBlock.estimatedHeight += contextualAdjustedAmount;
+        track.height += contextualAdjustedAmount;
+        contextualAdjustedPreviousBlock = void 0;
+        contextualAdjustedAmount = 0;
+      }
+      collapseWithPrevious = false;
+    },
+    onAfterPush(block, si) {
+      if (si === 0) {
+        registerParagraphFloatingExclusions({
+          track,
+          layout: block.layout,
+          blockTop: track.height - block.estimatedHeight + (paragraphStyle.spacingBefore ?? 0),
+          params,
+          resolveTextBoxHeight
+        });
+      }
     }
-  }
+  });
 }
 function normalizeCellStartPositions(row, starts, legacyStarts) {
   return row.cells.map((_, cellIdx) => {
@@ -16867,139 +16899,192 @@ function paginateTableBlock(track, params, sourceBlock, index) {
     rowGroups
   );
   let groupStartIndex = 0;
-  let segmentIndex = 0;
   let currentCellBlockPositions;
-  while (groupStartIndex < rowGroups.length) {
-    const startRowIndex = rowGroups[groupStartIndex].startRowIndex;
-    const repeatedHeaderRowCount = startRowIndex > 0 ? headerRowCount : 0;
-    const remainingHeight = track.currentMaxHeight - track.height;
-    let groupEndIndex = groupStartIndex;
-    let segmentHeight = 0;
-    let splitEnds;
-    let splitEndPositions;
-    let isLastRowSplit = false;
-    while (groupEndIndex < rowGroups.length) {
-      const candidateEndRowIndex = rowGroups[groupEndIndex].endRowIndexExclusive;
-      let candidateHeight = 0;
-      if (groupEndIndex === groupStartIndex && currentCellBlockPositions) {
-        const firstRow2 = sourceBlock.rows[startRowIndex];
-        const starts = normalizeCellStartPositions(
-          firstRow2,
-          currentCellBlockPositions,
-          void 0
-        );
-        const ends = firstRow2.cells.map((cell) => ({
-          blockIndex: cell.blocks.length
-        }));
-        const slicedFirstRow = buildRowSliceFromPositions(
-          firstRow2,
-          starts,
-          ends
-        );
-        candidateHeight = getTableSegmentHeight(
-          {
-            ...sourceBlock,
-            rows: [slicedFirstRow]
-          },
-          0,
-          1,
-          repeatedHeaderRowCount,
-          styles,
-          contentWidth,
-          measurer,
-          defaultTabStop
-        );
+  const buildTableBlock = (segmentId, startRowIndex, groupEndIndex, repeatedHeaderRowCount, segmentHeight, splitEnds, splitEndPositions, startCellPositions) => {
+    const endRowIndex = rowGroups[groupEndIndex - 1].endRowIndexExclusive;
+    const measuredSegmentHeight = (measuredHeights == null ? void 0 : measuredHeights[segmentId]) ?? segmentHeight;
+    return {
+      blockId: segmentId,
+      sourceBlockId: sourceBlock.id,
+      blockType: sourceBlock.type,
+      globalIndex: index,
+      estimatedHeight: measuredSegmentHeight,
+      tableSegment: {
+        startRowIndex,
+        endRowIndex,
+        repeatedHeaderRowCount,
+        startRowCellBlockStarts: positionsToBlockIndexes(startCellPositions),
+        endRowCellBlockEnds: splitEnds,
+        startRowCellBlockPositions: hasPartialPositions(startCellPositions) ? startCellPositions : void 0,
+        endRowCellBlockPositions: hasPartialPositions(splitEndPositions) ? splitEndPositions : void 0
+      },
+      sourceBlock
+    };
+  };
+  const advanceCursor = (groupEndIndex, isLastRowSplit, splitEnds, splitEndPositions) => {
+    if (isLastRowSplit) {
+      const lastRowIndex = rowGroups[groupEndIndex - 1].startRowIndex;
+      const lastRow = sourceBlock.rows[lastRowIndex];
+      const ends = splitEndPositions ?? (splitEnds == null ? void 0 : splitEnds.map((blockIndex) => ({ blockIndex }))) ?? [];
+      if (positionsFinishedRow(lastRow, ends)) {
+        currentCellBlockPositions = void 0;
+        groupStartIndex = groupEndIndex;
       } else {
-        candidateHeight = getTableSegmentHeight(
-          sourceBlock,
-          startRowIndex,
-          candidateEndRowIndex,
-          repeatedHeaderRowCount,
-          styles,
-          contentWidth,
-          measurer,
-          defaultTabStop
-        );
-      }
-      if (candidateHeight <= remainingHeight) {
-        segmentHeight = candidateHeight;
-        groupEndIndex += 1;
-        continue;
+        currentCellBlockPositions = ends;
+        groupStartIndex = groupEndIndex - 1;
       }
-      const isSingleRowGroup = candidateEndRowIndex === rowGroups[groupEndIndex].startRowIndex + 1;
-      const targetRow = sourceBlock.rows[rowGroups[groupEndIndex].startRowIndex];
-      const isSplitCandidate = isSingleRowGroup && canSplitTableRow(targetRow);
-      if (isSplitCandidate) {
-        const precedingHeight = groupEndIndex > groupStartIndex ? getTableSegmentHeight(
-          sourceBlock,
-          startRowIndex,
-          rowGroups[groupEndIndex].startRowIndex,
-          repeatedHeaderRowCount,
-          styles,
-          contentWidth,
-          measurer,
-          defaultTabStop
-        ) : 0;
-        const availableForSplitRow = remainingHeight - precedingHeight;
-        if (availableForSplitRow > 0) {
+    } else {
+      currentCellBlockPositions = void 0;
+      groupStartIndex = groupEndIndex;
+    }
+  };
+  paginateSegments(track, sourceBlock.id, {
+    hasMore: () => groupStartIndex < rowGroups.length,
+    fit(segmentId, remaining) {
+      const startRowIndex = rowGroups[groupStartIndex].startRowIndex;
+      const repeatedHeaderRowCount = startRowIndex > 0 ? headerRowCount : 0;
+      const startCellPositions = currentCellBlockPositions;
+      let groupEndIndex = groupStartIndex;
+      let segmentHeight = 0;
+      let splitEnds;
+      let splitEndPositions;
+      let isLastRowSplit = false;
+      while (groupEndIndex < rowGroups.length) {
+        const candidateEndRowIndex = rowGroups[groupEndIndex].endRowIndexExclusive;
+        let candidateHeight = 0;
+        if (groupEndIndex === groupStartIndex && currentCellBlockPositions) {
+          const firstRow2 = sourceBlock.rows[startRowIndex];
           const starts = normalizeCellStartPositions(
-            targetRow,
-            groupEndIndex === groupStartIndex ? currentCellBlockPositions : void 0,
+            firstRow2,
+            currentCellBlockPositions,
             void 0
           );
-          const ends = targetRow.cells.map(
-            (_, cellIdx) => findCellSplitEndPosition(
-              targetRow,
-              cellIdx,
-              starts[cellIdx] ?? { blockIndex: 0 },
-              availableForSplitRow,
-              styles,
-              measurer,
-              defaultTabStop,
-              contentWidth,
-              sourceBlock,
-              rowGroups[groupEndIndex].startRowIndex
-            )
+          const ends = firstRow2.cells.map((cell) => ({
+            blockIndex: cell.blocks.length
+          }));
+          const slicedFirstRow = buildRowSliceFromPositions(
+            firstRow2,
+            starts,
+            ends
+          );
+          candidateHeight = getTableSegmentHeight(
+            { ...sourceBlock, rows: [slicedFirstRow] },
+            0,
+            1,
+            repeatedHeaderRowCount,
+            styles,
+            contentWidth,
+            measurer,
+            defaultTabStop
+          );
+        } else {
+          candidateHeight = getTableSegmentHeight(
+            sourceBlock,
+            startRowIndex,
+            candidateEndRowIndex,
+            repeatedHeaderRowCount,
+            styles,
+            contentWidth,
+            measurer,
+            defaultTabStop
           );
-          const canProgress = positionsProgressed(starts, ends);
-          if (canProgress) {
-            splitEnds = positionsToBlockIndexes(ends);
-            isLastRowSplit = true;
-            const slicedLastRow = buildRowSliceFromPositions(
+        }
+        if (candidateHeight <= remaining) {
+          segmentHeight = candidateHeight;
+          groupEndIndex += 1;
+          continue;
+        }
+        const isSingleRowGroup = candidateEndRowIndex === rowGroups[groupEndIndex].startRowIndex + 1;
+        const targetRow = sourceBlock.rows[rowGroups[groupEndIndex].startRowIndex];
+        const isSplitCandidate = isSingleRowGroup && canSplitTableRow(targetRow);
+        if (isSplitCandidate) {
+          const precedingHeight = groupEndIndex > groupStartIndex ? getTableSegmentHeight(
+            sourceBlock,
+            startRowIndex,
+            rowGroups[groupEndIndex].startRowIndex,
+            repeatedHeaderRowCount,
+            styles,
+            contentWidth,
+            measurer,
+            defaultTabStop
+          ) : 0;
+          const availableForSplitRow = remaining - precedingHeight;
+          if (availableForSplitRow > 0) {
+            const starts = normalizeCellStartPositions(
               targetRow,
-              starts,
-              ends
+              groupEndIndex === groupStartIndex ? currentCellBlockPositions : void 0,
+              void 0
             );
-            const segmentRows = [
-              ...sourceBlock.rows.slice(
-                startRowIndex,
+            const ends = targetRow.cells.map(
+              (_, cellIdx) => findCellSplitEndPosition(
+                targetRow,
+                cellIdx,
+                starts[cellIdx] ?? { blockIndex: 0 },
+                availableForSplitRow,
+                styles,
+                measurer,
+                defaultTabStop,
+                contentWidth,
+                sourceBlock,
                 rowGroups[groupEndIndex].startRowIndex
-              ),
-              slicedLastRow
-            ];
-            segmentHeight = getTableSegmentHeight(
-              { ...sourceBlock, rows: segmentRows },
-              0,
-              segmentRows.length,
-              repeatedHeaderRowCount,
-              styles,
-              contentWidth,
-              measurer,
-              defaultTabStop
+              )
             );
-            splitEndPositions = ends;
-            groupEndIndex += 1;
-            break;
+            if (positionsProgressed(starts, ends)) {
+              splitEnds = positionsToBlockIndexes(ends);
+              isLastRowSplit = true;
+              const slicedLastRow = buildRowSliceFromPositions(
+                targetRow,
+                starts,
+                ends
+              );
+              const segmentRows = [
+                ...sourceBlock.rows.slice(
+                  startRowIndex,
+                  rowGroups[groupEndIndex].startRowIndex
+                ),
+                slicedLastRow
+              ];
+              segmentHeight = getTableSegmentHeight(
+                { ...sourceBlock, rows: segmentRows },
+                0,
+                segmentRows.length,
+                repeatedHeaderRowCount,
+                styles,
+                contentWidth,
+                measurer,
+                defaultTabStop
+              );
+              splitEndPositions = ends;
+              groupEndIndex += 1;
+              break;
+            }
           }
         }
+        break;
       }
-      break;
-    }
-    if (groupEndIndex === groupStartIndex && track.blocks.length > 0) {
-      track.flush();
-      continue;
-    }
-    if (groupEndIndex === groupStartIndex) {
+      if (groupEndIndex === groupStartIndex) return null;
+      const block = buildTableBlock(
+        segmentId,
+        startRowIndex,
+        groupEndIndex,
+        repeatedHeaderRowCount,
+        segmentHeight,
+        splitEnds,
+        splitEndPositions,
+        startCellPositions
+      );
+      advanceCursor(groupEndIndex, isLastRowSplit, splitEnds, splitEndPositions);
+      return block;
+    },
+    force(segmentId) {
+      const startRowIndex = rowGroups[groupStartIndex].startRowIndex;
+      const repeatedHeaderRowCount = startRowIndex > 0 ? headerRowCount : 0;
+      const startCellPositions = currentCellBlockPositions;
+      let groupEndIndex = groupStartIndex;
+      let segmentHeight = 0;
+      let splitEnds;
+      let splitEndPositions;
+      let isLastRowSplit = false;
       const targetRow = sourceBlock.rows[startRowIndex];
       const isSingleRowGroup = rowGroups[groupStartIndex].endRowIndexExclusive === startRowIndex + 1;
       const isSplitCandidate = isSingleRowGroup && canSplitTableRow(targetRow);
@@ -17034,11 +17119,7 @@ function paginateTableBlock(track, params, sourceBlock, index) {
         splitEnds = positionsToBlockIndexes(ends);
         splitEndPositions = ends;
         isLastRowSplit = true;
-        const slicedLastRow = buildRowSliceFromPositions(
-          targetRow,
-          starts,
-          ends
-        );
+        const slicedLastRow = buildRowSliceFromPositions(targetRow, starts, ends);
         segmentHeight = getTableSegmentHeight(
           { ...sourceBlock, rows: [slicedLastRow] },
           0,
@@ -17063,53 +17144,20 @@ function paginateTableBlock(track, params, sourceBlock, index) {
           defaultTabStop
         );
       }
-    }
-    const segmentId = `${sourceBlock.id}:segment:${segmentIndex}`;
-    const measuredSegmentHeight = (measuredHeights == null ? void 0 : measuredHeights[segmentId]) ?? segmentHeight;
-    const endRowIndex = rowGroups[groupEndIndex - 1].endRowIndexExclusive;
-    track.blocks.push({
-      blockId: segmentId,
-      sourceBlockId: sourceBlock.id,
-      blockType: sourceBlock.type,
-      globalIndex: index,
-      estimatedHeight: measuredSegmentHeight,
-      tableSegment: {
+      const block = buildTableBlock(
+        segmentId,
         startRowIndex,
-        endRowIndex,
+        groupEndIndex,
         repeatedHeaderRowCount,
-        startRowCellBlockStarts: positionsToBlockIndexes(
-          currentCellBlockPositions
-        ),
-        endRowCellBlockEnds: splitEnds,
-        startRowCellBlockPositions: hasPartialPositions(
-          currentCellBlockPositions
-        ) ? currentCellBlockPositions : void 0,
-        endRowCellBlockPositions: hasPartialPositions(splitEndPositions) ? splitEndPositions : void 0
-      },
-      sourceBlock
-    });
-    track.height += measuredSegmentHeight;
-    segmentIndex += 1;
-    if (isLastRowSplit) {
-      const lastRowIndex = rowGroups[groupEndIndex - 1].startRowIndex;
-      const lastRow = sourceBlock.rows[lastRowIndex];
-      const ends = splitEndPositions ?? (splitEnds == null ? void 0 : splitEnds.map((blockIndex) => ({ blockIndex }))) ?? [];
-      const isFinished = positionsFinishedRow(lastRow, ends);
-      if (isFinished) {
-        currentCellBlockPositions = void 0;
-        groupStartIndex = groupEndIndex;
-      } else {
-        currentCellBlockPositions = ends;
-        groupStartIndex = groupEndIndex - 1;
-      }
-    } else {
-      currentCellBlockPositions = void 0;
-      groupStartIndex = groupEndIndex;
-    }
-    if (groupStartIndex < rowGroups.length) {
-      track.flush();
+        segmentHeight,
+        splitEnds,
+        splitEndPositions,
+        startCellPositions
+      );
+      advanceCursor(groupEndIndex, isLastRowSplit, splitEnds, splitEndPositions);
+      return block;
     }
-  }
+  });
 }
 function projectBlocksLayout(context2) {
   const columns = context2.pageSettings.columns;
@@ -17519,6 +17567,19 @@ function applyCanvasTextFeatureHints(ctx, styles, fontSizePx) {
     featureCtx.textRendering = (styles == null ? void 0 : styles.ligatures) && styles.ligatures !== "none" ? "optimizeLegibility" : "optimizeSpeed";
   }
 }
+function resolveCanvasRunPaintStyle(styles) {
+  const fontSize = (styles == null ? void 0 : styles.fontSize) ?? DEFAULT_FONT_SIZE_PX;
+  const fontFamily = resolveCanvasFontFamily(styles == null ? void 0 : styles.fontFamily);
+  const fontWeight = (styles == null ? void 0 : styles.bold) ? "700" : "400";
+  const fontStyle = (styles == null ? void 0 : styles.italic) ? "italic" : "normal";
+  const renderMetrics = resolveCanvasTextRenderMetrics(styles, fontSize);
+  return {
+    font: `${fontStyle} ${fontWeight} ${renderMetrics.fontSize}px ${fontFamily}`,
+    fillStyle: (styles == null ? void 0 : styles.color) ?? "#000000",
+    renderMetrics,
+    scale: (styles == null ? void 0 : styles.characterScale) && styles.characterScale > 0 ? styles.characterScale / 100 : 1
+  };
+}
 function resolveVerticalMode(direction) {
   switch (direction) {
     case "tbRl":
@@ -17649,10 +17710,8 @@ function layoutStackedGlyphs(paragraph, state, box, startColumn, columnsRtl = tr
       state.document.styles
     );
     const fontSize = styles.fontSize ?? DEFAULT_FONT_SIZE_PX;
-    const metrics = resolveCanvasTextRenderMetrics(styles, fontSize);
+    const { font, fillStyle: color } = resolveCanvasRunPaintStyle(styles);
     const glyphHeight = fontSize * STACK_LINE_FACTOR;
-    const font = `${styles.italic ? "italic" : "normal"} ${styles.bold ? "700" : "400"} ${metrics.fontSize}px ${resolveCanvasFontFamily(styles.fontFamily)}`;
-    const color = styles.color ?? "#000000";
     for (const char of run.text) {
       if (char === "\n") {
         newColumn();
@@ -20490,13 +20549,10 @@ function drawParagraph(ctx, paragraph, lines, state, originX, originY, onUpdate,
         (_b = paragraph.style) == null ? void 0 : _b.styleId,
         state.document.styles
       );
-      const prefixFontSize = prefixStyles.fontSize ?? DEFAULT_FONT_SIZE_PX;
-      const prefixWeight = prefixStyles.bold ? "700" : "400";
-      const prefixStyle = prefixStyles.italic ? "italic" : "normal";
-      const prefixFamily = resolveCanvasFontFamily(prefixStyles.fontFamily);
+      const { font: prefixFont, fillStyle: prefixFillStyle } = resolveCanvasRunPaintStyle(prefixStyles);
       ctx.save();
-      ctx.font = `${prefixStyle} ${prefixWeight} ${prefixFontSize}px ${prefixFamily}`;
-      ctx.fillStyle = prefixStyles.color ?? "#000000";
+      ctx.font = prefixFont;
+      ctx.fillStyle = prefixFillStyle;
       const first = line.slots[0];
       const gap = ctx.measureText(`${listPrefix} `).width;
       const labelInset = getListLabelInset(paragraph, state.document.styles);
@@ -20524,12 +20580,9 @@ function drawParagraph(ctx, paragraph, lines, state, originX, originY, onUpdate,
       const metricFamily = resolveMetricCompatibleFamily(
         styles.fontFamily ?? "Calibri"
       );
-      const fontFamily = resolveCanvasFontFamily(styles.fontFamily);
-      const fontWeight = styles.bold ? "700" : "400";
-      const fontStyle = styles.italic ? "italic" : "normal";
-      const renderMetrics = resolveCanvasTextRenderMetrics(styles, fontSize);
+      const { font, renderMetrics } = resolveCanvasRunPaintStyle(styles);
       ctx.save();
-      ctx.font = `${fontStyle} ${fontWeight} ${renderMetrics.fontSize}px ${fontFamily}`;
+      ctx.font = font;
       applyCanvasTextFeatureHints(ctx, styles, fontSize);
       logCanvasFontUse({
         requestedFamily: styles.fontFamily,
@@ -20698,18 +20751,10 @@ function drawParagraph(ctx, paragraph, lines, state, originX, originY, onUpdate,
           state.document.styles
         );
         if (!styles.hidden) {
-          const fontSize = styles.fontSize ?? DEFAULT_FONT_SIZE_PX;
-          const fontFamily = resolveCanvasFontFamily(styles.fontFamily);
-          const fontWeight = styles.bold ? "700" : "400";
-          const fontStyle = styles.italic ? "italic" : "normal";
-          const renderMetrics = resolveCanvasTextRenderMetrics(
-            styles,
-            fontSize
-          );
-          const scale = styles.characterScale && styles.characterScale > 0 ? styles.characterScale / 100 : 1;
+          const { font, fillStyle, renderMetrics, scale } = resolveCanvasRunPaintStyle(styles);
           ctx.save();
-          ctx.font = `${fontStyle} ${fontWeight} ${renderMetrics.fontSize}px ${fontFamily}`;
-          ctx.fillStyle = styles.color ?? "#000000";
+          ctx.font = font;
+          ctx.fillStyle = fillStyle;
           drawStyledText(
             ctx,
             "-",
@@ -21248,18 +21293,14 @@ function drawDropCapForParagraph(options) {
     return;
   }
   const style2 = dropCap.style;
-  const fontSize = (style2 == null ? void 0 : style2.fontSize) ?? DEFAULT_FONT_SIZE_PX;
-  const bodyLineHeight = ((_a = lines[0]) == null ? void 0 : _a.height) ?? fontSize;
-  const renderMetrics = resolveCanvasTextRenderMetrics(style2, fontSize);
-  const fontWeight = (style2 == null ? void 0 : style2.bold) ? "700" : "400";
-  const fontStyle = (style2 == null ? void 0 : style2.italic) ? "italic" : "normal";
-  const fontFamily = resolveCanvasFontFamily(style2 == null ? void 0 : style2.fontFamily);
+  const { font, fillStyle, renderMetrics } = resolveCanvasRunPaintStyle(style2);
+  const bodyLineHeight = ((_a = lines[0]) == null ? void 0 : _a.height) ?? ((style2 == null ? void 0 : style2.fontSize) ?? DEFAULT_FONT_SIZE_PX);
   const glyphWidth = measureDropCapWidth(dropCap);
   const x = dropCap.type === "margin" ? originX - glyphWidth : originX;
   const baselineY = paragraphTop + (dropCap.lines - 0.2) * bodyLineHeight + renderMetrics.baselineOffset;
   ctx.save();
-  ctx.font = `${fontStyle} ${fontWeight} ${renderMetrics.fontSize}px ${fontFamily}`;
-  ctx.fillStyle = (style2 == null ? void 0 : style2.color) ?? "#000000";
+  ctx.font = font;
+  ctx.fillStyle = fillStyle;
   ctx.textBaseline = "alphabetic";
   ctx.fillText(dropCap.text, x, baselineY);
   ctx.restore();
@@ -33465,6 +33506,28 @@ function parseParagraphStyle$1(paragraphProperties, colors) {
   }
   return emptyOrUndefined(style2);
 }
+const TABLE_CONDITIONAL_FLAG_ATTRIBUTES = [
+  ["firstRow", "firstRow"],
+  ["lastRow", "lastRow"],
+  ["firstColumn", "firstCol"],
+  ["lastColumn", "lastCol"],
+  ["oddVBand", "band1Vert"],
+  ["evenVBand", "band2Vert"],
+  ["oddHBand", "band1Horz"],
+  ["evenHBand", "band2Horz"],
+  ["firstRowFirstColumn", "nwCell"],
+  ["firstRowLastColumn", "neCell"],
+  ["lastRowFirstColumn", "swCell"],
+  ["lastRowLastColumn", "seCell"]
+];
+const TABLE_BORDER_EDGE_KEYS = [
+  ["top", "borderTop"],
+  ["left", "borderLeft"],
+  ["bottom", "borderBottom"],
+  ["right", "borderRight"],
+  ["insideH", "borderInsideH"],
+  ["insideV", "borderInsideV"]
+];
 function parseDocxWidthValue(element) {
   if (!element) {
     return void 0;
@@ -33492,23 +33555,9 @@ function parsePositiveIntegerProperty(parent, localName) {
 function parseTableConditionalFlags(properties) {
   const element = getFirstChildByTagNameNS(properties, WORD_NS, "cnfStyle");
   if (!element) return void 0;
-  const names = [
-    ["firstRow", "firstRow"],
-    ["lastRow", "lastRow"],
-    ["firstColumn", "firstCol"],
-    ["lastColumn", "lastCol"],
-    ["oddVBand", "band1Vert"],
-    ["evenVBand", "band2Vert"],
-    ["oddHBand", "band1Horz"],
-    ["evenHBand", "band2Horz"],
-    ["firstRowFirstColumn", "nwCell"],
-    ["firstRowLastColumn", "neCell"],
-    ["lastRowFirstColumn", "swCell"],
-    ["lastRowLastColumn", "seCell"]
-  ];
   const rawBits = getAttributeValue(element, "val") ?? "";
   const flags = {};
-  names.forEach(([attribute, key], index) => {
+  TABLE_CONDITIONAL_FLAG_ATTRIBUTES.forEach(([attribute, key], index) => {
     const explicit = getAttributeValue(element, attribute);
     if (explicit === "1" || explicit === "true" || explicit === "on") {
       flags[key] = true;
@@ -36959,7 +37008,7 @@ function importDocxInWorker(buffer, options = {}) {
     const worker = new Worker(
       new URL(
         /* @vite-ignore */
-        "" + new URL("assets/importDocxWorker-DyYGjoXG.js", import.meta.url).href,
+        "" + new URL("assets/importDocxWorker-Bz2kZOBO.js", import.meta.url).href,
         import.meta.url
       ),
       {
@@ -42617,7 +42666,7 @@ export {
   resolveImageSrc as Z,
   listKindForTag as _,
   getPageContentWidth as a,
-  getImageFloatingGeometry as a$,
+  getPresetPathSegments as a$,
   collectInlineRuns as a0,
   parseParagraphStyle as a1,
   getRunImage as a2,
@@ -42633,28 +42682,28 @@ export {
   PX_PER_INCH as aC,
   TWIPS_PER_INCH as aD,
   normalizeHex6 as aE,
-  resolveEffectiveParagraphStyle as aF,
-  resolveEffectiveTextStyleForParagraph as aG,
-  EMU_PER_PT as aH,
-  OOXML_ROTATION_UNITS as aI,
-  OOXML_PERCENT_DENOMINATOR as aJ,
-  parseHexColorToRgb255 as aK,
-  EMU_PER_PX as aL,
-  getRunFootnoteReference as aM,
-  getRunEndnoteReference as aN,
-  iterateFootnoteReferenceRuns as aO,
-  iterateEndnoteReferenceRuns as aP,
-  imageContentTypeDefaults as aQ,
-  getRunFieldChar as aR,
-  getRunFieldInstruction as aS,
-  createEditorRun as aT,
-  JSZip as aU,
-  imageExtensionFromMime as aV,
-  pxToPt as aW,
-  resolveFloatingObjectRect as aX,
-  getTextBoxFloatingGeometry as aY,
-  getPresetPathSegments as aZ,
-  buildListLabels as a_,
+  TABLE_CONDITIONAL_FLAG_ATTRIBUTES as aF,
+  TABLE_BORDER_EDGE_KEYS as aG,
+  resolveEffectiveParagraphStyle as aH,
+  resolveEffectiveTextStyleForParagraph as aI,
+  EMU_PER_PT as aJ,
+  OOXML_ROTATION_UNITS as aK,
+  OOXML_PERCENT_DENOMINATOR as aL,
+  parseHexColorToRgb255 as aM,
+  EMU_PER_PX as aN,
+  getRunFootnoteReference as aO,
+  getRunEndnoteReference as aP,
+  iterateFootnoteReferenceRuns as aQ,
+  iterateEndnoteReferenceRuns as aR,
+  imageContentTypeDefaults as aS,
+  getRunFieldChar as aT,
+  getRunFieldInstruction as aU,
+  createEditorRun as aV,
+  JSZip as aW,
+  imageExtensionFromMime as aX,
+  pxToPt as aY,
+  resolveFloatingObjectRect as aZ,
+  getTextBoxFloatingGeometry as a_,
   CaretOverlay as aa,
   Show as ab,
   createRenderEffect as ac,
@@ -42663,13 +42712,13 @@ export {
   setStyleProperty as af,
   memo as ag,
   template as ah,
-  useI18n as ai,
-  createEffect as aj,
-  insert as ak,
-  use as al,
-  addEventListener as am,
-  Dialog as an,
-  delegateEvents as ao,
+  addEventListener as ai,
+  insert as aj,
+  delegateEvents as ak,
+  useI18n as al,
+  createEffect as am,
+  use as an,
+  Dialog as ao,
   className as ap,
   For as aq,
   UNDERLINE_STYLE_OPTIONS as ar,
@@ -42682,133 +42731,135 @@ export {
   setPreciseFontPreference as ay,
   setWelcomeSeen as az,
   getPageBodyTop as b,
-  getHeadingLevel as b$,
-  textStyleToFontSizePt as b0,
-  PX_PER_POINT as b1,
-  DEFAULT_FONT_SIZE_PX as b2,
-  resolveOpenTypeFeatureTags as b3,
-  rgb255ToHex as b4,
-  isDoubleUnderlineStyle as b5,
-  isWavyUnderlineStyle as b6,
-  underlineStyleLineWidthPx as b7,
-  underlineStyleDashArray as b8,
-  resolveListLabel as b9,
-  getTableCellContentWidthForParagraph as bA,
-  layoutMetricsEpoch as bB,
-  bumpLayoutMetricsEpoch as bC,
-  createCanvasLayoutSnapshotProvider as bD,
-  on as bE,
-  debounce as bF,
-  unwrap as bG,
-  perfTimer as bH,
-  getRunTextBox as bI,
-  createEditorDocument as bJ,
-  resolveResizedDimensions as bK,
-  resolveTextBoxRenderHeight as bL,
-  getToolbarStyleState as bM,
-  getCachedCanvasImage as bN,
-  measureParagraphMinContentWidthPx as bO,
-  getEditableBlocksForZone as bP,
-  findParagraphLocation as bQ,
-  createSectionBoundaryParagraph as bR,
-  normalizePageSettings as bS,
-  DEFAULT_EDITOR_PAGE_SETTINGS as bT,
-  markStart as bU,
-  markEnd as bV,
-  getParagraphEntries as bW,
-  getParagraphById as bX,
-  createEditorFootnote as bY,
-  createFootnoteReferenceRun as bZ,
-  renumberFootnotes as b_,
-  getListLabelInset as ba,
-  getAlignedListLabelInset as bb,
-  getParagraphBorderInsets as bc,
-  buildSegmentTable as bd,
-  buildCanvasTableLayout as be,
-  resolveCanvasTableWidth as bf,
-  resolveFloatingTableRect as bg,
-  normalizeFamily as bh,
-  ROBOTO_FONT_FILES as bi,
-  loadFontAsset as bj,
-  OFFICE_COMPAT_FONT_FAMILIES as bk,
-  BinaryReader as bl,
-  buildSfnt as bm,
-  defaultFontDecoderRegistry as bn,
-  SfntFontProgram as bo,
-  collectPdfFontFamilies as bp,
-  outlineFrom as bq,
-  getPageHeaderZoneTop as br,
-  getPageColumnRects as bs,
-  findFootnoteReference as bt,
-  FOOTNOTE_MARKER_GUTTER_PX as bu,
-  resolveImporterForFile as bv,
-  getDocumentSectionsCanonical as bw,
-  getDocumentParagraphsCanonical as bx,
-  getDocumentParagraphs as by,
-  getDocumentPageSettings as bz,
+  createFootnoteReferenceRun as b$,
+  buildListLabels as b0,
+  getImageFloatingGeometry as b1,
+  textStyleToFontSizePt as b2,
+  PX_PER_POINT as b3,
+  DEFAULT_FONT_SIZE_PX as b4,
+  resolveOpenTypeFeatureTags as b5,
+  rgb255ToHex as b6,
+  isDoubleUnderlineStyle as b7,
+  isWavyUnderlineStyle as b8,
+  underlineStyleLineWidthPx as b9,
+  getDocumentParagraphs as bA,
+  getDocumentPageSettings as bB,
+  getTableCellContentWidthForParagraph as bC,
+  layoutMetricsEpoch as bD,
+  bumpLayoutMetricsEpoch as bE,
+  createCanvasLayoutSnapshotProvider as bF,
+  on as bG,
+  debounce as bH,
+  unwrap as bI,
+  perfTimer as bJ,
+  getRunTextBox as bK,
+  createEditorDocument as bL,
+  resolveResizedDimensions as bM,
+  resolveTextBoxRenderHeight as bN,
+  getToolbarStyleState as bO,
+  getCachedCanvasImage as bP,
+  measureParagraphMinContentWidthPx as bQ,
+  getEditableBlocksForZone as bR,
+  findParagraphLocation as bS,
+  createSectionBoundaryParagraph as bT,
+  normalizePageSettings as bU,
+  DEFAULT_EDITOR_PAGE_SETTINGS as bV,
+  markStart as bW,
+  markEnd as bX,
+  getParagraphEntries as bY,
+  getParagraphById as bZ,
+  createEditorFootnote as b_,
+  underlineStyleDashArray as ba,
+  resolveListLabel as bb,
+  getListLabelInset as bc,
+  getAlignedListLabelInset as bd,
+  getParagraphBorderInsets as be,
+  buildSegmentTable as bf,
+  buildCanvasTableLayout as bg,
+  resolveCanvasTableWidth as bh,
+  resolveFloatingTableRect as bi,
+  normalizeFamily as bj,
+  ROBOTO_FONT_FILES as bk,
+  loadFontAsset as bl,
+  OFFICE_COMPAT_FONT_FAMILIES as bm,
+  BinaryReader as bn,
+  buildSfnt as bo,
+  defaultFontDecoderRegistry as bp,
+  SfntFontProgram as bq,
+  collectPdfFontFamilies as br,
+  outlineFrom as bs,
+  getPageHeaderZoneTop as bt,
+  getPageColumnRects as bu,
+  findFootnoteReference as bv,
+  FOOTNOTE_MARKER_GUTTER_PX as bw,
+  resolveImporterForFile as bx,
+  getDocumentSectionsCanonical as by,
+  getDocumentParagraphsCanonical as bz,
   getPageBodyBottom as c,
-  preciseFontModeVersion as c0,
-  isPreciseFontModeEnabled as c1,
-  resolveNamedTextStyle as c2,
-  togglePreciseFontMode as c3,
-  nextFontSizePt as c4,
-  previousFontSizePt as c5,
-  fontSizePtToPx as c6,
-  createDefaultToolbarPreset as c7,
-  MenuRegistry as c8,
-  createToolbarRegistry as c9,
-  Menu as cA,
-  OASIS_BUILTIN_COMMANDS as cB,
-  OASIS_MENU_ITEMS as cC,
-  OASIS_TOOLBAR_ITEMS as cD,
-  OasisEditorAppLazy as cE,
-  OasisEditorContainer as cF,
-  PluginCollection as cG,
-  Popover as cH,
-  RIBBON_TABS as cI,
-  Select as cJ,
-  SelectField as cK,
-  Separator as cL,
-  SidePanel as cM,
-  SidePanelBody as cN,
-  SidePanelFooter as cO,
-  SidePanelHeader as cP,
-  SplitButton as cQ,
-  StyleGallery as cR,
-  TextField as cS,
-  Button$1 as cT,
-  buildRibbonTabDefinitions as cU,
-  createEditorCommandBus as cV,
-  createOasisEditor as cW,
-  createOasisEditorContainer as cX,
-  mount as cY,
-  registerToolbarRenderer as cZ,
-  Editor as ca,
-  resolveCommandRef as cb,
-  commandRefName as cc,
-  createOasisEditorClient as cd,
-  createEditorZoom as ce,
-  startLongTaskObserver as cf,
-  installGlobalReport as cg,
-  applyStoredPreciseFontPreference as ch,
-  getWelcomeSeen as ci,
-  isLocalFontAccessSupported as cj,
-  EDITOR_SCROLL_PADDING_PX as ck,
-  Toolbar as cl,
-  OasisEditorLoading as cm,
-  I18nProvider as cn,
-  createTranslator as co,
-  createEditorLogger as cp,
-  registerDomStatsSurface as cq,
-  Button as cr,
-  Checkbox as cs,
-  ColorPicker as ct,
-  CommandRegistry as cu,
-  DEFAULT_PALETTE as cv,
-  DialogFooter as cw,
-  FloatingActionButton as cx,
-  GridPicker as cy,
-  IconButton as cz,
+  registerToolbarRenderer as c$,
+  renumberFootnotes as c0,
+  getHeadingLevel as c1,
+  preciseFontModeVersion as c2,
+  isPreciseFontModeEnabled as c3,
+  resolveNamedTextStyle as c4,
+  togglePreciseFontMode as c5,
+  nextFontSizePt as c6,
+  previousFontSizePt as c7,
+  fontSizePtToPx as c8,
+  createDefaultToolbarPreset as c9,
+  GridPicker as cA,
+  IconButton as cB,
+  Menu as cC,
+  OASIS_BUILTIN_COMMANDS as cD,
+  OASIS_MENU_ITEMS as cE,
+  OASIS_TOOLBAR_ITEMS as cF,
+  OasisEditorAppLazy as cG,
+  OasisEditorContainer as cH,
+  PluginCollection as cI,
+  Popover as cJ,
+  RIBBON_TABS as cK,
+  Select as cL,
+  SelectField as cM,
+  Separator as cN,
+  SidePanel as cO,
+  SidePanelBody as cP,
+  SidePanelFooter as cQ,
+  SidePanelHeader as cR,
+  SplitButton as cS,
+  StyleGallery as cT,
+  TextField as cU,
+  Button$1 as cV,
+  buildRibbonTabDefinitions as cW,
+  createEditorCommandBus as cX,
+  createOasisEditor as cY,
+  createOasisEditorContainer as cZ,
+  mount as c_,
+  MenuRegistry as ca,
+  createToolbarRegistry as cb,
+  Editor as cc,
+  resolveCommandRef as cd,
+  commandRefName as ce,
+  createOasisEditorClient as cf,
+  createEditorZoom as cg,
+  startLongTaskObserver as ch,
+  installGlobalReport as ci,
+  applyStoredPreciseFontPreference as cj,
+  getWelcomeSeen as ck,
+  isLocalFontAccessSupported as cl,
+  EDITOR_SCROLL_PADDING_PX as cm,
+  Toolbar as cn,
+  OasisEditorLoading as co,
+  I18nProvider as cp,
+  createTranslator as cq,
+  createEditorLogger as cr,
+  registerDomStatsSurface as cs,
+  Button as ct,
+  Checkbox as cu,
+  ColorPicker as cv,
+  CommandRegistry as cw,
+  DEFAULT_PALETTE as cx,
+  DialogFooter as cy,
+  FloatingActionButton as cz,
   domTextMeasurer as d,
   estimateTableBlockHeight as e,
   getFootnoteDisplayMarker as f,