fix(tabs): selectedIndexChange do not emit first value

A-l-y-l-e · Jun 8, 2019 · 1ce4fe7 · 1ce4fe7
1 parent a73f773
commit 1ce4fe7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/app/docs/layout/tabs-demo/tabs-with-lazy-loading/tabs-with-lazy-loading.component.ts b/src/app/docs/layout/tabs-demo/tabs-with-lazy-loading/tabs-with-lazy-loading.component.ts
@@ -16,6 +16,10 @@ export class TabsWithLazyLoadingComponent {
   readonly classes = this.theme.addStyleSheet(styles);
   tabLoadTimes: Date[] = [];
 
+  constructor(
+    private theme: LyTheme2
+  ) { }
+
   getTime(index: number) {
     if (!this.tabLoadTimes[index]) {
       this.tabLoadTimes[index] = new Date();
@@ -24,8 +28,4 @@ export class TabsWithLazyLoadingComponent {
     return this.tabLoadTimes[index];
   }
 
-  constructor(
-    private theme: LyTheme2
-  ) { }
-
 }
diff --git a/src/lib/tabs/tabs.ts b/src/lib/tabs/tabs.ts
@@ -190,7 +190,7 @@ mixinBg(
 export class LyTabs extends LyTabsMixinBase implements OnChanges, OnInit, AfterViewInit, AfterContentInit, OnDestroy {
   /** @docs-private */
   readonly classes = this.theme.addStyleSheet(STYLES);
-  _selectedIndex = 0;
+  _selectedIndex: number;
   _selectedBeforeIndex: number;
   _selectedTab: LyTab | null;
   _selectedBeforeTab: LyTab;
@@ -395,6 +395,9 @@ export class LyTabs extends LyTabsMixinBase implements OnChanges, OnInit, AfterV
   }
 
   ngOnInit() {
+    if (this.selectedIndex == null) {
+      this.selectedIndex = 0;
+    }
     this.renderer.addClass(this.el.nativeElement, this.classes.root);
     const tabsIndicatorEl = this.tabsIndicator.nativeElement;
     this.renderer.addClass(tabsIndicatorEl, this.classes.tabsIndicator);