@rowsncolumns/charts 28.1.1 → 28.1.4

package/dist/cjs/basic-chart/basic-chart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"basic-chart.d.ts","sourceRoot":"","sources":["../../../basic-chart/basic-chart.tsx"],"names":[],"mappings":"AA4DA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAEtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AA0PrD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAkEnD,eAAO,MAAM,UAAU,GAAI,wOAiBxB,eAAe,sBAmuGjB,CAAC"}
+{"version":3,"file":"basic-chart.d.ts","sourceRoot":"","sources":["../../../basic-chart/basic-chart.tsx"],"names":[],"mappings":"AA4DA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAEtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAmQrD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAqEnD,eAAO,MAAM,UAAU,GAAI,wOAiBxB,eAAe,sBAwyGjB,CAAC"}

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

@@ -29,6 +29,7 @@ var category_levels_1 = require("../utils/category-levels");
 var gradient_1 = require("../utils/gradient");
 var hierarchy_1 = require("../utils/hierarchy");
 var histogram_1 = require("../utils/histogram");
+var legend_layout_1 = require("../utils/legend-layout");
 var of_pie_1 = require("../utils/of-pie");
 var overrides_1 = require("../utils/overrides");
 var radar_1 = require("../utils/radar");
@@ -188,6 +189,8 @@ var defaultLegendConfig = {
     itemHeight: 4,
     top: 20,
 };
