@rowsncolumns/charts 27.0.30 → 27.0.32

package/dist/cjs/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AA8F3D,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAa1E,CAAC;AAYJ;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,GAAI,MAAM,OAAO,CAAC,SAAS,CAAC,KAAG,OAQzD,CAAC;AAcF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,GAAI,MAAM,OAAO,CAAC,SAAS,CAAC,KAAG,MAmB9D,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAqJ3D,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAgB1E,CAAC;AAYJ;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,GAAI,MAAM,OAAO,CAAC,SAAS,CAAC,KAAG,OAQzD,CAAC;AAiBF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,GAAI,MAAM,OAAO,CAAC,SAAS,CAAC,KAAG,MAmB9D,CAAC"}

package/dist/cjs/config.js

@@ -2,6 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getChartPresetLabel = exports.isDoughnutSpec = exports.CHART_TYPES = void 0;
 var tslib_1 = require("tslib");
+// Excel's 3-D chart classes degrade to a 2-D chartType with the authored
+// class kept as `sourceChartType` (BAR_3D, LINE_3D, PIE_3D, AREA_3D,
+// SURFACE, SURFACE_3D). The renderer draws BAR_3D / LINE_3D / AREA_3D /
+// surfaces through echarts-gl when WebGL is available (PIE_3D keeps the
+// 2-D pie) and both exporters write the matching `<c:…3DChart>` element.
+// A 2-D preset in the same family carries no token, and mergeChartSpec
+// clears a picker-authored one on that pick.
 var LINE_CHART_TYPES = [
     ["Line", { chartType: "line", smooth: false }],
     [
@@ -9,6 +16,7 @@ var LINE_CHART_TYPES = [
         { chartType: "line", smooth: false, stackedType: "STACKED" },
     ],
     ["Smooth line", { chartType: "line", smooth: true }],
+    ["3-D Line", { chartType: "line", smooth: false, sourceChartType: "LINE_3D" }],
 ];
 var COLUMN_CHART_TYPES = [
     ["Clustered Column", { chartType: "column", stackedType: "UNSTACKED" }],
@@ -17,11 +25,34 @@ var COLUMN_CHART_TYPES = [
         "100% stacked column",
         { chartType: "column", stackedType: "PERCENT_STACKED" },
     ],
+    [
+        "3-D Column",
+        { chartType: "column", stackedType: "UNSTACKED", sourceChartType: "BAR_3D" },
+    ],
 ];
 var BAR_CHART_TYPES = [
     ["Clustered Bar", { chartType: "bar", stackedType: "UNSTACKED" }],
     ["Stacked Bar", { chartType: "bar", stackedType: "STACKED" }],
     ["100% stacked Bar", { chartType: "bar", stackedType: "PERCENT_STACKED" }],
+    [
+        "3-D Bar",
+        { chartType: "bar", stackedType: "UNSTACKED", sourceChartType: "BAR_3D" },
+    ],
+];
+var AREA_CHART_TYPES = [
+    ["Area", { chartType: "area", stackedType: "UNSTACKED" }],
+    ["Stacked area", { chartType: "area", stackedType: "STACKED" }],
+    ["100% stacked area", { chartType: "area", stackedType: "PERCENT_STACKED" }],
+    [
+        "3-D Area",
+        { chartType: "area", stackedType: "UNSTACKED", sourceChartType: "AREA_3D" },
+    ],
+];
+// Surfaces share the area base type: `surface3DChart` is Excel's 3-D
+// Surface, `surfaceChart` its top-down Contour view.
+var SURFACE_CHART_TYPES = [
+    ["3-D Surface", { chartType: "area", sourceChartType: "SURFACE_3D" }],
+    ["Contour", { chartType: "area", sourceChartType: "SURFACE" }],
 ];
 var PIE_CHART_TYPES = [
     [
@@ -33,6 +64,26 @@ var PIE_CHART_TYPES = [
     // editor's "Chart options" section; the preset deliberately omits it
     // so re-picking "Doughnut" never clobbers an authored hole size.
     ["Doughnut", { chartType: "doughnut", stackedType: "UNSTACKED" }],
+    [
+        "3-D Pie",
+        {
+            chartType: "pie",
+            stackedType: "UNSTACKED",
+            radius: [0, "75%"],
+            sourceChartType: "PIE_3D",
+        },
+    ],
+    // Pie-of-pie / bar-of-pie composites (OOXML <c:ofPieChart>). The split
+    // rule (splitType / splitPos / secondPieSize) keeps the renderer's
+    // Excel defaults unless authored, so the presets only set the shape.
+    ["Pie of pie", { chartType: "pie", sourceChartType: "OF_PIE", ofPieType: "pie" }],
+    ["Bar of pie", { chartType: "pie", sourceChartType: "OF_PIE", ofPieType: "bar" }],
+];
+// Filled map (choropleth): category labels are region names, the first
+// series carries the values. "world" is bundled; other scopes must be
+// registered through registerChartGeoMap().
+var MAP_CHART_TYPES = [
+    ["Filled map", { chartType: "regionMap", geoScope: "world" }],
 ];
 var BUBBLE_CHART_TYPES = [
     [
@@ -84,11 +135,14 @@ exports.CHART_TYPES = [
     ["Bar", BAR_CHART_TYPES],
     ["Column", COLUMN_CHART_TYPES],
     ["Line", LINE_CHART_TYPES],
+    ["Area", AREA_CHART_TYPES],
     ["Pie", PIE_CHART_TYPES],
     ["Scatter & Bubble", BUBBLE_CHART_TYPES],
     ["Hierarchy", HIERARCHY_CHART_TYPES],
     ["Statistical", STATISTICAL_CHART_TYPES],
     ["Flow", FLOW_CHART_TYPES],
+    ["Surface", SURFACE_CHART_TYPES],
+    ["Map", MAP_CHART_TYPES],
     ["Radar", RADAR_CHART_TYPES],
     ["Stock", STOCK_CHART_TYPES],
     ["Combo", COMBO_CHART_TYPES],
@@ -133,6 +187,9 @@ var PRESET_DISCRIMINATORS = [
     ["smooth", false],
     ["radarStyle", "standard"],
     ["stockVariant", "HLC"],
+    // 3-D / of-pie variants share a chartType with their 2-D preset.
+    ["sourceChartType", undefined],
+    ["ofPieType", "pie"],
 ];
 /**
  * Derive the picker label for an existing spec — the inverse of the

package/dist/cjs/utils/chart-spec-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chart-spec-utils.d.ts","sourceRoot":"","sources":["../../../utils/chart-spec-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,SAAS,EACT,aAAa,EACb,UAAU,EACV,YAAY,EACb,MAAM,2BAA2B,CAAC;AAEnC,KAAK,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,CAAC;AACpD,KAAK,aAAa,GAAG,OAAO,GAAG,QAAQ,GAAG,WAAW,CAAC;AACtD,KAAK,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;AAEvC,eAAO,MAAM,iBAAiB,6MAe5B,CAAC;AAEH,eAAO,MAAM,kBAAkB,6MAA4C,CAAC;AAE5E,eAAO,MAAM,qBAAqB,6MAGhC,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAAI,WAAW,SAAS,KAAG,aAKvD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAC3B,MAAM,SAAS,KACd,IAAI,IAAI,SAAS,GAAG,cAAuD,CAAC;AAE/E,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,QAAQ,GAAG,SAAS,CAAC;IAChC,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC;IAC1B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,yEAAyE;IACzE,YAAY,CAAC,EACT,MAAM,GACN,QAAQ,GACR,YAAY,GACZ,cAAc,GACd,QAAQ,GACR,MAAM,GACN,IAAI,CAAC;CACV,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,MAAM,SAAS,KACd,IAAI,IAAI,SAAS,GAAG,qBACiB,CAAC;AAEzC,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG;IAC9C,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,MAAM,SAAS,KACd,IAAI,IAAI,SAAS,GAAG,kBACoB,CAAC;AAwC5C;;GAEG;AACH,eAAO,MAAM,uBAAuB,GAClC,WAAW,SAAS,KACnB,OAAO,CAAC,SAAS,CAEnB,CAAC;AA2DF;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAChC,UAAU,SAAS,EACnB,QAAQ,SAAS,KAChB,MAAM,EAoBR,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,GAAI,OAAO,SAAS,EAAE,KAAG,OAM3D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAC9B,UAAU,SAAS,EAAE,EACrB,WAAW,SAAS,EAAE,KACrB,SAAS,EAKX,CAAC;AA+BF;;;;GAIG;AACH,eAAO,MAAM,cAAc,GACzB,cAAc,SAAS,EACvB,cAAc,OAAO,CAAC,SAAS,CAAC,KAC/B,SAmDF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAI,MAAM,SAAS,KAAG,UAAU,EAsB9D,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAAI,QAAQ,OAAO,KAAG,MAQvD,CAAC"}
+{"version":3,"file":"chart-spec-utils.d.ts","sourceRoot":"","sources":["../../../utils/chart-spec-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,SAAS,EACT,aAAa,EACb,UAAU,EACV,YAAY,EACb,MAAM,2BAA2B,CAAC;AAEnC,KAAK,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,CAAC;AACpD,KAAK,aAAa,GAAG,OAAO,GAAG,QAAQ,GAAG,WAAW,CAAC;AACtD,KAAK,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;AAEvC,eAAO,MAAM,iBAAiB,6MAe5B,CAAC;AAEH,eAAO,MAAM,kBAAkB,6MAA4C,CAAC;AAE5E,eAAO,MAAM,qBAAqB,6MAGhC,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAAI,WAAW,SAAS,KAAG,aAKvD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAC3B,MAAM,SAAS,KACd,IAAI,IAAI,SAAS,GAAG,cAAuD,CAAC;AAE/E,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,QAAQ,GAAG,SAAS,CAAC;IAChC,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC;IAC1B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,yEAAyE;IACzE,YAAY,CAAC,EACT,MAAM,GACN,QAAQ,GACR,YAAY,GACZ,cAAc,GACd,QAAQ,GACR,MAAM,GACN,IAAI,CAAC;CACV,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,MAAM,SAAS,KACd,IAAI,IAAI,SAAS,GAAG,qBACiB,CAAC;AAEzC,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG;IAC9C,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,MAAM,SAAS,KACd,IAAI,IAAI,SAAS,GAAG,kBACoB,CAAC;AAwC5C;;GAEG;AACH,eAAO,MAAM,uBAAuB,GAClC,WAAW,SAAS,KACnB,OAAO,CAAC,SAAS,CAEnB,CAAC;AA8EF;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAChC,UAAU,SAAS,EACnB,QAAQ,SAAS,KAChB,MAAM,EAoBR,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,GAAI,OAAO,SAAS,EAAE,KAAG,OAM3D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAC9B,UAAU,SAAS,EAAE,EACrB,WAAW,SAAS,EAAE,KACrB,SAAS,EAKX,CAAC;AA+BF;;;;GAIG;AACH,eAAO,MAAM,cAAc,GACzB,cAAc,SAAS,EACvB,cAAc,OAAO,CAAC,SAAS,CAAC,KAC/B,SA0EF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAI,MAAM,SAAS,KAAG,UAAU,EAsB9D,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAAI,QAAQ,OAAO,KAAG,MAQvD,CAAC"}

package/dist/cjs/utils/chart-spec-utils.js

@@ -148,6 +148,23 @@ var CATEGORY_SPECIFIC_PROPERTIES = {
     ],
     hierarchy: ["labels", "parentLabels", "sizeData", "useFirstRowAsHeaders"],
 };
+/**
+ * `sourceChartType` tokens the picker's presets author (3-D classes and
+ * the of-pie composite). Picking a chart type that carries none of them
+ * resets the variant, so "Clustered Column" after "3-D Column" is 2-D
+ * again — unlike `PARETO` / `REGION_MAP`, which only import sets.
+ */
+var PICKER_VARIANT_TOKENS = new Set([
+    "BAR_3D",
+    "LINE_3D",
+    "PIE_3D",
+    "AREA_3D",
+    "SURFACE",
+    "SURFACE_3D",
+    "OF_PIE",
+]);
+/** Of-pie split fields; meaningless once the spec is no longer an of-pie. */
+var OF_PIE_FIELDS = ["ofPieType", "splitType", "splitPos", "secondPieSize"];
 /**
  * Returns the properties that should be removed when transitioning
  * from one chart type to another.
@@ -209,7 +226,8 @@ var CATEGORY_DATA_FIELDS = {
  * Also handles special merging for chart data arrays.
  */
 var mergeChartSpec = function (existingSpec, incomingSpec) {
-    var e_1, _a, e_2, _b, e_3, _c;
+    var e_1, _a, e_2, _b, e_3, _c, e_4, _d;
+    var _e, _f;
     var incomingChartType = incomingSpec.chartType;
     var existingChartType = existingSpec.chartType;
     var existingCategory = (0, exports.getChartCategory)(existingChartType);
@@ -253,6 +271,33 @@ var mergeChartSpec = function (existingSpec, incomingSpec) {
             finally { if (e_2) throw e_2.error; }
         }
     }
+    // A chart-type pick resets a picker-authored variant it doesn't carry:
+    // no incoming sourceChartType clears a 3-D / of-pie token, and leaving
+    // the of-pie composite drops its split fields (even for "3-D Pie").
+    if (incomingChartType) {
+        var existingToken = String((_e = existingSpec.sourceChartType) !== null && _e !== void 0 ? _e : "").toUpperCase();
+        var incomingToken = String((_f = incomingSpec.sourceChartType) !== null && _f !== void 0 ? _f : "").toUpperCase();
+        if (PICKER_VARIANT_TOKENS.has(existingToken) &&
+            !("sourceChartType" in incomingSpec)) {
+            delete merged.sourceChartType;
+        }
+        if (existingToken === "OF_PIE" && incomingToken !== "OF_PIE") {
+            try {
+                for (var OF_PIE_FIELDS_1 = tslib_1.__values(OF_PIE_FIELDS), OF_PIE_FIELDS_1_1 = OF_PIE_FIELDS_1.next(); !OF_PIE_FIELDS_1_1.done; OF_PIE_FIELDS_1_1 = OF_PIE_FIELDS_1.next()) {
+                    var field = OF_PIE_FIELDS_1_1.value;
+                    if (!(field in incomingSpec))
+                        delete merged[field];
+                }
+            }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            finally {
+                try {
+                    if (OF_PIE_FIELDS_1_1 && !OF_PIE_FIELDS_1_1.done && (_c = OF_PIE_FIELDS_1.return)) _c.call(OF_PIE_FIELDS_1);
+                }
+                finally { if (e_3) throw e_3.error; }
+            }
+        }
+    }
     // Apply incoming spec properties
     Object.assign(merged, incomingSpec);
     // Handle chart data array merging - preserve existing if incoming is placeholder
@@ -270,12 +315,12 @@ var mergeChartSpec = function (existingSpec, incomingSpec) {
             }
         }
     }
-    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+    catch (e_4_1) { e_4 = { error: e_4_1 }; }
     finally {
         try {
-            if (targetDataFields_1_1 && !targetDataFields_1_1.done && (_c = targetDataFields_1.return)) _c.call(targetDataFields_1);
+            if (targetDataFields_1_1 && !targetDataFields_1_1.done && (_d = targetDataFields_1.return)) _d.call(targetDataFields_1);
         }
-        finally { if (e_3) throw e_3.error; }
+        finally { if (e_4) throw e_4.error; }
     }
     return merged;
 };
@@ -285,7 +330,7 @@ exports.mergeChartSpec = mergeChartSpec;
  * Useful for subscribing to data changes across all chart data sources.
  */
 var getChartDataRanges = function (spec) {
-    var e_4, _a, e_5, _b, e_6, _c;
+    var e_5, _a, e_6, _b, e_7, _c;
     var ranges = [];
     var category = (0, exports.getChartCategory)(spec.chartType);
     var dataFields = CATEGORY_DATA_FIELDS[category];
@@ -296,43 +341,43 @@ var getChartDataRanges = function (spec) {
             var chartDataArray = specWithData[field];
             if (chartDataArray) {
                 try {
-                    for (var chartDataArray_1 = (e_5 = void 0, tslib_1.__values(chartDataArray)), chartDataArray_1_1 = chartDataArray_1.next(); !chartDataArray_1_1.done; chartDataArray_1_1 = chartDataArray_1.next()) {
+                    for (var chartDataArray_1 = (e_6 = void 0, tslib_1.__values(chartDataArray)), chartDataArray_1_1 = chartDataArray_1.next(); !chartDataArray_1_1.done; chartDataArray_1_1 = chartDataArray_1.next()) {
                         var chartData = chartDataArray_1_1.value;
                         if (chartData === null || chartData === void 0 ? void 0 : chartData.sources) {
                             try {
-                                for (var _d = (e_6 = void 0, tslib_1.__values(chartData.sources)), _e = _d.next(); !_e.done; _e = _d.next()) {
+                                for (var _d = (e_7 = void 0, tslib_1.__values(chartData.sources)), _e = _d.next(); !_e.done; _e = _d.next()) {
                                     var source = _e.value;
                                     if (source) {
                                         ranges.push(source);
                                     }
                                 }
                             }
-                            catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                            catch (e_7_1) { e_7 = { error: e_7_1 }; }
                             finally {
                                 try {
                                     if (_e && !_e.done && (_c = _d.return)) _c.call(_d);
                                 }
-                                finally { if (e_6) throw e_6.error; }
+                                finally { if (e_7) throw e_7.error; }
                             }
                         }
                     }
                 }
-                catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                catch (e_6_1) { e_6 = { error: e_6_1 }; }
                 finally {
                     try {
                         if (chartDataArray_1_1 && !chartDataArray_1_1.done && (_b = chartDataArray_1.return)) _b.call(chartDataArray_1);
                     }
-                    finally { if (e_5) throw e_5.error; }
+                    finally { if (e_6) throw e_6.error; }
                 }
             }
         }
     }
-    catch (e_4_1) { e_4 = { error: e_4_1 }; }
+    catch (e_5_1) { e_5 = { error: e_5_1 }; }
     finally {
         try {
             if (dataFields_1_1 && !dataFields_1_1.done && (_a = dataFields_1.return)) _a.call(dataFields_1);
         }
-        finally { if (e_4) throw e_4.error; }
+        finally { if (e_5) throw e_5.error; }
     }
     return ranges;
 };

package/dist/esm/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AA8F3D,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAa1E,CAAC;AAYJ;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,GAAI,MAAM,OAAO,CAAC,SAAS,CAAC,KAAG,OAQzD,CAAC;AAcF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,GAAI,MAAM,OAAO,CAAC,SAAS,CAAC,KAAG,MAmB9D,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAqJ3D,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAgB1E,CAAC;AAYJ;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,GAAI,MAAM,OAAO,CAAC,SAAS,CAAC,KAAG,OAQzD,CAAC;AAiBF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,GAAI,MAAM,OAAO,CAAC,SAAS,CAAC,KAAG,MAmB9D,CAAC"}

package/dist/esm/config.js

@@ -1,3 +1,10 @@
+// Excel's 3-D chart classes degrade to a 2-D chartType with the authored
+// class kept as `sourceChartType` (BAR_3D, LINE_3D, PIE_3D, AREA_3D,
+// SURFACE, SURFACE_3D). The renderer draws BAR_3D / LINE_3D / AREA_3D /
+// surfaces through echarts-gl when WebGL is available (PIE_3D keeps the
+// 2-D pie) and both exporters write the matching `<c:…3DChart>` element.
+// A 2-D preset in the same family carries no token, and mergeChartSpec
+// clears a picker-authored one on that pick.
 const LINE_CHART_TYPES = [
     ["Line", { chartType: "line", smooth: false }],
     [
@@ -5,6 +12,7 @@ const LINE_CHART_TYPES = [
         { chartType: "line", smooth: false, stackedType: "STACKED" },
     ],
     ["Smooth line", { chartType: "line", smooth: true }],
+    ["3-D Line", { chartType: "line", smooth: false, sourceChartType: "LINE_3D" }],
 ];
 const COLUMN_CHART_TYPES = [
     ["Clustered Column", { chartType: "column", stackedType: "UNSTACKED" }],
@@ -13,11 +21,34 @@ const COLUMN_CHART_TYPES = [
         "100% stacked column",
         { chartType: "column", stackedType: "PERCENT_STACKED" },
     ],
+    [
+        "3-D Column",
+        { chartType: "column", stackedType: "UNSTACKED", sourceChartType: "BAR_3D" },
+    ],
 ];
 const BAR_CHART_TYPES = [
     ["Clustered Bar", { chartType: "bar", stackedType: "UNSTACKED" }],
     ["Stacked Bar", { chartType: "bar", stackedType: "STACKED" }],
     ["100% stacked Bar", { chartType: "bar", stackedType: "PERCENT_STACKED" }],
+    [
+        "3-D Bar",
+        { chartType: "bar", stackedType: "UNSTACKED", sourceChartType: "BAR_3D" },
+    ],
+];
+const AREA_CHART_TYPES = [
+    ["Area", { chartType: "area", stackedType: "UNSTACKED" }],
+    ["Stacked area", { chartType: "area", stackedType: "STACKED" }],
+    ["100% stacked area", { chartType: "area", stackedType: "PERCENT_STACKED" }],
+    [
+        "3-D Area",
+        { chartType: "area", stackedType: "UNSTACKED", sourceChartType: "AREA_3D" },
+    ],
+];
+// Surfaces share the area base type: `surface3DChart` is Excel's 3-D
+// Surface, `surfaceChart` its top-down Contour view.
+const SURFACE_CHART_TYPES = [
+    ["3-D Surface", { chartType: "area", sourceChartType: "SURFACE_3D" }],
+    ["Contour", { chartType: "area", sourceChartType: "SURFACE" }],
 ];
 const PIE_CHART_TYPES = [
     [
@@ -29,6 +60,26 @@ const PIE_CHART_TYPES = [
     // editor's "Chart options" section; the preset deliberately omits it
     // so re-picking "Doughnut" never clobbers an authored hole size.
     ["Doughnut", { chartType: "doughnut", stackedType: "UNSTACKED" }],
+    [
+        "3-D Pie",
+        {
+            chartType: "pie",
+            stackedType: "UNSTACKED",
+            radius: [0, "75%"],
+            sourceChartType: "PIE_3D",
+        },
+    ],
+    // Pie-of-pie / bar-of-pie composites (OOXML <c:ofPieChart>). The split
+    // rule (splitType / splitPos / secondPieSize) keeps the renderer's
+    // Excel defaults unless authored, so the presets only set the shape.
+    ["Pie of pie", { chartType: "pie", sourceChartType: "OF_PIE", ofPieType: "pie" }],
+    ["Bar of pie", { chartType: "pie", sourceChartType: "OF_PIE", ofPieType: "bar" }],
+];
+// Filled map (choropleth): category labels are region names, the first
+// series carries the values. "world" is bundled; other scopes must be
+// registered through registerChartGeoMap().
+const MAP_CHART_TYPES = [
+    ["Filled map", { chartType: "regionMap", geoScope: "world" }],
 ];
 const BUBBLE_CHART_TYPES = [
     [
@@ -80,11 +131,14 @@ export const CHART_TYPES = [
     ["Bar", BAR_CHART_TYPES],
     ["Column", COLUMN_CHART_TYPES],
     ["Line", LINE_CHART_TYPES],
+    ["Area", AREA_CHART_TYPES],
     ["Pie", PIE_CHART_TYPES],
     ["Scatter & Bubble", BUBBLE_CHART_TYPES],
     ["Hierarchy", HIERARCHY_CHART_TYPES],
     ["Statistical", STATISTICAL_CHART_TYPES],
     ["Flow", FLOW_CHART_TYPES],
+    ["Surface", SURFACE_CHART_TYPES],
+    ["Map", MAP_CHART_TYPES],
     ["Radar", RADAR_CHART_TYPES],
     ["Stock", STOCK_CHART_TYPES],
     ["Combo", COMBO_CHART_TYPES],
@@ -128,6 +182,9 @@ const PRESET_DISCRIMINATORS = [
     ["smooth", false],
     ["radarStyle", "standard"],
     ["stockVariant", "HLC"],
+    // 3-D / of-pie variants share a chartType with their 2-D preset.
+    ["sourceChartType", undefined],
+    ["ofPieType", "pie"],
 ];
 /**
  * Derive the picker label for an existing spec — the inverse of the

package/dist/esm/utils/chart-spec-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chart-spec-utils.d.ts","sourceRoot":"","sources":["../../../utils/chart-spec-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,SAAS,EACT,aAAa,EACb,UAAU,EACV,YAAY,EACb,MAAM,2BAA2B,CAAC;AAEnC,KAAK,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,CAAC;AACpD,KAAK,aAAa,GAAG,OAAO,GAAG,QAAQ,GAAG,WAAW,CAAC;AACtD,KAAK,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;AAEvC,eAAO,MAAM,iBAAiB,6MAe5B,CAAC;AAEH,eAAO,MAAM,kBAAkB,6MAA4C,CAAC;AAE5E,eAAO,MAAM,qBAAqB,6MAGhC,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAAI,WAAW,SAAS,KAAG,aAKvD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAC3B,MAAM,SAAS,KACd,IAAI,IAAI,SAAS,GAAG,cAAuD,CAAC;AAE/E,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,QAAQ,GAAG,SAAS,CAAC;IAChC,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC;IAC1B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,yEAAyE;IACzE,YAAY,CAAC,EACT,MAAM,GACN,QAAQ,GACR,YAAY,GACZ,cAAc,GACd,QAAQ,GACR,MAAM,GACN,IAAI,CAAC;CACV,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,MAAM,SAAS,KACd,IAAI,IAAI,SAAS,GAAG,qBACiB,CAAC;AAEzC,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG;IAC9C,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,MAAM,SAAS,KACd,IAAI,IAAI,SAAS,GAAG,kBACoB,CAAC;AAwC5C;;GAEG;AACH,eAAO,MAAM,uBAAuB,GAClC,WAAW,SAAS,KACnB,OAAO,CAAC,SAAS,CAEnB,CAAC;AA2DF;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAChC,UAAU,SAAS,EACnB,QAAQ,SAAS,KAChB,MAAM,EAoBR,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,GAAI,OAAO,SAAS,EAAE,KAAG,OAM3D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAC9B,UAAU,SAAS,EAAE,EACrB,WAAW,SAAS,EAAE,KACrB,SAAS,EAKX,CAAC;AA+BF;;;;GAIG;AACH,eAAO,MAAM,cAAc,GACzB,cAAc,SAAS,EACvB,cAAc,OAAO,CAAC,SAAS,CAAC,KAC/B,SAmDF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAI,MAAM,SAAS,KAAG,UAAU,EAsB9D,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAAI,QAAQ,OAAO,KAAG,MAQvD,CAAC"}
+{"version":3,"file":"chart-spec-utils.d.ts","sourceRoot":"","sources":["../../../utils/chart-spec-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,SAAS,EACT,aAAa,EACb,UAAU,EACV,YAAY,EACb,MAAM,2BAA2B,CAAC;AAEnC,KAAK,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,CAAC;AACpD,KAAK,aAAa,GAAG,OAAO,GAAG,QAAQ,GAAG,WAAW,CAAC;AACtD,KAAK,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;AAEvC,eAAO,MAAM,iBAAiB,6MAe5B,CAAC;AAEH,eAAO,MAAM,kBAAkB,6MAA4C,CAAC;AAE5E,eAAO,MAAM,qBAAqB,6MAGhC,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAAI,WAAW,SAAS,KAAG,aAKvD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAC3B,MAAM,SAAS,KACd,IAAI,IAAI,SAAS,GAAG,cAAuD,CAAC;AAE/E,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,QAAQ,GAAG,SAAS,CAAC;IAChC,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC;IAC1B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,yEAAyE;IACzE,YAAY,CAAC,EACT,MAAM,GACN,QAAQ,GACR,YAAY,GACZ,cAAc,GACd,QAAQ,GACR,MAAM,GACN,IAAI,CAAC;CACV,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,MAAM,SAAS,KACd,IAAI,IAAI,SAAS,GAAG,qBACiB,CAAC;AAEzC,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG;IAC9C,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,MAAM,SAAS,KACd,IAAI,IAAI,SAAS,GAAG,kBACoB,CAAC;AAwC5C;;GAEG;AACH,eAAO,MAAM,uBAAuB,GAClC,WAAW,SAAS,KACnB,OAAO,CAAC,SAAS,CAEnB,CAAC;AA8EF;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAChC,UAAU,SAAS,EACnB,QAAQ,SAAS,KAChB,MAAM,EAoBR,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,GAAI,OAAO,SAAS,EAAE,KAAG,OAM3D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAC9B,UAAU,SAAS,EAAE,EACrB,WAAW,SAAS,EAAE,KACrB,SAAS,EAKX,CAAC;AA+BF;;;;GAIG;AACH,eAAO,MAAM,cAAc,GACzB,cAAc,SAAS,EACvB,cAAc,OAAO,CAAC,SAAS,CAAC,KAC/B,SA0EF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAI,MAAM,SAAS,KAAG,UAAU,EAsB9D,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAAI,QAAQ,OAAO,KAAG,MAQvD,CAAC"}

package/dist/esm/utils/chart-spec-utils.js

@@ -134,6 +134,23 @@ const CATEGORY_SPECIFIC_PROPERTIES = {
     ],
     hierarchy: ["labels", "parentLabels", "sizeData", "useFirstRowAsHeaders"],
 };
+/**
+ * `sourceChartType` tokens the picker's presets author (3-D classes and
+ * the of-pie composite). Picking a chart type that carries none of them
+ * resets the variant, so "Clustered Column" after "3-D Column" is 2-D
+ * again — unlike `PARETO` / `REGION_MAP`, which only import sets.
+ */
+const PICKER_VARIANT_TOKENS = new Set([
+    "BAR_3D",
+    "LINE_3D",
+    "PIE_3D",
+    "AREA_3D",
+    "SURFACE",
+    "SURFACE_3D",
+    "OF_PIE",
+]);
+/** Of-pie split fields; meaningless once the spec is no longer an of-pie. */
+const OF_PIE_FIELDS = ["ofPieType", "splitType", "splitPos", "secondPieSize"];
 /**
  * Returns the properties that should be removed when transitioning
  * from one chart type to another.
@@ -212,6 +229,23 @@ export const mergeChartSpec = (existingSpec, incomingSpec) => {
             delete merged[field];
         }
     }
+    // A chart-type pick resets a picker-authored variant it doesn't carry:
+    // no incoming sourceChartType clears a 3-D / of-pie token, and leaving
+    // the of-pie composite drops its split fields (even for "3-D Pie").
+    if (incomingChartType) {
+        const existingToken = String(existingSpec.sourceChartType ?? "").toUpperCase();
+        const incomingToken = String(incomingSpec.sourceChartType ?? "").toUpperCase();
+        if (PICKER_VARIANT_TOKENS.has(existingToken) &&
+            !("sourceChartType" in incomingSpec)) {
+            delete merged.sourceChartType;
+        }
+        if (existingToken === "OF_PIE" && incomingToken !== "OF_PIE") {
+            for (const field of OF_PIE_FIELDS) {
+                if (!(field in incomingSpec))
+                    delete merged[field];
+            }
+        }
+    }
     // Apply incoming spec properties
     Object.assign(merged, incomingSpec);
     // Handle chart data array merging - preserve existing if incoming is placeholder

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rowsncolumns/charts",
-  "version": "27.0.30",
+  "version": "27.0.32",
   "author": "Vinay M",
   "license": "SEE LICENSE IN LICENSE.md",
   "main": "./dist/cjs/index.js",
@@ -64,13 +64,13 @@
     "world-atlas": "^2.0.2"
   },
   "devDependencies": {
-    "@rowsncolumns/calculator": ">=7.2.29",
-    "@rowsncolumns/grid": ">=13.2.32",
-    "@rowsncolumns/spreadsheet": ">=10.2.68",
-    "@rowsncolumns/spreadsheet-state": ">=28.0.66",
-    "@rowsncolumns/toolkit": ">=24.4.1",
-    "@rowsncolumns/ui": ">=15.0.38",
-    "@rowsncolumns/utils": ">=9.2.35",
+    "@rowsncolumns/calculator": ">=7.2.31",
+    "@rowsncolumns/grid": ">=13.2.33",
+    "@rowsncolumns/spreadsheet": ">=10.2.74",
+    "@rowsncolumns/spreadsheet-state": ">=28.0.73",
+    "@rowsncolumns/toolkit": ">=24.4.3",
+    "@rowsncolumns/ui": ">=15.0.39",
+    "@rowsncolumns/utils": ">=9.2.40",
     "@types/react-plotly.js": "^2.6.3",
     "echarts": "^5.6.0",
     "formik": "^2.4.6",
@@ -79,13 +79,13 @@
     "react-plotly.js": "^2.6.0"
   },
   "peerDependencies": {
-    "@rowsncolumns/calculator": ">=7.2.29",
-    "@rowsncolumns/grid": ">=13.2.32",
-    "@rowsncolumns/spreadsheet": ">=10.2.68",
-    "@rowsncolumns/spreadsheet-state": ">=28.0.66",
-    "@rowsncolumns/toolkit": ">=24.4.1",
-    "@rowsncolumns/ui": ">=15.0.38",
-    "@rowsncolumns/utils": ">=9.2.35",
+    "@rowsncolumns/calculator": ">=7.2.31",
+    "@rowsncolumns/grid": ">=13.2.33",
+    "@rowsncolumns/spreadsheet": ">=10.2.74",
+    "@rowsncolumns/spreadsheet-state": ">=28.0.73",
+    "@rowsncolumns/toolkit": ">=24.4.3",
+    "@rowsncolumns/ui": ">=15.0.39",
+    "@rowsncolumns/utils": ">=9.2.40",
     "immer": ">10.0.0",
     "jotai": ">=2.10.3",
     "plotly.js": ">=3",