@rowsncolumns/charts 28.1.6 → 28.1.7

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,sBAo6DlB,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,sBAw6DlB,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/dist/cjs/components/editors/chart-editor.js

@@ -699,7 +699,11 @@ var ChartEditor = function (_a) {
                                     react_1.default.createElement("option", { value: "outside" }, "Outside"),
                                     react_1.default.createElement("option", { value: "insideEnd" }, "Inside end"),
                                     react_1.default.createElement("option", { value: "outsideEnd" }, "Outside end"),
-                                    react_1.default.createElement("option", { value: "bestFit" }, "Best fit")),
+                                    react_1.default.createElement("option", { value: "bestFit" }, "Best fit"),
+                                    react_1.default.createElement("option", { value: "above" }, "Above"),
+                                    react_1.default.createElement("option", { value: "below" }, "Below"),
+                                    react_1.default.createElement("option", { value: "left" }, "Left"),
+                                    react_1.default.createElement("option", { value: "right" }, "Right")),
                                 react_1.default.createElement("label", { className: "font-system text-xs" }, "Number format pattern"),
                                 react_1.default.createElement(ui_1.Input, { value: (_30 = (_29 = values === null || values === void 0 ? void 0 : values.spec.dataLabels) === null || _29 === void 0 ? void 0 : _29.numberFormatPattern) !== null && _30 !== void 0 ? _30 : "", type: "text", onChange: function (e) {
                                         return setFieldValue("spec.dataLabels.numberFormatPattern", e.target.value || undefined);

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

@@ -1,5 +1,5 @@
 import React from "react";
 import type { EChartComponentProps } from "../../types";
 export type BasicChartProps = EChartComponentProps;
-export declare const BasicChart: ({ width, height, chart, theme, isDarkMode, sheetId, readonly, getDomainValuesFromRange, getSeriesValuesFromRange, getFormattingFromRange, onDeleteChart, onUpdateChart, onRequestEdit, onRequestCalculate, isSelected, fieldButtons, }: BasicChartProps) => React.JSX.Element;
+export declare const BasicChart: ({ width, height, chart, theme, isDarkMode, sheetId, readonly, getDomainValuesFromRange, getSeriesValuesFromRange, getFormattingFromRange, onDeleteChart, onUpdateChart, onRequestEdit, onRequestCalculate, isSelected, fieldButtons, locale, }: BasicChartProps) => React.JSX.Element;
 //# sourceMappingURL=basic-chart.d.ts.map

package/dist/cjs/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":"AAoCA,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,sBA8zEjB,CAAC"}
+{"version":3,"file":"basic-chart.d.ts","sourceRoot":"","sources":["../../../../plotly/basic-chart/basic-chart.tsx"],"names":[],"mappings":"AAoCA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAEtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAuZxD,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC;AA0FnD,eAAO,MAAM,UAAU,GAAI,gPAkBxB,eAAe,sBA00EjB,CAAC"}

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

@@ -181,15 +181,45 @@ var PLOTLY_DLBL_POS_BAR = {
     insideEnd: "inside",
     outsideEnd: "outside",
     bestFit: "outside",
+    above: "outside",
+    below: "outside",
+    left: "outside",
+    right: "outside",
 };
-var applyDataLabelsToTracePlotly = function (trace, opts, chartType, sourceNumberFormat) {
+// A scatter trace (line / area / scatter) places its text with the compass
+// positions, and only draws it when `mode` carries `text`. Excel's line
+// placements are centre / left / right / above / below; the bar-only ones
+// land on Excel's default for a line, above the point (#1049).
+var PLOTLY_DLBL_POS_POINT = {
+    center: "middle center",
+    inside: "middle center",
+    outside: "top center",
+    insideEnd: "top center",
+    outsideEnd: "top center",
+    bestFit: "top center",
+    above: "top center",
+    below: "bottom center",
+    left: "middle left",
+    right: "middle right",
+};
+var withTextMode = function (mode) {
+    var base = typeof mode === "string" && mode ? mode : "lines+markers";
+    return base.split("+").includes("text") ? base : "".concat(base, "+text");
+};
+var applyDataLabelsToTracePlotly = function (trace, opts, chartType, sourceNumberFormat, locale) {
     var _a, _b, _c;
     if (!(opts === null || opts === void 0 ? void 0 : opts.show))
         return trace;
     var next = tslib_1.__assign({}, trace);
     var isCircular = chartType === "pie" || chartType === "doughnut";
-    var posMap = isCircular ? PLOTLY_DLBL_POS_PIE : PLOTLY_DLBL_POS_BAR;
-    var position = opts.position ? (_a = posMap[opts.position]) !== null && _a !== void 0 ? _a : "inside" : "inside";
+    var isPoint = !isCircular && next.type === "scatter";
+    var posMap = isCircular
+        ? PLOTLY_DLBL_POS_PIE
+        : isPoint
+            ? PLOTLY_DLBL_POS_POINT
+            : PLOTLY_DLBL_POS_BAR;
+    var fallback = isPoint ? "top center" : "inside";
+    var position = opts.position ? (_a = posMap[opts.position]) !== null && _a !== void 0 ? _a : fallback : fallback;
     if (isCircular) {
         // Plotly's pie trace uses `textinfo` to control which fields render.
         var parts = [];
@@ -207,7 +237,9 @@ var applyDataLabelsToTracePlotly = function (trace, opts, chartType, sourceNumbe
         var pattern_1 = (_b = opts.numberFormatPattern) !== null && _b !== void 0 ? _b : sourceNumberFormat;
         if (pattern_1) {
             var values = Array.isArray(next.values) ? next.values : [];
-            next.text = values.map(function (v) { return (0, axis_number_format_1.formatAxisValue)(pattern_1, v); });
+            next.text = values.map(function (v) {
+                return (0, axis_number_format_1.formatAxisValue)(pattern_1, v, locale);
+            });
             next.texttemplate = next.textinfo
                 .split("+")
                 .map(function (part) { return (part === "value" ? "%{text}" : "%{".concat(part, "}")); })
@@ -226,9 +258,15 @@ var applyDataLabelsToTracePlotly = function (trace, opts, chartType, sourceNumbe
         var values = next.orientation === "h" ? next.x : next.y;
         var vals = Array.isArray(values) ? values : [];
         next.text = pattern_2
-            ? vals.map(function (v) { return (v === null || v === undefined ? "" : (0, utils_1.ssfFormat)(pattern_2, v)); })
-            : values;
+            ? vals.map(function (v) {
+                return v === null || v === undefined ? "" : (0, utils_1.ssfFormat)(pattern_2, v, locale);
+            })
+            : locale
+                ? vals.map(function (v) { return (0, axis_number_format_1.formatAxisValue)(undefined, v, locale); })
+                : values;
         next.textposition = position;
+        if (isPoint)
+            next.mode = withTextMode(next.mode);
     }
     return next;
 };
@@ -369,7 +407,7 @@ var addAlphaToColor = function (color, alpha) {
 };
 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;
+    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, locale = _a.locale;
     var spec = chart.spec;
     var hierarchyTitleRef = (0, react_1.useRef)(undefined);
     var explicitChartTitle = (_b = chart.spec.title) !== null && _b !== void 0 ? _b : undefined;
@@ -1754,6 +1792,7 @@ var BasicChart = function (_a) {
                         : (0, axis_number_format_1.valueAxisNameGap)({
                             values: primaryValues,
                             pattern: primaryAxisNumberFormat,
+                            locale: locale,
                             fontSize: axisFontSize,
                             minimum: 0,
                         }) -
@@ -1771,6 +1810,7 @@ var BasicChart = function (_a) {
                                     : [];
                             }),
                             pattern: secondaryAxisNumberFormat,
+                            locale: locale,
                             fontSize: axisFontSize,
                             minimum: 0,
                         }) -
@@ -1882,12 +1922,14 @@ var BasicChart = function (_a) {
                     formattedTraces = traces.map(function (trace) {
                         var _a;
                         var pattern = traceNumberFormat(trace);
-                        var next = applyDataLabelsToTracePlotly(trace, dlOpts, spec.chartType, pattern);
+                        var next = applyDataLabelsToTracePlotly(trace, dlOpts, spec.chartType, pattern, locale);
                         if (next.type === "pie") {
                             // Hover values format like the slice's source cell.
                             if (pattern && !next.text) {
                                 var values = Array.isArray(next.values) ? next.values : [];
-                                next = tslib_1.__assign(tslib_1.__assign({}, next), { text: values.map(function (v) { return (0, axis_number_format_1.formatAxisValue)(pattern, v); }), hoverinfo: "label+text+percent+name" });
+                                next = tslib_1.__assign(tslib_1.__assign({}, next), { text: values.map(function (v) {
+                                        return (0, axis_number_format_1.formatAxisValue)(pattern, v, locale);
+                                    }), hoverinfo: "label+text+percent+name" });
                             }
                             else if (pattern) {
                                 next = tslib_1.__assign(tslib_1.__assign({}, next), { hoverinfo: "label+text+percent+name" });
@@ -1911,7 +1953,7 @@ var BasicChart = function (_a) {
                             var values = horizontal ? next.x : next.y;
                             if (seriesPattern_1 && Array.isArray(values)) {
                                 next = tslib_1.__assign(tslib_1.__assign({}, next), { customdata: values.map(function (v) {
-                                        return (0, axis_number_format_1.formatAxisValue)(seriesPattern_1, v);
+                                        return (0, axis_number_format_1.formatAxisValue)(seriesPattern_1, v, locale);
                                     }), hovertemplate: "".concat(horizontal ? "%{y}" : "%{x}", "<br>%{customdata}<extra>%{fullData.name}</extra>") });
                             }
                         }
@@ -1951,6 +1993,7 @@ var BasicChart = function (_a) {
         getDomainValuesFromRange,
         getSeriesValuesFromRange,
         getFormattingFromRange,
+        locale,
     ]);
     // Update theme
     (0, ui_1.useIsomorphicLayoutEffect)(function () {
@@ -1984,7 +2027,9 @@ var BasicChart = function (_a) {
         scrollZoom: false,
         doubleClick: false,
     };
-    var plotLayout = (0, react_1.useMemo)(function () { return (tslib_1.__assign(tslib_1.__assign({}, layout), { dragmode: false })); }, [layout]);
+    // Ticks and hover values plotly formats itself use the sheet's separators.
+    var separators = (0, react_1.useMemo)(function () { return (0, axis_number_format_1.plotlySeparators)(locale); }, [locale]);
+    var plotLayout = (0, react_1.useMemo)(function () { return (tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, layout), { dragmode: false }), (separators ? { separators: separators } : {}))); }, [layout, separators]);
     // Excel's "Rounded Corners" chart frame (`<c:roundedCorners val="1"/>`
     // at the chartSpace root). Default per OOXML §21.2.2.183 is square,
     // so only opt in when the workbook explicitly set the flag.

package/dist/cjs/utils/axis-number-format.d.ts

@@ -26,17 +26,28 @@ export declare const resolveValueAxisNumberFormat: ({ axisOptions, series, getFo
     getFormattingFromRange: RangeFormatReader | undefined;
     hiddenDimensionStrategy?: HIDDEN_DIMENSION_STRATEGY | null;
 }) => string | undefined;
-/** Format one numeric value through the resolved pattern; non-numbers pass through. */
-export declare const formatAxisValue: (pattern: string | undefined, value: unknown) => string;
-/** echarts `axisLabel.formatter` / `tooltip.valueFormatter` for a value axis. */
-export declare const valueAxisLabelFormatter: (pattern: string | undefined) => ((value: unknown) => string) | undefined;
+export declare const formatPlainNumber: (value: number, locale: string | undefined, grouping?: boolean) => string;
+/**
+ * Format one numeric value through the resolved pattern; non-numbers pass
+ * through. `locale` is the spreadsheet locale the cells format with: it
+ * picks the pattern's separators, and a number without a pattern reads
+ * like a `General` cell in that locale.
+ */
+export declare const formatAxisValue: (pattern: string | undefined, value: unknown, locale?: string) => string;
+/**
+ * echarts `axisLabel.formatter` / `tooltip.valueFormatter` for a value
+ * axis. Without a pattern the ticks keep echarts' own labels unless a
+ * locale is given, in which case they group thousands the way echarts
+ * does but with the locale's separators (#1050).
+ */
+export declare const valueAxisLabelFormatter: (pattern: string | undefined, locale?: string) => ((value: unknown) => string) | undefined;
 /**
  * echarts `tooltip.valueFormatter` for a series whose data items are
  * tuples (candlestick, 3-D points): every number formats through the
  * pattern; `undefined` when there is no pattern so echarts keeps its
  * default.
  */
-export declare const tooltipValueFormatter: (pattern: string | undefined) => ((value: unknown) => string | string[]) | undefined;
+export declare const tooltipValueFormatter: (pattern: string | undefined, locale?: string) => ((value: unknown) => string | string[]) | undefined;
 /**
  * Excel's data labels and tooltips are linked to *each series' own* source
  * cells, not to the axis: a revenue series formatted `$#,##0` next to a
@@ -45,11 +56,18 @@ export declare const tooltipValueFormatter: (pattern: string | undefined) => ((v
  */
 export declare const resolveSeriesNumberFormats: (series: Pick<ChartData, "sources">[] | undefined, getFormattingFromRange: RangeFormatReader | undefined, hiddenDimensionStrategy?: HIDDEN_DIMENSION_STRATEGY | null) => (string | undefined)[];
 /** echarts pie / doughnut tooltip: `name: value (percent%)` with the value formatted. */
-export declare const circularTooltipFormatter: (pattern: string | undefined) => (params: {
+export declare const circularTooltipFormatter: (pattern: string | undefined, locale?: string) => (params: {
     name?: string;
     value?: unknown;
     percent?: number;
 }) => string;
+/**
+ * plotly `layout.separators` for the spreadsheet locale: the decimal
+ * separator followed by the thousands separator, so ticks and hover
+ * values plotly formats itself read like the sheet's cells (#1050).
+ * `undefined` without a locale keeps plotly's default (`.,`).
+ */
+export declare const plotlySeparators: (locale: string | undefined) => string | undefined;
 export type PlotlyTickFormat = {
     tickformat?: string;
     tickprefix?: string;
@@ -73,9 +91,10 @@ export declare const numberFormatToPlotlyTicks: (pattern: string | undefined) =>
  * measured; the fixed default of 50px only fits labels up to ~4 digits and
  * lets a currency axis title paint over its own tick labels.
  */
-export declare const valueAxisNameGap: ({ values, pattern, fontSize, minimum, }: {
+export declare const valueAxisNameGap: ({ values, pattern, locale, fontSize, minimum, }: {
     values: readonly unknown[];
     pattern: string | undefined;
+    locale?: string;
     fontSize?: number;
     minimum?: number;
 }) => number;

package/dist/cjs/utils/axis-number-format.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"axis-number-format.d.ts","sourceRoot":"","sources":["../../../utils/axis-number-format.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,yBAAyB,EACzB,KAAK,EACL,UAAU,EACX,MAAM,2BAA2B,CAAC;AAWnC,KAAK,iBAAiB,GAAG,CACvB,UAAU,EAAE,UAAU,EACtB,uBAAuB,CAAC,EAAE,yBAAyB,KAChD,OAAO,EAAE,CAAC;AAMf;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAAI,SAAS,KAAK,CAAC,MAAM,CAAC,GAAG,SAAS,YAGjC,CAAC;AAExC;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,GACpC,SAAS,UAAU,EAAE,GAAG,SAAS,EACjC,wBAAwB,iBAAiB,GAAG,SAAS,EACrD,0BAA0B,yBAAyB,GAAG,IAAI,KACzD,MAAM,GAAG,SAWX,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,GAAI,2EAK1C;IACD,WAAW,EAAE,KAAK,CAAC;QAAE,mBAAmB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;KAAE,CAAC,GAAG,SAAS,CAAC;IACxE,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC;IACrC,sBAAsB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACtD,uBAAuB,CAAC,EAAE,yBAAyB,GAAG,IAAI,CAAC;CAC5D,KAAG,MAAM,GAAG,SAQZ,CAAC;AAEF,uFAAuF;AACvF,eAAO,MAAM,eAAe,GAC1B,SAAS,MAAM,GAAG,SAAS,EAC3B,OAAO,OAAO,KACb,MAIF,CAAC;AAEF,iFAAiF;AACjF,eAAO,MAAM,uBAAuB,GAAI,SAAS,MAAM,GAAG,SAAS,cAC/C,OAAO,wBAAgD,CAAC;AAE5E;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAAI,SAAS,MAAM,GAAG,SAAS,cAEnD,OAAO,mCAIN,CAAC;AAEhB;;;;;GAKG;AACH,eAAO,MAAM,0BAA0B,GACrC,QAAQ,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,GAAG,SAAS,EAChD,wBAAwB,iBAAiB,GAAG,SAAS,EACrD,0BAA0B,yBAAyB,GAAG,IAAI,KACzD,CAAC,MAAM,GAAG,SAAS,CAAC,EAOpB,CAAC;AAEJ,yFAAyF;AACzF,eAAO,MAAM,wBAAwB,GAClC,SAAS,MAAM,GAAG,SAAS,MAC3B,QAAQ;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,WAGvD,CAAC;AAET,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,yBAAyB,GACpC,SAAS,MAAM,GAAG,SAAS,KAC1B,gBAAgB,GAAG,SA4DrB,CAAC;AA2BF;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,GAAI,yCAK9B;IACD,MAAM,EAAE,SAAS,OAAO,EAAE,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,KAAG,MAgBH,CAAC"}
+{"version":3,"file":"axis-number-format.d.ts","sourceRoot":"","sources":["../../../utils/axis-number-format.ts"],"names":[],"mappings":"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"}

package/dist/cjs/utils/axis-number-format.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.valueAxisNameGap = exports.numberFormatToPlotlyTicks = exports.circularTooltipFormatter = exports.resolveSeriesNumberFormats = exports.tooltipValueFormatter = exports.valueAxisLabelFormatter = exports.formatAxisValue = exports.resolveValueAxisNumberFormat = exports.resolveSourceNumberFormat = exports.isGeneralNumberFormat = void 0;
+exports.valueAxisNameGap = exports.numberFormatToPlotlyTicks = exports.plotlySeparators = exports.circularTooltipFormatter = exports.resolveSeriesNumberFormats = exports.tooltipValueFormatter = exports.valueAxisLabelFormatter = exports.formatAxisValue = exports.formatPlainNumber = exports.resolveValueAxisNumberFormat = exports.resolveSourceNumberFormat = exports.isGeneralNumberFormat = void 0;
 var tslib_1 = require("tslib");
 var utils_1 = require("@rowsncolumns/utils");
 var patternOf = function (format) {
@@ -62,18 +62,74 @@ var resolveValueAxisNumberFormat = function (_a) {
     return (0, exports.resolveSourceNumberFormat)((_b = series[0]) === null || _b === void 0 ? void 0 : _b.sources, getFormattingFromRange, hiddenDimensionStrategy);
 };
 exports.resolveValueAxisNumberFormat = resolveValueAxisNumberFormat;
-/** Format one numeric value through the resolved pattern; non-numbers pass through. */
-var formatAxisValue = function (pattern, value) {
+// A number with no number format, in the spreadsheet locale (#1050). The
+// grid's cells show such a value through `General` — the locale's decimal
+// separator, no grouping — so a data label or tooltip reads the same;
+// echarts' default tick label groups thousands, so ticks keep grouping.
+// `toPrecision(15)` is Excel's significant-digit view of the double, which
+// drops binary noise such as `0.30000000000000004`.
+var plainNumberFormatters = new Map();
+var plainNumberFormatter = function (locale, grouping) {
+    var key = "".concat(locale, "\0").concat(grouping ? 1 : 0);
+    var formatter = plainNumberFormatters.get(key);
+    if (!formatter) {
+        try {
+            formatter = new Intl.NumberFormat(locale, {
+                useGrouping: grouping,
+                maximumFractionDigits: 20,
+            });
+        }
+        catch (_a) {
+            formatter = new Intl.NumberFormat("en-US", {
+                useGrouping: grouping,
+                maximumFractionDigits: 20,
+            });
+        }
+        plainNumberFormatters.set(key, formatter);
+    }
+    return formatter;
+};
+var formatPlainNumber = function (value, locale, grouping) {
+    if (grouping === void 0) { grouping = false; }
+    return Number.isFinite(value)
+        ? plainNumberFormatter(locale !== null && locale !== void 0 ? locale : "en-US", grouping).format(Number(value.toPrecision(15)))
+        : String(value);
+};
+exports.formatPlainNumber = formatPlainNumber;
+/**
+ * Format one numeric value through the resolved pattern; non-numbers pass
+ * through. `locale` is the spreadsheet locale the cells format with: it
+ * picks the pattern's separators, and a number without a pattern reads
+ * like a `General` cell in that locale.
+ */
+var formatAxisValue = function (pattern, value, locale) {
     if (value === undefined || value === null)
         return "";
-    if (pattern && typeof value === "number")
-        return (0, utils_1.ssfFormat)(pattern, value);
+    if (typeof value === "number") {
+        if (pattern)
+            return (0, utils_1.ssfFormat)(pattern, value, locale);
+        if (locale)
+            return (0, exports.formatPlainNumber)(value, locale);
+    }
     return String(value);
 };
 exports.formatAxisValue = formatAxisValue;
-/** echarts `axisLabel.formatter` / `tooltip.valueFormatter` for a value axis. */
-var valueAxisLabelFormatter = function (pattern) {
-    return pattern ? function (value) { return (0, exports.formatAxisValue)(pattern, value); } : undefined;
+/**
+ * echarts `axisLabel.formatter` / `tooltip.valueFormatter` for a value
+ * axis. Without a pattern the ticks keep echarts' own labels unless a
+ * locale is given, in which case they group thousands the way echarts
+ * does but with the locale's separators (#1050).
+ */
+var valueAxisLabelFormatter = function (pattern, locale) {
+    return pattern
+        ? function (value) { return (0, exports.formatAxisValue)(pattern, value, locale); }
+        : locale
+            ? function (value) {
+                return typeof value === "number"
+                    ? (0, exports.formatPlainNumber)(value, locale, true)
+                    : (0, exports.formatAxisValue)(undefined, value);
+            }
+            : undefined;
 };
 exports.valueAxisLabelFormatter = valueAxisLabelFormatter;
 /**
@@ -82,12 +138,12 @@ exports.valueAxisLabelFormatter = valueAxisLabelFormatter;
  * pattern; `undefined` when there is no pattern so echarts keeps its
  * default.
  */
-var tooltipValueFormatter = function (pattern) {
+var tooltipValueFormatter = function (pattern, locale) {
     return pattern
         ? function (value) {
             return Array.isArray(value)
-                ? value.map(function (entry) { return (0, exports.formatAxisValue)(pattern, entry); })
-                : (0, exports.formatAxisValue)(pattern, value);
+                ? value.map(function (entry) { return (0, exports.formatAxisValue)(pattern, entry, locale); })
+                : (0, exports.formatAxisValue)(pattern, value, locale);
         }
         : undefined;
 };
@@ -105,13 +161,35 @@ var resolveSeriesNumberFormats = function (series, getFormattingFromRange, hidde
 };
 exports.resolveSeriesNumberFormats = resolveSeriesNumberFormats;
 /** echarts pie / doughnut tooltip: `name: value (percent%)` with the value formatted. */
-var circularTooltipFormatter = function (pattern) {
+var circularTooltipFormatter = function (pattern, locale) {
     return function (params) {
         var _a, _b;
-        return "".concat((_a = params.name) !== null && _a !== void 0 ? _a : "", ": ").concat((0, exports.formatAxisValue)(pattern, params.value), " (").concat((_b = params.percent) !== null && _b !== void 0 ? _b : "", "%)");
+        return "".concat((_a = params.name) !== null && _a !== void 0 ? _a : "", ": ").concat((0, exports.formatAxisValue)(pattern, params.value, locale), " (").concat((_b = params.percent) !== null && _b !== void 0 ? _b : "", "%)");
     };
 };
 exports.circularTooltipFormatter = circularTooltipFormatter;
+/**
+ * plotly `layout.separators` for the spreadsheet locale: the decimal
+ * separator followed by the thousands separator, so ticks and hover
+ * values plotly formats itself read like the sheet's cells (#1050).
+ * `undefined` without a locale keeps plotly's default (`.,`).
+ */
+var plotlySeparators = function (locale) {
+    var _a, _b, _c, _d;
+    if (!locale)
+        return undefined;
+    var parts;
+    try {
+        parts = new Intl.NumberFormat(locale).formatToParts(1234.5);
+    }
+    catch (_e) {
+        return undefined;
+    }
+    var decimal = (_b = (_a = parts.find(function (p) { return p.type === "decimal"; })) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : ".";
+    var group = (_d = (_c = parts.find(function (p) { return p.type === "group"; })) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : ",";
+    return "".concat(decimal).concat(group);
+};
+exports.plotlySeparators = plotlySeparators;
 /**
  * Translate the numeric subset of a SpreadsheetML pattern into plotly's
  * d3-format axis settings (`tickformat` + literal prefix / suffix). Plotly
@@ -238,16 +316,16 @@ var measureLabelWidth = function (text, fontSize) {
  * lets a currency axis title paint over its own tick labels.
  */
 var valueAxisNameGap = function (_a) {
-    var values = _a.values, pattern = _a.pattern, _b = _a.fontSize, fontSize = _b === void 0 ? 12 : _b, _c = _a.minimum, minimum = _c === void 0 ? 50 : _c;
+    var values = _a.values, pattern = _a.pattern, locale = _a.locale, _b = _a.fontSize, fontSize = _b === void 0 ? 12 : _b, _c = _a.minimum, minimum = _c === void 0 ? 50 : _c;
     var numbers = values.filter(function (v) { return typeof v === "number" && Number.isFinite(v); });
     if (!numbers.length)
         return minimum;
     var min = Math.min.apply(Math, tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(numbers), false), [0], false));
     var max = Math.max.apply(Math, tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(numbers), false), [0], false));
     // echarts' default axis label puts thousands separators on plain numbers.
-    var defaultLabel = function (v) { return v.toLocaleString("en-US"); };
+    var defaultLabel = function (v) { return (0, exports.formatPlainNumber)(v, locale, true); };
     var labels = [min, max].map(function (v) {
-        return pattern ? (0, exports.formatAxisValue)(pattern, v) : defaultLabel(v);
+        return pattern ? (0, exports.formatAxisValue)(pattern, v, locale) : defaultLabel(v);
     });
     var widest = Math.max.apply(Math, tslib_1.__spreadArray([], tslib_1.__read(labels.map(function (l) { return measureLabelWidth(l, fontSize); })), false));
     // 8px tick-label margin + the rotated title's own line box + breathing room.

package/dist/cjs/utils/overrides.d.ts

@@ -7,9 +7,9 @@ export declare const applyLegendOverrides: (legend: LegendComponentOption, opts:
  * the linked source-cell format — see `resolveValueAxisNumberFormat`); it
  * becomes the tick-label formatter.
  */
-export declare const applyAxisOverrides: (axis: any, opts: any, numberFormatPattern?: string) => any;
-export declare const dataLabelFormatter: (opts: any) => (params: any) => string;
-export declare const buildSeriesLabelOption: (opts: any) => {
+export declare const applyAxisOverrides: (axis: any, opts: any, numberFormatPattern?: string, locale?: string) => any;
+export declare const dataLabelFormatter: (opts: any, locale?: string) => (params: any) => string;
+export declare const buildSeriesLabelOption: (opts: any, seriesType?: string, locale?: string) => {
     readonly show: true;
     readonly position: any;
     readonly formatter: (params: any) => string;

package/dist/cjs/utils/overrides.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"overrides.d.ts","sourceRoot":"","sources":["../../../utils/overrides.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAWrD,oEAAoE;AACpE,eAAO,MAAM,4BAA4B,GAAI,KAAK,GAAG,oCASpD,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,qBAAqB,EAC7B,MAAM,GAAG,KACR,qBA6CF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM,GAAG,EACT,MAAM,GAAG,EACT,sBAAsB,MAAM,QA4B7B,CAAC;AAqBF,eAAO,MAAM,kBAAkB,GAAI,MAAM,GAAG,MAAM,QAAQ,GAAG,WA4B5D,CAAC;AAWF,eAAO,MAAM,sBAAsB,GAAI,MAAM,GAAG;;;iCAvCU,GAAG;aA+C5D,CAAC"}
+{"version":3,"file":"overrides.d.ts","sourceRoot":"","sources":["../../../utils/overrides.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAWrD,oEAAoE;AACpE,eAAO,MAAM,4BAA4B,GAAI,KAAK,GAAG,oCASpD,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,qBAAqB,EAC7B,MAAM,GAAG,KACR,qBA6CF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM,GAAG,EACT,MAAM,GAAG,EACT,sBAAsB,MAAM,EAC5B,SAAS,MAAM,QA4BhB,CAAC;AAgBF,eAAO,MAAM,kBAAkB,GAAI,MAAM,GAAG,EAAE,SAAS,MAAM,MAAM,QAAQ,GAAG,WAiC7E,CAAC;AAgCF,eAAO,MAAM,sBAAsB,GACjC,MAAM,GAAG,EACT,aAAa,MAAM,EACnB,SAAS,MAAM;;;iCApE0D,GAAG;aAiF7E,CAAC"}

package/dist/cjs/utils/overrides.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildSeriesLabelOption = exports.dataLabelFormatter = exports.applyAxisOverrides = exports.applyLegendOverrides = exports.textFormatToEchartsTextStyle = void 0;
 var tslib_1 = require("tslib");
-var utils_1 = require("@rowsncolumns/utils");
 var axis_number_format_1 = require("./axis-number-format");
 // Map ChartSpec.legend / dataLabels / axisOptions to ECharts option
 // fragments. Each helper is a no-op when the spec field is missing, so
@@ -82,9 +81,9 @@ exports.applyLegendOverrides = applyLegendOverrides;
  * the linked source-cell format — see `resolveValueAxisNumberFormat`); it
  * becomes the tick-label formatter.
  */
-var applyAxisOverrides = function (axis, opts, numberFormatPattern) {
+var applyAxisOverrides = function (axis, opts, numberFormatPattern, locale) {
     var _a, _b, _c, _d, _e;
-    var formatter = (0, axis_number_format_1.valueAxisLabelFormatter)(numberFormatPattern);
+    var formatter = (0, axis_number_format_1.valueAxisLabelFormatter)(numberFormatPattern, locale);
     if (!opts && !formatter)
         return axis;
     var next = tslib_1.__assign({}, axis);
@@ -126,14 +125,8 @@ exports.applyAxisOverrides = applyAxisOverrides;
  * over the normalized percentage so labels read "$1,831" not "84.6"
  * — Excel's behaviour.
  */
-var formatLabelValue = function (rawValue, originalValue, pattern) {
-    var target = originalValue !== null && originalValue !== void 0 ? originalValue : rawValue;
-    if (pattern) {
-        return (0, utils_1.ssfFormat)(pattern, target);
-    }
-    return target === undefined || target === null ? "" : String(target);
-};
-var dataLabelFormatter = function (opts) { return function (params) {
+var formatLabelValue = function (rawValue, originalValue, pattern, locale) { return (0, axis_number_format_1.formatAxisValue)(pattern, originalValue !== null && originalValue !== void 0 ? originalValue : rawValue, locale); };
+var dataLabelFormatter = function (opts, locale) { return function (params) {
     var parts = [];
     if (opts.showSeriesName && params.seriesName)
         parts.push(params.seriesName);
@@ -156,7 +149,7 @@ var dataLabelFormatter = function (opts) { return function (params) {
         var originalValue = typeof params.data === "object" && params.data
             ? params.data.originalValue
             : undefined;
-        parts.push(formatLabelValue(params.value, originalValue, opts.numberFormatPattern));
+        parts.push(formatLabelValue(params.value, originalValue, opts.numberFormatPattern, locale));
     }
     return parts.join(": ");
 }; };
@@ -168,16 +161,40 @@ var ECHARTS_DLBL_POS = {
     insideEnd: "insideTop",
     outsideEnd: "top",
     bestFit: "top",
+    above: "top",
+    below: "bottom",
+    left: "left",
+    right: "right",
+};
+// A line / scatter label sits on a point, not in a bar: echarts has no
+// `outside` / `insideTop` for it (an unknown position is drawn at the
+// default) and Excel offers centre / left / right / above / below. The
+// bar-only placements land on Excel's default for a line, above the point.
+var ECHARTS_POINT_DLBL_POS = {
+    center: "inside",
+    inside: "inside",
+    outside: "top",
+    insideEnd: "top",
+    outsideEnd: "top",
+    bestFit: "top",
+    above: "top",
+    below: "bottom",
+    left: "left",
+    right: "right",
 };
-var buildSeriesLabelOption = function (opts) {
+var POINT_SERIES_TYPES = new Set(["line", "scatter", "effectScatter"]);
+var buildSeriesLabelOption = function (opts, seriesType, locale) {
     var _a;
     if (!(opts === null || opts === void 0 ? void 0 : opts.show))
         return undefined;
-    var position = (_a = (opts.position && ECHARTS_DLBL_POS[opts.position])) !== null && _a !== void 0 ? _a : "top";
+    var positions = seriesType && POINT_SERIES_TYPES.has(seriesType)
+        ? ECHARTS_POINT_DLBL_POS
+        : ECHARTS_DLBL_POS;
+    var position = (_a = (opts.position && positions[opts.position])) !== null && _a !== void 0 ? _a : "top";
     return {
         show: true,
         position: position,
-        formatter: (0, exports.dataLabelFormatter)(opts),
+        formatter: (0, exports.dataLabelFormatter)(opts, locale),
     };
 };
 exports.buildSeriesLabelOption = buildSeriesLabelOption;

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

@@ -1,5 +1,5 @@
 import React from "react";
 import type { EChartComponentProps } from "../types";
 export type BasicChartProps = EChartComponentProps;
-export declare const BasicChart: ({ width, height, chart, theme, isDarkMode, sheetId, readonly, getDomainValuesFromRange, getSeriesValuesFromRange, getFormattingFromRange, onDeleteChart, onUpdateChart, onRequestEdit, onRequestCalculate, isSelected, fieldButtons, }: BasicChartProps) => React.JSX.Element;
+export declare const BasicChart: ({ width, height, chart, theme, isDarkMode, sheetId, readonly, getDomainValuesFromRange, getSeriesValuesFromRange, getFormattingFromRange, onDeleteChart, onUpdateChart, onRequestEdit, onRequestCalculate, isSelected, fieldButtons, locale, }: BasicChartProps) => React.JSX.Element;
 //# sourceMappingURL=basic-chart.d.ts.map

package/dist/esm/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":"AAkEA,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,sBAwzGjB,CAAC"}
+{"version":3,"file":"basic-chart.d.ts","sourceRoot":"","sources":["../../../basic-chart/basic-chart.tsx"],"names":[],"mappings":"AAkEA,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,gPAkBxB,eAAe,sBA02GjB,CAAC"}