@extend-ai/react-xlsx 0.17.3 → 0.18.1

package/dist/xlsx-worker.js

@@ -1,6 +1,78 @@
 // src/xlsx-worker.ts
 import { strFromU8 as strFromU83, unzipSync as unzipSync2 } from "fflate";
 
+// src/builtin-chart-styles.ts
+function decodeSrgb(channel) {
+  return channel <= 0.04045 ? channel / 12.92 : ((channel + 0.055) / 1.055) ** 2.4;
+}
+function encodeSrgb(channel) {
+  return channel <= 31308e-7 ? channel * 12.92 : 1.055 * channel ** (1 / 2.4) - 0.055;
+}
+function quantizeLinear(channel) {
+  return Math.round(channel * 1e5) / 1e5;
+}
+function resolveBuiltinChartColor(color, colorsByIndex) {
+  if (!color) return void 0;
+  const hex = colorsByIndex[color.themeIndex]?.replace(/^#/, "");
+  if (!hex || !/^[\da-f]{6}$/i.test(hex)) return void 0;
+  if (color.transforms.length === 0) return `#${hex.toLowerCase()}`;
+  const channels = [0, 2, 4].map((offset) => Math.fround(quantizeLinear(decodeSrgb(Number.parseInt(hex.slice(offset, offset + 2), 16) / 255))));
+  for (const transform of color.transforms) {
+    const amount = Math.fround(Math.max(0, Math.min(1, transform.value)));
+    for (let index = 0; index < channels.length; index += 1) {
+      const channel = channels[index];
+      channels[index] = transform.type === "tint" ? Math.fround(Math.fround(1 - amount) + Math.fround(amount * channel)) : Math.fround(amount * channel);
+    }
+  }
+  return `#${channels.map((channel) => Math.round(encodeSrgb(quantizeLinear(channel)) * 255).toString(16).padStart(2, "0")).join("")}`;
+}
+var GRAYSCALE_TINTS = [88, 55, 78, 92, 70, 30];
+var DARK_GRAYSCALE_TINTS = [5, 55, 78, 15, 70, 30];
+function normalizeClassicStyle(styleId) {
+  if (styleId === void 0 || !Number.isInteger(styleId)) return void 0;
+  if (styleId >= 1 && styleId <= 48) return styleId;
+  if (styleId >= 101 && styleId <= 148) return styleId - 100;
+  return void 0;
+}
+function themeColor(themeIndex, tint) {
+  return {
+    themeIndex,
+    transforms: tint === void 0 ? [] : [{ type: "tint", value: tint / 100 }]
+  };
+}
+function appendBrightness(color, percent) {
+  if (percent > 0) color.transforms.push({ type: "tint", value: (100 - percent) / 100 });
+  if (percent < 0) color.transforms.push({ type: "shade", value: (100 + percent) / 100 });
+  return color;
+}
+function getBuiltinChartColor(styleId, index, count) {
+  const style = normalizeClassicStyle(styleId);
+  if (style === void 0 || !Number.isInteger(index) || index < 0 || !Number.isInteger(count) || count < 1) {
+    return void 0;
+  }
+  const palette = style === 41 ? 9 : (style - 1) % 8 + 1;
+  const monochrome = palette >= 3 && palette <= 8;
+  const color = monochrome ? themeColor(palette + 1) : palette === 2 ? themeColor(4 + index % 6) : themeColor(1, (palette === 9 ? DARK_GRAYSCALE_TINTS : GRAYSCALE_TINTS)[index % 6]);
+  const numerator = 140 * (monochrome ? index + 1 : Math.floor(index / 6) + 1);
+  const denominator = monochrome ? count + 1 : Math.floor(count / 6) + 2;
+  const brightness = (Math.trunc(Math.fround(Math.fround(numerator) / Math.fround(denominator))) - 70) % 100;
+  return appendBrightness(color, brightness);
+}
+function getBuiltinChartSurfaceStyle(styleId) {
+  const style = normalizeClassicStyle(styleId);
+  if (style === void 0) return void 0;
+  let fill = null;
+  if (style === 33 || style === 34) fill = themeColor(1, 20);
+  if (style >= 35 && style <= 40) fill = themeColor(style - 31, (styleId ?? 0) >= 100 ? 20 : void 0);
+  if (style >= 41) fill = themeColor(1, 95);
+  return {
+    floor: { fill, line: style <= 40 ? themeColor(1, 75) : null },
+    wall: { fill, line: null },
+    majorGridline: themeColor(1, (styleId ?? 0) >= 100 ? 75 : void 0),
+    minorGridline: themeColor(1, style >= 41 ? 90 : 50)
+  };
+}
+
 // src/charts.ts
 import { strFromU8, strToU8 } from "fflate";
 var CHART_REL_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart";
@@ -223,63 +295,6 @@ function parseFallbackBubbleSizesFromChartXml(chartXml) {
     return parseNumericPointCacheFromXmlFragment(bubbleSizeBlock);
   });
 }
