@oliasoft-open-source/charts-library 5.9.0-beta-12 → 5.9.0-beta-14

package/dist/index.d.ts

@@ -656,7 +656,7 @@ export declare interface ILineChartDataInput extends Omit<ILineChartData, 'data'
             lineHeight?: number;
             data?: Array<DeepPartial<ICommonDataValue> | null>;
             [key: string]: unknown;
-        }) | object | null>;
+        }) | object | null> | object;
     };
     options?: ILineChartOptionsInput;
 }
@@ -726,10 +726,11 @@ export declare type ILineChartOptionsInput = Omit<DeepPartial<ILineChartOptions>
         tooltip?: unknown;
         [key: string]: unknown;
     };
-    annotations?: (DeepPartial<ICommonAnnotations> & {
+    annotations?: (Omit<DeepPartial<ICommonAnnotations>, 'annotationsData'> & {
         annotationsData?: ILooseLineAnnotation[];
-    }) | null;
+    }) | ILooseLineAnnotation[] | null;
     additionalAxesOptions?: DeepPartial<ILineChartAdditionalAxesOptions> & {
+        stepSize?: unknown;
         range?: ILineRange | ILineChartRange | Record<string, ILineChartRange | undefined>;
     } & Record<string, unknown>;
 };
@@ -786,9 +787,19 @@ declare type ILooseBarAxis = DeepPartial<ICommonAxis<string>> & {
     [key: string]: unknown;
 };
 
