diff --git a/libs/ng2-charts/src/lib/base-chart.directive.spec.ts b/libs/ng2-charts/src/lib/base-chart.directive.spec.ts index 0340d945..21cb05f4 100644 --- a/libs/ng2-charts/src/lib/base-chart.directive.spec.ts +++ b/libs/ng2-charts/src/lib/base-chart.directive.spec.ts @@ -7,7 +7,7 @@ import { tick, } from '@angular/core/testing'; import { Component } from '@angular/core'; -import { Chart, registerables } from 'chart.js'; +import { Chart, ChartData, ChartDataset, registerables } from "chart.js"; @Component({ template: @@ -19,8 +19,8 @@ import { Chart, registerables } from 'chart.js'; ' (chartHover)="hover()">', }) class TestComponent { - public data?: any; - public datasets?: any[]; + public data?: ChartData; + public datasets?: ChartDataset[]; public labels?: string[]; public click = jest.fn(); public hover = jest.fn(); diff --git a/libs/ng2-charts/src/lib/base-chart.directive.ts b/libs/ng2-charts/src/lib/base-chart.directive.ts index f2f53f97..967d660c 100644 --- a/libs/ng2-charts/src/lib/base-chart.directive.ts +++ b/libs/ng2-charts/src/lib/base-chart.directive.ts @@ -15,8 +15,8 @@ import { ChartEvent, ChartType, DefaultDataPoint, - Plugin, -} from 'chart.js'; + Plugin, UpdateMode +} from "chart.js"; import { ThemeService } from './theme.service'; import { Subscription } from 'rxjs'; @@ -126,9 +126,9 @@ export class BaseChartDirective< ); } - public update(duration?: any): void { + public update(mode?: UpdateMode): void { if (this.chart) { - this.zone.runOutsideAngular(() => this.chart?.update(duration)); + this.zone.runOutsideAngular(() => this.chart?.update(mode)); } } diff --git a/libs/ng2-charts/src/lib/get-colors.ts b/libs/ng2-charts/src/lib/get-colors.ts index a08c6b03..b18b8866 100644 --- a/libs/ng2-charts/src/lib/get-colors.ts +++ b/libs/ng2-charts/src/lib/get-colors.ts @@ -1,47 +1,47 @@ import { baseColors } from './base-colors'; -import { Color } from 'chart.js'; +import { Color, ScriptableContext } from "chart.js"; export const builtInDefaults = { plugins: { colors: { enabled: false } }, datasets: { line: { - backgroundColor: (context: any) => + backgroundColor: (context: ScriptableContext<'line'>) => rgba(generateColor(context.datasetIndex), 0.4), - borderColor: (context: any) => + borderColor: (context: ScriptableContext<'line'>) => rgba(generateColor(context.datasetIndex), 1), - pointBackgroundColor: (context: any) => + pointBackgroundColor: (context: ScriptableContext<'line'>) => rgba(generateColor(context.datasetIndex), 1), pointBorderColor: '#fff', }, bar: { - backgroundColor: (context: any) => + backgroundColor: (context: ScriptableContext<'bar'>) => rgba(generateColor(context.datasetIndex), 0.6), - borderColor: (context: any) => + borderColor: (context: ScriptableContext<'bar'>) => rgba(generateColor(context.datasetIndex), 1), }, - get radar(): { [key: string]: ((context: any) => Color) | Color } { + get radar(): { [key: string]: ((context: ScriptableContext<'line'>) => Color) | Color } { return this.line; }, doughnut: { - backgroundColor: (context: any) => + backgroundColor: (context: ScriptableContext<'doughnut'>) => rgba(generateColor(context.dataIndex), 0.6), borderColor: '#fff', }, - get pie(): { [key: string]: ((context: any) => Color) | Color } { + get pie(): { [key: string]: ((context: ScriptableContext<'doughnut'>) => Color) | Color } { return this.doughnut; }, polarArea: { - backgroundColor: (context: any) => + backgroundColor: (context: ScriptableContext<'polarArea'>) => rgba(generateColor(context.dataIndex), 0.6), - borderColor: (context: any) => rgba(generateColor(context.dataIndex), 1), + borderColor: (context: ScriptableContext<'polarArea'>) => rgba(generateColor(context.dataIndex), 1), }, - get bubble(): { [key: string]: ((context: any) => Color) | Color } { + get bubble(): { [key: string]: ((context: ScriptableContext<'doughnut'>) => Color) | Color } { return this.doughnut; }, - get scatter(): { [key: string]: ((context: any) => Color) | Color } { + get scatter(): { [key: string]: ((context: ScriptableContext<'doughnut'>) => Color) | Color } { return this.doughnut; }, - get area(): { [key: string]: ((context: any) => Color) | Color } { + get area(): { [key: string]: ((context: ScriptableContext<'polarArea'>) => Color) | Color } { return this.polarArea; }, },