@oliasoft-open-source/charts-library 5.15.0-beta-2 → 5.15.0

package/dist/index.js

@@ -20802,6 +20802,9 @@ var formatAxisLabelNumbers = (tickValue, ticks) => {
 };
 //#endregion
 //#region src/components/common/helpers/get-cartesian-scale-options.ts
+var isTimeScaleType = (scaleType) => {
+	return scaleType === ScaleType.Time || scaleType === ScaleType.TimeSeries;
+};
 var isNumericScale = (scaleType) => {
 	return scaleType === ScaleType.Linear || scaleType === ScaleType.Logarithmic;
 };
@@ -21198,13 +21201,20 @@ var getLineChartToolTips = (options) => {
 	const titleCallback = (tooltipItem) => {
 		if (!tooltipItem?.[0]) return "";
 		const { titleLabel = "", titleAxisLabel = "" } = getTooltipLabels(tooltipItem[0].dataset) ?? {};
-		return `${customFormatNumber$1(titleLabel === TooltipLabel.Y ? tooltipItem?.[0]?.parsed?.y : tooltipItem?.[0]?.parsed?.x, scientificNotation)} ${titleAxisLabel}`;
+		const titleAxisId = titleLabel === TooltipLabel.Y ? tooltipItem[0].dataset?.yAxisID ?? "y" : tooltipItem[0].dataset?.xAxisID ?? "x";
+		const titleScaleType = options?.scales?.[titleAxisId]?.type;
+		const titleValue = isTimeScaleType(titleScaleType) || titleScaleType === "category" ? tooltipItem[0].label : void 0;
+		const formattedValue = titleLabel === TooltipLabel.Y ? tooltipItem?.[0]?.parsed?.y : tooltipItem?.[0]?.parsed?.x;
+		return `${titleValue ?? customFormatNumber$1(formattedValue, scientificNotation)} ${titleAxisLabel}`;
 	};
 	const labelCallback = (tooltipItem) => {
 		const { showLabelsInTooltips = false } = options?.tooltip ?? {};
 		let label = tooltipItem?.dataset?.label || "";
 		const { valueLabel = "", valueAxisLabel = "" } = getTooltipLabels(tooltipItem?.dataset) ?? {};
 		const getTooltipItemValue = () => {
+			const valueAxisId = valueLabel === TooltipLabel.X ? tooltipItem.dataset?.xAxisID ?? "x" : tooltipItem.dataset?.yAxisID ?? "y";
+			const valueScaleType = options?.scales?.[valueAxisId]?.type;
+			if ((isTimeScaleType(valueScaleType) || valueScaleType === "category") && tooltipItem.label) return tooltipItem.label;
 			return customFormatNumber$1(valueLabel === TooltipLabel.X ? tooltipItem?.parsed?.x : tooltipItem?.parsed?.y, scientificNotation);
 		};
 		return `${label}: ${getTooltipItemValue()} ${getUnitsFromLabel(valueAxisLabel)} ${getTooltipLabel(tooltipItem, showLabelsInTooltips)}`;
@@ -39304,7 +39314,13 @@ var labelCallback = (tooltipItem, options) => {
 	const { raw, dataset } = tooltipItem ?? {};
 	const datapointLabel = raw?.label;
 	const scientificNotation = options?.tooltip?.scientificNotation;
-	return `${datapointLabel ?? dataset?.label} ( x: ${customFormatNumber(raw?.x, scientificNotation)} , y: ${customFormatNumber(raw?.y, scientificNotation)} )`;
+	const xScaleType = options?.scales?.x?.type;
+	const yScaleType = options?.scales?.y?.type;
+	const formatValue = (value, scaleType, formattedLabel) => {
+		if (isTimeScaleType(scaleType) && formattedLabel) return formattedLabel;
+		return typeof value === "number" ? customFormatNumber(value, scientificNotation) : value;
+	};
+	return `${datapointLabel ?? dataset?.label} ( x: ${formatValue(raw?.x, xScaleType, tooltipItem.label)} , y: ${formatValue(raw?.y, yScaleType)} )`;
 };
 var getTooltipsConfig = (options) => {
 	return {

package/dist/src/components/common/helpers/get-cartesian-scale-options.d.ts

@@ -1,6 +1,7 @@
 import { Tick } from 'chart.js';
 import { ICommonScaleOptions, UnusedParameter } from '../common.interface';
 type TScaleType = NonNullable<ICommonScaleOptions['type']>;
+export declare const isTimeScaleType: (scaleType?: ICommonScaleOptions["type"]) => scaleType is "time" | "timeseries";
 interface IGetCartesianScaleOptionsParams {
     axisData?: {
         gridLines?: unknown;

package/dist/src/components/scatter-chart/utils/get-tooltip-config.d.ts

@@ -1,8 +1,8 @@
 import { TooltipItem } from 'chart.js';
 import { IDefaultScatterOptions } from '../scatter-chart-default-props.interface';
 interface IRawData {
-    x: number;
-    y: number;
+    x: number | string;
+    y: number | string;
     label?: string;
 }
 export interface IScatterTooltipItem extends TooltipItem<'scatter'> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oliasoft-open-source/charts-library",
-  "version": "5.15.0-beta-2",
+  "version": "5.15.0",
   "description": "React Chart Library (based on Chart.js and react-chart-js-2)",
   "homepage": "https://gitlab.com/oliasoft-open-source/charts-library",
   "bugs": {