@extend-ai/react-xlsx 0.20.3 → 0.20.5

package/dist/index.js

@@ -1,4 +1,7 @@
-import "./chunk-HKMFMIKE.js";
+import {
+  loadSpreadsheetFonts
+} from "./chunk-LY4EWUKF.js";
+import "./chunk-KSXNNWAY.js";
 import {
   getBuiltinChartColor,
   getBuiltinChartSurfaceStyle,
@@ -68,31 +71,85 @@ function localizeCellNumber(worksheet, row, col, text, locale = "en-US") {
   );
 }
 
-// src/spreadsheet-fonts.ts
-var fontLoadPromise;
-var SPREADSHEET_FALLBACK_FONT = "React XLSX Carlito";
-function loadSpreadsheetFonts() {
-  if (typeof document === "undefined" || typeof FontFace === "undefined") {
-    return Promise.resolve();
-  }
-  return fontLoadPromise ??= import("./spreadsheet-font-assets-V366MXRM.js").then(async ({ spreadsheetFontFaces }) => {
-    await Promise.allSettled(spreadsheetFontFaces.map(async ({ source, ...descriptors }) => {
-      const face = new FontFace(SPREADSHEET_FALLBACK_FONT, `url(${JSON.stringify(source)})`, descriptors);
-      await face.load();
-      document.fonts.add(face);
-    }));
-  }).catch(() => {
-  });
-}
-
 // src/controller.tsx
 import * as React from "react";
 import { formatBinaryBytes, XlsxFileSizeLimitExceededError } from "@extend-ai/react-xlsx/internal";
 import { XlsxFileSizeLimitExceededError as XlsxFileSizeLimitExceededError2 } from "@extend-ai/react-xlsx/internal";
-import { strFromU8 as strFromU83, strToU8 as strToU83, unzipSync as unzipSync2, zipSync as zipSync2 } from "fflate";
+import { strFromU8 as strFromU84, strToU8 as strToU83, unzipSync as unzipSync2, zipSync as zipSync2 } from "fflate";
+
+// src/chartsheet-payload.ts
+import { strFromU8 } from "fflate";
+var REL_NS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships";
+function readXml(archive, path) {
+  const bytes = archive[path];
+  if (!bytes || typeof DOMParser === "undefined") return null;
+  const document2 = new DOMParser().parseFromString(strFromU8(bytes), "application/xml");
+  return document2.getElementsByTagName("parsererror").length > 0 ? null : document2;
+}
+function relationshipPath(partPath) {
+  const separator = partPath.lastIndexOf("/");
+  return `${partPath.slice(0, separator + 1)}_rels/${partPath.slice(separator + 1)}.rels`;
+}
+function resolveTarget(partPath, target) {
+  if (/^[a-z][a-z0-9+.-]*:/i.test(target) || target.startsWith("//")) return null;
+  const segments = target.startsWith("/") ? [] : partPath.split("/").slice(0, -1);
+  for (const segment of target.replace(/\\/g, "/").split("/")) {
+    if (!segment || segment === ".") continue;
+    if (segment === "..") {
+      if (segments.length === 0) return null;
+      segments.pop();
+    } else {
+      segments.push(segment);
+    }
+  }
+  return segments.join("/");
+}
+function readRelationships(archive, partPath) {
+  const relationships = /* @__PURE__ */ new Map();
+  const document2 = readXml(archive, relationshipPath(partPath));
+  for (const element of Array.from(document2?.getElementsByTagNameNS("*", "Relationship") ?? [])) {
+    if (element.getAttribute("TargetMode") === "External") continue;
+    const id = element.getAttribute("Id");
+    const rawTarget = element.getAttribute("Target");
+    const type = element.getAttribute("Type");
+    const target = rawTarget ? resolveTarget(partPath, rawTarget) : null;
+    if (id && type && target && archive[target]) relationships.set(id, { target, type });
+  }
+  return relationships;
+}
+function collectChartsheetDrawingOrigins(archive, chartsheets) {
+  const origins = /* @__PURE__ */ new Map();
+  if (chartsheets.length === 0) return origins;
+  const workbookPath = "xl/workbook.xml";
+  const workbookDocument = readXml(archive, workbookPath);
+  const workbookRelationships = readRelationships(archive, workbookPath);
+  for (const sheet of Array.from(workbookDocument?.getElementsByTagNameNS("*", "sheet") ?? [])) {
+    const relationshipId = sheet.getAttributeNS(REL_NS, "id") ?? sheet.getAttribute("r:id");
+    const relationship = relationshipId ? workbookRelationships.get(relationshipId) : null;
+    if (!relationship?.type.endsWith("/chartsheet")) continue;
+    const chartsheet = chartsheets.find((entry) => entry.name === sheet.getAttribute("name"));
+    if (!chartsheet || chartsheet.workbookSheetIndex == null) continue;
+    const sheetDocument = readXml(archive, relationship.target);
+    const sheetRelationships = readRelationships(archive, relationship.target);
+    const attachments = [];
+    for (const drawing of Array.from(sheetDocument?.getElementsByTagNameNS("*", "drawing") ?? [])) {
+      const drawingId = drawing.getAttributeNS(REL_NS, "id") ?? drawing.getAttribute("r:id");
+      const drawingRelationship = drawingId ? sheetRelationships.get(drawingId) : null;
+      if (!drawingRelationship?.type.endsWith("/drawing")) continue;
+      const drawingRelsPath = relationshipPath(drawingRelationship.target);
+      attachments.push({
+        drawingPath: drawingRelationship.target,
+        drawingRelsPath: archive[drawingRelsPath] ? drawingRelsPath : null,
+        mediaPaths: []
+      });
+    }
+    origins.set(chartsheet.index, { attachments, workbookSheetIndex: chartsheet.workbookSheetIndex });
+  }
+  return origins;
+}
 
 // src/charts.ts
-import { strFromU8, strToU8 } from "fflate";
+import { strFromU8 as strFromU82, strToU8 } from "fflate";
 var CHART_NS = "http://schemas.openxmlformats.org/drawingml/2006/chart";
 var DRAWINGML_NS = "http://schemas.openxmlformats.org/drawingml/2006/main";
 var CHART_REL_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart";
