@oliasoft-open-source/charts-library 7.0.0-beta-2 → 8.0.0-beta-1

package/dist/index.d.ts

@@ -769,6 +769,7 @@ export declare interface ILineChartStyling extends ICommonStyling {
 export declare interface ILineChartTooltip extends ICommonTooltip {
     hideSimulationName?: boolean;
     scientificNotation?: boolean;
+    titleAxis?: `${AxisType}`;
 }
 
 export declare interface ILineInteractions extends ICommonInteractions {
@@ -1237,7 +1238,9 @@ export { }
 
 declare module 'chart.js' {
     interface PluginOptionsByType<TType extends ChartType> {
-        annotationDraggerPlugin?: AnnotationDraggerPluginOptions;
+        calloutConnectorPlugin?: {
+            enableCalloutAnnotation?: boolean;
+        };
     }
 }
 
@@ -1253,9 +1256,7 @@ declare module 'chart.js' {
 
 declare module 'chart.js' {
     interface PluginOptionsByType<TType extends ChartType> {
-        calloutConnectorPlugin?: {
-            enableCalloutAnnotation?: boolean;
-        };
+        annotationDraggerPlugin?: AnnotationDraggerPluginOptions;
     }
 }
 

package/dist/index.js

@@ -20540,7 +20540,8 @@ var defaultTooltip$3 = (tooltip) => ({
 	showLabelsInTooltips: tooltip?.showLabelsInTooltips ?? false,
 	hideSimulationName: tooltip?.hideSimulationName ?? false,
 	scientificNotation: tooltip?.scientificNotation ?? true,
-	callbacks: tooltip?.callbacks
+	callbacks: tooltip?.callbacks,
+	titleAxis: tooltip?.titleAxis ?? AxisType.X
 });
 var defaultGraph$3 = (graph) => ({
 	lineTension: graph?.lineTension ?? .01,
@@ -21193,45 +21194,38 @@ var getLineChartToolTips = (options) => {
 			callbacks: {}
 		};
 	}
-	const { scientificNotation = true } = options?.tooltip ?? {};
-	const getTooltipLabels = ({ xAxisID = "", yAxisID = "" }) => {
-		const xIndex = xAxisID?.length > 1 ? Number(xAxisID?.[1]) - 1 : 0;
-		const yIndex = yAxisID?.length > 1 ? Number(yAxisID?.[1]) - 1 : 0;
-		const xAxis = options?.axes?.x?.[xIndex];
-		const yAxis = options?.axes?.y?.[yIndex];
-		if (options?.axes?.x?.[0]?.position === Position.Top) return {
-			titleAxisLabel: yAxis?.label || "",
-			valueAxisLabel: xAxis?.label || "",
-			titleLabel: TooltipLabel.Y,
-			valueLabel: TooltipLabel.X
-		};
-		else return {
-			titleAxisLabel: xAxis?.label || "",
-			valueAxisLabel: yAxis?.label || "",
-			titleLabel: TooltipLabel.X,
-			valueLabel: TooltipLabel.Y
-		};
-	};
-	const titleCallback = (tooltipItem) => {
-		if (!tooltipItem?.[0]) return "";
-		const { titleLabel = "", titleAxisLabel = "" } = getTooltipLabels(tooltipItem[0].dataset) ?? {};
-		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)}`;
+	const { scientificNotation = true, showLabelsInTooltips = false, titleAxis = AxisType.X } = options?.tooltip ?? {};
+	const valueAxis = titleAxis === AxisType.X ? AxisType.Y : AxisType.X;
+	const getAxis = (item, axis) => {
+		const axisIdKey = `${axis}AxisID`;
+		const id = item.dataset[axisIdKey] || axis;
+		const index = id === axis ? 0 : toNum(id.slice(1)) - 1;
+		return {
+			id,
+			config: options.axes[axis][index]
+		};
+	};
+	const formatValue = (item, axis) => {
+		const { id } = getAxis(item, axis);
+		const scale = item.chart?.scales[id];
+		const scaleType = scale?.type ?? options.scales?.[id]?.type;
+		const value = item.parsed[axis];
+		if (value === null || value === void 0) return "";
+		if (scaleType === ScaleType.Time || scaleType === ScaleType.TimeSeries || scaleType === ScaleType.Category) return (axis === (item.chart?.getDatasetMeta(item.datasetIndex).iScale?.axis ?? AxisType.X) ? item.label : item.formattedValue) || scale?.getLabelForValue(value) || String(value);
+		return customFormatNumber$1(value, scientificNotation);
+	};
+	const titleCallback = (items) => {
+		const item = items?.[0];
+		if (!item) return "";
+		const { config } = getAxis(item, titleAxis);
+		return `${formatValue(item, titleAxis)} ${config?.label || ""}`;
+	};
+	const labelCallback = (item) => {
+		const { config } = getAxis(item, valueAxis);
+		const units = (typeof config?.unit === "string" ? config.unit : config?.unit?.selectedUnit) || getUnitsFromLabel(config?.label || "");
+		const label = item.dataset.label || "";
+		const pointLabel = getTooltipLabel(item, showLabelsInTooltips);
+		return `${label}: ${formatValue(item, valueAxis)} ${units} ${pointLabel}`;
 	};
 	const userCallbacks = options?.tooltip?.callbacks ?? null;
 	const callbacks = {

package/package.json

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