@oliasoft-open-source/charts-library 5.11.1-beta-1 → 5.12.0

package/dist/index.d.ts

@@ -958,6 +958,7 @@ export declare interface IScatterOptions extends ICommonOptions {
     graph?: IScatterGraph;
     legend?: IScatterLegend;
     axes?: IScatterAxes;
+    scales?: ICommonScales;
     additionalAxesOptions?: ICommonAdditionalAxesOptions;
     direction?: ChartDirection;
 }
@@ -1193,24 +1194,24 @@ export { }
 
 declare module 'chart.js' {
     interface PluginOptionsByType<TType extends ChartType> {
-        lineMarkersPlugin?: {
-            enabled?: boolean;
-        } | TLineMarkersOptions;
+        annotationDraggerPlugin?: AnnotationDraggerPluginOptions;
     }
 }
 
 
 declare module 'chart.js' {
     interface PluginOptionsByType<TType extends ChartType> {
-        annotationDraggerPlugin?: AnnotationDraggerPluginOptions;
+        calloutConnectorPlugin?: {
+            enableCalloutAnnotation?: boolean;
+        };
     }
 }
 
 
 declare module 'chart.js' {
     interface PluginOptionsByType<TType extends ChartType> {
-        calloutConnectorPlugin?: {
-            enableCalloutAnnotation?: boolean;
-        };
+        lineMarkersPlugin?: {
+            enabled?: boolean;
+        } | TLineMarkersOptions;
     }
 }

package/dist/index.js

@@ -19480,14 +19480,11 @@ var downloadPgn = (chartRef) => {
 	ctx.fillRect(0, 0, chart.width, chart.height);
 	ctx.restore();
 	const fileName = getChartFileName(getAxesLabelsFromChart(chart));
-	const toPngOptions = { skipFonts: navigator.userAgent.includes("Firefox") };
-	setTimeout(() => {
-		toPng(canvasElement, toPngOptions).then((dataUrl) => {
-			triggerBase64Download(dataUrl, fileName);
-		}).catch((e) => {
-			console.error("Could not parse the html: ", e);
-		});
-	}, 0);
+	toPng(canvasElement, { skipFonts: navigator.userAgent.includes("Firefox") }).then((dataUrl) => {
+		triggerBase64Download(dataUrl, fileName);
+	}).catch((e) => {
+		console.error("Could not parse the html: ", e);
+	});
 };
 //#endregion
 //#region src/components/line-chart/utils/line-chart-utils.ts