+/** Category-axis title gap: clears one row of tick labels (#986). */
+var CATEGORY_AXIS_NAME_GAP = (0, legend_layout_1.categoryAxisNameGap)();
 var BasicChart = function (_a) {
     var _b;
     var width = _a.width, height = _a.height, chart = _a.chart, theme = _a.theme, isDarkMode = _a.isDarkMode, sheetId = _a.sheetId, readonly = _a.readonly, getDomainValuesFromRange = _a.getDomainValuesFromRange, getSeriesValuesFromRange = _a.getSeriesValuesFromRange, getFormattingFromRange = _a.getFormattingFromRange, onDeleteChart = _a.onDeleteChart, onUpdateChart = _a.onUpdateChart, onRequestEdit = _a.onRequestEdit, onRequestCalculate = _a.onRequestCalculate, isSelected = _a.isSelected, fieldButtons = _a.fieldButtons;
@@ -316,7 +319,7 @@ var BasicChart = function (_a) {
             rawDomainValues.length === seriesValues.length;
         if (canAggregate) {
             var aggregatedValues_1 = (0, aggregation_1.aggregateSeriesByDomain)(rawDomainValues, seriesValues, aggregateType, orderedDomainValues);
-            if (spec.chartType === "pie") {
+            if ((0, helpers_1.isCircularChartType)(spec.chartType)) {
                 return orderedDomainValues.map(function (name, idx) {
                     var _a;
                     return ({
@@ -328,7 +331,9 @@ var BasicChart = function (_a) {
             return aggregatedValues_1;
         }
         var 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 ((0, helpers_1.isCircularChartType)(spec.chartType)) {
             if (options.pieLabels) {
                 var _b = options.pieLabels, domainLabels = _b.domainLabels, offset = _b.offset;
                 var labels = offset === undefined
@@ -362,11 +367,11 @@ var BasicChart = function (_a) {
      * Triggers a chart update
      */
     var updateChart = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-        var threeDRenderKind, canRender3D, willRender3D, isRegionMap, regionSpec, geoScope, geo, labels, seriesEntry, values, _a, data, unmatched, min, max, textColor, ramp, noDataColor, borderColor, regionSeriesLabel, seriesName, chartDomains, chartSeries, legend, chartType, position, showAxis, isBubble, isHierarchy, skipHeaders_1, labelValues, perSeriesX, perSeriesSize, seriesInputs, i, seriesEntry, resolvedLabel, _b, xValues, sizeValues_1, sharedXValues, sharedSizeValues, _c, categories_1, preparedSeries, sizeValues, sizeScale_1, xAxisConfig, tooltipFormatter, bubbleSeriesLabel_1, hierarchyRows, headerTitle, hierarchyData, rootName, seriesDisplayName, hierarchyDepth, levels, sizeNumberFormat_1, tooltipFormatter, hierarchyDataLabels, hierarchySeriesLabel, isContour, categories_2, contourSeriesInputs, _d, _e, seriesEntry, dataLabel, _f, _g, values, e_1_1, seriesNames_1, contourPoints, _h, zMin, zMax, contourFormats_1, contourLabel, categories_3, threeDSeriesInputs, _j, _k, seriesEntry, dataLabel, _l, _m, values, e_2_1, seriesNames_2, threeDPalette_1, seriesColorAt_1, categoryAxisLabel, seriesAxisLabel, stackedBar3D_1, threeDFormats_1, threeDTooltipFormatter, threeDSeries, visualMap, xAxis3D, yAxis3D, categoryCount, categoryTotals_1, threeDSeriesInputs_1, threeDSeriesInputs_1_1, entry, isPercent_1, surfacePoints, _o, zMin, zMax, skipHeaders, categories, radarSeriesInputs, _p, _q, seriesEntry, label, values, indicators_1, radarData, radarStyle_1, radarColors_1, radarFormats_1, radarDataLabels_1, radarSeriesLabelFor_1, radarTooltipFormatter, variant_1, categories, seriesValues, stockFormats_1, stockRoleIndex_1, stockFormatFor_1, stockDataLabels_1, stockSeriesLabelFor_1, upColor_1, downColor_1, volumePoints, hasVolume, stockGrid, baseStockXAxis, stockXAxis, volumeYAxis, volumeSeries, stockAxisPointer, candleData, lineSeries, stockColors_1, isStacked, isCircularChart, isOfPie, ofPieLayout, isHorizontalBarChart, shouldAggregate, primaryDomainSource, rawPrimaryDomainValues, aggregateDomainValues, categoryLevels, pushSeriesOverlays, sideBySideBarCount, specBarGap, specBarCategoryGap, _loop_1, _r, _s, _t, specSeriesIndex, series, e_3_1, labels, seriesEntry, rawValues, _u, main_1, secondary, otherTotal, total, ofPieType_1, secondScale, halfAngle_1, hasSecondary, MAIN_CX_1, CY_1, MAIN_RADIUS_PCT_1, SECONDARY_CX_1, secondaryRadiusPct_1, BAR_LEFT_1, BAR_RIGHT, barHalfFrac_1, ofPiePalette_1, paletteAt_1, connectorColor_1, primaryDomainSource_1, rawDomainValues, labels, seriesEntry, rawValues_1, totalIndices, steps, accent_1, decreaseColor_1, totalColor_1, connectors, primaryDomainSource_2, rawDomainValues, labels_1, seriesEntry, rawValues, quartileMethod, showOutliers, showMeanMarker, boxStats, boxLabels, outlierPoints, meanPoints, _v, _w, seriesEntry, label, rawValues, summary, boxIndex, lo, hi, _x, _y, outlier, boxSeries, boxColor, rawValues, _z, labels, counts, isPareto_1, cumulativePercents, pareto, histogramSeries, histogramColor, renderedSeriesCount, replaceMerge, gridConfig, valueAxisBase, isPareto, hasSecondaryAxis, isPercentStackedBars, primaryAxisNumberFormat, secondaryAxisNumberFormat, axisNumberFormatFor, seriesNumberFormats, seriesNumberFormatFor, tooltipConfig, finalLegend, dataLabelOptions, seriesLabelOptionFor, isDoughnut, doughnutHoleSize, explosion, explosionOffset, barSeries, len, categoryTotals_2, barSeries_1, barSeries_1_1, s, i, raw, n, barSeries_2, barSeries_2_1, s, seriesWithLabels;
+        var threeDRenderKind, canRender3D, willRender3D, isRegionMap, regionSpec, geoScope, geo, labels, seriesEntry, values, _a, data, unmatched, min, max, textColor, ramp, noDataColor, borderColor, regionSeriesLabel, seriesName, chartDomains, chartSeries, legend, chartType, position, showAxis, isBubble, isHierarchy, skipHeaders_1, labelValues, perSeriesX, perSeriesSize, seriesInputs, i, seriesEntry, resolvedLabel, _b, xValues, sizeValues_1, sharedXValues, sharedSizeValues, _c, categories_1, preparedSeries, sizeValues, sizeScale_1, xAxisConfig, tooltipFormatter, bubbleSeriesLabel_1, hierarchyRows, headerTitle, hierarchyData, rootName, seriesDisplayName, hierarchyDepth, levels, sizeNumberFormat_1, tooltipFormatter, hierarchyDataLabels, hierarchySeriesLabel, isContour, categories_2, contourSeriesInputs, _d, _e, seriesEntry, dataLabel, _f, _g, values, e_1_1, seriesNames_1, contourPoints, _h, zMin, zMax, contourFormats_1, contourLabel, categories_3, threeDSeriesInputs, _j, _k, seriesEntry, dataLabel, _l, _m, values, e_2_1, seriesNames_2, threeDPalette_1, seriesColorAt_1, categoryAxisLabel, seriesAxisLabel, stackedBar3D_1, threeDFormats_1, threeDTooltipFormatter, threeDSeries, visualMap, xAxis3D, yAxis3D, categoryCount, categoryTotals_1, threeDSeriesInputs_1, threeDSeriesInputs_1_1, entry, isPercent_1, surfacePoints, _o, zMin, zMax, skipHeaders, categories, radarSeriesInputs, _p, _q, seriesEntry, label, values, indicators_1, radarData, radarStyle_1, radarColors_1, radarFormats_1, radarDataLabels_1, radarSeriesLabelFor_1, radarTooltipFormatter, variant_1, categories, seriesValues, stockFormats_1, stockRoleIndex_1, stockFormatFor_1, stockDataLabels_1, stockSeriesLabelFor_1, upColor_1, downColor_1, volumePoints, hasVolume, stockGrid, baseStockXAxis, stockXAxis, volumeYAxis, volumeSeries, stockAxisPointer, candleData, lineSeries, stockColors_1, isStacked, isCircularChart, isOfPie, ofPieLayout, isHorizontalBarChart, shouldAggregate, primaryDomainSource, rawPrimaryDomainValues, aggregateDomainValues, categoryLevels, pushSeriesOverlays, sideBySideBarCount, specBarGap, specBarCategoryGap, _loop_1, _r, _s, _t, specSeriesIndex, series, e_3_1, labels, seriesEntry, rawValues, _u, main_1, secondary, otherTotal, total, ofPieType_1, secondScale, halfAngle_1, hasSecondary, MAIN_CX_1, CY_1, MAIN_RADIUS_PCT_1, SECONDARY_CX_1, secondaryRadiusPct_1, BAR_LEFT_1, BAR_RIGHT, barHalfFrac_1, ofPiePalette_1, paletteAt_1, connectorColor_1, primaryDomainSource_1, rawDomainValues, labels, seriesEntry, rawValues_1, totalIndices, steps, accent_1, decreaseColor_1, totalColor_1, connectors, primaryDomainSource_2, rawDomainValues, labels_1, seriesEntry, rawValues, quartileMethod, showOutliers, showMeanMarker, boxStats, boxLabels, outlierPoints, meanPoints, _v, _w, seriesEntry, label, rawValues, summary, boxIndex, lo, hi, _x, _y, outlier, boxSeries, boxColor, rawValues, _z, labels, counts, isPareto_1, cumulativePercents, pareto, histogramSeries, histogramColor, renderedSeriesCount, replaceMerge, valueAxisBase, isPareto, hasSecondaryAxis, isPercentStackedBars, primaryAxisNumberFormat, secondaryAxisNumberFormat, axisNumberFormatFor, seriesNumberFormats, seriesNumberFormatFor, tooltipConfig, finalLegend, bottomAxisNameGap, legendBand, positionedLegend, gridConfig, dataLabelOptions, seriesLabelOptionFor, isDoughnut, doughnutHoleSize, explosion, explosionOffset, barSeries, len, categoryTotals_2, barSeries_1, barSeries_1_1, s, i, raw, n, barSeries_2, barSeries_2_1, s, seriesWithLabels;
         var e_1, _0, e_2, _1, e_4, _2, e_5, _3, e_3, _4, e_6, _5, e_7, _6, e_8, _7, e_9, _8;
-        var _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, _65, _66, _67, _68, _69, _70, _71, _72, _73, _74, _75, _76, _77, _78, _79, _80, _81, _82, _83, _84, _85, _86, _87, _88, _89, _90, _91, _92, _93, _94, _95, _96, _97, _98, _99, _100, _101, _102, _103, _104, _105, _106, _107, _108, _109, _110, _111, _112, _113, _114, _115, _116, _117, _118, _119, _120, _121, _122, _123, _124, _125, _126, _127, _128;
-        return tslib_1.__generator(this, function (_129) {
-            switch (_129.label) {
+        var _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, _65, _66, _67, _68, _69, _70, _71, _72, _73, _74, _75, _76, _77, _78, _79, _80, _81, _82, _83, _84, _85, _86, _87, _88, _89, _90, _91, _92, _93, _94, _95, _96, _97, _98, _99, _100, _101, _102, _103, _104, _105, _106, _107, _108, _109, _110, _111, _112, _113, _114, _115, _116, _117, _118, _119, _120, _121, _122, _123, _124, _125, _126, _127, _128, _129, _130, _131, _132, _133, _134, _135, _136, _137, _138;
+        return tslib_1.__generator(this, function (_139) {
+            switch (_139.label) {
                 case 0:
                     (0, utils_1.debug)("Updating chart", chart);
                     threeDRenderKind = (0, three_d_1.resolve3DRenderKind)(spec.sourceChartType);
@@ -417,7 +422,7 @@ var BasicChart = function (_a) {
                     geoScope = (0, region_map_1.resolveGeoScope)(regionSpec.geoScope);
                     return [4 /*yield*/, (0, region_map_loader_1.loadRegionMapGeo)(geoScope)];
                 case 1:
-                    geo = _129.sent();
+                    geo = _139.sent();
                     // Entering the region map from a cartesian render: the previous
                     // grid/axis option doesn't merge into the map one, so start from
                     // a bare instance (theme options are re-applied after setOption).
@@ -532,7 +537,7 @@ var BasicChart = function (_a) {
                     });
                     seriesInputs = [];
                     i = 0;
-                    _129.label = 3;
+                    _139.label = 3;
                 case 3:
                     if (!(i < spec.series.length)) return [3 /*break*/, 7];
                     seriesEntry = spec.series[i];
@@ -541,13 +546,13 @@ var BasicChart = function (_a) {
                     _b = chart_spec_utils_1.coerceCalculatedLabel;
                     return [4 /*yield*/, onRequestCalculate(resolvedLabel, (_17 = position.sheetId) !== null && _17 !== void 0 ? _17 : sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex)];
                 case 4:
-                    resolvedLabel = _b.apply(void 0, [_129.sent()]);
-                    _129.label = 5;
+                    resolvedLabel = _b.apply(void 0, [_139.sent()]);
+                    _139.label = 5;
                 case 5:
                     xValues = (_18 = perSeriesX[i]) !== null && _18 !== void 0 ? _18 : perSeriesX[0];
                     sizeValues_1 = (_19 = perSeriesSize[i]) !== null && _19 !== void 0 ? _19 : perSeriesSize[0];
                     seriesInputs.push(tslib_1.__assign(tslib_1.__assign({ name: resolvedLabel, values: flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy, skipHeaders_1) }, (xValues ? { xValues: xValues } : {})), (sizeValues_1 ? { sizeValues: sizeValues_1 } : {})));
-                    _129.label = 6;
+                    _139.label = 6;
                 case 6:
                     i++;
                     return [3 /*break*/, 3];
@@ -770,11 +775,11 @@ var BasicChart = function (_a) {
                     if (!isContour) return [3 /*break*/, 19];
                     categories_2 = flattenChartDataValues(spec.domains, getDomainValuesFromRange, spec.hiddenDimensionStrategy, false).map(function (v) { return String(v !== null && v !== void 0 ? v : ""); });
                     contourSeriesInputs = [];
-                    _129.label = 9;
+                    _139.label = 9;
                 case 9:
-                    _129.trys.push([9, 16, 17, 18]);
+                    _139.trys.push([9, 16, 17, 18]);
                     _d = tslib_1.__values((_34 = spec.series) !== null && _34 !== void 0 ? _34 : []), _e = _d.next();
-                    _129.label = 10;
+                    _139.label = 10;
                 case 10:
                     if (!!_e.done) return [3 /*break*/, 15];
                     seriesEntry = _e.value;
@@ -782,22 +787,22 @@ var BasicChart = function (_a) {
                     _g = chart_spec_utils_1.coerceCalculatedLabel;
                     return [4 /*yield*/, onRequestCalculate(seriesEntry.dataLabel, (_35 = position.sheetId) !== null && _35 !== void 0 ? _35 : sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex)];
                 case 11:
-                    _f = _g.apply(void 0, [_129.sent()]);
+                    _f = _g.apply(void 0, [_139.sent()]);
                     return [3 /*break*/, 13];
                 case 12:
                     _f = (_36 = seriesEntry.dataLabel) !== null && _36 !== void 0 ? _36 : "";
-                    _129.label = 13;
+                    _139.label = 13;
                 case 13:
                     dataLabel = _f;
                     values = flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map(sanitizeChartValue);
                     contourSeriesInputs.push({ name: dataLabel, values: values });
-                    _129.label = 14;
+                    _139.label = 14;
                 case 14:
                     _e = _d.next();
                     return [3 /*break*/, 10];
                 case 15: return [3 /*break*/, 18];
                 case 16:
-                    e_1_1 = _129.sent();
+                    e_1_1 = _139.sent();
                     e_1 = { error: e_1_1 };
                     return [3 /*break*/, 18];
                 case 17:
@@ -905,11 +910,11 @@ var BasicChart = function (_a) {
                     if (!(willRender3D && threeDRenderKind)) return [3 /*break*/, 30];
                     categories_3 = flattenChartDataValues(spec.domains, getDomainValuesFromRange, spec.hiddenDimensionStrategy, false).map(function (v) { return String(v !== null && v !== void 0 ? v : ""); });
                     threeDSeriesInputs = [];
-                    _129.label = 20;
+                    _139.label = 20;
                 case 20:
-                    _129.trys.push([20, 27, 28, 29]);
+                    _139.trys.push([20, 27, 28, 29]);
                     _j = tslib_1.__values((_40 = spec.series) !== null && _40 !== void 0 ? _40 : []), _k = _j.next();
-                    _129.label = 21;
+                    _139.label = 21;
                 case 21:
                     if (!!_k.done) return [3 /*break*/, 26];
                     seriesEntry = _k.value;
@@ -917,22 +922,22 @@ var BasicChart = function (_a) {
                     _m = chart_spec_utils_1.coerceCalculatedLabel;
                     return [4 /*yield*/, onRequestCalculate(seriesEntry.dataLabel, (_41 = position.sheetId) !== null && _41 !== void 0 ? _41 : sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex)];
                 case 22:
-                    _l = _m.apply(void 0, [_129.sent()]);
+                    _l = _m.apply(void 0, [_139.sent()]);
                     return [3 /*break*/, 24];
                 case 23:
                     _l = (_42 = seriesEntry.dataLabel) !== null && _42 !== void 0 ? _42 : "";
-                    _129.label = 24;
+                    _139.label = 24;
                 case 24:
                     dataLabel = _l;
                     values = flattenChartDataValues([seriesEntry], getSeriesValuesFromRange, spec.hiddenDimensionStrategy).map(sanitizeChartValue);
                     threeDSeriesInputs.push({ name: dataLabel, values: values });
-                    _129.label = 25;
+                    _139.label = 25;
                 case 25:
                     _k = _j.next();
                     return [3 /*break*/, 21];
                 case 26: return [3 /*break*/, 29];
                 case 27:
-                    e_2_1 = _129.sent();
+                    e_2_1 = _139.sent();
                     e_2 = { error: e_2_1 };
                     return [3 /*break*/, 29];
                 case 28:
@@ -1409,7 +1414,7 @@ var BasicChart = function (_a) {
                                 ? (_62 = spec.verticalAxisTitle) !== null && _62 !== void 0 ? _62 : ""
                                 : (_63 = spec.horizontalAxisTitle) !== null && _63 !== void 0 ? _63 : "",
                             nameLocation: "middle",
-                            nameGap: 30 + 24 * categoryLevels.outer.length,
+                            nameGap: CATEGORY_AXIS_NAME_GAP + 24 * categoryLevels.outer.length,
                         })), false));
                     }
                     // One category axis per domain (Excel): a domain drawn from several
@@ -1438,7 +1443,7 @@ var BasicChart = function (_a) {
                             splitLine: { show: !isCircularChart },
                             name: axisTitle,
                             nameLocation: "middle",
-                            nameGap: 30,
+                            nameGap: CATEGORY_AXIS_NAME_GAP,
                         });
                     });
                     if (chartDomains.length === 0 && !isCircularChart) {
@@ -1453,7 +1458,7 @@ var BasicChart = function (_a) {
                                 ? (_65 = spec.verticalAxisTitle) !== null && _65 !== void 0 ? _65 : ""
                                 : (_66 = spec.horizontalAxisTitle) !== null && _66 !== void 0 ? _66 : "",
                             nameLocation: "middle",
-                            nameGap: 30,
+                            nameGap: CATEGORY_AXIS_NAME_GAP,
                         });
                     }
                     pushSeriesOverlays = function (series, data, dataLabel) {
@@ -1611,22 +1616,22 @@ var BasicChart = function (_a) {
                         overlap: isStacked ? 0 : spec.overlap,
                     });
                     _loop_1 = function (specSeriesIndex, series) {
-                        var dataLabel, _130, _131, effectiveChartType, lineLike, domainSources, pieDomainLabels, piePointOffset, data, seriesEchartsType, seriesStyleAttrs, seriesEntry, isBarOrColumn, seriesAny, markerSymbol, wantsMarkers, gradientArgs, gradient, overrides_2, _132, _133, dp, fallback_1, overrides_3, _134, _135, dp, slicePalette_1, positiveColor_1, negativeColor_1;
-                        var e_11, _136, e_12, _137;
-                        return tslib_1.__generator(this, function (_138) {
-                            switch (_138.label) {
+                        var dataLabel, _140, _141, effectiveChartType, lineLike, domainSources, pieDomainLabels, piePointOffset, data, seriesEchartsType, seriesStyleAttrs, seriesEntry, isBarOrColumn, seriesAny, markerSymbol, wantsMarkers, isolated, marked, isolated_1, isolated_1_1, i, gradientArgs, gradient, overrides_2, _142, _143, dp, fallback_1, overrides_3, _144, _145, dp, slicePalette_1, positiveColor_1, negativeColor_1;
+                        var e_11, _146, e_12, _147, e_13, _148;
+                        return tslib_1.__generator(this, function (_149) {
+                            switch (_149.label) {
                                 case 0:
                                     if (!(!(0, utils_1.isNil)(series.dataLabel) && (0, utils_1.isAFormula)(series.dataLabel))) return [3 /*break*/, 2];
-                                    _131 = chart_spec_utils_1.coerceCalculatedLabel;
+                                    _141 = chart_spec_utils_1.coerceCalculatedLabel;
                                     return [4 /*yield*/, onRequestCalculate(series.dataLabel, (_69 = position.sheetId) !== null && _69 !== void 0 ? _69 : sheetId, position.overlayPosition.anchorCell.rowIndex, position.overlayPosition.anchorCell.columnIndex)];
                                 case 1:
-                                    _130 = _131.apply(void 0, [_138.sent()]);
+                                    _140 = _141.apply(void 0, [_149.sent()]);
                                     return [3 /*break*/, 3];
                                 case 2:
-                                    _130 = (_70 = series.dataLabel) !== null && _70 !== void 0 ? _70 : "";
-                                    _138.label = 3;
+                                    _140 = (_70 = series.dataLabel) !== null && _70 !== void 0 ? _70 : "";
+                                    _149.label = 3;
                                 case 3:
-                                    dataLabel = _130;
+                                    dataLabel = _140;
                                     // Label
                                     if (dataLabel) {
                                         (_71 = legend.data) === null || _71 === void 0 ? void 0 : _71.push(dataLabel);
@@ -1634,7 +1639,7 @@ var BasicChart = function (_a) {
                                     effectiveChartType = (_72 = series.seriesChartType) !== null && _72 !== void 0 ? _72 : spec.chartType;
                                     lineLike = (0, empty_cells_1.isLineLikeChartType)(effectiveChartType);
                                     domainSources = (_75 = (_74 = (_73 = spec.domains) === null || _73 === void 0 ? void 0 : _73[0]) === null || _74 === void 0 ? void 0 : _74.sources) !== null && _75 !== void 0 ? _75 : [];
-                                    pieDomainLabels = spec.chartType === "pie" &&
+                                    pieDomainLabels = isCircularChart &&
                                         (domainSources.length > 1 || series.sources.length > 1)
                                         ? domainSources.flatMap(function (sheetRange) {
                                             var _a;
@@ -1700,6 +1705,28 @@ var BasicChart = function (_a) {
                                                 (_79 = (0, helpers_1.mapMarkerSymbolToEcharts)(markerSymbol)) !== null && _79 !== void 0 ? _79 : "circle";
                                             seriesEntry.symbolSize = (_81 = (_80 = seriesAny.marker) === null || _80 === void 0 ? void 0 : _80.size) !== null && _81 !== void 0 ? _81 : 6;
                                         }
+                                        else if (Array.isArray(data)) {
+                                            isolated = (0, empty_cells_1.isolatedPointIndexes)(data, (0, empty_cells_1.connectsAcrossEmptyCells)(spec, lineLike));
+                                            if (isolated.length) {
+                                                seriesEntry.showSymbol = true;
+                                                seriesEntry.symbol = "none";
+                                                marked = tslib_1.__spreadArray([], tslib_1.__read(data), false);
+                                                try {
+                                                    for (isolated_1 = (e_11 = void 0, tslib_1.__values(isolated)), isolated_1_1 = isolated_1.next(); !isolated_1_1.done; isolated_1_1 = isolated_1.next()) {
+                                                        i = isolated_1_1.value;
+                                                        marked[i] = { value: marked[i], symbol: "circle", symbolSize: 6 };
+                                                    }
+                                                }
+                                                catch (e_11_1) { e_11 = { error: e_11_1 }; }
+                                                finally {
+                                                    try {
+                                                        if (isolated_1_1 && !isolated_1_1.done && (_146 = isolated_1.return)) _146.call(isolated_1);
+                                                    }
+                                                    finally { if (e_11) throw e_11.error; }
+                                                }
+                                                seriesEntry.data = marked;
+                                            }
+                                        }
                                     }
                                     gradientArgs = (0, gradient_1.gradientToEcharts)(series.gradient);
                                     if (gradientArgs && !seriesAny.noFill) {
@@ -1721,19 +1748,19 @@ var BasicChart = function (_a) {
                                         seriesAny.dataPointColors.length) {
                                         overrides_2 = new Map();
                                         try {
-                                            for (_132 = (e_11 = void 0, tslib_1.__values(seriesAny.dataPointColors)), _133 = _132.next(); !_133.done; _133 = _132.next()) {
-                                                dp = _133.value;
+                                            for (_142 = (e_12 = void 0, tslib_1.__values(seriesAny.dataPointColors)), _143 = _142.next(); !_143.done; _143 = _142.next()) {
+                                                dp = _143.value;
                                                 if (typeof dp.idx === "number" && typeof dp.color === "string") {
                                                     overrides_2.set(dp.idx, dp.color);
                                                 }
                                             }
                                         }
-                                        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+                                        catch (e_12_1) { e_12 = { error: e_12_1 }; }
                                         finally {
                                             try {
-                                                if (_133 && !_133.done && (_136 = _132.return)) _136.call(_132);
+                                                if (_143 && !_143.done && (_147 = _142.return)) _147.call(_142);
                                             }
-                                            finally { if (e_11) throw e_11.error; }
+                                            finally { if (e_12) throw e_12.error; }
                                         }
                                         fallback_1 = (_85 = series.color) !== null && _85 !== void 0 ? _85 : theme.themeColors.accent1;
                                         seriesEntry.itemStyle = tslib_1.__assign(tslib_1.__assign({}, ((_86 = seriesEntry.itemStyle) !== null && _86 !== void 0 ? _86 : {})), { color: function (params) { var _a; return (_a = overrides_2.get(params.dataIndex)) !== null && _a !== void 0 ? _a : fallback_1; } });
@@ -1743,19 +1770,19 @@ var BasicChart = function (_a) {
                                         seriesAny.dataPointColors.length) {
                                         overrides_3 = new Map();
                                         try {
-                                            for (_134 = (e_12 = void 0, tslib_1.__values(seriesAny.dataPointColors)), _135 = _134.next(); !_135.done; _135 = _134.next()) {
-                                                dp = _135.value;
+                                            for (_144 = (e_13 = void 0, tslib_1.__values(seriesAny.dataPointColors)), _145 = _144.next(); !_145.done; _145 = _144.next()) {
+                                                dp = _145.value;
                                                 if (typeof dp.idx === "number" && typeof dp.color === "string") {
                                                     overrides_3.set(dp.idx, dp.color);
                                                 }
                                             }
                                         }
-                                        catch (e_12_1) { e_12 = { error: e_12_1 }; }
+                                        catch (e_13_1) { e_13 = { error: e_13_1 }; }
                                         finally {
                                             try {
-                                                if (_135 && !_135.done && (_137 = _134.return)) _137.call(_134);
+                                                if (_145 && !_145.done && (_148 = _144.return)) _148.call(_144);
                                             }
-                                            finally { if (e_12) throw e_12.error; }
+                                            finally { if (e_13) throw e_13.error; }
                                         }
                                         slicePalette_1 = (0, chart_styles_1.getChartPalette)(spec, [
                                             theme.themeColors.accent1,
@@ -1797,24 +1824,24 @@ var BasicChart = function (_a) {
                             }
                         });
                     };
-                    _129.label = 31;
+                    _139.label = 31;
                 case 31:
-                    _129.trys.push([31, 36, 37, 38]);
+                    _139.trys.push([31, 36, 37, 38]);
                     _r = tslib_1.__values(((_68 = spec.series) !== null && _68 !== void 0 ? _68 : []).entries()), _s = _r.next();
-                    _129.label = 32;
+                    _139.label = 32;
                 case 32:
                     if (!!_s.done) return [3 /*break*/, 35];
                     _t = tslib_1.__read(_s.value, 2), specSeriesIndex = _t[0], series = _t[1];
                     return [5 /*yield**/, _loop_1(specSeriesIndex, series)];
                 case 33:
-                    _129.sent();
-                    _129.label = 34;
+                    _139.sent();
+                    _139.label = 34;
                 case 34:
                     _s = _r.next();
                     return [3 /*break*/, 32];
                 case 35: return [3 /*break*/, 38];
                 case 36:
-                    e_3_1 = _129.sent();
+                    e_3_1 = _139.sent();
                     e_3 = { error: e_3_1 };
                     return [3 /*break*/, 38];
                 case 37:
@@ -1824,6 +1851,12 @@ var BasicChart = function (_a) {
                     finally { if (e_3) throw e_3.error; }
                     return [7 /*endfinally*/];
                 case 38:
+                    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 = (0, helpers_1.circularLegendEntries)(chartSeries);
+                    }
                     if (isOfPie) {
                         labels = rawPrimaryDomainValues.map(function (v) { return String(v !== null && v !== void 0 ? v : ""); });
                         seriesEntry = (_94 = spec.series) === null || _94 === void 0 ? void 0 : _94[0];
@@ -2216,23 +2249,6 @@ var BasicChart = function (_a) {
                         previousSeriesCount.current !== renderedSeriesCount
                         ? ["series", "xAxis", "yAxis", "legend", "grid", "tooltip"]
                         : [];
-                    gridConfig = isOfPie
-                        ? tslib_1.__spreadArray([
-                            { left: 0, right: 0, top: 0, bottom: 0 }
-                        ], tslib_1.__read(((ofPieLayout === null || ofPieLayout === void 0 ? void 0 : ofPieLayout.barGrid) ? [ofPieLayout.barGrid] : [])), false)
-                        : isCircularChart
-                            ? {
-                                left: 0,
-                                right: 0,
-                                top: 0,
-                                bottom: 0,
-                            }
-                            : {
-                                left: "3%",
-                                right: "4%",
-                                bottom: "3%",
-                                containLabel: true,
-                            };
                     valueAxisBase = {
                         type: "value",
                         show: !isCircularChart,
@@ -2285,6 +2301,38 @@ var BasicChart = function (_a) {
                             : undefined,
                     };
                     finalLegend = (0, overrides_1.applyLegendOverrides)(legend, spec.legend);
+                    bottomAxisNameGap = isHorizontalBarChart
+                        ? valueAxisBase.nameGap
+                        : Number((_129 = (_128 = chartDomains[0]) === null || _128 === void 0 ? void 0 : _128.nameGap) !== null && _129 !== void 0 ? _129 : CATEGORY_AXIS_NAME_GAP);
+                    legendBand = (0, legend_layout_1.reserveEchartsLegendBand)({
+                        position: (_130 = spec.legend) === null || _130 === void 0 ? void 0 : _130.position,
+                        visible: finalLegend.show !== false,
+                        labels: (0, legend_layout_1.legendLabelsFrom)(finalLegend.data, chartSeries.map(function (s) { return s === null || s === void 0 ? void 0 : s.name; })),
+                        legendFontSize: (_135 = (_132 = (_131 = finalLegend.textStyle) === null || _131 === void 0 ? void 0 : _131.fontSize) !== null && _132 !== void 0 ? _132 : (_134 = (_133 = spec.legend) === null || _133 === void 0 ? void 0 : _133.textFormat) === null || _134 === void 0 ? void 0 : _134.fontSize) !== null && _135 !== void 0 ? _135 : 12,
+                        legendItemWidth: defaultLegendConfig.itemWidth,
+                        width: width !== null && width !== void 0 ? width : 0,
+                        height: height !== null && height !== void 0 ? height : 0,
+                        hasTitle: Boolean(title),
+                        titleFontSize: (_137 = (_136 = spec.titleTextFormat) === null || _136 === void 0 ? void 0 : _136.fontSize) !== null && _137 !== void 0 ? _137 : 16,
+                        hasBottomAxisTitle: !isCircularChart && Boolean(spec.horizontalAxisTitle),
+                        bottomAxisNameGap: bottomAxisNameGap,
+                        hasLeftAxisTitle: !isCircularChart && Boolean(spec.verticalAxisTitle),
+                    });
+                    positionedLegend = isCircularChart
+                        ? finalLegend
+                        : tslib_1.__assign(tslib_1.__assign({}, finalLegend), legendBand.legend);
+                    gridConfig = isOfPie
+                        ? tslib_1.__spreadArray([
+                            { left: 0, right: 0, top: 0, bottom: 0 }
+                        ], tslib_1.__read(((ofPieLayout === null || ofPieLayout === void 0 ? void 0 : ofPieLayout.barGrid) ? [ofPieLayout.barGrid] : [])), false)
+                        : isCircularChart
+                            ? {
+                                left: 0,
+                                right: 0,
+                                top: 0,
+                                bottom: 0,
+                            }
+                            : legendBand.grid;
                     dataLabelOptions = spec.dataLabels;
                     seriesLabelOptionFor = function (s) {
                         return (0, overrides_1.buildSeriesLabelOption)(dataLabelOptions && !dataLabelOptions.numberFormatPattern
@@ -2393,7 +2441,7 @@ var BasicChart = function (_a) {
                         return next;
                     });
                     // Update charts
-                    (_128 = chartRef.current) === null || _128 === void 0 ? void 0 : _128.setOption({
+                    (_138 = chartRef.current) === null || _138 === void 0 ? void 0 : _138.setOption({
                         xAxis: (function () {
                             var _a, _b;
                             if (isOfPie) {
@@ -2451,7 +2499,7 @@ var BasicChart = function (_a) {
                                         splitLine: { show: true },
                                         name: (_b = spec.horizontalAxisTitle) !== null && _b !== void 0 ? _b : "",
                                         nameLocation: "middle",
-                                        nameGap: 30,
+                                        nameGap: CATEGORY_AXIS_NAME_GAP,
                                     },
                                 ];
                             return base.map(function (axis) {
@@ -2493,7 +2541,7 @@ var BasicChart = function (_a) {
                                             splitLine: { show: true },
                                             name: (_a = spec.verticalAxisTitle) !== null && _a !== void 0 ? _a : "",
                                             nameLocation: "middle",
-                                            nameGap: 30,
+                                            nameGap: CATEGORY_AXIS_NAME_GAP,
                                         },
                                     ];
                                 return base.map(function (axis) {
@@ -2501,7 +2549,21 @@ var BasicChart = function (_a) {
                                 });
                             }
                             var axes = [
-                                (0, overrides_1.applyAxisOverrides)(tslib_1.__assign(tslib_1.__assign({}, valueAxisBase), { name: (_b = spec.verticalAxisTitle) !== null && _b !== void 0 ? _b : "" }), spec.valueAxisOptions, primaryAxisNumberFormat),
+                                (0, overrides_1.applyAxisOverrides)(tslib_1.__assign(tslib_1.__assign({}, valueAxisBase), { name: (_b = spec.verticalAxisTitle) !== null && _b !== void 0 ? _b : "", 
+                                    // Clear the tick labels: "$2,000.00" is wider than the 50px
+                                    // default gap, and the title painted over its own labels.
+                                    nameGap: (0, axis_number_format_1.valueAxisNameGap)({
+                                        values: chartSeries
+                                            .filter(function (s) { return (s === null || s === void 0 ? void 0 : s.yAxisIndex) !== 1; })
+                                            .flatMap(function (s) {
+                                            return Array.isArray(s === null || s === void 0 ? void 0 : s.data)
+                                                ? s.data.map(function (d) {
+                                                    return d !== null && typeof d === "object" ? d.value : d;
+                                                })
+                                                : [];
+                                        }),
+                                        pattern: primaryAxisNumberFormat,
+                                    }) }), spec.valueAxisOptions, primaryAxisNumberFormat),
                             ];
                             if (hasSecondaryAxis) {
                                 axes.push((0, overrides_1.applyAxisOverrides)(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, valueAxisBase), { name: "", splitLine: { show: false } }), (isPareto
@@ -2515,7 +2577,7 @@ var BasicChart = function (_a) {
                             return axes;
                         })(),
                         series: seriesWithLabels,
-                        legend: finalLegend,
+                        legend: positionedLegend,
                         grid: gridConfig,
                         tooltip: tooltipConfig,
                     }, { replaceMerge: replaceMerge, lazyUpdate: true });

package/dist/cjs/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/cjs/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/cjs/basic-chart/helpers.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.showXAxis = exports.getEchartsSeriesStyle = exports.mapMarkerSymbolToEcharts = exports.chartTypeToEchartsType = void 0;
+exports.showXAxis = exports.getEchartsSeriesStyle = exports.circularLegendEntries = exports.isCircularChartType = exports.mapMarkerSymbolToEcharts = exports.chartTypeToEchartsType = void 0;
+var tslib_1 = require("tslib");
 var chartTypeToEchartsType = function (type) {
     switch (type) {
         case "column":
@@ -79,6 +80,59 @@ var mapMarkerSymbolToEcharts = function (symbol) {
     }
 };
 exports.mapMarkerSymbolToEcharts = mapMarkerSymbolToEcharts;
+/** Pie and doughnut — the pie-family types whose points are slices. */
+var isCircularChartType = function (type) { return type === "pie" || type === "doughnut"; };
+exports.isCircularChartType = isCircularChartType;
+/**
+ * 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.
+ */
+var circularLegendEntries = function (series) {
+    var e_1, _a, e_2, _b;
+    var seen = new Set();
+    var entries = [];
+    try {
+        for (var series_1 = tslib_1.__values(series), series_1_1 = series_1.next(); !series_1_1.done; series_1_1 = series_1.next()) {
+            var raw = series_1_1.value;
+            var entry = raw;
+            if ((entry === null || entry === void 0 ? void 0 : entry.type) !== "pie" || !Array.isArray(entry.data))
+                continue;
+            try {
+                for (var _c = (e_2 = void 0, tslib_1.__values(entry.data)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    var item = _d.value;
+                    var name_1 = item !== null && typeof item === "object" && "name" in item
+                        ? item.name
+                        : undefined;
+                    if (name_1 === undefined || name_1 === null)
+                        continue;
+                    var label = String(name_1);
+                    if (label === "" || seen.has(label))
+                        continue;
+                    seen.add(label);
+                    entries.push(label);
+                }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (series_1_1 && !series_1_1.done && (_a = series_1.return)) _a.call(series_1);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return entries;
+};
+exports.circularLegendEntries = circularLegendEntries;
 var getEchartsSeriesStyle = function (type) {
     switch (type) {
         case "area":

package/dist/cjs/components/editors/chart-editor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chart-editor.d.ts","sourceRoot":"","sources":["../../../../components/editors/chart-editor.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAGV,aAAa,EAGd,MAAM,2BAA2B,CAAC;AAuBnC,OAAO,KAAkB,MAAM,OAAO,CAAC;AAMvC,OAAO,EAEL,KAAK,oBAAoB,EAG1B,MAAM,+BAA+B,CAAC;AA4CvC,KAAK,gBAAgB,GAAG;IACtB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IACtC;;;;OAIG;IACH,kBAAkB,CAAC,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IAChD;;;OAGG;IACH,iBAAiB,CAAC,EAAE,oBAAoB,CAAC;CAC1C,CAAC;AAuBF,eAAO,MAAM,WAAW,GAAI,sEAMzB,gBAAgB,sBA+5DlB,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"chart-editor.d.ts","sourceRoot":"","sources":["../../../../components/editors/chart-editor.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAGV,aAAa,EAGd,MAAM,2BAA2B,CAAC;AAuBnC,OAAO,KAAkB,MAAM,OAAO,CAAC;AAMvC,OAAO,EAEL,KAAK,oBAAoB,EAG1B,MAAM,+BAA+B,CAAC;AA4CvC,KAAK,gBAAgB,GAAG;IACtB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IACtC;;;;OAIG;IACH,kBAAkB,CAAC,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IAChD;;;OAGG;IACH,iBAAiB,CAAC,EAAE,oBAAoB,CAAC;CAC1C,CAAC;AAuBF,eAAO,MAAM,WAAW,GAAI,sEAMzB,gBAAgB,sBAo6DlB,CAAC;AAEF,eAAe,WAAW,CAAC"}