@rowsncolumns/charts 28.1.2 → 28.1.5

package/dist/esm/basic-chart/basic-chart.js

@@ -10,7 +10,7 @@ import * as echarts from "echarts/core";
 import { CanvasRenderer } from "echarts/renderers";
 import React, { useCallback, useMemo, useRef, useState } from "react";
 import { aggregateSeriesByDomain, getDomainValuesForAxis, sanitizeDomainValues, shouldAggregateSeries, } from "../utils/aggregation";
-import { circularTooltipFormatter, formatAxisValue, resolveSeriesNumberFormats, resolveSourceNumberFormat, resolveValueAxisNumberFormat, tooltipValueFormatter, valueAxisLabelFormatter, } from "../utils/axis-number-format";
+import { circularTooltipFormatter, formatAxisValue, resolveSeriesNumberFormats, resolveSourceNumberFormat, resolveValueAxisNumberFormat, tooltipValueFormatter, valueAxisLabelFormatter, valueAxisNameGap, } from "../utils/axis-number-format";
 import { gapWidthToBarCategoryGap, overlapToBarGap, } from "../utils/bar-layout";
 import { computeBoxplotSummary } from "../utils/boxplot";
 import { createBubbleSizeScale, prepareBubbleSeriesData, } from "../utils/bubble";
@@ -18,13 +18,14 @@ import { coerceCalculatedLabel, getChartDataRanges, } from "../utils/chart-spec-
 import { canSwitchRowColumn, cellLabelGetterFromRangeReader, switchRowColumn, } from "../utils/chart-orientation";
 import { dataUrlToBlob } from "../utils/chart-image";
 import { getChartPalette } from "../utils/chart-styles";
-import { applyEmptyCellsPolicy, connectsAcrossEmptyCells, isLineLikeChartType, } from "../utils/empty-cells";
+import { applyEmptyCellsPolicy, connectsAcrossEmptyCells, isolatedPointIndexes, isLineLikeChartType, } from "../utils/empty-cells";
 import { getEchartsGlState, loadEchartsGl, } from "../utils/echarts-gl-loader";
 import { computeErrorBars, resolveCustomErrorBarValues, } from "../utils/error-bars";
 import { echartsGroupedCategoryAxes, resolveCategoryLevels, } from "../utils/category-levels";
 import { gradientToEcharts } from "../utils/gradient";
 import { buildHierarchyTree, extractHierarchyRows, getHierarchyHeaderTitle, } from "../utils/hierarchy";
 import { binHistogram, computePareto, isParetoSpec, } from "../utils/histogram";
+import { categoryAxisNameGap, legendLabelsFrom, reserveEchartsLegendBand, } from "../utils/legend-layout";
 import { clampSecondPieSize, isOfPieChartSpec, otherSliceHalfAngle, resolveOfPieType, splitOfPie, } from "../utils/of-pie";
 import { applyAxisOverrides, applyLegendOverrides, buildSeriesLabelOption, } from "../utils/overrides";
 import { buildRadarIndicators, buildRadarSeriesData } from "../utils/radar";
