@extend-ai/react-xlsx 0.17.0 → 0.17.2

package/dist/xlsx-worker.js

@@ -3003,9 +3003,6 @@ function loadWorkbookChartAssets(workbook2, imageAssets, visibleSheetIndexByWork
   };
 }
 
-// src/images.ts
-import { strFromU8 as strFromU82, strToU8 as strToU82, unzipSync, zipSync } from "fflate";
-
 // src/colors.ts
 function normalizeHexColor2(value) {
   const hex = value.replace(/^#/, "");
@@ -3101,6 +3098,16 @@ function applyExcelTint(baseColor, tint) {
   const [nextRed, nextGreen, nextBlue] = hslToRgb2(hue, saturation, Math.max(0, Math.min(1, nextLightness)));
   return rgbToHex2(nextRed, nextGreen, nextBlue);
 }
+function buildThemePaletteFromHex(hexColors) {
+  const colorsByIndex = {};
+  hexColors.forEach((hex, index) => {
+    const color = normalizeHexColor2(hex);
+    if (color) {
+      colorsByIndex[index] = color;
+    }
+  });
+  return { colorsByIndex };
+}
 function resolveWorkbookColor(color, themePalette) {
   if (!color) {
     return null;
@@ -3109,7 +3116,7 @@ function resolveWorkbookColor(color, themePalette) {
   if (directHex) {
     return normalizeHexColor2(directHex);
   }
-  const themeValue = color.theme;
+  const themeValue = color.theme ?? color.themeIndex;
   const numericTheme = typeof themeValue === "number" ? themeValue : typeof themeValue === "string" && themeValue.trim().length > 0 ? Number(themeValue) : Number.NaN;
   const themeColor = Number.isFinite(numericTheme) ? themePalette?.colorsByIndex[numericTheme] ?? null : null;
   if (!themeColor) {
@@ -3121,6 +3128,7 @@ function resolveWorkbookColor(color, themePalette) {
 }
 
 // src/images.ts
+import { strFromU8 as strFromU82, strToU8 as strToU82, unzipSync, zipSync } from "fflate";
 var REL_NS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships";
 var SPREADSHEET_NS = "http://schemas.openxmlformats.org/spreadsheetml/2006/main";
 var DRAWING_REL_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing";
@@ -3596,6 +3604,12 @@ function parseSpreadsheetFont(node) {
     return void 0;
   }
   const font = {};
+  for (const [tag, property] of [["b", "bold"], ["i", "italic"], ["strike", "strikethrough"]]) {
+    const flag = getFirstChild(node, tag);
+    if (flag) {
+      font[property] = hasEnabledSpreadsheetFlag(flag);
+    }
+  }
   const size = getFirstChild(node, "sz")?.getAttribute("val");
   const name = getFirstChild(node, "name")?.getAttribute("val");
   const family = getFirstChild(node, "family")?.getAttribute("val");
@@ -3603,15 +3617,6 @@ function parseSpreadsheetFont(node) {
   const charset = getFirstChild(node, "charset")?.getAttribute("val");
   const verticalAlign = getFirstChild(node, "vertAlign")?.getAttribute("val");
   const color = parseSpreadsheetColor(getFirstChild(node, "color"));
-  if (hasEnabledSpreadsheetFlag(getFirstChild(node, "b"))) {
-    font.bold = true;
-  }
-  if (hasEnabledSpreadsheetFlag(getFirstChild(node, "i"))) {
-    font.italic = true;
-  }
-  if (hasEnabledSpreadsheetFlag(getFirstChild(node, "strike"))) {
-    font.strikethrough = true;
-  }
   if (getFirstChild(node, "u")) {
     font.underline = getFirstChild(node, "u")?.getAttribute("val") ?? "single";
   }
@@ -3860,7 +3865,14 @@ function parseWorkbookStyles(archive) {
   const styleById = {};
   const tableStyleByName = {};
   getChildElements(cellXfsNode, "xf").forEach((xfNode, index) => {
-    styleById[index] = parseResolvedXfStyle(xfNode, fonts, fills, borders, checkboxComplementIndices);
+    const style = parseResolvedXfStyle(xfNode, fonts, fills, borders, checkboxComplementIndices);
+    const overrides = {};
+    for (const component of ["font", "fill", "border"]) {
+      if (Number(xfNode.getAttribute(`${component}Id`) ?? 0) > 0 && xfNode.getAttribute(`apply${component[0].toUpperCase()}${component.slice(1)}`) !== "0") {
+        Object.assign(overrides, { [component]: style[component] });
+      }
+    }
+    styleById[index] = { ...style, tableStyleOverrides: overrides };
   });
   getChildElements(cellStylesNode ?? document2.documentElement, "cellStyle").forEach((cellStyleNode) => {
     const name = cellStyleNode.getAttribute("name");
@@ -4204,6 +4216,7 @@ function parseSheetState(archive, path, options) {
   const rowHeightOverridesPx = {};
   const colWidthOverridesPx = {};
   const rowStyleIds = {};
+  const cellStyleIds = {};
   const colStyleIds = {};
   let minContentCol = Number.POSITIVE_INFINITY;
   let minContentRow = Number.POSITIVE_INFINITY;
@@ -4253,6 +4266,10 @@ function parseSheetState(archive, path, options) {
     }
     getChildElements(rowNode, "c").forEach((cellNode) => {
       const cellRef = cellNode.getAttribute("r");
+      const cellStyleId = Number(cellNode.getAttribute("s") ?? Number.NaN);
+      if (cellRef && Number.isFinite(cellStyleId)) {
+        cellStyleIds[cellRef] = cellStyleId;
+      }
       if (isMeaningfulCellNode(cellNode)) {
         trackContentCell(cellRef);
       }
@@ -4291,6 +4308,7 @@ function parseSheetState(archive, path, options) {
   return {
     autoFilterRanges,
     cachedFormulaValues,
+    cellStyleIds,
     columnWidthCharacterWidthPx,
     colWidthOverridesPx,
     colStyleIds,
@@ -4672,13 +4690,52 @@ function hasUnresolvedSheetReferences(workbook2) {
   }
   return false;
 }
+function collectFormulaCellsWithSavedValues(workbook2) {
+  const positions = [];
+  for (let sheetIdx = 0; sheetIdx < workbook2.sheetCount; sheetIdx += 1) {
+    let sheet;
+    try {
+      sheet = workbook2.getSheet(sheetIdx);
+    } catch {
+      continue;
+    }
+    const cells = sheet.formulaCells;
+    if (!Array.isArray(cells)) {
+      continue;
+    }
+    for (const cell of cells) {
+      if (typeof cell?.row !== "number" || typeof cell?.col !== "number") {
+        continue;
+      }
+      let saved;
+      try {
+        saved = sheet.getCalculatedValueAt(cell.row, cell.col);
+      } catch {
+        continue;
+      }
+      if (!saved.is_empty && !saved.is_error) {
+        positions.push({ sheetIdx, row: cell.row, col: cell.col });
+      }
+    }
+  }
+  return positions;
+}
+function anyBecameError(workbook2, positions) {
+  return positions.some(({ sheetIdx, row, col }) => {
+    try {
+      return workbook2.getSheet(sheetIdx).getCalculatedValueAt(row, col).is_error;
+    } catch {
+      return false;
+    }
+  });
+}
 function safeCalculate(workbook2, options = {}) {
   if (hasUnresolvedSheetReferences(workbook2)) {
     return { workbook: workbook2, calculated: false, skipReason: "unresolved-sheet-refs" };
   }
+  const withSavedValues = options.reparse ? collectFormulaCellsWithSavedValues(workbook2) : [];
   try {
     workbook2.calculate();
-    return { workbook: workbook2, calculated: true, skipReason: null };
   } catch (err) {
     console.warn("[react-xlsx] workbook.calculate() trapped; falling back to cached formula values", err);
     if (options.reparse) {
@@ -4690,6 +4747,14 @@ function safeCalculate(workbook2, options = {}) {
     }
     return { workbook: workbook2, calculated: false, skipReason: "calculate-trapped" };
   }
+  if (options.reparse && anyBecameError(workbook2, withSavedValues)) {
+    try {
+      return { workbook: options.reparse(), calculated: false, skipReason: "calculate-regressed" };
+    } catch (reparseErr) {
+      console.warn("[react-xlsx] workbook reparse after calculate regression failed", reparseErr);
+    }
+  }
+  return { workbook: workbook2, calculated: true, skipReason: null };
 }
 
 // src/wasm.ts
@@ -5012,7 +5077,7 @@ function resolveSheetDisplayUsedRange(usedRange, sheetState) {
     maxMeaningfulCol >= 0 ? maxContentCol >= 0 ? Math.min(maxCol, maxMeaningfulCol) : Math.max(maxCol, maxMeaningfulCol) : maxCol
   ];
 }
-function buildSheetList(nextWorkbook, structureAssets, sheetLayoutStates, showHiddenSheets = false) {
+function buildSheetList(nextWorkbook, themePalette, structureAssets, sheetLayoutStates, showHiddenSheets = false) {
   const sheetsByWorkbookSheetIndex = [];
   for (let index = 0; index < nextWorkbook.sheetCount; index += 1) {
     const worksheet = nextWorkbook.getSheet(index);
@@ -5082,11 +5147,12 @@ function buildSheetList(nextWorkbook, structureAssets, sheetLayoutStates, showHi
         rowHeightOverridesPx: sheetState?.rowHeightOverridesPx ?? {},
         rowHeights: [],
         rowStyleIds: sheetState?.rowStyleIds ?? {},
+        cellStyleIds: sheetState?.cellStyleIds ?? {},
         showGridLines: sheetState?.showGridLines ?? true,
         sparklines: sheetState?.sparklines ?? [],
         styleById: structureAssets?.styleById ?? {},
         tableStyleByName: structureAssets?.tableStyleByName ?? {},
-        themePalette: structureAssets?.themePalette ?? { colorsByIndex: {} },
+        themePalette,
         visibleCols: [],
         visibleRows: [],
         workbookSheetIndex: index,
@@ -5144,11 +5210,12 @@ function buildSheetList(nextWorkbook, structureAssets, sheetLayoutStates, showHi
       rowHeightOverridesPx: sheetState?.rowHeightOverridesPx ?? {},
       rowHeights: visibleRows.map(resolveRowHeightPx),
       rowStyleIds: sheetState?.rowStyleIds ?? {},
+      cellStyleIds: sheetState?.cellStyleIds ?? {},
       showGridLines: sheetState?.showGridLines ?? true,
       sparklines: sheetState?.sparklines ?? [],
       styleById: structureAssets?.styleById ?? {},
       tableStyleByName: structureAssets?.tableStyleByName ?? {},
-      themePalette: structureAssets?.themePalette ?? { colorsByIndex: {} },
+      themePalette,
       visibleCols,
       visibleRows,
       workbookSheetIndex: index,
@@ -5298,9 +5365,10 @@ async function loadWorkbook(buffer, skipXmlParsing = false, showHiddenSheets = f
   const structureAssets = effectiveSkipXmlParsing || shouldUseFastStructureParse || !canParseXmlInWorker() ? null : parseWorkbookStructureAssets(bytes, {
     includeCachedFormulaValues: true
   });
+  const themePalette = structureAssets?.themePalette ?? buildThemePaletteFromHex(nextWorkbook.themePalette);
   formControlsByWorkbookSheetIndex = collectWorkbookFormControls(
     nextWorkbook,
-    structureAssets?.themePalette
+    themePalette
   ).map(
     (controls, workbookSheetIndex) => controls.map((control) => ({
       ...control,
@@ -5309,7 +5377,7 @@ async function loadWorkbook(buffer, skipXmlParsing = false, showHiddenSheets = f
   );
   const sheetLayoutStates = structureAssets ? void 0 : parseWorkerSheetLayoutAssets(bytes, nextWorkbook.sheetCount);
   workbook = nextWorkbook;
-  sheets = buildSheetList(nextWorkbook, structureAssets, sheetLayoutStates, showHiddenSheets);
+  sheets = buildSheetList(nextWorkbook, themePalette, structureAssets, sheetLayoutStates, showHiddenSheets);
   tablesByWorkbookSheetIndex = Array.from(
     { length: nextWorkbook.sheetCount },
     (_, workbookSheetIndex) => mapWorksheetTables(