@@ -20432,7 +20429,9 @@ var formatAxisLabelNumbers = (tickValue, ticks) => {
 var getLineChartAxis = (options, axisType, state, currentScales, i = 0) => {
 	const axisData = currentScales || options.axes[axisType][0] || {};
 	const stateAxis = state?.axes.filter((axis) => axis?.id?.startsWith(axisType))[i];
-	const ticksConfigFromProps = options?.scales?.[`${i === 0 ? axisType : axisType + i}`]?.ticks;
+	const axisKey = `${i === 0 ? axisType : axisType + i}`;
+	const ticksConfigFromProps = options?.scales?.[axisKey]?.ticks;
+	const titleConfigFromProps = options?.scales?.[axisKey]?.title;
 	const { additionalAxesOptions } = options;
 	const getTicks = () => {
 		const isLogarithmic = additionalAxesOptions?.chartScaleType === ScaleType.Logarithmic;
@@ -20444,7 +20443,10 @@ var getLineChartAxis = (options, axisType, state, currentScales, i = 0) => {
 			callback: ticksFormattingCallback,
 			includeBounds: false,
 			...ticksConfigFromProps,
-			font: { size: 12 }
+			font: {
+				size: 12,
+				...ticksConfigFromProps?.font
+			}
 		};
 	};
 	return {
@@ -20460,7 +20462,12 @@ var getLineChartAxis = (options, axisType, state, currentScales, i = 0) => {
 		title: {
 			display: axisData.label?.length,
 			text: axisData.label,
-			padding: 0
+			padding: 0,
+			...titleConfigFromProps,
+			font: {
+				size: 12,
+				...titleConfigFromProps?.font
+			}
 		},
 		ticks: getTicks(),
 		grid: { ...axisData.gridLines }
@@ -38437,9 +38444,11 @@ var getBarChartAxis = ({ chart, axisType = AxisType.X, currentScale, i }) => {
 	const getReverse = () => {
 		return axisType === (isDirectionVertical ? AxisType.Y : AxisType.X) ? options?.additionalAxesOptions?.reverse : false;
 	};
+	const axisKey = `${i === 0 ? axisType : axisType + i}`;
+	const titleConfigFromProps = options?.scales?.[axisKey]?.title;
 	const getTicks = () => {
 		const additionalAxesOptions = options?.additionalAxesOptions;
-		const ticksConfigFromProps = options?.scales?.[`${i === 0 ? axisType : axisType + i}`]?.ticks;
+		const ticksConfigFromProps = options?.scales?.[axisKey]?.ticks;
 		const isLogarithmic = isDirectionCompatibleWithAxisType && additionalAxesOptions?.chartScaleType === ScaleType.Logarithmic;
 		const ticksFormattingCallback = (tick, _, ticks) => {
 			return isLogarithmic ? LOGARITHMIC_STEPS.includes(Number(tick)) ? formatAxisLabelNumbers(tick, ticks) : "" : formatAxisLabelNumbers(tick, ticks);
@@ -38448,7 +38457,10 @@ var getBarChartAxis = ({ chart, axisType = AxisType.X, currentScale, i }) => {
 			...!isLogarithmic ? { stepSize: axisData.stepSize ?? (axisType === AxisType.Y ? additionalAxesOptions?.stepSize : null) } : {},
 			includeBounds: false,
 			...ticksConfigFromProps,
-			font: { size: 12 }
+			font: {
+				size: 12,
+				...ticksConfigFromProps?.font
+			}
 		};
 		if (additionalAxesOptions?.chartScaleType === ScaleType.Logarithmic) ticks.callback = ticksFormattingCallback;
 		return ticks;
@@ -38465,7 +38477,12 @@ var getBarChartAxis = ({ chart, axisType = AxisType.X, currentScale, i }) => {
 		title: {
 			display: axisData?.label?.length || axisData?.unit?.length,
 			text: axisData?.label || axisData?.unit,
-			padding: 0
+			padding: 0,
+			...titleConfigFromProps,
+			font: {
+				size: 12,
+				...titleConfigFromProps?.font
+			}
 		},
 		ticks: getTicks(),
 		grid: { ...grid },
@@ -38887,6 +38904,8 @@ var getScatterChartAxis = ({ options, axisType = AxisType.X, currentScale }) =>
 	const axisData = currentScale || options?.axes?.[axisType]?.[0];
 	const isDirectionCompatibleWithAxisType = isDirectionVertical && axisType === AxisType.Y || !isDirectionVertical && axisType === AxisType.X;
 	const grid = axisData?.gridLines || {};
+	const ticksConfigFromProps = options?.scales?.[axisType]?.ticks;
+	const titleConfigFromProps = options?.scales?.[axisType]?.title;
 	const getReverse = () => {
 		return axisType === (isDirectionVertical ? AxisType.Y : AxisType.X) ? options?.additionalAxesOptions?.reverse : false;
 	};
@@ -38895,7 +38914,11 @@ var getScatterChartAxis = ({ options, axisType = AxisType.X, currentScale }) =>
 		return {
 			stepSize: axisData?.stepSize ?? (axisType === AxisType.Y ? additionalAxesOptions?.stepSize : void 0),
 			includeBounds: false,
-			font: { size: 12 }
+			...ticksConfigFromProps,
+			font: {
+				size: 12,
+				...ticksConfigFromProps?.font
+			}
 		};
 	};
 	return {
@@ -38910,7 +38933,12 @@ var getScatterChartAxis = ({ options, axisType = AxisType.X, currentScale }) =>
 		title: {
 			display: !!axisData?.label?.length || !!axisData?.unit?.length,
 			text: axisData?.label || axisData?.unit,
-			padding: 0
+			padding: 0,
+			...titleConfigFromProps,
+			font: {
+				size: 12,
+				...titleConfigFromProps?.font
+			}
 		},
 		ticks: getTicks(),
 		grid: { ...grid }

package/package.json

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