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

package/dist/index.d.ts

@@ -133,7 +133,9 @@ export declare interface IBarChartData extends ICommonData {
 }
 
 export declare interface IBarChartDataInput extends Omit<IBarChartData, 'options' | 'data'> {
-    data?: DeepPartial<IBarChartData['data']>;
+    data?: Omit<DeepPartial<IBarChartData['data']>, 'datasets'> & {
+        datasets?: Array<DeepPartial<IBarChartDataset> | object | null>;
+    };
     options?: IBarOptionsInput;
 }
 
@@ -194,7 +196,34 @@ export declare interface IBarOptions extends ICommonOptions {
     dragData?: ICommonDragData;
 }
 
-export declare type IBarOptionsInput = DeepPartial<IBarOptions>;
+export declare type IBarOptionsInput = Omit<DeepPartial<IBarOptions>, 'title' | 'direction' | 'axes' | 'legend' | 'chartStyling' | 'interactions' | 'annotations'> & {
+    [key: string]: unknown;
+    title?: unknown;
+    direction?: string;
+    axes?: {
+        x?: ILooseBarAxis[];
+        y?: ILooseBarAxis[];
+        [key: string]: ILooseBarAxis[] | undefined;
+    };
+    legend?: Omit<DeepPartial<IBarLegend>, 'position' | 'align'> & {
+        position?: string;
+        align?: string;
+        [key: string]: unknown;
+    };
+    chartStyling?: DeepPartial<IBarStyling> & {
+        hideControls?: boolean;
+        minHeight?: number | string;
+        [key: string]: unknown;
+    };
+    interactions?: DeepPartial<ICommonInteractions> & {
+        enableZoom?: boolean;
+        enablePan?: boolean;
+        [key: string]: unknown;
+    };
+    annotations?: (DeepPartial<ICommonAnnotations> & {
+        annotationsData?: ILooseBarAnnotation[];
+    }) | null;
+};
 
 export declare interface IBarStyling extends ICommonStyling {
     squareAspectRatio?: boolean;
@@ -617,7 +646,18 @@ export declare interface ILineChartData extends ICommonData {
 }
 
 export declare interface ILineChartDataInput extends Omit<ILineChartData, 'data' | 'options'> {
-    data?: DeepPartial<ILineChartData['data']>;
+    data?: Omit<DeepPartial<ILineChartData['data']>, 'datasets'> & {
+        datasets?: Array<(DeepPartial<ILineChartDataset> & {
+            lineTension?: number | string;
+            fill?: boolean | string | Record<string, unknown>;
+            pointStyle?: unknown;
+            showPoint?: boolean;
+            showPoints?: boolean;
+            lineHeight?: number;
+            data?: Array<DeepPartial<ICommonDataValue> | null>;
+            [key: string]: unknown;
+        }) | object | null>;
+    };
     options?: ILineChartOptionsInput;
 }
 
@@ -658,7 +698,41 @@ export declare interface ILineChartOptions extends ICommonOptions {
     depthType?: IDepthType | object;
 }
 
-export declare type ILineChartOptionsInput = DeepPartial<ILineChartOptions>;
+export declare type ILineChartOptionsInput = Omit<DeepPartial<ILineChartOptions>, 'title' | 'axes' | 'legend' | 'chartStyling' | 'interactions' | 'graph' | 'annotations' | 'additionalAxesOptions'> & {
+    [key: string]: unknown;
+    title?: unknown;
+    direction?: string;
+    axes?: {
+        x?: ILooseLineAxis[];
+        y?: ILooseLineAxis[];
+        [key: string]: ILooseLineAxis[] | undefined;
+    };
+    legend?: Omit<DeepPartial<ILineLegend>, 'position' | 'align'> & {
+        position?: string;
+        align?: string;
+        [key: string]: unknown;
+    };
+    chartStyling?: DeepPartial<ILineChartStyling> & {
+        hideControls?: boolean;
+        minHeight?: number | string;
+        [key: string]: unknown;
+    };
+    interactions?: DeepPartial<ILineInteractions> & {
+        enableZoom?: boolean;
+        enablePan?: boolean;
+        [key: string]: unknown;
+    };
+    graph?: DeepPartial<ILineChartGraph> & {
+        tooltip?: unknown;
+        [key: string]: unknown;
+    };
+    annotations?: (DeepPartial<ICommonAnnotations> & {
+        annotationsData?: ILooseLineAnnotation[];
+    }) | null;
+    additionalAxesOptions?: DeepPartial<ILineChartAdditionalAxesOptions> & {
+        range?: ILineRange | ILineChartRange | Record<string, ILineChartRange | undefined>;
+    } & Record<string, unknown>;
+};
 
 export declare interface ILineChartProps {
     chart: ILineChartDataInput;
@@ -668,8 +742,8 @@ export declare interface ILineChartProps {
 }
 
 export declare interface ILineChartRange {
-    min: number;
-    max: number;
+    min?: number;
+    max?: number;
 }
 
 export declare interface ILineChartStyling extends ICommonStyling {
@@ -700,6 +774,48 @@ export declare interface ILineRange {
     [key: string]: ILineChartRange;
 }
 
+declare type ILooseBarAnnotation = DeepPartial<ICommonAnnotationsData> & {
+    [key: string]: unknown;
+} & {
+    annotationAxis?: string;
+    type?: string;
+    value?: number | string | null;
+};
+
+declare type ILooseBarAxis = DeepPartial<ICommonAxis<string>> & {
+    [key: string]: unknown;
+};
+
+declare type ILooseLineAnnotation = DeepPartial<ICommonAnnotationsData> & {
+    [key: string]: unknown;
+} & {
+    annotationAxis?: string;
+    type?: string;
+    value?: number | string | null;
+    xMin?: number | string | null;
+    xMax?: number | string | null;
+    yMin?: number | string | null;
+    yMax?: number | string | null;
+    xValue?: number | string | null;
+    yValue?: number | string | null;
+};
+
+declare type ILooseLineAxis = DeepPartial<ILineChartAxis<string>> & {
+    [key: string]: unknown;
+};
+
+declare type ILooseScatterAnnotation = DeepPartial<ICommonAnnotationsData> & {
+    [key: string]: unknown;
+} & {
+    annotationAxis?: string;
+    type?: string;
+    value?: number | string | null;
+};
+
+declare type ILooseScatterAxis = DeepPartial<ICommonAxis<string>> & {
+    [key: string]: unknown;
+};
+
 /**
  * Initialize the charts library with the provided configurations.
  * This function will store the configuration options in a config object.
@@ -761,6 +877,8 @@ export declare type IPieLegendItemFilter = IChartLegendItemFilter;
 export declare interface IPieOptions extends ICommonOptions {
     graph?: IPieGraph;
     legend?: IPieLegend;
+    axes?: unknown;
+    [key: string]: unknown;
 }
 
 export declare type IPiesDataLabelsOptions = IChartDataLabelsOptions;
@@ -777,7 +895,9 @@ export declare interface IScatterChartData extends ICommonData {
 }
 
 export declare interface IScatterChartDataInput extends Omit<IScatterChartData, 'data' | 'options'> {
-    data?: DeepPartial<IScatterChartData['data']>;
+    data?: Omit<DeepPartial<IScatterChartData['data']>, 'datasets'> & {
+        datasets?: Array<DeepPartial<IScatterChartDataset> | object | null>;
+    };
     options?: IScatterOptionsInput;
 }
 
@@ -825,7 +945,32 @@ export declare interface IScatterOptions extends ICommonOptions {
     direction?: ChartDirection;
 }
 
-export declare type IScatterOptionsInput = DeepPartial<IScatterOptions>;
+export declare type IScatterOptionsInput = Omit<DeepPartial<IScatterOptions>, 'title' | 'direction' | 'axes' | 'legend' | 'chartStyling' | 'interactions' | 'annotations'> & {
+    [key: string]: unknown;
+    title?: unknown;
+    direction?: string;
+    axes?: {
+        x?: ILooseScatterAxis[];
+        y?: ILooseScatterAxis[];
+        [key: string]: ILooseScatterAxis[] | undefined;
+    };
+    legend?: Omit<DeepPartial<IScatterLegend>, 'position' | 'align'> & {
+        position?: string;
+        align?: string;
+        [key: string]: unknown;
+    };
+    chartStyling?: {
+        [key: string]: unknown;
+    };
+    interactions?: DeepPartial<ICommonOptions['interactions']> & {
+        enableZoom?: boolean;
+        enablePan?: boolean;
+        [key: string]: unknown;
+    };
+    annotations?: (DeepPartial<ICommonAnnotations> & {
+        annotationsData?: ILooseScatterAnnotation[];
+    }) | null;
+};
 
 export declare interface IScatterTooltip {
     enabled?: boolean;
@@ -956,22 +1101,6 @@ export declare type UnusedParameter = unknown;
 export { }
 
 
-declare module 'chart.js' {
-    interface PluginOptionsByType<TType extends ChartType> {
-        annotationDraggerPlugin?: AnnotationDraggerPluginOptions;
-    }
-}
-
-
-declare module 'chart.js' {
-    interface PluginOptionsByType<TType extends ChartType> {
-        calloutConnectorPlugin?: {
-            enableCalloutAnnotation?: boolean;
-        };
-    }
-}
-
-
 /**
  * Vertical Markers Plugin
  *
@@ -1023,3 +1152,19 @@ declare module 'chart.js' {
         } | TVerticalMarkersOptions;
     }
 }
+
+
+declare module 'chart.js' {
+    interface PluginOptionsByType<TType extends ChartType> {
+        annotationDraggerPlugin?: AnnotationDraggerPluginOptions;
+    }
+}
+
+
+declare module 'chart.js' {
+    interface PluginOptionsByType<TType extends ChartType> {
+        calloutConnectorPlugin?: {
+            enableCalloutAnnotation?: boolean;
+        };
+    }
+}

package/dist/index.js

@@ -20052,6 +20052,27 @@ var TextLabelPosition = {
 	BOTTOM_RIGHT: "bottom-right"
 };
 //#endregion
+//#region src/components/common/helpers/input-normalizers.ts
+var normalizeTitle = (title) => {
+	return typeof title === "string" || Array.isArray(title) ? title : "";
+};
+var normalizeCartesianDirection = (direction) => {
+	return typeof direction === "string" && direction.toLowerCase() === "horizontal" ? "horizontal" : "vertical";
+};
+var normalizeChartDirection = (direction) => {
+	return normalizeCartesianDirection(direction) === "horizontal" ? ChartDirection.HORIZONTAL : ChartDirection.VERTICAL;
+};
+var normalizeLegendPosition = (position, fallback) => {
+	return Object.values(Position).includes(String(position)) ? position : fallback;
+};
+var normalizeLegendAlign = (align, fallback) => {
+	return Object.values(AlignOptions).includes(String(align)) ? align : fallback;
+};
+var normalizeDragRange = (range) => ({
+	x: Array.isArray(range?.x) && range.x.length >= 2 ? [range.x[0], range.x[1]] : void 0,
+	y: Array.isArray(range?.y) && range.y.length >= 2 ? [range.y[0], range.y[1]] : void 0
+});
+//#endregion
 //#region src/components/line-chart/line-chart-get-default-props.ts
 var defaultAxis = (position) => ({
 	label: "",
@@ -20076,10 +20097,13 @@ var normalizeUnit = (unit) => {
 		setSelectedUnit: unit.setSelectedUnit ?? (() => {})
 	};
 };
+var normalizeAxisPosition = (position, fallbackPosition) => {
+	return typeof position === "string" && (fallbackPosition === "bottom" || fallbackPosition === "top" ? ["bottom", "top"] : ["left", "right"]).includes(position) ? position : fallbackPosition;
+};
 var normalizeAxis = (axis, fallbackPosition) => ({
 	...defaultAxis(fallbackPosition),
 	...axis || {},
-	position: axis?.position ?? fallbackPosition,
+	position: normalizeAxisPosition(axis?.position, fallbackPosition),
 	color: axis?.color ?? "",
 	unit: normalizeUnit(axis?.unit)
 });
@@ -20136,10 +20160,6 @@ var defaultGraph$3 = (graph) => ({
 	showMinorGridlines: graph?.showMinorGridlines ?? false
 });
 var defaultAnnotationsData$2 = (annotationsData) => {
-	const normalizeDragRange = (range) => ({
-		x: Array.isArray(range?.x) && range.x.length >= 2 ? [range.x[0], range.x[1]] : void 0,
-		y: Array.isArray(range?.y) && range.y.length >= 2 ? [range.y[0], range.y[1]] : void 0
-	});
 	const asCallback = (fn) => typeof fn === "function" ? fn : void 0;
 	return annotationsData ? annotationsData.map((ann) => ({
 		...ann,
@@ -20184,8 +20204,8 @@ var defaultAnnotations$2 = (annotations) => ({
 });
 var defaultLegend$3 = (legend) => ({
 	display: legend?.display ?? true,
-	position: legend?.position ?? Position.BottomLeft,
-	align: legend?.align ?? AlignOptions.Center,
+	position: normalizeLegendPosition(legend?.position, Position.BottomLeft),
+	align: normalizeLegendAlign(legend?.align, AlignOptions.Center),
 	customLegend: {
 		customLegendPlugin: legend?.customLegend?.customLegendPlugin && typeof legend.customLegend.customLegendPlugin === "object" && "id" in legend.customLegend.customLegendPlugin ? legend.customLegend.customLegendPlugin : null,
 		customLegendContainerID: typeof legend?.customLegend?.customLegendContainerID === "string" ? legend.customLegend.customLegendContainerID : ""
@@ -20217,7 +20237,7 @@ var defaultDragData$1 = (dragData) => ({
 	onDragEnd: dragData?.onDragEnd
 });
 var normalizeLineChartOptions = (options = {}) => ({
-	title: options?.title ?? "",
+	title: normalizeTitle(options?.title),
 	scales: options?.scales ?? {
 		x: {},
 		y: {}
@@ -20234,10 +20254,13 @@ var normalizeLineChartOptions = (options = {}) => ({
 	dragData: defaultDragData$1(options?.dragData),
 	depthType: options?.depthType ?? {}
 });
-var normalizeLineDatasets = (datasets) => (datasets ?? []).map((dataset) => ({
-	...dataset,
-	data: dataset?.data ?? []
-}));
+var normalizeLineDatasets = (datasets) => (datasets ?? []).map((dataset) => {
+	const normalizedDataset = dataset && typeof dataset === "object" ? dataset : {};
+	return {
+		...normalizedDataset,
+		data: Array.isArray(normalizedDataset.data) ? normalizedDataset.data : []
+	};
+});
 var getDefaultProps$3 = (props) => {
 	const chart = props?.chart || {};
 	const options = chart?.options || {};
@@ -37423,10 +37446,6 @@ var defaultGraph$1 = (graph) => ({
 	showMinorGridlines: graph?.showMinorGridlines || false
 });
 var defaultAnnotationsData$1 = (annotationsData) => {
-	const normalizeDragRange = (range) => ({
-		x: Array.isArray(range?.x) && range.x.length >= 2 ? [range.x[0], range.x[1]] : void 0,
-		y: Array.isArray(range?.y) && range.y.length >= 2 ? [range.y[0], range.y[1]] : void 0
-	});
 	const asCallback = (fn) => typeof fn === "function" ? fn : void 0;
 	return annotationsData ? annotationsData.map((ann) => ({
 		...ann,
@@ -37444,8 +37463,8 @@ var defaultAnnotations$1 = (annotations) => ({
 });
 var defaultLegend$1 = (legend) => ({
 	display: legend?.display ?? true,
-	position: legend?.position || Position.TopLeft,
-	align: legend?.align || AlignOptions.Center,
+	position: normalizeLegendPosition(legend?.position, Position.TopLeft),
+	align: normalizeLegendAlign(legend?.align, AlignOptions.Center),
 	customLegend: {
 		customLegendPlugin: legend?.customLegend?.customLegendPlugin && typeof legend.customLegend.customLegendPlugin === "object" && "id" in legend.customLegend.customLegendPlugin ? legend.customLegend.customLegendPlugin : null,
 		customLegendContainerID: typeof legend?.customLegend?.customLegendContainerID === "string" ? legend.customLegend.customLegendContainerID : ""
@@ -37471,8 +37490,8 @@ var defaultDragData = (dragData) => ({
 	onDragEnd: dragData?.onDragEnd
 });
 var normalizeBarOptions = (options = {}) => ({
-	title: options?.title || "",
-	direction: options?.direction || "vertical",
+	title: normalizeTitle(options?.title),
+	direction: normalizeCartesianDirection(options?.direction),
 	axes: defaultAxes$1(options?.axes),
 	additionalAxesOptions: defaultAdditionalAxesOptions$1(options?.additionalAxesOptions),
 	chartStyling: defaultChartStyling$1(options?.chartStyling),
@@ -37484,10 +37503,13 @@ var normalizeBarOptions = (options = {}) => ({
 	interactions: defaultInteractions$1(options?.interactions),
 	dragData: defaultDragData(options?.dragData)
 });
-var normalizeBarDatasets = (datasets) => (datasets ?? []).map((dataset) => ({
-	...dataset,
-	data: dataset?.data ?? []
-}));
+var normalizeBarDatasets = (datasets) => (datasets ?? []).map((dataset) => {
+	const normalizedDataset = dataset && typeof dataset === "object" ? dataset : {};
+	return {
+		...normalizedDataset,
+		data: Array.isArray(normalizedDataset.data) ? normalizedDataset.data : []
+	};
+});
 var getDefaultProps$1 = (props) => {
 	const chart = props?.chart || {};
 	const options = chart?.options || {};
@@ -37765,8 +37787,8 @@ var defaultGraph = (graph) => ({
 var defaultLegend = (legend) => ({
 	display: legend?.display ?? true,
 	useDataset: legend?.useDataset ?? false,
-	position: legend?.position ?? Position.BottomLeft,
-	align: legend?.align ?? AlignOptions.Center
+	position: normalizeLegendPosition(legend?.position, Position.BottomLeft),
+	align: normalizeLegendAlign(legend?.align, AlignOptions.Center)
 });
 var defaultChartOptions = (options) => ({
 	enableZoom: options?.enableZoom ?? false,
@@ -37780,14 +37802,13 @@ var defaultInteractions = (interactions) => ({
 });
 var defaultChartData = (data) => ({
 	labels: data?.labels ?? [],
-	datasets: (data?.datasets ?? []).map((dataset) => ({
-		...dataset,
-		data: dataset?.data ?? []
-	}))
-});
-var normalizeDragRange = (range) => ({
-	x: Array.isArray(range?.x) && range.x.length >= 2 ? [range.x[0], range.x[1]] : void 0,
-	y: Array.isArray(range?.y) && range.y.length >= 2 ? [range.y[0], range.y[1]] : void 0
+	datasets: (data?.datasets ?? []).map((dataset) => {
+		const normalizedDataset = dataset && typeof dataset === "object" ? dataset : {};
+		return {
+			...normalizedDataset,
+			data: Array.isArray(normalizedDataset.data) ? normalizedDataset.data : []
+		};
+	})
 });
 var defaultAnnotationsData = (annotationsData) => (annotationsData ?? []).map((ann) => ({
 	...ann,
@@ -37817,10 +37838,10 @@ var defaultAdditionalAxesOptions = (options) => ({
 	max: options?.max
 });
 var normalizeScatterOptions = (options = {}) => ({
-	title: options?.title ?? "",
+	title: normalizeTitle(options?.title),
 	axes: defaultAxes(options?.axes),
 	additionalAxesOptions: defaultAdditionalAxesOptions(options?.additionalAxesOptions),
-	direction: options?.direction ?? ChartDirection.VERTICAL,
+	direction: normalizeChartDirection(options?.direction),
 	chartStyling: defaultChartStyling(options?.chartStyling),
 	tooltip: defaultTooltip(options?.tooltip),
 	graph: defaultGraph(options?.graph),

package/package.json

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