fix(accordion): Fixed changed after check error on dynamic panels

Closes #158
edcarroll · Jul 4, 2017 · d116b6a · d116b6a
1 parent 9bb3e5c
commit d116b6a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/modules/accordion/components/accordion-panel.ts b/src/modules/accordion/components/accordion-panel.ts
@@ -1,4 +1,4 @@
-import { Component, Input, Output, EventEmitter } from "@angular/core";
+import { Component, Input, Output, EventEmitter, ChangeDetectorRef } from "@angular/core";
 import { SuiAccordionService } from "../services/accordion.service";
 import { TransitionController, Transition } from "../../transition";
 
@@ -36,6 +36,7 @@ export class SuiAccordionPanel {
 
     public set service(service:SuiAccordionService) {
         this._service = service;
+        this._changeDetector.detectChanges();
     }
 
     @Input()
@@ -88,7 +89,7 @@ export class SuiAccordionPanel {
     @Output()
     public isOpenChange:EventEmitter<boolean>;
 
-    constructor() {
+    constructor(private _changeDetector:ChangeDetectorRef) {
         this.transitionController = new TransitionController(false);
 
         this._isOpen = false;

diff --git a/src/modules/accordion/components/accordion.ts b/src/modules/accordion/components/accordion.ts
@@ -59,7 +59,7 @@ export class SuiAccordion implements AfterContentInit {
         this.updatePanels();
 
         // Reconnect panels after they have updated.
-        this._panels.changes.subscribe(() => setTimeout(() => this.updatePanels()));
+        this._panels.changes.subscribe(() => this.updatePanels());
     }
 
     public updatePanels():void {