@extend-ai/react-xlsx 0.8.3 → 0.8.4

package/dist/xlsx-worker.js

@@ -4120,6 +4120,10 @@ function parseSheetState(archive, path, options) {
   let hasVerticalMerges = false;
   let maxHorizontalMergeEndCol = -1;
   let maxVerticalMergeEndRow = -1;
+  let minContentCol = Number.POSITIVE_INFINITY;
+  let minContentRow = Number.POSITIVE_INFINITY;
+  let maxContentCol = -1;
+  let maxContentRow = -1;
   const columnWidthCharacterWidthPx = measureColumnCharacterWidthPx(
     options?.defaultFont?.family,
     options?.defaultFont?.sizePt
@@ -4132,6 +4136,26 @@ function parseSheetState(archive, path, options) {
     sheetViewNode?.getAttribute("zoomScale") ?? sheetViewNode?.getAttribute("zoomScaleNormal") ?? Number.NaN
   );
   const zoomScale = Number.isFinite(rawZoomScale) && rawZoomScale > 0 ? rawZoomScale : 100;
+  const trackContentCell = (cellRef) => {
+    if (!cellRef) {
+      return;
+    }
+    const cell = parseA1CellReference(cellRef);
+    if (!cell) {
+      return;
+    }
+    minContentCol = Math.min(minContentCol, cell.col);
+    minContentRow = Math.min(minContentRow, cell.row);
+    maxContentCol = Math.max(maxContentCol, cell.col);
+    maxContentRow = Math.max(maxContentRow, cell.row);
+  };
+  const isMeaningfulCellNode = (cellNode) => {
+    if (getFirstChild(cellNode, "f") || getFirstChild(cellNode, "is")) {
+      return true;
+    }
+    const valueNode = getFirstChild(cellNode, "v");
+    return Boolean(valueNode && (valueNode.textContent ?? "").length > 0);
+  };
   getLocalElements(document2, "row").forEach((rowNode) => {
     const rowIndex = Number(rowNode.getAttribute("r") ?? 0) - 1;
     const height = Number(rowNode.getAttribute("ht") ?? Number.NaN);
@@ -4146,17 +4170,36 @@ function parseSheetState(archive, path, options) {
     if (rowIndex >= 0 && isHidden) {
       hiddenRows.add(rowIndex);
     }
-    if (includeCachedFormulaValues) {
-      getChildElements(rowNode, "c").forEach((cellNode) => {
+    getChildElements(rowNode, "c").forEach((cellNode) => {
+      const cellRef = cellNode.getAttribute("r");
+      if (isMeaningfulCellNode(cellNode)) {
+        trackContentCell(cellRef);
+      }
+      if (includeCachedFormulaValues) {
         const formulaNode = getFirstChild(cellNode, "f");
         const valueNode = getFirstChild(cellNode, "v");
-        const cellRef = cellNode.getAttribute("r");
         if (formulaNode && valueNode && cellRef) {
           cachedFormulaValues[cellRef] = valueNode.textContent ?? "";
         }
-      });
+      }
+    });
+  });
+  getLocalElements(document2, "mergeCell").forEach((mergeNode) => {
+    const reference = mergeNode.getAttribute("ref");
+    const range = reference ? parseA1RangeReference(reference) : null;
+    if (!range) {
+      return;
+    }
+    if (range.end.col > range.start.col) {
+      hasHorizontalMerges = true;
+      maxHorizontalMergeEndCol = Math.max(maxHorizontalMergeEndCol, range.end.col);
+    }
+    if (range.end.row > range.start.row) {
+      hasVerticalMerges = true;
+      maxVerticalMergeEndRow = Math.max(maxVerticalMergeEndRow, range.end.row);
     }
   });
+  const maxMetadataCol = Math.max(maxContentCol, maxHorizontalMergeEndCol, 0) + 256;
   getLocalElements(document2, "col").forEach((colNode) => {
     const min = Number(colNode.getAttribute("min") ?? 0) - 1;
     const max = Number(colNode.getAttribute("max") ?? 0) - 1;
@@ -4168,7 +4211,7 @@ function parseSheetState(archive, path, options) {
         return;
       }
     }
-    for (let col = min; col <= max; col += 1) {
+    for (let col = min; col <= Math.min(max, maxMetadataCol); col += 1) {
       if (col >= 0) {
         if (Number.isFinite(width)) {
           const widthPx = sheetColumnWidthToPixels(width, columnWidthCharacterWidthPx);
@@ -4183,21 +4226,6 @@ function parseSheetState(archive, path, options) {
       }
     }
   });
-  getLocalElements(document2, "mergeCell").forEach((mergeNode) => {
-    const reference = mergeNode.getAttribute("ref");
-    const range = reference ? parseA1RangeReference(reference) : null;
-    if (!range) {
-      return;
-    }
-    if (range.end.col > range.start.col) {
-      hasHorizontalMerges = true;
-      maxHorizontalMergeEndCol = Math.max(maxHorizontalMergeEndCol, range.end.col);
-    }
-    if (range.end.row > range.start.row) {
-      hasVerticalMerges = true;
-      maxVerticalMergeEndRow = Math.max(maxVerticalMergeEndRow, range.end.row);
-    }
-  });
   return {
     cachedFormulaValues,
     columnWidthCharacterWidthPx,
@@ -4210,6 +4238,10 @@ function parseSheetState(archive, path, options) {
     hasVerticalMerges,
     maxHorizontalMergeEndCol,
     maxVerticalMergeEndRow,
+    maxContentCol,
+    maxContentRow,
+    minContentCol: Number.isFinite(minContentCol) ? minContentCol : -1,
+    minContentRow: Number.isFinite(minContentRow) ? minContentRow : -1,
     hiddenCols: [...hiddenCols].sort((left, right) => left - right),
     hiddenRows: [...hiddenRows].sort((left, right) => left - right),
     rowHeightOverridesPx,
@@ -4517,6 +4549,20 @@ function resolveWorksheetZoomScale(worksheet, sheetState) {
   const value = candidates.find((entry) => typeof entry === "number" && Number.isFinite(entry) && entry > 0);
   return value ?? DEFAULT_ZOOM_SCALE;
 }
+function resolveSheetDisplayUsedRange(usedRange, sheetState) {
+  const [minRow, minCol, maxRow, maxCol] = usedRange;
+  const maxMeaningfulRow = Math.max(sheetState?.maxContentRow ?? -1, sheetState?.maxVerticalMergeEndRow ?? -1);
+  const maxMeaningfulCol = Math.max(sheetState?.maxContentCol ?? -1, sheetState?.maxHorizontalMergeEndCol ?? -1);
+  if (maxMeaningfulRow < 0 && maxMeaningfulCol < 0) {
+    return usedRange;
+  }
+  return [
+    sheetState?.minContentRow !== void 0 && sheetState.minContentRow >= 0 ? Math.min(minRow, sheetState.minContentRow) : minRow,
+    sheetState?.minContentCol !== void 0 && sheetState.minContentCol >= 0 ? Math.min(minCol, sheetState.minContentCol) : minCol,
+    maxMeaningfulRow >= 0 ? Math.min(maxRow, maxMeaningfulRow) : maxRow,
+    maxMeaningfulCol >= 0 ? Math.min(maxCol, maxMeaningfulCol) : maxCol
+  ];
+}
 function buildSheetList(nextWorkbook, structureAssets, showHiddenSheets = false) {
   const sheetsByWorkbookSheetIndex = [];
   for (let index = 0; index < nextWorkbook.sheetCount; index += 1) {
@@ -4583,7 +4629,7 @@ function buildSheetList(nextWorkbook, structureAssets, showHiddenSheets = false)
       });
       continue;
     }
-    const [minRow, minCol, maxRow, maxCol] = usedRange;
+    const [minRow, minCol, maxRow, maxCol] = resolveSheetDisplayUsedRange(usedRange, sheetState);
     const hiddenRows = (sheetState?.hiddenRows ?? []).filter((row) => row >= 0 && row <= maxRow);
     const hiddenCols = (sheetState?.hiddenCols ?? []).filter((col) => col >= 0 && col <= maxCol);
     sheetsByWorkbookSheetIndex.push({