fix(module: accordion): fix accordion not automatic expand bug (#575)

NG-ZORRO · Sep 9, 2019 · 19b90da · 19b90da
1 parent 6df7d7c
commit 19b90da
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 30 deletions.
diff --git a/components/accordion/accordion.component.ts b/components/accordion/accordion.component.ts
@@ -47,8 +47,8 @@ export class AccordionComponent implements AfterContentInit, OnDestroy, OnChange
   @HostBinding('class.am-accordion')
   amAccordion: boolean = true;
 
-  @HostListener('click', ['$event'])
-  click(event) {
+  @HostListener('click')
+  click() {
     let result: any = [];
     this.groups.toArray().forEach(group => {
       if (group.isOpened) {
@@ -75,7 +75,7 @@ export class AccordionComponent implements AfterContentInit, OnDestroy, OnChange
   init() {
     if (this.expandAll && this.groups && this.groups.length > 0) {
       this._oldGroups = this.groups.toArray();
-      this._oldGroups.forEach((group, index) => {
+      this._oldGroups.forEach((group) => {
         group.openOnInitialization();
       });
       this._subscription = this.groups.changes.subscribe(change => {
@@ -89,15 +89,16 @@ export class AccordionComponent implements AfterContentInit, OnDestroy, OnChange
       });
     }
 
-    let currentActiveKey = [];
-    if (
-      this.activeKey !== undefined &&
-      this.activeKey.length > 0 &&
-      !this.accordion &&
-      this.groups &&
-      this.groups.length > 0
-    ) {
+    let currentActiveKey: Array<any> = [];
+    if (this.activeKey && this.activeKey.length > 0) {
       currentActiveKey = this.toArray(this.activeKey);
+      if (this.accordion) {
+        currentActiveKey = currentActiveKey.slice(0, 1);
+      }
+    } else if (this.defaultActiveKey) {
+      currentActiveKey = [this.defaultActiveKey];
+    }
+    if (this.groups && this.groups.length > 0) {
       this.groups.forEach((group, index) => {
         currentActiveKey.forEach(key => {
           if (index === parseInt(key, 0)) {
@@ -108,21 +109,6 @@ export class AccordionComponent implements AfterContentInit, OnDestroy, OnChange
           }
         });
       });
-    } else if (
-      this.defaultActiveKey !== undefined &&
-      !this.expandAll &&
-      !this.accordion &&
-      this.groups &&
-      this.groups.length > 0
-    ) {
-      this.groups.forEach((group, index) => {
-        if (index === parseInt(this.defaultActiveKey, 0)) {
-          setTimeout(() => {
-            group.isOpened = true;
-            group.openOnInitialization();
-          }, 0);
-        }
-      });
     }
   }
 

diff --git a/components/accordion/demo/accordion.ts b/components/accordion/demo/accordion.ts
@@ -20,11 +20,11 @@ import { Component } from '@angular/core';
   `
 })
 export class DemoAccordionAccordionComponent {
-  activeKey = [0, 1];
+  activeKey = [1];
   accordions: Array<any> = [
     { title: 'Title 1', child: ['content 1', 'content 1', 'content 1'] },
-    { title: 'Title 2', child: ['content 2', 'content 2', 'content 2'], inactive: false },
-    { title: 'Title 3', child: ['content 3', 'content 3', 'content 3'], inactive: true }
+    { title: 'Title 2', child: ['content 2', 'content 2', 'content 2'] },
+    { title: 'Title 3', child: ['content 3', 'content 3', 'content 3'] }
   ];
 
   onChange(event) {

diff --git a/components/accordion/demo/basic.ts b/components/accordion/demo/basic.ts
@@ -23,7 +23,7 @@ import { Component, ViewChild, AfterViewInit, OnInit } from '@angular/core';
   `
 })
 export class DemoAccordionBasicComponent implements OnInit {
-  @ViewChild('title1', {static: false}) title1: ViewChild;
+  @ViewChild('title1', {static: true}) title1: ViewChild;
   accordions: Array<any> = [];
 
   activeKey = [0, 1];