-function decodeChartXmlText(value) {
-  return value.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&").replace(/&quot;/g, '"').replace(/&apos;/g, "'");
-}
-function normalizeChartTitleForMatch(value) {
-  return (value ?? "").trim().replace(/\s+/g, " ").toLowerCase();
-}
-function extractChartTitleFromXml(chartXml) {
-  const match = chartXml.match(/<c:title\b[\s\S]*?<a:t>([\s\S]*?)<\/a:t>/i);
-  if (!match?.[1]) {
-    return null;
-  }
-  const decoded = decodeChartXmlText(match[1]).trim();
-  return decoded.length > 0 ? decoded : null;
-}
-function resolveArchiveFallbackBubbleSizes(archive, preferredTitle) {
-  const preferred = normalizeChartTitleForMatch(preferredTitle);
-  let bestScore = Number.NEGATIVE_INFINITY;
-  let bestCandidate = [];
-  for (const [path, bytes] of Object.entries(archive)) {
-    if (!/\/charts\/chart\d+\.xml$/i.test(path)) {
-      continue;
-    }
-    const chartXml = strFromU8(bytes);
-    if (!/<c:bubbleChart\b/i.test(chartXml)) {
-      continue;
-    }
-    const candidateBubbleSizes = parseFallbackBubbleSizesFromChartXml(chartXml);
-    const hasCandidateValues = candidateBubbleSizes.some((seriesValues) => seriesValues.some((value) => value != null));
-    if (!hasCandidateValues) {
-      continue;
-    }
-    let score = 0;
-    const candidateTitle = normalizeChartTitleForMatch(extractChartTitleFromXml(chartXml));
-    if (preferred.length > 0 && candidateTitle.length > 0 && preferred === candidateTitle) {
-      score += 100;
-    }
-    if (bestCandidate.length === 0) {
-      score += 1;
-    }
-    if (score > bestScore) {
-      bestScore = score;
-      bestCandidate = candidateBubbleSizes;
-      if (score >= 100) {
-        break;
-      }
-    }
-  }
-  return bestCandidate;
-}
-function parseChartTypeFromXml(chartXml) {
-  for (const chartType of PRIMARY_CHART_TYPE_LOCAL_NAMES) {
-    if (new RegExp(`<c:${chartType}\\b`, "i").test(chartXml)) {
-      return chartType;
-    }
-  }
-  return "";
-}
 function findPrimaryChartTypeNode(plotAreaNode) {
   if (!plotAreaNode) {
     return null;
@@ -304,46 +319,6 @@ function resolveScatterChartType(scatterStyle) {
       return "Scatter";
   }
 }
-function resolveArchiveFallbackPointStyles(archive, preferredTitle, preferredChartXmlType, themePalette) {
-  const preferred = normalizeChartTitleForMatch(preferredTitle);
-  const preferredType = (preferredChartXmlType ?? "").trim();
-  let bestScore = Number.NEGATIVE_INFINITY;
-  let bestCandidate = [];
-  for (const [path, bytes] of Object.entries(archive)) {
-    if (!/\/charts\/chart\d+\.xml$/i.test(path)) {
-      continue;
-    }
-    const chartXml = strFromU8(bytes);
-    const candidateType = parseChartTypeFromXml(chartXml);
-    if (!candidateType) {
-      continue;
-    }
-    const candidatePointStyles = parseFallbackPointStylesFromChartXml(chartXml, themePalette);
-    const hasCandidateValues = candidatePointStyles.some((seriesStyles) => seriesStyles.some((style) => typeof style.color === "string" && style.color.length > 0 || typeof style.explosion === "number"));
-    if (!hasCandidateValues) {
-      continue;
-    }
-    let score = 0;
-    const candidateTitle = normalizeChartTitleForMatch(extractChartTitleFromXml(chartXml));
-    if (preferred.length > 0 && candidateTitle.length > 0 && preferred === candidateTitle) {
-      score += 100;
-    }
-    if (preferredType && candidateType === preferredType) {
-      score += 20;
-    }
-    if (bestCandidate.length === 0) {
-      score += 1;
-    }
-    if (score > bestScore) {
-      bestScore = score;
-      bestCandidate = candidatePointStyles;
-      if (score >= 120) {
-        break;
-      }
-    }
-  }
-  return bestCandidate;
-}
 function parseHexColor(color) {
   const normalized = normalizeHexColor(color);
   if (!normalized) {
@@ -730,49 +705,37 @@ function buildThemeSeriesPalette(themePalette) {
   const themeColors = [4, 5, 6, 7, 8, 9].map((index) => themePalette?.colorsByIndex[index] ?? null).filter((color) => Boolean(color));
   return themeColors.length > 0 ? themeColors : SERIES_COLORS;
 }
-function normalizeBuiltinSurfaceStyleId(styleId) {
-  if (typeof styleId !== "number" || !Number.isFinite(styleId)) {
-    return null;
-  }
-  return styleId >= 100 ? styleId - 100 : styleId;
-}
-function getBuiltinSurfacePalette(styleId, wireframe) {
-  const normalized = normalizeBuiltinSurfaceStyleId(styleId);
-  if (normalized === 34 || wireframe === true && normalized == null) {
-    return ["#5b9bd5", "#ed7d31", "#a5a5a5"];
-  }
-  if (normalized === 35 || normalized === 36 || wireframe !== true && normalized == null) {
-    return ["#2f5597", "#4472c4", "#5b9bd5", "#8faadc", "#d9e2f3"];
-  }
-  return null;
-}
-function applyBuiltinSurfaceDefaults(chart) {
+function applyBuiltinSurfaceDefaults(chart, themePalette) {
   if (chart.chartType !== "Surface") {
     return;
   }
-  const builtinPalette = getBuiltinSurfacePalette(chart.chartStyleId, chart.wireframe);
-  if ((!chart.chartColorPalette || chart.chartColorPalette.length === 0) && builtinPalette) {
-    chart.chartColorPalette = builtinPalette;
+  const builtin = chart.raw?.hasCustomChartColorStyle !== true ? getBuiltinChartSurfaceStyle(chart.chartStyleId) : void 0;
+  const colors = themePalette?.colorsByIndex ?? {};
+  const wallFill = resolveBuiltinChartColor(builtin?.wall.fill, colors) ?? (chart.wireframe ? "#d0d0d0" : "#d9d9df");
+  const floorFill = resolveBuiltinChartColor(builtin?.floor.fill, colors) ?? wallFill;
+  const gridlineColor = resolveBuiltinChartColor(builtin?.majorGridline, colors);
+  for (const axis of [chart.categoryAxis, chart.valueAxis, chart.seriesAxis]) {
+    if (axis && !axis.majorGridlineColor) axis.majorGridlineColor = gridlineColor;
   }
-  const wallFill = chart.wireframe ? "#d0d0d0" : "#d9d9df";
   const wallLine = chart.wireframe ? "#a6a6a6" : "#a8adb7";
-  chart.floor = {
-    ...chart.floor ?? {},
-    fillColor: chart.floor?.fillColor ?? wallFill,
-    lineColor: chart.floor?.lineColor ?? wallLine
-  };
-  chart.sideWall = {
-    ...chart.sideWall ?? {},
-    fillColor: chart.sideWall?.fillColor ?? wallFill,
-    lineColor: chart.sideWall?.lineColor ?? wallLine
-  };
-  chart.backWall = {
-    ...chart.backWall ?? {},
-    fillColor: chart.backWall?.fillColor ?? wallFill,
-    lineColor: chart.backWall?.lineColor ?? wallLine
-  };
+  const previousDefaults = chart.raw?.builtinSurfaceDefaults;
+  const nextDefaults = {};
+  for (const key of ["floor", "sideWall", "backWall"]) {
+    const wall = chart[key] ?? {};
+    const previous = previousDefaults?.[key];
+    const fillIsDefault = wall.fillColor === void 0 || wall.fillColor === previous?.fillColor;
+    const lineIsDefault = wall.lineColor === void 0 || wall.lineColor === previous?.lineColor;
+    const fillColor = fillIsDefault ? key === "floor" ? floorFill : wallFill : wall.fillColor;
+    const lineColor = lineIsDefault ? wallLine : wall.lineColor;
+    chart[key] = { ...wall, fillColor, lineColor };
+    nextDefaults[key] = {
+      fillColor: fillIsDefault ? fillColor : void 0,
+      lineColor: lineIsDefault ? lineColor : void 0
+    };
+  }
+  chart.raw = { ...chart.raw, builtinSurfaceDefaults: nextDefaults };
   if (!chart.surfaceMaterial && chart.wireframe !== true) {
-    chart.surfaceMaterial = "flat";
+    chart.surfaceMaterial = "matte";
   }
 }
 function applyBuiltinChartDefaults(chart, themePalette) {
@@ -796,34 +759,48 @@ function applyBuiltinChartDefaults(chart, themePalette) {
   chart.axisLineColor = chart.axisLineColor ?? derivedAxisColor ?? textColor ?? void 0;
   chart.fontFamily = chart.fontFamily ?? minorTypeface;
   chart.titleFontFamily = chart.titleFontFamily ?? chart.fontFamily ?? minorTypeface;
-  const seriesPalette = chart.chartColorPalette && chart.chartColorPalette.length > 0 ? chart.chartColorPalette : buildThemeSeriesPalette(themePalette);
-  if (!chart.chartColorPalette || chart.chartColorPalette.length === 0) {
-    chart.chartColorPalette = seriesPalette;
-  }
-  chart.series = chart.series.map((series, index) => {
+  const themeColors = themePalette?.colorsByIndex;
+  const useBuiltin = chart.raw?.hasCustomChartColorStyle !== true && themeColors && getBuiltinChartColor(chart.chartStyleId, 0, 1) !== void 0;
+  const colorCount = Math.max(1, chart.series.length, chart.typeGroups?.reduce((total, group) => total + group.series.length, 0) ?? 0);
+  const seriesPalette = useBuiltin && chart.chartType !== "Surface" ? Array.from({ length: colorCount }, (_, index) => resolveBuiltinChartColor(getBuiltinChartColor(chart.chartStyleId, index, colorCount), themeColors) ?? SERIES_COLORS[index % SERIES_COLORS.length]) : chart.chartColorPalette?.length ? chart.chartColorPalette : buildThemeSeriesPalette(themePalette);
+  chart.chartColorPalette = seriesPalette;
+  chart.raw = { ...chart.raw, builtinThemeColors: useBuiltin ? themeColors : void 0 };
+  const applySeriesDefaults = (series, index) => {
     const fallbackColor = seriesPalette[index % seriesPalette.length];
+    const properties = series.shapeProperties ?? {};
+    const previous = properties.builtinDefaultColors;
+    const generated = {};
+    const resolveColor = (key, explicit, fallback) => {
+      const value = series[key];
+      if (!explicit && (value == null || value === previous?.[key] || (key === "color" || key === "lineColor") && useBuiltin && chart.raw?.xmlChartType)) {
+        generated[key] = fallback;
+        return fallback;
+      }
+      return value ?? fallback;
+    };
+    const explicitFill = properties.xmlFillColor ?? properties.solidFillHex ?? properties.xmlFillHidden;
+    const explicitLine = properties.xmlLineColor ?? properties.lineColorHex ?? properties.xmlLineHidden;
+    const color = explicitFill ? series.color ?? series.lineColor ?? fallbackColor : explicitLine ? series.lineColor ?? series.color ?? fallbackColor : resolveColor("color", false, fallbackColor);
+    const lineColor = explicitLine ? series.lineColor ?? color : explicitFill ? color : resolveColor("lineColor", false, color ?? fallbackColor);
+    const markerColor = resolveColor("markerColor", properties.xmlMarkerFillColor ?? properties.xmlMarkerFillHidden, color ?? lineColor ?? fallbackColor);
+    const markerLineColor = resolveColor("markerLineColor", properties.xmlMarkerLineColor ?? properties.xmlMarkerLineHidden, lineColor ?? color ?? fallbackColor);
     return {
       ...series,
-      color: series.color ?? series.lineColor ?? fallbackColor,
-      lineColor: series.lineColor ?? series.color ?? fallbackColor,
-      markerColor: series.markerColor ?? series.color ?? series.lineColor ?? fallbackColor,
-      markerLineColor: series.markerLineColor ?? series.lineColor ?? series.color ?? fallbackColor
+      color,
+      lineColor,
+      markerColor,
+      markerLineColor,
+      shapeProperties: { ...properties, builtinDefaultColors: generated }
     };
+  };
+  chart.series = chart.series.map(applySeriesDefaults);
+  let groupSeriesOffset = 0;
+  chart.typeGroups = chart.typeGroups?.map((group) => {
+    const series = group.series.map((entry, index) => applySeriesDefaults(entry, groupSeriesOffset + index));
+    groupSeriesOffset += group.series.length;
+    return { ...group, series };
   });
-  chart.typeGroups = chart.typeGroups?.map((group, groupIndex) => ({
-    ...group,
-    series: group.series.map((series, seriesIndex) => {
-      const fallbackColor = seriesPalette[(groupIndex + seriesIndex) % seriesPalette.length];
-      return {
-        ...series,
-        color: series.color ?? series.lineColor ?? fallbackColor,
-        lineColor: series.lineColor ?? series.color ?? fallbackColor,
-        markerColor: series.markerColor ?? series.color ?? series.lineColor ?? fallbackColor,
-        markerLineColor: series.markerLineColor ?? series.lineColor ?? series.color ?? fallbackColor
-      };
-    })
-  }));
-  applyBuiltinSurfaceDefaults(chart);
+  applyBuiltinSurfaceDefaults(chart, themePalette);
 }
 function parseChartPointStyles(seriesNode, themePalette) {
   const pointStyles = [];
@@ -863,7 +840,7 @@ function parseChartCacheValues(parentNode, cacheName, mode) {
     return null;
   }
   const referenceNode = getFirstLocalChild(parentNode, "numRef") ?? getFirstLocalChild(parentNode, "strRef") ?? parentNode;
-  const cacheNode = getFirstLocalChild(referenceNode, cacheName);
+  const cacheNode = getFirstLocalChild(referenceNode, cacheName) ?? getFirstLocalChild(parentNode, cacheName === "numCache" ? "numLit" : "strLit");
   if (!cacheNode) {
     return null;
   }
@@ -950,7 +927,7 @@ function applyChartSeriesStyleFromXml(chart, chartTypeNode, themePalette) {
     const fillColor = resolveChartFillColor(shapeProperties, themePalette);
     const markerSize = readChartNumericAttribute(markerNode, "size");
     const markerSymbolNode = markerNode ? getFirstLocalChild(markerNode, "symbol") : null;
-    const markerSymbol = markerSymbolNode?.getAttribute("val") ?? void 0;
+    const markerSymbol = markerSymbolNode?.getAttribute("val") ?? (markerNode || chart.chartType === "Scatter" || ["marker", "lineMarker", "smoothMarker"].includes(chart.scatterStyle ?? "") || readChartBooleanAttribute(chartTypeNode, "marker") === true ? "auto" : series.markerSymbol);
     const pointStyles = parseChartPointStyles(seriesNode, themePalette);
     const seriesExplosion = readChartNumericAttribute(seriesNode, "explosion");
     const invertNegativeStyle = parseInvertNegativeStyle(seriesNode, themePalette);
@@ -974,8 +951,8 @@ function applyChartSeriesStyleFromXml(chart, chartTypeNode, themePalette) {
       dataPointStyles: pointStyles.length > 0 ? pointStyles : series.dataPointStyles,
       lineColor: resolvedLineColor,
       lineWidthPx: lineStyle.hidden ? void 0 : lineStyle.widthPx ?? series.lineWidthPx,
-      markerColor: rawFillColor ?? rawLineColor ?? resolveChartFillColor(markerShapeProperties, themePalette) ?? fillColor ?? lineStyle.color ?? void 0,
-      markerLineColor: rawLineColor ?? rawFillColor ?? markerLineStyle.color ?? lineStyle.color ?? fillColor ?? void 0,
+      markerColor: resolveChartFillColor(markerShapeProperties, themePalette) ?? rawFillColor ?? rawLineColor ?? fillColor ?? lineStyle.color ?? void 0,
+      markerLineColor: markerLineStyle.color ?? rawLineColor ?? rawFillColor ?? lineStyle.color ?? fillColor ?? void 0,
       markerSize: markerSize ?? series.markerSize,
       markerSymbol,
       smooth: readChartBooleanAttribute(seriesNode, "smooth") ?? series.smooth,
@@ -983,10 +960,15 @@ function applyChartSeriesStyleFromXml(chart, chartTypeNode, themePalette) {
       shapeProperties: {
         ...series.shapeProperties,
         xmlExplosion: seriesExplosion ?? void 0,
+        xmlFillHidden: getFirstLocalChild(shapeProperties, "noFill") ? true : void 0,
         xmlFillColor: fillColor ?? void 0,
         xmlLineHidden: lineStyle.hidden ? true : void 0,
         xmlLineColor: lineStyle.color ?? void 0,
         xmlLineWidthPx: lineStyle.widthPx ?? void 0,
+        xmlMarkerFillColor: resolveChartFillColor(markerShapeProperties, themePalette) ?? void 0,
+        xmlMarkerFillHidden: getFirstLocalChild(markerShapeProperties, "noFill") ? true : void 0,
+        xmlMarkerLineColor: markerLineStyle.color ?? void 0,
+        xmlMarkerLineHidden: markerLineStyle.hidden ? true : void 0,
         xmlNegativeFillColor: invertNegativeStyle.color ?? void 0,
         xmlNegativeLineColor: invertNegativeStyle.lineColor ?? void 0
       },
@@ -1068,6 +1050,7 @@ function applyChartStyleFromXml(chart, chartPath, archive, themePalette) {
   };
   const applyRelationshipStyles = () => {
     chart.chartColorPalette = readChartColorPalette(archive, relationships.get(CHART_COLOR_STYLE_REL_TYPE), themePalette);
+    chart.raw = { ...chart.raw, hasCustomChartColorStyle: Boolean(chart.chartColorPalette?.length) };
     const styleAppearance2 = readChartStyleAppearance(
       archive,
       relationships.get(CHART_STYLE_REL_TYPE),
@@ -1347,20 +1330,30 @@ function applyChartStyleFromXml(chart, chartPath, archive, themePalette) {
   chart.surfaceMaterial = seriesSp3dNode?.getAttribute("prstMaterial") ?? chart.surfaceMaterial;
   const bandFormatsNode = getLocalChildren(chartTypeNode, "bandFmts")[0] ?? null;
   const bandFormatNodes = bandFormatsNode ? getLocalChildren(bandFormatsNode, "bandFmt") : [];
-  const bandFormatColors = bandFormatNodes.map((bandFormatNode) => {
-    const shapeProperties = getFirstLocalChild(bandFormatNode, "spPr");
-    return resolveChartFillColor(shapeProperties, themePalette) ?? void 0;
-  }).filter((color) => typeof color === "string" && color.length > 0);
-  const bandFormatLineColors = bandFormatNodes.map((bandFormatNode) => {
+  const bandFormatColors = /* @__PURE__ */ Object.create(null);
+  const bandFormatLineColors = /* @__PURE__ */ Object.create(null);
+  const bandFormatLineWidths = /* @__PURE__ */ Object.create(null);
+  for (const bandFormatNode of bandFormatNodes) {
+    const index = readChartNumericAttribute(bandFormatNode, "idx");
+    if (index == null || !Number.isInteger(index) || index < 0 || index > 4294967295) {
+      continue;
+    }
     const shapeProperties = getFirstLocalChild(bandFormatNode, "spPr");
-    return resolveChartLineStyle(shapeProperties, themePalette).color ?? void 0;
-  }).filter((color) => typeof color === "string" && color.length > 0);
+    const fillColor = getFirstLocalChild(shapeProperties, "noFill") ? "transparent" : resolveChartFillColor(shapeProperties, themePalette);
+    const lineStyle = resolveChartLineStyle(shapeProperties, themePalette);
+    const lineColor = lineStyle.hidden ? "transparent" : lineStyle.color;
+    const lineWidth = Number(getFirstLocalChild(shapeProperties, "ln")?.getAttribute("w") ?? Number.NaN);
+    if (fillColor) bandFormatColors[index] = fillColor;
+    if (lineColor) bandFormatLineColors[index] = lineColor;
+    if (Number.isFinite(lineWidth) && lineWidth >= 0) bandFormatLineWidths[index] = lineWidth / EMU_PER_PIXEL;
+  }
   chart.raw = {
     ...chart.raw ?? {},
-    bandFormatCount: bandFormatNodes.length > 0 ? bandFormatNodes.length : void 0,
-    bandFormatColors: bandFormatColors.length > 0 ? bandFormatColors : void 0,
-    bandFormatLineColors: bandFormatLineColors.length > 0 ? bandFormatLineColors : void 0,
+    bandFormatColors: Object.keys(bandFormatColors).length > 0 ? bandFormatColors : void 0,
+    bandFormatLineColors: Object.keys(bandFormatLineColors).length > 0 ? bandFormatLineColors : void 0,
+    bandFormatLineWidths: Object.keys(bandFormatLineWidths).length > 0 ? bandFormatLineWidths : void 0,
     date1904: readChartBooleanAttribute(chartDocument?.documentElement ?? null, "date1904"),
+    titleOverlay: readChartBooleanAttribute(getFirstLocalChild(chartNode, "title"), "overlay"),
     bubble3d: chart.bubble3d,
     grouping: getFirstLocalChild(chartTypeNode, "grouping")?.getAttribute("val") ?? void 0,
     ofPieType: getFirstLocalChild(chartTypeNode, "ofPieType")?.getAttribute("val") ?? void 0,
@@ -1375,15 +1368,21 @@ function applyChartStyleFromXml(chart, chartPath, archive, themePalette) {
   if (view3dNode) {
     chart.view3d = {
       depthPercent: readChartNumericAttribute(view3dNode, "depthPercent"),
+      heightPercent: readChartNumericAttribute(view3dNode, "hPercent"),
       perspective: readChartNumericAttribute(view3dNode, "perspective"),
       rAngAx: getFirstLocalChild(view3dNode, "rAngAx")?.getAttribute("val") === "1",
       rotX: readChartNumericAttribute(view3dNode, "rotX"),
       rotY: readChartNumericAttribute(view3dNode, "rotY")
     };
   }
-  chart.floor = readChartWallFromXml(getFirstLocalChild(chartNode, "floor"), themePalette) ?? chart.floor;
-  chart.sideWall = readChartWallFromXml(getFirstLocalChild(chartNode, "sideWall"), themePalette) ?? chart.sideWall;
-  chart.backWall = readChartWallFromXml(getFirstLocalChild(chartNode, "backWall"), themePalette) ?? chart.backWall;
+  for (const key of ["floor", "sideWall", "backWall"]) {
+    const wall = readChartWallFromXml(getFirstLocalChild(chartNode, key), themePalette);
+    if (wall) {
+      chart[key] = wall;
+      const defaults = chart.raw?.builtinSurfaceDefaults;
+      if (defaults) chart.raw = { ...chart.raw, builtinSurfaceDefaults: { ...defaults, [key]: void 0 } };
+    }
+  }
   const styleAppearance = applyRelationshipStyles();
   const chartTextTypeface = readChartTextTypeface(getFirstLocalChild(chartNode, "txPr"), themePalette);
   const titleTypeface = readChartTextTypeface(getFirstLocalDescendant(chartNode, "title"), themePalette);
@@ -1396,7 +1395,9 @@ function applyChartStyleFromXml(chart, chartPath, archive, themePalette) {
   chart.raw = {
     ...chart.raw ?? {},
     chartAreaNoFill: styleAppearance.chartAreaNoFill === true || chartAreaNoFill,
-    plotAreaNoFill
+    plotAreaNoFill,
+    plotAreaFillColor: resolveChartFillColor(plotAreaShapeProperties, themePalette) ?? void 0,
+    plotAreaLineColor: resolveChartLineStyle(plotAreaShapeProperties, themePalette).color ?? void 0
   };
   if (chartAreaShapeProperties) {
     const chartAreaFillColor = resolveChartFillColor(chartAreaShapeProperties, themePalette);
@@ -1434,88 +1435,18 @@ function applyChartStyleFromXml(chart, chartPath, archive, themePalette) {
       return position === "l" || position === "r";
     }) ?? valueAxisNodes[1] ?? valueAxisNodes[0];
   }
-  chart.categoryAxis = mergeChartAxis(chart.categoryAxis, readChartAxisFromXml(categoryAxisNode));
-  chart.valueAxis = mergeChartAxis(chart.valueAxis, readChartAxisFromXml(valueAxisNode));
-  chart.seriesAxis = mergeChartAxis(chart.seriesAxis, readChartAxisFromXml(seriesAxisNode));
-  chart.axes = chart.axes.length > 0 ? chart.axes.map((axis, index) => index === 0 && categoryAxisNode ? { ...axis, ...readChartAxisFromXml(categoryAxisNode) } : index === 1 && valueAxisNode ? { ...axis, ...readChartAxisFromXml(valueAxisNode) } : axis) : chart.axes;
+  chart.categoryAxis = mergeChartAxis(chart.categoryAxis, readChartAxisFromXml(categoryAxisNode, themePalette));
+  chart.valueAxis = mergeChartAxis(chart.valueAxis, readChartAxisFromXml(valueAxisNode, themePalette));
+  chart.seriesAxis = mergeChartAxis(chart.seriesAxis, readChartAxisFromXml(seriesAxisNode, themePalette));
+  chart.axes = chart.axes.length > 0 ? chart.axes.map((axis, index) => index === 0 && categoryAxisNode ? { ...axis, ...readChartAxisFromXml(categoryAxisNode, themePalette) } : index === 1 && valueAxisNode ? { ...axis, ...readChartAxisFromXml(valueAxisNode, themePalette) } : axis) : chart.axes;
   if (seriesAxisNode) {
-    const seriesAxis = readChartAxisFromXml(seriesAxisNode);
+    const seriesAxis = readChartAxisFromXml(seriesAxisNode, themePalette);
     if (seriesAxis && !chart.axes.some((axis) => axis.id != null && axis.id === seriesAxis.id)) {
       chart.axes = [...chart.axes, seriesAxis];
     }
   }
   applyChartSeriesStyleFromXml(chart, chartTypeNode, themePalette);
   applyFallbackSeriesStyles();
-  if (chart.chartType === "Bubble") {
-    const archiveFallbackBubbleSizes = resolveArchiveFallbackBubbleSizes(archive, chart.title);
-    if (archiveFallbackBubbleSizes.length > 0) {
-      chart.series = chart.series.map((series, seriesIndex) => {
-        const pointCount = Math.max(series.values.length, series.categories.length);
-        if (pointCount <= 1) {
-          return series;
-        }
-        const numericBubbleCount = (series.bubbleSizes ?? []).filter(
-          (value) => typeof value === "number" && Number.isFinite(value)
-        ).length;
-        if (numericBubbleCount >= pointCount) {
-          return series;
-        }
-        const fallbackCandidate = archiveFallbackBubbleSizes[seriesIndex] ?? archiveFallbackBubbleSizes[0] ?? [];
-        const fallbackNumericCount = fallbackCandidate.filter(
-          (value) => typeof value === "number" && Number.isFinite(value)
-        ).length;
-        if (fallbackNumericCount < pointCount) {
-          return series;
-        }
-        return {
-          ...series,
-          bubbleSizes: fallbackCandidate
-        };
-      });
-    }
-  }
-  if (chart.chartType === "Pie" || chart.chartType === "Pie3D" || chart.chartType === "PieExploded" || chart.chartType === "Doughnut" || chart.chartType === "BarOfPie") {
-    const needsPointColorFallback = chart.series.some((series) => {
-      const pointCount = Math.max(series.values.length, series.categories.length);
-      if (pointCount <= 0) {
-        return false;
-      }
-      const coloredPointCount = (series.dataPointStyles ?? []).filter(
-        (style) => typeof style.color === "string" && style.color.length > 0
-      ).length;
-      return coloredPointCount === 0;
-    });
-    if (needsPointColorFallback) {
-      const archiveFallbackPointStyles = resolveArchiveFallbackPointStyles(
-        archive,
-        chart.title,
-        chartTypeNode.localName,
-        themePalette
-      );
-      if (archiveFallbackPointStyles.length > 0) {
-        chart.series = chart.series.map((series, seriesIndex) => {
-          const fallbackStyles = archiveFallbackPointStyles[seriesIndex] ?? archiveFallbackPointStyles[0] ?? [];
-          if (fallbackStyles.length === 0) {
-            return series;
-          }
-          const existingByIndex = new Map((series.dataPointStyles ?? []).map((entry) => [entry.index, entry]));
-          for (const fallbackStyle of fallbackStyles) {
-            const existing = existingByIndex.get(fallbackStyle.index);
-            existingByIndex.set(fallbackStyle.index, {
-              color: existing?.color ?? fallbackStyle.color,
-              explosion: existing?.explosion ?? fallbackStyle.explosion,
-              index: fallbackStyle.index,
-              lineColor: existing?.lineColor ?? fallbackStyle.lineColor
-            });
-          }
-          return {
-            ...series,
-            dataPointStyles: Array.from(existingByIndex.values()).sort((left, right) => left.index - right.index)
-          };
-        });
-      }
-    }
-  }
   applyBuiltinChartDefaults(chart, themePalette);
 }
 function normalizeArchivePath(path) {
@@ -1578,12 +1509,12 @@ function parseXml(xml) {
   }
 }
 function getLocalChildren(parent, localName) {
-  return Array.from(parent.childNodes).filter(
+  return Array.from(parent?.childNodes ?? []).filter(
     (node) => node.nodeType === Node.ELEMENT_NODE && node.localName === localName
   );
 }
 function getLocalDescendants(parent, localName) {
-  return Array.from(parent.getElementsByTagName("*")).filter(
+  return Array.from(parent?.getElementsByTagName("*") ?? []).filter(
     (node) => node.localName === localName
   );
 }
@@ -2060,9 +1991,10 @@ function normalizeChartExSeries(workbook2, workbookSheetIndex, chartId, raw, dat
   const valuesRef = valueDimension ? normalizeChartReference({
     formula: valueDimensionFormula
   }) : null;
-  const resolvedValueCells = resolveReferenceValues(workbook2, workbookSheetIndex, valuesRef, "value");
+  const isCategoricalMap = chartType === "RegionMap" && valueDimension?.dimType === "colorStr";
+  const resolvedValueCells = resolveReferenceValues(workbook2, workbookSheetIndex, valuesRef, isCategoricalMap ? "category" : "value");
   const values = resolvedValueCells.map((value) => typeof value === "number" && Number.isFinite(value) ? value : null);
-  const colorStrings = chartType === "RegionMap" && valueDimension?.dimType === "colorStr" ? resolvedValueCells.map((value) => {
+  const colorStrings = isCategoricalMap ? resolvedValueCells.map((value) => {
     if (typeof value === "string") {
       const trimmed = value.trim();
       return trimmed.length > 0 ? trimmed : null;
@@ -2072,7 +2004,8 @@ function normalizeChartExSeries(workbook2, workbookSheetIndex, chartId, raw, dat
     }
     return null;
   }) : [];
-  const categories = resolveReferenceValues(workbook2, workbookSheetIndex, categoriesRef, "category");
+  const categoryRows = chartType === "RegionMap" ? resolveReferenceRowPaths(workbook2, workbookSheetIndex, categoriesRef) : [];
+  const categories = categoryRows.length === resolvedValueCells.length && categoryRows.length > 0 ? categoryRows.map((parts) => parts[0] ?? "") : resolveReferenceValues(workbook2, workbookSheetIndex, categoriesRef, "category");
   const hierarchyCategories = chartType === "Sunburst" || chartType === "Treemap" ? resolveReferenceRowPaths(workbook2, workbookSheetIndex, categoriesRef) : [];
   const seriesTextFormula = resolveChartExTextFormula(series.text);
   const shapeProperties = series.shapeProperties && typeof series.shapeProperties === "object" ? series.shapeProperties : void 0;
@@ -2428,7 +2361,7 @@ function mergeChartAxis(target, patch) {
     ...patch
   };
 }
-function readChartAxisFromXml(axisNode) {
+function readChartAxisFromXml(axisNode, themePalette) {
   if (!axisNode) {
     return null;
   }
@@ -2444,6 +2377,10 @@ function readChartAxisFromXml(axisNode) {
     logBase: readChartNumericAttribute(getFirstLocalChild(axisNode, "scaling"), "logBase"),
     orientation: getFirstLocalChild(scalingNode ?? axisNode, "orientation")?.getAttribute("val") ?? void 0,
     majorGridlines: Boolean(getFirstLocalChild(axisNode, "majorGridlines")),
+    majorGridlineColor: (() => {
+      const style = resolveChartLineStyle(getFirstLocalChild(getFirstLocalChild(axisNode, "majorGridlines"), "spPr"), themePalette);
+      return style.hidden ? "transparent" : style.color ?? void 0;
+    })(),
     majorTickMark: getFirstLocalChild(axisNode, "majorTickMark")?.getAttribute("val") ?? void 0,
     majorUnit: readChartNumericAttribute(axisNode, "majorUnit"),
     max: readChartNumericAttribute(scalingNode, "max"),
@@ -2949,6 +2886,7 @@ function loadWorkbookChartAssets(workbook2, imageAssets, visibleSheetIndexByWork
         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,
@@ -3118,13 +3056,25 @@ function resolveWorkbookColor(color, themePalette) {
   }
   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) {
+  const themeColor2 = Number.isFinite(numericTheme) ? themePalette?.colorsByIndex[numericTheme] ?? null : null;
+  if (!themeColor2) {
     return null;
   }
   const tintValue = color.tint;
   const tint = typeof tintValue === "number" ? tintValue : typeof tintValue === "string" && tintValue.trim().length > 0 ? Number(tintValue) : Number.NaN;
-  return Number.isFinite(tint) ? applyExcelTint(themeColor, tint) : themeColor;
+  return Number.isFinite(tint) ? applyExcelTint(themeColor2, tint) : themeColor2;
+}
+
+// src/cell-alignment.ts
+function getCellGeneralAlignment(worksheet, row, col) {
+  const value = worksheet.getCalculatedValueAt(row, col);
+  try {
+    if (value.is_number) return "right";
+    if (value.is_boolean || value.is_error) return "center";
+    return "left";
+  } finally {
+    value.free();
+  }
 }
 
 // src/images.ts
@@ -3148,7 +3098,9 @@ function measureColumnCharacterWidthPx(fontFamily, fontSizePt) {
     return cached;
   }
   const fontSizePx = normalizedSizePt * (96 / 72);
-  const font = `${fontSizePx}px "${normalizedFamily}"`;
+  const family = JSON.stringify(normalizedFamily);
+  const fallback = normalizedFamily.toLowerCase() === "calibri" || normalizedFamily.toLowerCase() === "carlito" ? ', "Carlito", "React XLSX Carlito"' : "";
+  const font = `${fontSizePx}px ${family}${fallback}`;
   let width = DEFAULT_COLUMN_CHARACTER_WIDTH_PX;
   try {
     const context = typeof document !== "undefined" ? document.createElement("canvas").getContext("2d") : typeof OffscreenCanvas !== "undefined" ? new OffscreenCanvas(32, 32).getContext("2d") : null;
@@ -3762,7 +3714,7 @@ function parseSpreadsheetAlignment(node) {
   if (textRotation !== null) {
     const parsedRotation = Number(textRotation);
     if (Number.isFinite(parsedRotation)) {
-      alignment.textRotation = parsedRotation;
+      alignment.rotation = parsedRotation;
     }
   }
   return Object.keys(alignment).length > 0 ? alignment : void 0;
@@ -4887,6 +4839,9 @@ function parseWorkerSheetLayoutAssets(bytes, sheetCount) {
       if (!xml) {
         return null;
       }
+      const sheetFormatTag = /<(?:[\w.-]+:)?sheetFormatPr\b[^>]*>/.exec(xml)?.[0] ?? "";
+      const defaultRowHeight = Number(readXmlAttribute(sheetFormatTag, "defaultRowHeight") ?? Number.NaN);
+      const defaultColWidth = Number(readXmlAttribute(sheetFormatTag, "defaultColWidth") ?? readXmlAttribute(sheetFormatTag, "baseColWidth") ?? Number.NaN);
       const rowHeightOverridesPx = {};
       for (const match of xml.matchAll(/<row\b[^>]*>/g)) {
         const tag = match[0];
@@ -4897,7 +4852,11 @@ function parseWorkerSheetLayoutAssets(bytes, sheetCount) {
           rowHeightOverridesPx[rowIndex] = Math.max(MIN_ROW_HEIGHT_PX2, Math.round(height * 1.33));
         }
       }
-      return { rowHeightOverridesPx };
+      return {
+        defaultRowHeightPx: Number.isFinite(defaultRowHeight) && defaultRowHeight > 0 ? Math.max(MIN_ROW_HEIGHT_PX2, Math.round(defaultRowHeight * 1.33)) : void 0,
+        defaultColWidthPx: Number.isFinite(defaultColWidth) && defaultColWidth > 0 ? resolveSheetColumnWidthPixels(defaultColWidth) : void 0,
+        rowHeightOverridesPx
+      };
     });
   } catch {
     return [];
@@ -5087,14 +5046,14 @@ function buildSheetList(nextWorkbook, themePalette, structureAssets, sheetLayout
       ...sheetState,
       ...mergeMetadata
     };
-    const defaultColWidthPx = resolveWorksheetDefaultColumnWidthPixels(
+    const defaultColWidthPx = sheetState?.defaultColWidthPx ?? resolveWorksheetDefaultColumnWidthPixels(
       worksheet,
       sheetState?.columnWidthCharacterWidthPx,
-      sheetState?.defaultColWidthPx ?? DEFAULT_COL_WIDTH
+      DEFAULT_COL_WIDTH
     );
-    const defaultRowHeightPx = resolveWorksheetDefaultRowHeightPixels(
+    const defaultRowHeightPx = sheetState?.defaultRowHeightPx ?? resolveWorksheetDefaultRowHeightPixels(
       worksheet,
-      sheetState?.defaultRowHeightPx ?? DEFAULT_ROW_HEIGHT
+      DEFAULT_ROW_HEIGHT
     );
     const visibility = normalizeWorksheetVisibility2(worksheet.visibility);
     if (!showHiddenSheets && visibility !== "visible") {
@@ -5480,13 +5439,21 @@ async function handleMessage(message) {
       if (typeof worksheet.getRowsBatch !== "function") {
         return null;
       }
-      return worksheet.getRowsBatch(message.payload.startRow, message.payload.rowCount, {
+      const rows = worksheet.getRowsBatch(message.payload.startRow, message.payload.rowCount, {
         includeFormulas: true,
         includeHyperlinks: true,
         includeMergeInfo: true,
         includeStyles: true,
         useFormattedValues: true
       });
+      for (const row of rows ?? []) {
+        for (const cell of row.cells) {
+          if (!cell.isMergedSecondary) {
+            cell.generalAlignment = getCellGeneralAlignment(worksheet, row.index, cell.col);
+          }
+        }
+      }
+      return rows;
     }
     default:
       return null;