@@ -37,7 +38,7 @@ import { buildBar3DData, buildContourData, buildLine3DSeries, buildSurfaceData,
 import { computeTrendline } from "../utils/trendline";
 import { computeWaterfall } from "../utils/waterfall";
 import { isWebGLAvailable } from "../utils/webgl";
-import { chartTypeToEchartsType, getEchartsSeriesStyle, mapMarkerSymbolToEcharts, showXAxis, } from "./helpers";
+import { chartTypeToEchartsType, circularLegendEntries, getEchartsSeriesStyle, isCircularChartType, mapMarkerSymbolToEcharts, showXAxis, } from "./helpers";
 // Excel error values that should be treated as null in charts
 const EXCEL_ERROR_VALUES = new Set([
     "#N/A",
@@ -180,6 +181,8 @@ const defaultLegendConfig = {
     itemHeight: 4,
     top: 20,
 };
+/** Category-axis title gap: clears one row of tick labels (#986). */
+const CATEGORY_AXIS_NAME_GAP = categoryAxisNameGap();
 export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, readonly, getDomainValuesFromRange, getSeriesValuesFromRange, getFormattingFromRange, onDeleteChart, onUpdateChart, onRequestEdit, onRequestCalculate, isSelected, fieldButtons, }) => {
     const spec = chart.spec;
     const explicitChartTitle = chart.spec.title ?? undefined;
@@ -306,7 +309,7 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
             rawDomainValues.length === seriesValues.length;
         if (canAggregate) {
             const aggregatedValues = aggregateSeriesByDomain(rawDomainValues, seriesValues, aggregateType, orderedDomainValues);
-            if (spec.chartType === "pie") {
+            if (isCircularChartType(spec.chartType)) {
                 return orderedDomainValues.map((name, idx) => ({
                     value: aggregatedValues[idx] ?? 0,
                     name,
@@ -315,7 +318,9 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
             return aggregatedValues;
         }
         const numericValues = seriesValues;
-        if (spec.chartType === "pie") {
+        // Pie and doughnut points are slices keyed by their category name;
+        // a doughnut is a pie series with a hole, so it labels the same way.
+        if (isCircularChartType(spec.chartType)) {
             if (options.pieLabels) {
                 const { domainLabels, offset } = options.pieLabels;
                 const labels = offset === undefined
@@ -1458,7 +1463,7 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                     ? spec.verticalAxisTitle ?? ""
                     : spec.horizontalAxisTitle ?? "",
                 nameLocation: "middle",
-                nameGap: 30 + 24 * categoryLevels.outer.length,
+                nameGap: CATEGORY_AXIS_NAME_GAP + 24 * categoryLevels.outer.length,
             }));
         }
         // One category axis per domain (Excel): a domain drawn from several
@@ -1485,7 +1490,7 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                 splitLine: { show: !isCircularChart },
                 name: axisTitle,
                 nameLocation: "middle",
-                nameGap: 30,
+                nameGap: CATEGORY_AXIS_NAME_GAP,
             });
         });
         if (chartDomains.length === 0 && !isCircularChart) {
@@ -1500,7 +1505,7 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                     ? spec.verticalAxisTitle ?? ""
                     : spec.horizontalAxisTitle ?? "",
                 nameLocation: "middle",
-                nameGap: 30,
+                nameGap: CATEGORY_AXIS_NAME_GAP,
             });
         }
         // Trendline + error-bar overlays are extra series appended after the
@@ -1670,6 +1675,20 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
             seriesCount: sideBySideBarCount,
             overlap: isStacked ? 0 : spec.overlap,
         });
+        // The colour a series without its own fill gets: the chart palette entry
+        // for its position, the same cycle the option-level `color` gives echarts'
+        // default path. Excel keeps that colour whatever else is authored on the
+        // series — `<c:dPt>` overrides recolour only their points and
+        // `invertIfNegative` only the negative bars (rowsncolumns/spreadsheet#1030).
+        const seriesPalette = getChartPalette(spec, [
+            theme.themeColors.accent1,
+            theme.themeColors.accent2,
+            theme.themeColors.accent3,
+            theme.themeColors.accent4,
+            theme.themeColors.accent5,
+            theme.themeColors.accent6,
+        ]);
+        const paletteColorAt = (index) => seriesPalette[index % seriesPalette.length];
         for (const [specSeriesIndex, series] of (spec.series ?? []).entries()) {
             const dataLabel = !isNil(series.dataLabel) && isAFormula(series.dataLabel)
                 ? coerceCalculatedLabel(await onRequestCalculate(series.dataLabel, position.sheetId ?? sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex))
@@ -1689,7 +1708,7 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
             // domain range's labels in sequence, each series range taking its own
             // window — not the primary domain range alone (C-78).
             const domainSources = spec.domains?.[0]?.sources ?? [];
-            const pieDomainLabels = spec.chartType === "pie" &&
+            const pieDomainLabels = isCircularChart &&
                 (domainSources.length > 1 || series.sources.length > 1)
                 ? domainSources.flatMap((sheetRange) => getDomainValuesFromRange(sheetRange, spec.hiddenDimensionStrategy) ?? [])
                 : undefined;
@@ -1766,6 +1785,22 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                         mapMarkerSymbolToEcharts(markerSymbol) ?? "circle";
                     seriesEntry.symbolSize = seriesAny.marker?.size ?? 6;
                 }
