Commit1dbffdb

committed

fix(chartjs): use afterRender, afterNextRender fails - temp fix

1 parent9b0dce9 commit1dbffdbCopy full SHA for 1dbffdb

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import{ComponentFixture,fakeAsync,TestBed,tick}from'@angular/core/testing';`
`2`	`2`
`3`	`3`	`import{ChartjsComponent}from'./chartjs.component';`
`4`		`-import{Chart,registerables}from'chart.js';`
	`4`	`+import{Chart,ChartData,registerables}from'chart.js';`
`5`	`5`
`6`	`6`	`describe('ChartjsComponent',()=>{`
`7`	`7`	`letcomponent:ChartjsComponent;`
`@@ -16,7 +16,7 @@ describe('ChartjsComponent', () => {`
`16`	`16`
`17`	`17`	`constlabels=['Mo','Tu','We','Th','Fr','Sa','Su'];`
`18`	`18`
`19`		`-constdata={`
	`19`	`+constdata:ChartData={`
`20`	`20`	`labels:labels,`
`21`	`21`	`datasets:[{`
`22`	`22`	`data:[65,59,84,84,51,55,40],`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import{`
`2`		`-afterNextRender,`
	`2`	`+afterRender,`
`3`	`3`	`AfterRenderPhase,`
`4`	`4`	`AfterViewInit,`
`5`	`5`	`booleanAttribute,`
`@@ -84,10 +84,11 @@ export class ChartjsComponent<TType extends ChartType = ChartType, TData = Defau`
`84`	`84`	`privaterenderer:Renderer2,`
`85`	`85`	`privatechangeDetectorRef:ChangeDetectorRef`
`86`	`86`	`){`
`87`		`-afterNextRender(()=>{`
	`87`	`+// todo: verify afterRender / afterNextRender for chartjs (spec fails with 17.0.10)`
	`88`	`+afterRender(()=>{`
`88`	`89`	`this.ctx=this.canvasElement?.nativeElement?.getContext('2d');`
`89`	`90`	`this.chartRender();`
`90`		`-},{phase:AfterRenderPhase.Read});`
	`91`	`+},{phase:AfterRenderPhase.Write});`
`91`	`92`	`}`
`92`	`93`
`93`	`94`	`ngAfterViewInit():void{`

Comments

(0)