Improve validation of options

Makanz · Jun 23, 2024 · e25772f · e25772f
1 parent 08c5832
commit e25772f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/dist/chartjs-plugin-trendline.min.js b/dist/chartjs-plugin-trendline.min.js
diff --git a/src/chartjs-plugin-trendline.js b/src/chartjs-plugin-trendline.js
@@ -49,16 +49,14 @@ const addFitter = (datasetMeta, ctx, dataset, xScale, yScale) => {
     let defaultColor = dataset.borderColor || 'rgba(169,169,169, .6)';
     let colorMin = dataset.trendlineLinear.colorMin || defaultColor;
     let colorMax = dataset.trendlineLinear.colorMax || defaultColor;
-    let lineWidth = dataset.trendlineLinear.width || dataset.borderWidth;
+    let lineWidth = dataset.trendlineLinear.width ?? dataset.borderWidth ?? 3;
     let lineStyle = dataset.trendlineLinear.lineStyle || 'solid';
     let fillColor = dataset.trendlineLinear.fillColor;
 
-    const parsing = typeof datasetMeta.controller.chart.options.parsing === "object" ?
-        datasetMeta.controller.chart.options.parsing : undefined;
-    const xAxisKey = dataset.trendlineLinear.xAxisKey || parsing ? parsing.xAxisKey : "x";
-    const yAxisKey = dataset.trendlineLinear.yAxisKey || parsing ? parsing.yAxisKey : "y";
-
-    lineWidth = lineWidth !== undefined ? lineWidth : 3;
+    const chartOptions = datasetMeta.controller.chart.options;
+    const parsingOptions = typeof chartOptions.parsing === 'object' ? chartOptions.parsing : undefined;
+    const xAxisKey = dataset.trendlineLinear.xAxisKey || parsingOptions?.xAxisKey || 'x';
+    const yAxisKey = dataset.trendlineLinear.yAxisKey || parsingOptions?.yAxisKey || 'y';
 
     let fitter = new LineFitter();
     let firstIndex = dataset.data.findIndex((d) => {