+                else if (Array.isArray(data)) {
+                    // A marker-less line draws nothing for a point with a gap on both
+                    // sides (a data row followed by a blank row), so that row vanishes
+                    // from the chart. Excel plots an isolated marker there: keep the
+                    // series symbol-less and mark only those points.
+                    const isolated = isolatedPointIndexes(data, connectsAcrossEmptyCells(spec, lineLike));
+                    if (isolated.length) {
+                        seriesEntry.showSymbol = true;
+                        seriesEntry.symbol = "none";
+                        const marked = [...data];
+                        for (const i of isolated) {
+                            marked[i] = { value: marked[i], symbol: "circle", symbolSize: 6 };
+                        }
+                        seriesEntry.data = marked;
+                    }
+                }
             }
             // Gradient fill — overrides solid color when present. echarts
             // paints it natively via a LinearGradient on itemStyle.color
@@ -1801,14 +1836,16 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                 // Per-data-point color overrides — Gantt-style charts colour
                 // each task differently via `<c:dPt>`. Echarts accepts an
                 // `itemStyle.color` function that receives the data index;
-                // we look up the override or fall back to the series color.
+                // we look up the override or fall back to the series colour —
+                // its own, else its palette slot (never a fixed accent1, which
+                // painted every such series alike).
                 const overrides = new Map();
                 for (const dp of seriesAny.dataPointColors) {
                     if (typeof dp.idx === "number" && typeof dp.color === "string") {
                         overrides.set(dp.idx, dp.color);
                     }
                 }
-                const fallback = series.color ?? theme.themeColors.accent1;
+                const fallback = series.color ?? paletteColorAt(specSeriesIndex);
                 seriesEntry.itemStyle = {
                     ...(seriesEntry.itemStyle ?? {}),
                     color: (params) => overrides.get(params.dataIndex) ?? fallback,
@@ -1826,25 +1863,18 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                         overrides.set(dp.idx, dp.color);
                     }
                 }