@@ -241,18 +298,33 @@ function applyChartSeriesFormula(chart, seriesIndex, formula, workbook) {
   }
   const categoriesRef = {
     ...currentSeries.categoriesRef ?? {},
-    formula: parsed.categoryFormula
+    formula: parsed.categoryFormula,
+    values: parsed.categoryFormula === currentSeries.categoriesRef?.formula ? currentSeries.categoriesRef.values : void 0
   };
   const valuesRef = {
     ...currentSeries.valuesRef ?? {},
-    formula: parsed.valueFormula
+    formula: parsed.valueFormula,
+    values: parsed.valueFormula === currentSeries.valuesRef?.formula ? currentSeries.valuesRef.values : void 0
   };
   const bubbleSizeRef = chart.chartType === "Bubble" || parsed.bubbleSizeFormula ? {
     ...currentSeries.bubbleSizeRef ?? {},
-    formula: parsed.bubbleSizeFormula
+    formula: parsed.bubbleSizeFormula,
+    values: parsed.bubbleSizeFormula === currentSeries.bubbleSizeRef?.formula ? currentSeries.bubbleSizeRef?.values : void 0
   } : currentSeries.bubbleSizeRef ?? null;
+  const isUnresolved = (formula2) => Boolean(
+    workbook && formula2 && !resolveReferenceSheet(workbook, chart.workbookSheetIndex, formula2).sheet
+  );
+  const resolveEditedReference = (reference, currentReference, currentValues, mode) => {
+    if (!workbook) return currentValues;
+    if (reference?.formula === currentReference?.formula && isUnresolved(reference?.formula)) return currentValues;
+    return resolveReferenceValues(workbook, chart.workbookSheetIndex, reference, mode);
+  };
   const raw = {
-    ...currentSeries.raw ?? {}
+    ...currentSeries.raw ?? {},
+    unresolvedCategoriesReference: isUnresolved(categoriesRef.formula),
+    unresolvedValuesReference: isUnresolved(valuesRef.formula),
+    unresolvedBubbleSizeReference: isUnresolved(bubbleSizeRef?.formula),
+    unresolvedNameReference: isUnresolved(parsed.nameFormula)
   };
   if (parsed.nameFormula) {
     raw.name = parsed.nameFormula;
@@ -262,17 +334,21 @@ function applyChartSeriesFormula(chart, seriesIndex, formula, workbook) {
   const nextSeries = {
     ...currentSeries,
     bubbleSizeRef,
-    bubbleSizes: workbook && bubbleSizeRef?.formula ? resolveReferenceValues(workbook, chart.workbookSheetIndex, bubbleSizeRef, "value").map((value) => typeof value === "number" && Number.isFinite(value) ? value : null) : currentSeries.bubbleSizes,
-    categories: workbook ? resolveReferenceValues(workbook, chart.workbookSheetIndex, categoriesRef, "category") : currentSeries.categories,
+    bubbleSizes: resolveEditedReference(bubbleSizeRef, currentSeries.bubbleSizeRef, currentSeries.bubbleSizes ?? [], "value").map((value) => typeof value === "number" && Number.isFinite(value) ? value : null),
+    categories: resolveEditedReference(categoriesRef, currentSeries.categoriesRef, currentSeries.categories, "category"),
     categoriesRef,
-    name: parsed.nameLiteral ?? (parsed.nameFormula && workbook ? resolveSeriesName(workbook, chart.workbookSheetIndex, parsed.nameFormula) : parsed.nameFormula ?? currentSeries.name),
+    name: parsed.nameLiteral ?? (parsed.nameFormula === currentSeries.raw?.name && isUnresolved(parsed.nameFormula) ? currentSeries.name : parsed.nameFormula && workbook ? resolveSeriesName(workbook, chart.workbookSheetIndex, parsed.nameFormula) : parsed.nameFormula ?? currentSeries.name),
     raw,
-    values: workbook ? resolveReferenceValues(workbook, chart.workbookSheetIndex, valuesRef, "value").map((value) => typeof value === "number" && Number.isFinite(value) ? value : null) : currentSeries.values,
+    values: resolveEditedReference(valuesRef, currentSeries.valuesRef, currentSeries.values, "value").map((value) => typeof value === "number" && Number.isFinite(value) ? value : null),
     valuesRef
   };
   return {
     ...chart,
-    series: chart.series.map((series, index) => index === seriesIndex ? nextSeries : series)
+    series: chart.series.map((series, index) => index === seriesIndex ? nextSeries : series),
+    typeGroups: chart.typeGroups?.map((group) => ({
+      ...group,
+      series: group.series.map((series) => series.id === currentSeries.id ? nextSeries : series)
+    }))
   };
 }
 function normalizeWorksheetVisibility(value) {
@@ -978,9 +1054,10 @@ function applyBuiltinChartDefaults(chart, themePalette) {
     };
   };
   chart.series = chart.series.map(applySeriesDefaults);
+  const canonicalSeries = chart.id.startsWith("chart-ex-") ? null : new Map(chart.series.map((series) => [series.id, series]));
   let groupSeriesOffset = 0;
   chart.typeGroups = chart.typeGroups?.map((group) => {
-    const series = group.series.map((entry, index) => applySeriesDefaults(entry, groupSeriesOffset + index));
+    const series = group.series.map((entry, index) => canonicalSeries?.get(entry.id) ?? applySeriesDefaults(entry, groupSeriesOffset + index));
     groupSeriesOffset += group.series.length;
     return { ...group, series };
   });
@@ -1124,11 +1201,12 @@ function applyChartSeriesStyleFromXml(chart, chartTypeNode, themePalette) {
     const rawFillColor = typeof existingShapeProperties?.solidFillHex === "string" ? normalizeHexColor(existingShapeProperties.solidFillHex) : null;
     const rawLineColor = typeof existingShapeProperties?.lineColorHex === "string" ? normalizeHexColor(existingShapeProperties.lineColorHex) : null;
     const resolvedLineColor = lineStyle.hidden ? void 0 : rawLineColor ?? lineStyle.color ?? rawFillColor ?? fillColor ?? series.lineColor ?? series.color;
-    const hasCategoryReference = typeof series.categoriesRef?.formula === "string" && series.categoriesRef.formula.length > 0;
-    const hasValueReference = typeof series.valuesRef?.formula === "string" && series.valuesRef.formula.length > 0;
-    const hasBubbleSizeReference = typeof series.bubbleSizeRef?.formula === "string" && series.bubbleSizeRef.formula.length > 0;
+    const hasCategoryReference = typeof series.categoriesRef?.formula === "string" && series.categoriesRef.formula.length > 0 && !series.raw?.unresolvedCategoriesReference;
+    const hasValueReference = typeof series.valuesRef?.formula === "string" && series.valuesRef.formula.length > 0 && !series.raw?.unresolvedValuesReference;
+    const hasBubbleSizeReference = typeof series.bubbleSizeRef?.formula === "string" && series.bubbleSizeRef.formula.length > 0 && !series.raw?.unresolvedBubbleSizeReference;
     return {
       ...series,
+      name: series.raw?.unresolvedNameReference ? parseChartCacheValues(getFirstLocalChild(seriesNode, "tx"), "strCache", "category")?.[0]?.toString() ?? series.name : series.name,
       bubbleSizes: !hasBubbleSizeReference && cachedBubbleSizes ? cachedBubbleSizes.map((value) => typeof value === "number" && Number.isFinite(value) ? value : null) : series.bubbleSizes,
       categories: !hasCategoryReference && cachedCategories ? cachedCategories : series.categories,
       color: rawFillColor ?? rawLineColor ?? fillColor ?? lineStyle.color ?? series.color,
@@ -1388,6 +1466,23 @@ function applyChartStyleFromXml(chart, chartPath, archive, themePalette) {
     if (typeof fallbackStyleId === "number" && Number.isFinite(fallbackStyleId)) {
       chart.chartStyleId = fallbackStyleId;
     }
+    const sourceSeries = chart.raw?.officeSourceSeries;
+    if (sourceSeries && chartDocument?.documentElement.namespaceURI === "http://schemas.microsoft.com/office/drawing/2014/chartex") {
+      chart.renderSource = {
+        kind: chart.chartExLayout ?? "",
+        seriesTypes: getLocalDescendants(chartNode, "series").map((node) => node.getAttribute("layoutId") ?? ""),
+        sourceSeries,
+        experimental: true,
+        xml: chartXml,
+        themeColors: themePalette ? Object.fromEntries(Object.entries(THEME_COLOR_INDEX_BY_NAME).flatMap(([key, index]) => {
+          const color = themePalette.colorsByIndex[index];
+          return color ? [[key, color]] : [];
+        })) : void 0,
+        themeOverrideXml: readArchiveText(archive, relationships.get("http://schemas.openxmlformats.org/officeDocument/2006/relationships/themeOverride")) ?? void 0,
+        styleXml: readArchiveText(archive, relationships.get(CHART_STYLE_REL_TYPE)) ?? void 0,
+        colorStyleXml: readArchiveText(archive, relationships.get(CHART_COLOR_STYLE_REL_TYPE)) ?? void 0
+      };
+    }
     applyModernChartExStyles();
     applyFallbackSeriesStyles();
     applyBuiltinChartDefaults(chart, themePalette);
@@ -1629,11 +1724,22 @@ function applyChartStyleFromXml(chart, chartPath, archive, themePalette) {
       chart.axes = [...chart.axes, seriesAxis];
     }
   }
-  const kind = chartTypeNode.localName === "lineChart" && chart.chartType === "Line" ? "line" : chartTypeNode.localName === "barChart" && chart.chartType === "ColumnClustered" ? "bar" : null;
-  const groupCount = Array.from(plotArea.children).filter((entry) => entry.localName.endsWith("Chart")).length;
-  if (kind && groupCount === 1 && !chart.is3d && !plotArea.querySelector("trendline, errBars, dropLines, hiLowLines, upDownBars, dateAx, multiLvlStrRef, pictureOptions") && getLocalChildren(chartTypeNode, "ser").length === chart.series.length) {
+  const groups = Array.from(plotArea.children).filter((entry) => entry.localName.endsWith("Chart"));
+  const seriesTypes = groups.flatMap((group) => getLocalChildren(group, "ser").map(() => group.localName.slice(0, -5)));
+  const seriesNodes = groups.flatMap((group) => getLocalChildren(group, "ser"));
+  const indexedXSeries = seriesNodes.map((series) => {
+    const x = getFirstLocalChild(series, "xVal");
+    return Boolean(x && (getFirstLocalChild(x, "multiLvlStrRef") || getFirstLocalChild(x, "strRef") || getFirstLocalChild(x, "strLit")));
+  });
+  const unsupportedHierarchy = getLocalDescendants(plotArea, "multiLvlStrRef").some((node) => node.parentElement?.localName !== "xVal");
+  const kind = chartTypeNode.localName.slice(0, -5);
+  const stable = groups.length === 1 && !chart.is3d && (kind === "line" && chart.chartType === "Line" || kind === "bar" && chart.chartType === "ColumnClustered") && !plotArea.querySelector("trendline, errBars, dropLines, hiLowLines, upDownBars, dateAx, multiLvlStrRef, pictureOptions");
+  if (seriesTypes.length === chart.series.length && !unsupportedHierarchy && !plotArea.querySelector("pictureOptions")) {
     chart.renderSource = {
       kind,
+      seriesTypes,
+      indexedXSeries,
+      experimental: !stable,
       xml: chartXml,
       themeColors: themePalette ? Object.fromEntries(Object.entries(THEME_COLOR_INDEX_BY_NAME).flatMap(([key, index]) => {
         const color = themePalette.colorsByIndex[index];
@@ -1644,7 +1750,21 @@ function applyChartStyleFromXml(chart, chartPath, archive, themePalette) {
       colorStyleXml: readArchiveText(archive, relationships.get(CHART_COLOR_STYLE_REL_TYPE)) ?? void 0
     };
   }
-  applyChartSeriesStyleFromXml(chart, chartTypeNode, themePalette);
+  if (groups.length > 1 && chart.typeGroups?.length === groups.length) {
+    let seriesOffset = 0;
+    const hydratedSeries = [];
+    chart.typeGroups = chart.typeGroups.map((group, index) => {
+      const count = getLocalChildren(groups[index], "ser").length;
+      const groupChart = { ...chart, chartType: group.chartType, series: chart.series.slice(seriesOffset, seriesOffset + count) };
+      applyChartSeriesStyleFromXml(groupChart, groups[index], themePalette);
+      seriesOffset += count;
+      hydratedSeries.push(...groupChart.series);
+      return { ...group, series: groupChart.series };
+    });
+    chart.series = [...hydratedSeries, ...chart.series.slice(seriesOffset)];
+  } else {
+    applyChartSeriesStyleFromXml(chart, chartTypeNode, themePalette);
+  }
   applyFallbackSeriesStyles();
   applyBuiltinChartDefaults(chart, themePalette);
 }
@@ -1695,7 +1815,7 @@ function readArchiveText(archive, path) {
     return null;
   }
   const entry = archive[normalizeArchivePath(path)];
-  return entry ? strFromU8(entry) : null;
+  return entry ? strFromU82(entry) : null;
 }
 function parseXml(xml) {
   if (typeof DOMParser === "undefined") {
@@ -1831,8 +1951,8 @@ function resolveReferenceSheet(workbook, fallbackSheetIndex, formula) {
   if (!formula) {
     return {
       range: null,
-      sheet: workbook.getSheet(fallbackSheetIndex),
-      sheetName: workbook.getSheet(fallbackSheetIndex)?.name ?? ""
+      sheet: fallbackSheetIndex < workbook.sheetCount ? workbook.getSheet(fallbackSheetIndex) : null,
+      sheetName: fallbackSheetIndex < workbook.sheetCount ? workbook.getSheet(fallbackSheetIndex)?.name ?? "" : ""
     };
   }
   const trimmedFormula = formula.trim();
@@ -1849,8 +1969,8 @@ function resolveReferenceSheet(workbook, fallbackSheetIndex, formula) {
   if (!split) {
     return {
       range: parseA1Range(trimmedFormula),
-      sheet: workbook.getSheet(fallbackSheetIndex),
-      sheetName: workbook.getSheet(fallbackSheetIndex)?.name ?? ""
+      sheet: fallbackSheetIndex < workbook.sheetCount ? workbook.getSheet(fallbackSheetIndex) : null,
+      sheetName: fallbackSheetIndex < workbook.sheetCount ? workbook.getSheet(fallbackSheetIndex)?.name ?? "" : ""
     };
   }
   try {
@@ -1862,8 +1982,8 @@ function resolveReferenceSheet(workbook, fallbackSheetIndex, formula) {
   } catch {
     return {
       range: parseA1Range(split.range),
-      sheet: workbook.getSheet(fallbackSheetIndex),
-      sheetName: workbook.getSheet(fallbackSheetIndex)?.name ?? ""
+      sheet: null,
+      sheetName: split.sheetName
     };
   }
 }
@@ -2132,6 +2252,7 @@ function buildChartExParetoLineSeries(series, sourceRaw, index) {
   });
   return {
     ...series,
+    id: series.id.replace(/-series-\d+$/, `-series-${index}`),
     color: void 0,
     lineColor: void 0,
     markerColor: void 0,
@@ -2394,7 +2515,7 @@ function normalizeChartExChart(workbook, workbookSheetIndex, visibleSheetIndex,
     name: typeof drawing.name === "string" ? drawing.name : chartTitle,
     overlap: void 0,
     plotVisibleOnly: void 0,
-    raw: chart,
+    raw: { ...chart, officeSourceSeries: normalizedSeries },
     radarStyle: void 0,
     scatterStyle: void 0,
     roundedCorners: void 0,
@@ -2862,7 +2983,13 @@ function normalizeChartSeries(workbook, workbookSheetIndex, chartId, raw, index)
     name: resolveSeriesName(workbook, workbookSheetIndex, series.name),
     negativeColor: void 0,
     negativeLineColor: void 0,
-    raw: series,
+    raw: {
+      ...series,
+      unresolvedCategoriesReference: Boolean(categoriesRef?.formula && !resolveReferenceSheet(workbook, workbookSheetIndex, categoriesRef.formula).sheet),
+      unresolvedValuesReference: Boolean(valuesRef?.formula && !resolveReferenceSheet(workbook, workbookSheetIndex, valuesRef.formula).sheet),
+      unresolvedBubbleSizeReference: Boolean(bubbleSizeRef?.formula && !resolveReferenceSheet(workbook, workbookSheetIndex, bubbleSizeRef.formula).sheet),
+      unresolvedNameReference: typeof series.name === "string" && series.name.includes("!") && !resolveReferenceSheet(workbook, workbookSheetIndex, series.name).sheet
+    },
     shapeProperties,
     smooth: typeof series.smooth === "boolean" ? series.smooth : void 0,
     values: resolveReferenceValues(workbook, workbookSheetIndex, valuesRef, "value").map((value) => typeof value === "number" && Number.isFinite(value) ? value : null),
@@ -2924,12 +3051,15 @@ function buildTabs(workbook, chartsheets, visibleSheetIndexByWorkbookSheetIndex,
     const slotIndex = typeof entry.index === "number" ? entry.index : index;
     if (slotType === "chartsheet") {
       const chartsheet = chartsheets[slotIndex];
+      const visibility2 = normalizeWorksheetVisibility(chartsheet?.raw?.visibility);
+      if (!showHiddenSheets && visibility2 !== "visible") return [];
       return chartsheet ? [{
         chartsheetIndex: slotIndex,
         id: `chartsheet-${slotIndex}`,
         index,
         kind: "chartsheet",
-        name: chartsheet.name
+        name: chartsheet.name,
+        visibility: visibility2
       }] : [];
     }
     const worksheet = workbook.getSheet(slotIndex);
@@ -3033,9 +3163,24 @@ function applyChartOrigins(chartsByWorkbookSheetIndex, chartOriginsById, archive
     });
   }
 }
-function hydrateWorkbookChartStyles(chartsByWorkbookSheetIndex, imageAssets) {
+function hydrateWorkbookChartStyles(chartsByWorkbookSheetIndex, imageAssets, chartsheets = []) {
   const chartOriginsById = /* @__PURE__ */ new Map();
   applyChartOrigins(chartsByWorkbookSheetIndex, chartOriginsById, imageAssets.archive, imageAssets.sheetOrigins);
+  const chartsheetOrigins = collectChartsheetDrawingOrigins(imageAssets.archive, chartsheets);
+  for (const chartsheet of chartsheets) {
+    if (chartsheet.workbookSheetIndex == null) continue;
+    const charts = chartsByWorkbookSheetIndex[chartsheet.workbookSheetIndex] ?? [];
+    const origins = collectChartOriginsForSheet(imageAssets.archive, chartsheetOrigins.get(chartsheet.index) ?? null);
+    for (const chart of charts) {
+      const kind = chart.id.startsWith("chart-ex-") ? "modern" : "classic";
+      const origin = origins.find((entry) => entry.chartKind === kind);
+      if (!origin) continue;
+      if (origin.anchor) chart.anchor = origin.anchor;
+      chart.chartPath = origin.chartPath ?? void 0;
+      chartsheet.chartPath = chart.chartPath;
+      chartOriginsById.set(chart.id, origin);
+    }
+  }
   for (const charts of chartsByWorkbookSheetIndex) {
     for (const chart of charts) {
       applyChartStyleFromXml(chart, chart.chartPath, imageAssets.archive, imageAssets.themePalette);
@@ -3044,6 +3189,84 @@ function hydrateWorkbookChartStyles(chartsByWorkbookSheetIndex, imageAssets) {
   }
   return chartOriginsById;
 }
+function normalizeClassicChartDrawing(workbook, workbookSheetIndex, visibleSheetIndex, rawChart, chartIndex, chartId = `chart-${workbookSheetIndex}-${chartIndex}`) {
+  const drawing = rawChart && typeof rawChart === "object" ? rawChart : {};
+  const chart = drawing.chart && typeof drawing.chart === "object" ? drawing.chart : {};
+  const rawView3d = chart.view3D && typeof chart.view3D === "object" ? chart.view3D : null;
+  const rawSeries = Array.isArray(chart.series) ? chart.series : [];
+  const typeGroups = Array.isArray(chart.typeGroups) ? chart.typeGroups.map((entry, groupIndex) => normalizeChartTypeGroup(workbook, workbookSheetIndex, chartId, entry, groupIndex)).filter((value) => value != null) : [];
+  let seriesOrdinal = 0;
+  const series = typeGroups.some((group) => group.series.length > 0) ? typeGroups.flatMap((group) => {
+    group.series = group.series.map((entry) => ({ ...entry, id: `${chartId}-series-${seriesOrdinal++}` }));
+    return group.series;
+  }) : rawSeries.map((entry, seriesIndex) => normalizeChartSeries(workbook, workbookSheetIndex, chartId, entry, seriesIndex));
+  const chartLevelDataLabels = normalizeChartDataLabels(chart.dataLabels);
+  const firstSeriesDataLabels = rawSeries.length > 0 && rawSeries[0] && typeof rawSeries[0] === "object" ? normalizeChartDataLabels(rawSeries[0].dataLabels) : null;
+  return {
+    anchor: normalizeChartAnchor(drawing.anchor),
+    autoTitleDeleted: typeof chart.autoTitleDeleted === "boolean" ? chart.autoTitleDeleted : void 0,
+    axes: Array.isArray(chart.axes) ? chart.axes.map(normalizeChartAxis).filter((value) => Boolean(value)) : [],
+    axisLabelColor: void 0,
+    axisLineColor: void 0,
+    categoryAxis: normalizeChartAxis(chart.categoryAxis),
+    chartAreaBorderColor: void 0,
+    chartAreaFillColor: void 0,
+    chartColorPalette: void 0,
+    chartColorPaletteOffset: void 0,
+    chartPath: void 0,
+    chartStyleId: void 0,
+    chartType: typeof chart.chartType === "string" ? chart.chartType : "ColumnClustered",
+    dataLabels: chartLevelDataLabels ?? firstSeriesDataLabels,
+    displayBlanksAs: typeof chart.displayBlanksAs === "string" ? chart.displayBlanksAs : void 0,
+    editable: true,
+    firstSliceAngle: typeof chart.firstSliceAngle === "number" ? chart.firstSliceAngle : void 0,
+    fontFamily: void 0,
+    gapWidth: typeof chart.gapWidth === "number" ? chart.gapWidth : void 0,
+    holeSize: typeof chart.holeSize === "number" ? chart.holeSize : void 0,
+    id: chartId,
+    is3d: typeof chart.is3D === "boolean" ? chart.is3D : typeof chart.is3d === "boolean" ? chart.is3d : void 0,
+    legend: normalizeLegend(chart.legend) ? {
+      ...normalizeLegend(chart.legend),
+      position: normalizeLegendPosition(normalizeLegend(chart.legend)?.position)
+    } : null,
+    name: typeof drawing.name === "string" ? drawing.name : void 0,
+    overlap: typeof chart.overlap === "number" ? chart.overlap : void 0,
+    plotVisibleOnly: typeof chart.plotVisibleOnly === "boolean" ? chart.plotVisibleOnly : void 0,
+    raw: chart,
+    radarStyle: typeof chart.radarStyle === "string" ? chart.radarStyle : void 0,
+    scatterStyle: typeof chart.scatterStyle === "string" ? chart.scatterStyle : void 0,
+    roundedCorners: typeof chart.roundedCorners === "boolean" ? chart.roundedCorners : void 0,
+    shape3d: typeof chart.shape === "string" ? chart.shape : typeof chart.shape3d === "string" ? chart.shape3d : void 0,
+    seriesAxis: null,
+    series,
+    sheetIndex: visibleSheetIndex,
+    showDlblsOverMax: typeof chart.showDlblsOverMax === "boolean" ? chart.showDlblsOverMax : void 0,
+    sideWall: null,
+    backWall: null,
+    bubbleScale: typeof chart.bubbleScale === "number" ? chart.bubbleScale : void 0,
+    bubble3d: typeof chart.bubble3d === "boolean" ? chart.bubble3d : void 0,
+    floor: null,
+    surfaceMaterial: void 0,
+    textColor: void 0,
+    title: typeof chart.title === "string" ? chart.title : void 0,
+    titleColor: void 0,
+    titleFontFamily: void 0,
+    typeGroups,
+    valueAxis: normalizeChartAxis(chart.valueAxis),
+    varyColors: typeof chart.varyColors === "boolean" ? chart.varyColors : void 0,
+    view3d: rawView3d ? {
+      depthPercent: typeof rawView3d.depthPercent === "number" ? rawView3d.depthPercent : void 0,
+      heightPercent: typeof rawView3d.heightPercent === "number" ? rawView3d.heightPercent : void 0,
+      perspective: typeof rawView3d.perspective === "number" ? rawView3d.perspective : void 0,
+      rAngAx: typeof rawView3d.rAngAx === "boolean" ? rawView3d.rAngAx : typeof rawView3d.rightAngleAxes === "boolean" ? rawView3d.rightAngleAxes : void 0,
+      rotX: typeof rawView3d.rotX === "number" ? rawView3d.rotX : typeof rawView3d.rotateX === "number" ? rawView3d.rotateX : void 0,
+      rotY: typeof rawView3d.rotY === "number" ? rawView3d.rotY : typeof rawView3d.rotateY === "number" ? rawView3d.rotateY : void 0
+    } : void 0,
+    wireframe: typeof chart.wireframe === "boolean" ? chart.wireframe : void 0,
+    workbookSheetIndex,
+    zIndex: Array.isArray(drawing.drawingPath) && typeof drawing.drawingPath[0] === "number" ? drawing.drawingPath[0] + 1 : chartIndex + 1
+  };
+}
 function loadWorkbookChartAssets(workbook, imageAssets, visibleSheetIndexByWorkbookSheetIndex, showHiddenSheets = false) {
   const excludedChartIds = /* @__PURE__ */ new Set();
   const chartsByWorkbookSheetIndex = Array.from({ length: workbook.sheetCount }, (_, workbookSheetIndex) => {
@@ -3056,76 +3279,7 @@ function loadWorkbookChartAssets(workbook, imageAssets, visibleSheetIndexByWorkb
       if (rawChart.hidden || !rawChart.anchor) {
         excludedChartIds.add(chartId);
       }
-      const drawing = rawChart && typeof rawChart === "object" ? rawChart : {};
-      const chart = drawing.chart && typeof drawing.chart === "object" ? drawing.chart : {};
-      const rawView3d = chart.view3D && typeof chart.view3D === "object" ? chart.view3D : null;
-      const rawSeries = Array.isArray(chart.series) ? chart.series : [];
-      const chartLevelDataLabels = normalizeChartDataLabels(chart.dataLabels);
-      const firstSeriesDataLabels = rawSeries.length > 0 && rawSeries[0] && typeof rawSeries[0] === "object" ? normalizeChartDataLabels(rawSeries[0].dataLabels) : null;
-      return {
-        anchor: normalizeChartAnchor(drawing.anchor),
-        autoTitleDeleted: typeof chart.autoTitleDeleted === "boolean" ? chart.autoTitleDeleted : void 0,
-        axes: Array.isArray(chart.axes) ? chart.axes.map(normalizeChartAxis).filter((value) => Boolean(value)) : [],
-        axisLabelColor: void 0,
-        axisLineColor: void 0,
-        categoryAxis: normalizeChartAxis(chart.categoryAxis),
-        chartAreaBorderColor: void 0,
-        chartAreaFillColor: void 0,
-        chartColorPalette: void 0,
-        chartColorPaletteOffset: void 0,
-        chartPath: void 0,
-        chartStyleId: void 0,
-        chartType: typeof chart.chartType === "string" ? chart.chartType : "ColumnClustered",
-        dataLabels: chartLevelDataLabels ?? firstSeriesDataLabels,
-        displayBlanksAs: typeof chart.displayBlanksAs === "string" ? chart.displayBlanksAs : void 0,
-        editable: true,
-        firstSliceAngle: typeof chart.firstSliceAngle === "number" ? chart.firstSliceAngle : void 0,
-        fontFamily: void 0,
-        gapWidth: typeof chart.gapWidth === "number" ? chart.gapWidth : void 0,
-        holeSize: typeof chart.holeSize === "number" ? chart.holeSize : void 0,
-        id: chartId,
-        is3d: typeof chart.is3D === "boolean" ? chart.is3D : void 0,
-        legend: normalizeLegend(chart.legend) ? {
-          ...normalizeLegend(chart.legend),
-          position: normalizeLegendPosition(normalizeLegend(chart.legend)?.position)
-        } : null,
-        name: typeof drawing.name === "string" ? drawing.name : void 0,
-        overlap: typeof chart.overlap === "number" ? chart.overlap : void 0,
-        plotVisibleOnly: typeof chart.plotVisibleOnly === "boolean" ? chart.plotVisibleOnly : void 0,
-        raw: chart,
-        radarStyle: typeof chart.radarStyle === "string" ? chart.radarStyle : void 0,
-        scatterStyle: typeof chart.scatterStyle === "string" ? chart.scatterStyle : void 0,
-        roundedCorners: typeof chart.roundedCorners === "boolean" ? chart.roundedCorners : void 0,
-        shape3d: typeof chart.shape === "string" ? chart.shape : typeof chart.shape3d === "string" ? chart.shape3d : void 0,
-        seriesAxis: null,
-        series: rawSeries.map((entry, seriesIndex) => normalizeChartSeries(workbook, workbookSheetIndex, chartId, entry, seriesIndex)),
-        sheetIndex: visibleSheetIndex,
-        showDlblsOverMax: typeof chart.showDlblsOverMax === "boolean" ? chart.showDlblsOverMax : void 0,
-        sideWall: null,
-        backWall: null,
-        bubbleScale: typeof chart.bubbleScale === "number" ? chart.bubbleScale : void 0,
-        bubble3d: typeof chart.bubble3d === "boolean" ? chart.bubble3d : void 0,
-        floor: null,
-        surfaceMaterial: void 0,
-        textColor: void 0,
-        title: typeof chart.title === "string" ? chart.title : void 0,
-        titleColor: void 0,
-        titleFontFamily: void 0,
-        typeGroups: Array.isArray(chart.typeGroups) ? chart.typeGroups.map((entry, groupIndex) => normalizeChartTypeGroup(workbook, workbookSheetIndex, chartId, entry, groupIndex)).filter((value) => value != null) : [],
-        valueAxis: normalizeChartAxis(chart.valueAxis),
-        varyColors: typeof chart.varyColors === "boolean" ? chart.varyColors : void 0,
-        view3d: rawView3d ? {
-          depthPercent: typeof rawView3d.depthPercent === "number" ? rawView3d.depthPercent : void 0,
-          heightPercent: typeof rawView3d.heightPercent === "number" ? rawView3d.heightPercent : void 0,
-          perspective: typeof rawView3d.perspective === "number" ? rawView3d.perspective : void 0,
-          rAngAx: typeof rawView3d.rAngAx === "boolean" ? rawView3d.rAngAx : typeof rawView3d.rightAngleAxes === "boolean" ? rawView3d.rightAngleAxes : void 0,
-          rotX: typeof rawView3d.rotX === "number" ? rawView3d.rotX : typeof rawView3d.rotateX === "number" ? rawView3d.rotateX : void 0,
-          rotY: typeof rawView3d.rotY === "number" ? rawView3d.rotY : typeof rawView3d.rotateY === "number" ? rawView3d.rotateY : void 0
-        } : void 0,
-        wireframe: typeof chart.wireframe === "boolean" ? chart.wireframe : void 0,
-        workbookSheetIndex,
-        zIndex: Array.isArray(drawing.drawingPath) && typeof drawing.drawingPath[0] === "number" ? drawing.drawingPath[0] + 1 : chartIndex + 1
-      };
+      return normalizeClassicChartDrawing(workbook, workbookSheetIndex, visibleSheetIndex, rawChart, chartIndex, chartId);
     });
     const modernCharts = rawChartsEx.map((rawChartEx, chartExIndex) => {
       const chartId = `chart-ex-${workbookSheetIndex}-${chartExIndex}`;
@@ -3144,8 +3298,36 @@ function loadWorkbookChartAssets(workbook, imageAssets, visibleSheetIndexByWorkb
     return [...classicCharts, ...modernCharts];
   });
   const chartsheets = Array.isArray(workbook.chartsheets) ? workbook.chartsheets.map((entry, index) => normalizeChartsheet(entry, index)) : [];
+  for (const chartsheet of chartsheets) {
+    const workbookSheetIndex = workbook.sheetCount + chartsheet.index;
+    const raw = chartsheet.raw;
+    const charts = [];
+    if (raw?.chart && typeof raw.chart === "object") {
+      charts.push(normalizeClassicChartDrawing(
+        workbook,
+        workbookSheetIndex,
+        workbookSheetIndex,
+        raw,
+        0,
+        `${chartsheet.id}-chart-0`
+      ));
+    }
+    if (raw?.chartEx && typeof raw.chartEx === "object") {
+      charts.push(normalizeChartExChart(
+        workbook,
+        workbookSheetIndex,
+        workbookSheetIndex,
+        raw,
+        0,
+        imageAssets?.themePalette ?? null
+      ));
+    }
+    chartsByWorkbookSheetIndex[workbookSheetIndex] = charts;
+    chartsheet.chartIds = charts.map((chart) => chart.id);
+    chartsheet.workbookSheetIndex = workbookSheetIndex;
+  }
   const tabs = buildTabs(workbook, chartsheets, visibleSheetIndexByWorkbookSheetIndex, showHiddenSheets);
-  const chartOriginsById = imageAssets ? hydrateWorkbookChartStyles(chartsByWorkbookSheetIndex, imageAssets) : /* @__PURE__ */ new Map();
+  const chartOriginsById = imageAssets ? hydrateWorkbookChartStyles(chartsByWorkbookSheetIndex, imageAssets, chartsheets) : /* @__PURE__ */ new Map();
   if (imageAssets) {
     for (let index = 0; index < chartsByWorkbookSheetIndex.length; index += 1) {
       chartsByWorkbookSheetIndex[index] = (chartsByWorkbookSheetIndex[index] ?? []).filter((chart) => !excludedChartIds.has(chart.id));
@@ -3616,8 +3798,8 @@ function resolveWorkbookFillStyle(fill, 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";
+import { strFromU8 as strFromU83, strToU8 as strToU82, unzipSync, zipSync } from "fflate";
+var REL_NS2 = "http://schemas.openxmlformats.org/officeDocument/2006/relationships";
 var PKG_REL_NS = "http://schemas.openxmlformats.org/package/2006/relationships";
 var SPREADSHEET_NS = "http://schemas.openxmlformats.org/spreadsheetml/2006/main";
 var CONTENT_TYPES_NS = "http://schemas.openxmlformats.org/package/2006/content-types";
@@ -3666,6 +3848,19 @@ function measureColumnCharacterWidthPx(fontFamily, fontSizePt) {
   columnCharacterWidthCache.set(cacheKey, width);
   return width;
 }
+function measureOfficeDigitWidthPt(fontFamily, fontSizePt) {
+  const family = fontFamily?.trim() || "Calibri";
+  const size = typeof fontSizePt === "number" && fontSizePt > 0 ? fontSizePt : 11;
+  const key = `office|${family}|${size}`;
+  const cached = columnCharacterWidthCache.get(key);
+  if (cached !== void 0) return cached;
+  const context = typeof document !== "undefined" ? document.createElement("canvas").getContext("2d") : null;
+  if (!context) return 6;
+  context.font = `${size}px ${JSON.stringify(family)}, "React XLSX Carlito"`;
+  const width = Math.max(1, Math.round(Math.max(...Array.from("0123456789", (digit) => context.measureText(digit).width))));
+  columnCharacterWidthCache.set(key, width);
+  return width;
+}
 function sheetColumnWidthToPixels(width, columnCharacterWidthPx = DEFAULT_COLUMN_CHARACTER_WIDTH_PX) {
   if (!Number.isFinite(width) || width <= 0) {
     return MIN_COL_WIDTH_PX;
@@ -3838,7 +4033,7 @@ function serializeXml2(document2) {
 }
 function readArchiveText2(archive, path) {
   const entry = archive[path];
-  return entry ? strFromU82(entry) : null;
+  return entry ? strFromU83(entry) : null;
 }
 function parseColumnReference(reference) {
   let value = 0;
@@ -3933,10 +4128,10 @@ function readFeaturePropertyBagCheckboxComplements(archive) {
   return checkboxComplementIndices;
 }
 function getRelationshipId(element) {
-  return element.getAttributeNS(REL_NS, "id") ?? element.getAttribute("r:id") ?? element.getAttribute("id");
+  return element.getAttributeNS(REL_NS2, "id") ?? element.getAttribute("r:id") ?? element.getAttribute("id");
 }
 function getEmbeddedRelationshipId(element) {
-  return element.getAttributeNS(REL_NS, "embed") ?? element.getAttribute("r:embed") ?? element.getAttribute("embed");
+  return element.getAttributeNS(REL_NS2, "embed") ?? element.getAttribute("r:embed") ?? element.getAttribute("embed");
 }
 function setChildText(parent, localName, value) {
   const child = getFirstChild(parent, localName);
@@ -4804,6 +4999,18 @@ function parseSheetState(archive, path, options) {
     options?.defaultFont?.sizePt
   );
   const defaultRowHeight = Number(sheetFormatNode?.getAttribute("defaultRowHeight") ?? 15);
+  const digitWidthPt = measureOfficeDigitWidthPt(options?.defaultFont?.family, options?.defaultFont?.sizePt);
+  const storedColumnPixels = (width) => Math.max(0, Math.floor(
+    (256 * width + Math.floor(128 / digitWidthPt)) / 256 * digitWidthPt
+  ) * (4 / 3));
+  const explicitDefaultWidth = Number(sheetFormatNode?.getAttribute("defaultColWidth") ?? Number.NaN);
+  const baseWidth = Number(sheetFormatNode?.getAttribute("baseColWidth") ?? 8);
+  const officeLayout = {
+    defaultColumnPx: Number.isFinite(explicitDefaultWidth) && explicitDefaultWidth > 0 ? storedColumnPixels(explicitDefaultWidth) : ((Number.isFinite(baseWidth) && baseWidth > 0 ? baseWidth : 8) * digitWidthPt + 5) * (4 / 3),
+    defaultRowPx: (Number.isFinite(defaultRowHeight) && defaultRowHeight > 0 ? defaultRowHeight : 15) * (4 / 3),
+    columns: {},
+    rows: {}
+  };
   const defaultColWidth = Number(
     sheetFormatNode?.getAttribute("defaultColWidth") ?? sheetFormatNode?.getAttribute("baseColWidth") ?? 8.43
   );
@@ -4837,6 +5044,7 @@ function parseSheetState(archive, path, options) {
     const styleId = Number(rowNode.getAttribute("s") ?? Number.NaN);
     if (rowIndex >= 0 && Number.isFinite(height)) {
       rowHeightOverridesPx[rowIndex] = Math.max(MIN_ROW_HEIGHT_PX, Math.round(height * 1.33));
+      officeLayout.rows[rowIndex] = { sourcePx: rowHeightOverridesPx[rowIndex], sizePx: Math.max(0, height * (4 / 3)) };
     }
     if (rowIndex >= 0 && Number.isFinite(styleId)) {
       rowStyleIds[rowIndex] = styleId;
@@ -4875,6 +5083,7 @@ function parseSheetState(archive, path, options) {
         if (Number.isFinite(width)) {
           const widthPx = sheetColumnWidthToPixels(width, columnWidthCharacterWidthPx);
           colWidthOverridesPx[col] = widthPx;
+          officeLayout.columns[col] = { sourcePx: widthPx, sizePx: storedColumnPixels(width) };
         }
         if (Number.isFinite(styleId)) {
           colStyleIds[col] = styleId;
@@ -4891,6 +5100,7 @@ function parseSheetState(archive, path, options) {
     colStyleIds,
     conditionalFormatRules,
     defaultColWidthPx: sheetColumnWidthToPixels(defaultColWidth, columnWidthCharacterWidthPx),
+    officeLayout,
     defaultRowHeightPx: Math.max(MIN_ROW_HEIGHT_PX, Math.round(defaultRowHeight * 1.33)),
     hasHorizontalMerges: false,
     hasVerticalMerges: false,
@@ -6345,7 +6555,7 @@ function appendSheetDrawingReference(sheetDocument, relationshipId) {
     return;
   }
   const drawingNode = sheetDocument.createElementNS(SPREADSHEET_NS, "drawing");
-  drawingNode.setAttributeNS(REL_NS, "r:id", relationshipId);
+  drawingNode.setAttributeNS(REL_NS2, "r:id", relationshipId);
   const successorNames = /* @__PURE__ */ new Set([
     "legacyDrawing",
     "legacyDrawingHF",
@@ -7396,6 +7606,7 @@ function buildSheetList(workbook, sheetStatesByWorkbookSheetIndex, themePalette,
         colStyleIds: sheetState?.colStyleIds ?? {},
         conditionalFormatRules: sheetState?.conditionalFormatRules ?? [],
         dataValidations: parseWorksheetDataValidations(worksheet),
+        officeLayout: sheetState?.officeLayout,
         defaultColWidthPx,
         defaultRowHeightPx,
         freezePanes: parseWorksheetFreezePanes(worksheet),
@@ -7485,6 +7696,7 @@ function buildSheetList(workbook, sheetStatesByWorkbookSheetIndex, themePalette,
       colStyleIds: sheetState?.colStyleIds ?? {},
       conditionalFormatRules: sheetState?.conditionalFormatRules ?? [],
       dataValidations: parseWorksheetDataValidations(worksheet),
+      officeLayout: sheetState?.officeLayout,
       defaultColWidthPx,
       defaultRowHeightPx,
       freezePanes: parseWorksheetFreezePanes(worksheet),
@@ -8010,7 +8222,7 @@ function sanitizeSavedWorkbookBytes(bytes) {
     const archive = unzipSync2(bytes);
     const stylesEntry = archive["xl/styles.xml"];
     if (stylesEntry) {
-      const stylesXml = strFromU83(stylesEntry).replace(/&amp;quot;/g, "&quot;").replace(/&amp;apos;/g, "&apos;");
+      const stylesXml = strFromU84(stylesEntry).replace(/&amp;quot;/g, "&quot;").replace(/&amp;apos;/g, "&apos;");
       archive["xl/styles.xml"] = strToU83(stylesXml);
     }
     return zipSync2(archive, { level: 6 });
@@ -8653,7 +8865,7 @@ function useXlsxViewerController(options) {
         return;
       }
       if (imageAssetsRef.current && !effectiveSkipXmlParsing) {
-        const chartOriginsById = hydrateWorkbookChartStyles(result.chartsByWorkbookSheetIndex, imageAssetsRef.current);
+        const chartOriginsById = hydrateWorkbookChartStyles(result.chartsByWorkbookSheetIndex, imageAssetsRef.current, result.chartsheets);
         chartAssetsRef.current = { ...result, chartOriginsById };
       }
       setChartsByWorkbookSheetIndex(result.chartsByWorkbookSheetIndex);
@@ -8878,10 +9090,10 @@ function useXlsxViewerController(options) {
             return;
           }
           setImageAssets(workerImageAssets);
-          const chartOriginsById = workerImageAssets ? hydrateWorkbookChartStyles(snapshot.chartsByWorkbookSheetIndex, workerImageAssets) : /* @__PURE__ */ new Map();
+          const chartOriginsById = workerImageAssets ? hydrateWorkbookChartStyles(snapshot.chartsByWorkbookSheetIndex, workerImageAssets, snapshot.chartsheets) : /* @__PURE__ */ new Map();
           setFormControlsByWorkbookSheetIndex(snapshot.formControlsByWorkbookSheetIndex);
           setWorkbook(null);
-          setSheets(snapshot.sheets);
+          setSheets(snapshot.sheets.map((sheet) => ({ ...sheet, officeLayout: workerImageAssets?.sheetStatesByWorkbookSheetIndex[sheet.workbookSheetIndex]?.officeLayout })));
           setChartsByWorkbookSheetIndex(snapshot.chartsByWorkbookSheetIndex);
           setChartsheets(snapshot.chartsheets);
           setTabs(snapshot.tabs);
@@ -9134,11 +9346,11 @@ function useXlsxViewerController(options) {
         }
         const workerImageAssets = effectiveSkipXmlParsing ? null : parseWorkbookImageAssets(new Uint8Array(deferredBuffer));
         setImageAssets(workerImageAssets);
-        const chartOriginsById = workerImageAssets ? hydrateWorkbookChartStyles(snapshot.chartsByWorkbookSheetIndex, workerImageAssets) : /* @__PURE__ */ new Map();
+        const chartOriginsById = workerImageAssets ? hydrateWorkbookChartStyles(snapshot.chartsByWorkbookSheetIndex, workerImageAssets, snapshot.chartsheets) : /* @__PURE__ */ new Map();
         deferredBufferRef.current = null;
         setDeferredLoadFileSize(null);
         setWorkbook(null);
-        setSheets(snapshot.sheets);
+        setSheets(snapshot.sheets.map((sheet) => ({ ...sheet, officeLayout: workerImageAssets?.sheetStatesByWorkbookSheetIndex[sheet.workbookSheetIndex]?.officeLayout })));
         setChartsByWorkbookSheetIndex(snapshot.chartsByWorkbookSheetIndex);
         setChartsheets(snapshot.chartsheets);
         setTabs(snapshot.tabs);
@@ -10461,7 +10673,13 @@ function useXlsxViewerController(options) {
     if (!nextChart) {
       return false;
     }
-    updateChart(chartId, { series: nextChart.series, renderSource: chart.renderSource });
+    const source = chart.renderSource;
+    const indexedCategoryFormulaChanged = source?.indexedXSeries?.[seriesIndex] && chart.series[seriesIndex]?.categoriesRef?.formula !== nextChart.series[seriesIndex]?.categoriesRef?.formula;
+    updateChart(chartId, {
+      series: nextChart.series,
+      typeGroups: nextChart.typeGroups,
+      renderSource: source?.sourceSeries || indexedCategoryFormulaChanged ? void 0 : source
+    });
     const selectedSeries = nextChart.series[seriesIndex];
     if (selectedSeries) {
       setSelectedChartElement((current) => current && current.chartId === chartId && current.kind !== "chart" ? {