-declare type ILooseLineAnnotation = DeepPartial<ICommonAnnotationsData> & {
+declare type ILooseLineAnnotation = {
     [key: string]: unknown;
-} & {
+    id?: string;
+    label?: string;
+    color?: string;
+    borderColor?: string;
+    backgroundColor?: string;
+    borderWidth?: number;
+    display?: boolean;
+    adjustScaleRange?: boolean;
+    opacity?: number;
+    hideLegend?: boolean;
+    labelOffsetPx?: number;
     annotationAxis?: string;
     type?: string;
     value?: number | string | null;
@@ -798,10 +809,14 @@ declare type ILooseLineAnnotation = DeepPartial<ICommonAnnotationsData> & {
     yMax?: number | string | null;
     xValue?: number | string | null;
     yValue?: number | string | null;
+    onDragStart?: (...args: unknown[]) => void;
+    onDrag?: (...args: unknown[]) => void;
+    onDragEnd?: (...args: unknown[]) => void;
 };
 
 declare type ILooseLineAxis = DeepPartial<ILineChartAxis<string>> & {
     [key: string]: unknown;
+    stepSize?: unknown;
 };
 
 declare type ILooseScatterAnnotation = DeepPartial<ICommonAnnotationsData> & {

package/dist/index.js

@@ -20171,36 +20171,43 @@ var defaultAnnotationsData$2 = (annotationsData) => {
 	})) : [];
 };
 var defaultAnnotations$2 = (annotations) => ({
-	labelAnnotation: {
-		showLabel: annotations?.labelAnnotation?.showLabel ?? false,
-		text: annotations?.labelAnnotation?.text ?? "",
-		position: annotations?.labelAnnotation?.position ?? TextLabelPosition.BOTTOM_RIGHT,
-		fontSize: annotations?.labelAnnotation?.fontSize ?? 12,
-		xOffset: annotations?.labelAnnotation?.xOffset ?? 5,
-		yOffset: annotations?.labelAnnotation?.yOffset ?? 5,
-		maxWidth: annotations?.labelAnnotation?.maxWidth ?? 300,
-		lineHeight: annotations?.labelAnnotation?.lineHeight ?? 12
-	},
-	showAnnotations: annotations?.showAnnotations ?? false,
-	controlAnnotation: annotations?.controlAnnotation ?? false,
-	enableDragAnnotation: annotations?.enableDragAnnotation ?? false,
-	enableCalloutAnnotation: annotations?.enableCalloutAnnotation ?? false,
-	verticalMarkersAnnotation: {
-		enabled: annotations?.verticalMarkersAnnotation?.enabled ?? false,
-		itemGapPx: annotations?.verticalMarkersAnnotation?.itemGapPx ?? 4,
-		edgePaddingPx: annotations?.verticalMarkersAnnotation?.edgePaddingPx ?? 8,
-		stickToEdge: annotations?.verticalMarkersAnnotation?.stickToEdge ?? true,
-		stickSide: annotations?.verticalMarkersAnnotation?.stickSide ?? "right",
-		reverse: annotations?.verticalMarkersAnnotation?.reverse ?? false,
-		xValue: annotations?.verticalMarkersAnnotation?.xValue,
-		yStartValue: annotations?.verticalMarkersAnnotation?.yStartValue,
-		color: annotations?.verticalMarkersAnnotation?.color ?? "rgba(20,20,20,0.9)",
-		opacity: annotations?.verticalMarkersAnnotation?.opacity ?? 1,
-		lineWidth: annotations?.verticalMarkersAnnotation?.lineWidth ?? 1,
-		lineDash: annotations?.verticalMarkersAnnotation?.lineDash ?? [],
-		items: annotations?.verticalMarkersAnnotation?.items ?? []
-	},
-	annotationsData: defaultAnnotationsData$2(annotations?.annotationsData)
+	...!Array.isArray(annotations) ? annotations : {},
+	...Array.isArray(annotations) ? { annotationsData: annotations } : {},
+	...(() => {
+		const annotationConfig = Array.isArray(annotations) ? void 0 : annotations;
+		return {
+			labelAnnotation: {
+				showLabel: annotationConfig?.labelAnnotation?.showLabel ?? false,
+				text: annotationConfig?.labelAnnotation?.text ?? "",
+				position: annotationConfig?.labelAnnotation?.position ?? TextLabelPosition.BOTTOM_RIGHT,
+				fontSize: annotationConfig?.labelAnnotation?.fontSize ?? 12,
+				xOffset: annotationConfig?.labelAnnotation?.xOffset ?? 5,
+				yOffset: annotationConfig?.labelAnnotation?.yOffset ?? 5,
+				maxWidth: annotationConfig?.labelAnnotation?.maxWidth ?? 300,
+				lineHeight: annotationConfig?.labelAnnotation?.lineHeight ?? 12
+			},
+			showAnnotations: annotationConfig?.showAnnotations ?? false,
+			controlAnnotation: annotationConfig?.controlAnnotation ?? false,
+			enableDragAnnotation: annotationConfig?.enableDragAnnotation ?? false,
+			enableCalloutAnnotation: annotationConfig?.enableCalloutAnnotation ?? false,
+			verticalMarkersAnnotation: {
+				enabled: annotationConfig?.verticalMarkersAnnotation?.enabled ?? false,
+				itemGapPx: annotationConfig?.verticalMarkersAnnotation?.itemGapPx ?? 4,
+				edgePaddingPx: annotationConfig?.verticalMarkersAnnotation?.edgePaddingPx ?? 8,
+				stickToEdge: annotationConfig?.verticalMarkersAnnotation?.stickToEdge ?? true,
+				stickSide: annotationConfig?.verticalMarkersAnnotation?.stickSide ?? "right",
+				reverse: annotationConfig?.verticalMarkersAnnotation?.reverse ?? false,
+				xValue: annotationConfig?.verticalMarkersAnnotation?.xValue,
+				yStartValue: annotationConfig?.verticalMarkersAnnotation?.yStartValue,
+				color: annotationConfig?.verticalMarkersAnnotation?.color ?? "rgba(20,20,20,0.9)",
+				opacity: annotationConfig?.verticalMarkersAnnotation?.opacity ?? 1,
+				lineWidth: annotationConfig?.verticalMarkersAnnotation?.lineWidth ?? 1,
+				lineDash: annotationConfig?.verticalMarkersAnnotation?.lineDash ?? [],
+				items: annotationConfig?.verticalMarkersAnnotation?.items ?? []
+			},
+			annotationsData: defaultAnnotationsData$2(Array.isArray(annotations) ? annotations : annotations?.annotationsData)
+		};
+	})()
 });
 var defaultLegend$3 = (legend) => ({
 	display: legend?.display ?? true,
@@ -20254,7 +20261,7 @@ var normalizeLineChartOptions = (options = {}) => ({
 	dragData: defaultDragData$1(options?.dragData),
 	depthType: options?.depthType ?? {}
 });
-var normalizeLineDatasets = (datasets) => (datasets ?? []).map((dataset) => {
+var normalizeLineDatasets = (datasets) => (Array.isArray(datasets) ? datasets : []).map((dataset) => {
 	const normalizedDataset = dataset && typeof dataset === "object" ? dataset : {};
 	return {
 		...normalizedDataset,
@@ -37503,7 +37510,7 @@ var normalizeBarOptions = (options = {}) => ({
 	interactions: defaultInteractions$1(options?.interactions),
 	dragData: defaultDragData(options?.dragData)
 });
-var normalizeBarDatasets = (datasets) => (datasets ?? []).map((dataset) => {
+var normalizeBarDatasets = (datasets) => (Array.isArray(datasets) ? datasets : []).map((dataset) => {
 	const normalizedDataset = dataset && typeof dataset === "object" ? dataset : {};
 	return {
 		...normalizedDataset,
@@ -37802,7 +37809,7 @@ var defaultInteractions = (interactions) => ({
 });
 var defaultChartData = (data) => ({
 	labels: data?.labels ?? [],
-	datasets: (data?.datasets ?? []).map((dataset) => {
+	datasets: (Array.isArray(data?.datasets) ? data.datasets : []).map((dataset) => {
 		const normalizedDataset = dataset && typeof dataset === "object" ? dataset : {};
 		return {
 			...normalizedDataset,

package/package.json

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