Mirrors/Chart.js
2
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2026-03-06 00:14:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: unbind instance config from chart type (#10963)

Browse Source
This commit is contained in:
Dan Onoshko
2022-12-16 04:27:12 +04:00
committed by GitHub
parent 35fd6204b9
commit 38bf550558
2 changed files with 74 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
types/index.d.ts vendored
View File

@@ -488,7 +488,7 @@ export declare class Chart<
readonly id: string;
readonly canvas: HTMLCanvasElement;
readonly ctx: CanvasRenderingContext2D;
readonly config: ChartConfiguration<TType, TData, TLabel> | ChartConfigurationCustomTypesPerDataset<TType, TData, TLabel>;
readonly config: ChartConfigurationInstance;
readonly width: number;
readonly height: number;
readonly aspectRatio: number;
@@ -498,11 +498,11 @@ export declare class Chart<
readonly scales: { [key: string]: Scale };
readonly attached: boolean;
readonly legend?: LegendElement<TType>; // Only available if legend plugin is registered and enabled
readonly tooltip?: TooltipModel<TType>; // Only available if tooltip plugin is registered and enabled
readonly legend?: LegendElement; // Only available if legend plugin is registered and enabled
readonly tooltip?: TooltipModel; // Only available if tooltip plugin is registered and enabled
data: ChartData<TType, TData, TLabel>;
options: ChartOptions<TType>;
data: ChartData;
options: ChartOptions;
constructor(item: ChartItem, config: ChartConfiguration<TType, TData, TLabel> | ChartConfigurationCustomTypesPerDataset<TType, TData, TLabel>);
@@ -2186,7 +2186,7 @@ export interface LegendItem {
textAlign?: TextAlign;
}
export interface LegendElement<TType extends ChartType> extends Element<AnyObject, LegendOptions<TType>>, LayoutItem {
export interface LegendElement<TType extends ChartType = ChartType> extends Element<AnyObject, LegendOptions<TType>>, LayoutItem {
chart: Chart<TType>;
ctx: CanvasRenderingContext2D;
legendItems?: LegendItem[];
@@ -2420,7 +2420,7 @@ export interface TooltipLabelStyle {
*/
borderRadius?: number | BorderRadius;
}
export interface TooltipModel<TType extends ChartType> extends Element<AnyObject, TooltipOptions<TType>> {
export interface TooltipModel<TType extends ChartType = ChartType> extends Element<AnyObject, TooltipOptions<TType>> {
readonly chart: Chart<TType>;
// The items that we are rendering in the tooltip. See Tooltip Item Interface section
@@ -3660,3 +3660,5 @@ export interface ChartConfigurationCustomTypesPerDataset<
options?: ChartOptions<TType>;
plugins?: Plugin<TType>[];
}
export type ChartConfigurationInstance = ChartConfiguration | ChartConfigurationCustomTypesPerDataset & { type?: undefined }

65
types/tests/config_types.ts Normal file
View File

@@ -0,0 +1,65 @@
import { Chart } from '../../src/types.js';
const chart = new Chart('chart', {
type: 'bar',
data: {
labels: ['1', '2', '3'],
datasets: [{
data: [1, 2, 3]
},
{
data: [1, 2, 3]
}],
}
});
chart.config.type = 'line';
const chart2 = new Chart('chart', {
type: 'bar',
data: {
labels: ['1', '2', '3'],
datasets: [{
type: 'line',
data: [1, 2, 3]
},
{
type: 'line',
data: [1, 2, 3]
}],
}
});
chart2.config.type = 'line';
const chart3 = new Chart('chart', {
data: {
labels: ['1', '2', '3'],
datasets: [{
type: 'bar',
data: [1, 2, 3]
},
{
type: 'bar',
data: [1, 2, 3],
categoryPercentage: 10
}],
}
});
chart3.config.type = 'line';
const chart4 = new Chart('chart', {
data: {
labels: ['1', '2', '3'],
datasets: [{
type: 'bar',
data: [1, 2, 3]
}]
}
});
chart4.data.datasets.push({
type: 'line',
data: [1, 2, 3]
});