archive-gh-me/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2025-12-08 20:36:08 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Evert Timberg 2022-02-06 13:53:03 -05:00 committed by GitHub
parent aebbb5afff
commit c869972b60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
types/index.esm.d.ts vendored
View File

@ -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;
/**

30
types/tests/scales/time_string_max.ts Normal file
View File

@ -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
}
}
}
});