-                const slicePalette = getChartPalette(spec, [
-                    theme.themeColors.accent1,
-                    theme.themeColors.accent2,
-                    theme.themeColors.accent3,
-                    theme.themeColors.accent4,
-                    theme.themeColors.accent5,
-                    theme.themeColors.accent6,
-                ]);
                 seriesEntry.itemStyle = {
                     ...(seriesEntry.itemStyle ?? {}),
                     color: (params) => overrides.get(params.dataIndex) ??
                         series.color ??
-                        slicePalette[params.dataIndex % slicePalette.length],
+                        paletteColorAt(params.dataIndex),
                 };
             }
             else if (isBarOrColumn && series.invertIfNegative) {
-                const positiveColor = series.color ?? theme.themeColors.accent1;
+                // Positive bars keep the series colour (own, else palette slot);
+                // only negative bars take the inverted colour.
+                const positiveColor = series.color ?? paletteColorAt(specSeriesIndex);
                 const negativeColor = series.negativeColor ?? "#FF0000";
-                // Use a color function that returns different colors based on value
                 seriesEntry.itemStyle = {
                     ...(seriesEntry.itemStyle ?? {}),
                     color: (params) => {
@@ -1876,6 +1906,12 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
             chartSeries.push(seriesEntry);
             pushSeriesOverlays(series, data, dataLabel);
         }
+        if (isCircularChart && !isOfPie) {
+            // Excel's pie / doughnut legend lists the categories, one entry per
+            // slice — not the series name (the loop above collected those). The
+            // of-pie branch below builds its own category legend.
+            legend.data = circularLegendEntries(chartSeries);
+        }
         if (isOfPie) {
             // Pie-of-pie / bar-of-pie — Excel splits the minor slices into a
             // secondary pie or stacked bar beside the main pie, replaces them
@@ -2298,27 +2334,6 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
             previousSeriesCount.current !== renderedSeriesCount
             ? ["series", "xAxis", "yAxis", "legend", "grid", "tooltip"]
             : [];
-        // Of-pie uses a full-container grid (for the connector overlay's
-        // hidden 0-1 axes) plus, for bar-of-pie, a second grid hosting the
-        // stacked secondary bar.
-        const gridConfig = isOfPie
-            ? [
-                { left: 0, right: 0, top: 0, bottom: 0 },
-                ...(ofPieLayout?.barGrid ? [ofPieLayout.barGrid] : []),
-            ]
-            : isCircularChart
-                ? {
-                    left: 0,
-                    right: 0,
-                    top: 0,
-                    bottom: 0,
-                }
-                : {
-                    left: "3%",
-                    right: "4%",
-                    bottom: "3%",
-                    containLabel: true,
-                };
         const valueAxisBase = {
             type: "value",
             show: !isCircularChart,
@@ -2380,6 +2395,49 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
         };
         // Phase 5.1: apply legend / axis / dataLabels / doughnut overrides.
         const finalLegend = applyLegendOverrides(legend, spec.legend);
+        // Reserve a band for the legend outside the axis-title band, outside
+        // the tick labels — Excel shrinks the plot instead of painting the
+        // legend over the category labels / axis title (#986). The bottom
+        // axis is the value axis on a horizontal bar chart, else the (first)
+        // category axis with whatever nameGap its levels needed.
+        const bottomAxisNameGap = isHorizontalBarChart
+            ? valueAxisBase.nameGap
+            : Number(chartDomains[0]?.nameGap ?? CATEGORY_AXIS_NAME_GAP);
+        const legendBand = reserveEchartsLegendBand({
+            position: spec.legend?.position,
+            visible: finalLegend.show !== false,
+            labels: legendLabelsFrom(finalLegend.data, chartSeries.map((s) => s?.name)),
+            legendFontSize: finalLegend.textStyle?.fontSize ??
+                spec.legend?.textFormat?.fontSize ??
+                12,
+            legendItemWidth: defaultLegendConfig.itemWidth,
+            width: width ?? 0,
+            height: height ?? 0,
+            hasTitle: Boolean(title),
+            titleFontSize: spec.titleTextFormat?.fontSize ?? 16,
+            hasBottomAxisTitle: !isCircularChart && Boolean(spec.horizontalAxisTitle),
+            bottomAxisNameGap,
+            hasLeftAxisTitle: !isCircularChart && Boolean(spec.verticalAxisTitle),
+        });
+        const positionedLegend = isCircularChart
+            ? finalLegend
+            : { ...finalLegend, ...legendBand.legend };
+        // Of-pie uses a full-container grid (for the connector overlay's
+        // hidden 0-1 axes) plus, for bar-of-pie, a second grid hosting the
+        // stacked secondary bar.
+        const gridConfig = isOfPie
+            ? [
+                { left: 0, right: 0, top: 0, bottom: 0 },
+                ...(ofPieLayout?.barGrid ? [ofPieLayout.barGrid] : []),
+            ]
+            : isCircularChart
+                ? {
+                    left: 0,
+                    right: 0,
+                    top: 0,
+                    bottom: 0,
+                }
+                : legendBand.grid;
         // Data labels fall back to the series' axis format when the spec has
         // no explicit `<c:dLbls><c:numFmt>` — Excel's "Linked to source".
         const dataLabelOptions = spec.dataLabels;
@@ -2540,7 +2598,7 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                             splitLine: { show: true },
                             name: spec.horizontalAxisTitle ?? "",
                             nameLocation: "middle",
-                            nameGap: 30,
+                            nameGap: CATEGORY_AXIS_NAME_GAP,
                         },
                     ];
                 return base.map((axis) => applyAxisOverrides(axis, spec.categoryAxisOptions));
@@ -2595,13 +2653,26 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                                 splitLine: { show: true },
                                 name: spec.verticalAxisTitle ?? "",
                                 nameLocation: "middle",
-                                nameGap: 30,
+                                nameGap: CATEGORY_AXIS_NAME_GAP,
                             },
                         ];
                     return base.map((axis) => applyAxisOverrides(axis, spec.categoryAxisOptions));
                 }
                 const axes = [
-                    applyAxisOverrides({ ...valueAxisBase, name: spec.verticalAxisTitle ?? "" }, spec.valueAxisOptions, primaryAxisNumberFormat),
+                    applyAxisOverrides({
+                        ...valueAxisBase,
+                        name: spec.verticalAxisTitle ?? "",
+                        // Clear the tick labels: "$2,000.00" is wider than the 50px
+                        // default gap, and the title painted over its own labels.
+                        nameGap: valueAxisNameGap({
+                            values: chartSeries
+                                .filter((s) => s?.yAxisIndex !== 1)
+                                .flatMap((s) => Array.isArray(s?.data)
+                                ? s.data.map((d) => d !== null && typeof d === "object" ? d.value : d)
+                                : []),
+                            pattern: primaryAxisNumberFormat,
+                        }),
+                    }, spec.valueAxisOptions, primaryAxisNumberFormat),
                 ];
                 if (hasSecondaryAxis) {
                     axes.push(applyAxisOverrides({
@@ -2621,7 +2692,7 @@ export const BasicChart = ({ width, height, chart, theme, isDarkMode, sheetId, r
                 return axes;
             })(),
             series: seriesWithLabels,
-            legend: finalLegend,
+            legend: positionedLegend,
             grid: gridConfig,
             tooltip: tooltipConfig,
         }, { replaceMerge, lazyUpdate: true });

package/dist/esm/basic-chart/helpers.d.ts

@@ -5,6 +5,15 @@ export declare const chartTypeToEchartsType: (type: EmbeddedChart["spec"]["chart
  * Returns undefined for "auto" / unknown — caller defaults to "circle".
  */
 export declare const mapMarkerSymbolToEcharts: (symbol: string | undefined | null) => string | undefined;
+/** Pie and doughnut — the pie-family types whose points are slices. */
+export declare const isCircularChartType: (type: EmbeddedChart["spec"]["chartType"] | undefined) => boolean;
+/**
+ * Legend entries of a pie / doughnut: the slice names (the categories), in
+ * order, each once across every pie series — Excel's pie legend lists the
+ * categories, not the series name. echarts keys pie legend items by data
+ * item name, so an entry toggles that slice in every series.
+ */
+export declare const circularLegendEntries: (series: ReadonlyArray<unknown>) => string[];
 export declare const getEchartsSeriesStyle: (type: EmbeddedChart["spec"]["chartType"]) => {
     areaStyle: {};
 } | undefined;

package/dist/esm/basic-chart/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../basic-chart/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE/D,eAAO,MAAM,sBAAsB,GACjC,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,yGA6DzC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,GACnC,QAAQ,MAAM,GAAG,SAAS,GAAG,IAAI,KAChC,MAAM,GAAG,SAuBX,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC;;aASzC,CAAC;AAEF,eAAO,MAAM,SAAS,GAAI,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,YAejE,CAAC"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../basic-chart/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE/D,eAAO,MAAM,sBAAsB,GACjC,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,yGA6DzC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,GACnC,QAAQ,MAAM,GAAG,SAAS,GAAG,IAAI,KAChC,MAAM,GAAG,SAuBX,CAAC;AAEF,uEAAuE;AACvE,eAAO,MAAM,mBAAmB,GAC9B,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,GAAG,SAAS,KACnD,OAAgD,CAAC;AAEpD;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAChC,QAAQ,aAAa,CAAC,OAAO,CAAC,KAC7B,MAAM,EAmBR,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC;;aASzC,CAAC;AAEF,eAAO,MAAM,SAAS,GAAI,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,YAejE,CAAC"}

package/dist/esm/basic-chart/helpers.js

@@ -74,6 +74,36 @@ export const mapMarkerSymbolToEcharts = (symbol) => {
             return undefined;
     }
 };
+/** Pie and doughnut — the pie-family types whose points are slices. */
+export const isCircularChartType = (type) => type === "pie" || type === "doughnut";
+/**
+ * Legend entries of a pie / doughnut: the slice names (the categories), in
+ * order, each once across every pie series — Excel's pie legend lists the
+ * categories, not the series name. echarts keys pie legend items by data
+ * item name, so an entry toggles that slice in every series.
+ */
+export const circularLegendEntries = (series) => {
+    const seen = new Set();
+    const entries = [];
+    for (const raw of series) {
+        const entry = raw;
+        if (entry?.type !== "pie" || !Array.isArray(entry.data))
+            continue;
+        for (const item of entry.data) {
+            const name = item !== null && typeof item === "object" && "name" in item
+                ? item.name
+                : undefined;
+            if (name === undefined || name === null)
+                continue;
+            const label = String(name);
+            if (label === "" || seen.has(label))
+                continue;
+            seen.add(label);
+            entries.push(label);
+        }
+    }
+    return entries;
+};
 export const getEchartsSeriesStyle = (type) => {
     switch (type) {
         case "area":

package/dist/esm/plotly/basic-chart/basic-chart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"basic-chart.d.ts","sourceRoot":"","sources":["../../../../plotly/basic-chart/basic-chart.tsx"],"names":[],"mappings":"AA6BA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAGtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AA4VxD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AA0FnD,eAAO,MAAM,UAAU,GAAI,wOAiBxB,eAAe,sBAmrEjB,CAAC"}
+{"version":3,"file":"basic-chart.d.ts","sourceRoot":"","sources":["../../../../plotly/basic-chart/basic-chart.tsx"],"names":[],"mappings":"AA6BA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAEtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAgXxD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AA0FnD,eAAO,MAAM,UAAU,GAAI,wOAiBxB,eAAe,sBA4zEjB,CAAC"}