From: Evert Timberg <evert.timberg@gmail.com>
Date: Sun, 6 Feb 2022 18:53:03 +0000 (-0500)
Subject: Ensure that min/max of TimeScaleOptions can be a string (#10137)
X-Git-Tag: v3.7.1~4
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c869972b60e0c5a7a286e489c7e87a7922b6ec9f;p=thirdparty%2FChart.js.git

Ensure that min/max of TimeScaleOptions can be a string (#10137)
---

diff --git a/types/index.esm.d.ts b/types/index.esm.d.ts
index 10ac49f4e..14a26d596 100644
--- a/types/index.esm.d.ts
+++ b/types/index.esm.d.ts
@@ -3088,7 +3088,7 @@ export interface CartesianScaleOptions extends CoreScaleOptions {
   };
 }
 
-export type CategoryScaleOptions = CartesianScaleOptions & {
+export type CategoryScaleOptions = Omit<CartesianScaleOptions, 'min' | 'max'> & {
   min: string | number;
   max: string | number;
   labels: string[] | string[][];
@@ -3107,7 +3107,6 @@ export type LinearScaleOptions = CartesianScaleOptions & {
    * @default true
    */
   beginAtZero: boolean;
-
   /**
    * Adjustment used when calculating the maximum data value.
    */
@@ -3151,7 +3150,6 @@ export const LinearScale: ChartComponent & {
 };
 
 export type LogarithmicScaleOptions = CartesianScaleOptions & {
-
   /**
    * Adjustment used when calculating the maximum data value.
    */
@@ -3175,10 +3173,9 @@ export const LogarithmicScale: ChartComponent & {
   new <O extends LogarithmicScaleOptions = LogarithmicScaleOptions>(cfg: AnyObject): LogarithmicScale<O>;
 };
 
-export type TimeScaleOptions = CartesianScaleOptions & {
+export type TimeScaleOptions = Omit<CartesianScaleOptions, 'min' | 'max'> & {
   min: string | number;
   max: string | number;
-
   suggestedMin: string | number;
   suggestedMax: string | number;
   /**
diff --git a/types/tests/scales/time_string_max.ts b/types/tests/scales/time_string_max.ts
new file mode 100644
index 000000000..530b1c548
--- /dev/null
+++ b/types/tests/scales/time_string_max.ts
@@ -0,0 +1,30 @@
+import { Chart } from '../../index.esm';
+
+const chart = new Chart('id', {
+  type: 'line',
+  data: {
+    datasets: [
+      {
+        label: 'Pie',
+        data: [
+        ],
+        borderColor: '#000000',
+        backgroundColor: '#00FF00'
+      }
+    ]
+  },
+  options: {
+    scales: {
+      x: {
+        type: 'time',
+        min: '2021-01-01',
+        max: '2021-12-01'
+      },
+      y: {
+        type: 'linear',
+        min: 0,
+        max: 10
+      }
+    }
+  }
+});