Skip to content

Commit 1dbffdb

Browse files
committed
fix(chartjs): use afterRender, afterNextRender fails - temp fix
1 parent 9b0dce9 commit 1dbffdb

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

projects/coreui-angular-chartjs/src/lib/chartjs.component.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
22

33
import { ChartjsComponent } from './chartjs.component';
4-
import { Chart, registerables } from 'chart.js';
4+
import { Chart, ChartData, registerables } from 'chart.js';
55

66
describe('ChartjsComponent', () => {
77
let component: ChartjsComponent;
@@ -16,7 +16,7 @@ describe('ChartjsComponent', () => {
1616

1717
const labels = ['Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa', 'Su'];
1818

19-
const data = {
19+
const data: ChartData = {
2020
labels: labels,
2121
datasets: [{
2222
data: [65, 59, 84, 84, 51, 55, 40],

projects/coreui-angular-chartjs/src/lib/chartjs.component.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {
2-
afterNextRender,
2+
afterRender,
33
AfterRenderPhase,
44
AfterViewInit,
55
booleanAttribute,
@@ -84,10 +84,11 @@ export class ChartjsComponent<TType extends ChartType = ChartType, TData = Defau
8484
private renderer: Renderer2,
8585
private changeDetectorRef: ChangeDetectorRef
8686
) {
87-
afterNextRender(() => {
87+
// todo: verify afterRender / afterNextRender for chartjs (spec fails with 17.0.10)
88+
afterRender(() => {
8889
this.ctx = this.canvasElement?.nativeElement?.getContext('2d');
8990
this.chartRender();
90-
}, { phase: AfterRenderPhase.Read });
91+
}, { phase: AfterRenderPhase.Write });
9192
}
9293

9394
ngAfterViewInit(): void {

0 commit comments

Comments
 (0)