feat(tab-nav-bar): add initial functionality of tab nav bar (#1589)

src/demo-app/demo-app-module.ts

@@ -32,9 +32,7 @@ import {SidenavDemo} from './sidenav/sidenav-demo';
 import {SnackBarDemo} from './snack-bar/snack-bar-demo';
 import {PortalDemo, ScienceJoke} from './portal/portal-demo';
 import {MenuDemo} from './menu/menu-demo';
-import {TabsDemo} from './tabs/tab-group-demo';
-
-
+import {TabsDemoModule} from './tabs/tabs-demo.module';
 
 @NgModule({
   imports: [
@@ -43,6 +41,7 @@ import {TabsDemo} from './tabs/tab-group-demo';
     HttpModule,
     RouterModule.forRoot(DEMO_APP_ROUTES),
     MaterialModule.forRoot(),
+    TabsDemoModule,
   ],
   declarations: [
     BaselineDemo,
@@ -76,7 +75,6 @@ import {TabsDemo} from './tabs/tab-group-demo';
     SliderDemo,
     SlideToggleDemo,
     SpagettiPanel,
-    TabsDemo,
     ToolbarDemo,
     TooltipDemo,
   ],

src/demo-app/demo-app/routes.ts

@@ -3,7 +3,7 @@ import {Home} from './demo-app';
 import {ButtonDemo} from '../button/button-demo';
 import {BaselineDemo} from '../baseline/baseline-demo';
 import {ButtonToggleDemo} from '../button-toggle/button-toggle-demo';
-import {TabsDemo} from '../tabs/tab-group-demo';
+import {TabsDemo} from '../tabs/tabs-demo';
 import {GridListDemo} from '../grid-list/grid-list-demo';
 import {GesturesDemo} from '../gestures/gestures-demo';
 import {LiveAnnouncerDemo} from '../live-announcer/live-announcer-demo';
@@ -27,7 +27,7 @@ import {RippleDemo} from '../ripple/ripple-demo';
 import {DialogDemo} from '../dialog/dialog-demo';
 import {TooltipDemo} from '../tooltip/tooltip-demo';
 import {SnackBarDemo} from '../snack-bar/snack-bar-demo';
-
+import {TABS_DEMO_ROUTES} from '../tabs/routes';
 
 export const DEMO_APP_ROUTES: Routes = [
   {path: '', component: Home},
@@ -51,7 +51,7 @@ export const DEMO_APP_ROUTES: Routes = [
   {path: 'live-announcer', component: LiveAnnouncerDemo},
   {path: 'gestures', component: GesturesDemo},
   {path: 'grid-list', component: GridListDemo},
-  {path: 'tabs', component: TabsDemo},
+  {path: 'tabs', component: TabsDemo, children: TABS_DEMO_ROUTES},
   {path: 'button-toggle', component: ButtonToggleDemo},
   {path: 'baseline', component: BaselineDemo},
   {path: 'ripple', component: RippleDemo},

src/demo-app/tabs/routes.ts

@@ -0,0 +1,10 @@
+import {Routes} from '@angular/router';
+
+import {SunnyTabContent, RainyTabContent, FoggyTabContent} from '../tabs/tabs-demo';
+
+export const TABS_DEMO_ROUTES: Routes = [
+  {path: '', redirectTo: 'sunny-tab', pathMatch: 'full'},
+  {path: 'sunny-tab', component: SunnyTabContent},
+  {path: 'rainy-tab', component: RainyTabContent},
+  {path: 'foggy-tab', component: FoggyTabContent},
+];

src/demo-app/tabs/tab-group-demo.html → src/demo-app/tabs/tabs-demo.html

@@ -1,3 +1,19 @@
+<h1>Tab Nav Bar</h1>
+
+<div class="demo-nav-bar">
+  <nav md-tab-nav-bar aria-label="weather navigation links">
+    <a md-tab-link
+       *ngFor="let tabLink of tabLinks; let i = index"
+       [routerLink]="tabLink.link"
+       [active]="activeLinkIndex === i"
+       (click)="activeLinkIndex = i">
+      {{tabLink.label}}
+    </a>
+  </nav>
+  <router-outlet></router-outlet>
+</div>
+
+
 <h1>Tab Group Demo</h1>
 
 <md-tab-group class="demo-tab-group">
@@ -13,6 +29,7 @@ <h1>Tab Group Demo</h1>
   </md-tab>
 </md-tab-group>
 
+
 <h1>Async Tabs</h1>
 
 <md-tab-group class="demo-tab-group">

src/demo-app/tabs/tabs-demo.module.ts

@@ -0,0 +1,23 @@
+import {NgModule} from '@angular/core';
+import {MaterialModule} from '@angular/material';
+import {FormsModule} from '@angular/forms';
+import {BrowserModule} from '@angular/platform-browser';
+import {RouterModule} from '@angular/router';
+
+import {TabsDemo, SunnyTabContent, RainyTabContent, FoggyTabContent} from './tabs-demo';
+
+@NgModule({
+  imports: [
+    FormsModule,
+    BrowserModule,
+    MaterialModule,
+    RouterModule,
+  ],
+  declarations: [
+    TabsDemo,
+    SunnyTabContent,
+    RainyTabContent,
+    FoggyTabContent,
+  ]
+})
+export class TabsDemoModule {}

src/demo-app/tabs/tabs-demo.scss

@@ -0,0 +1,22 @@
+.demo-nav-bar {
+  border: 1px solid #e0e0e0;
+  [md-tab-nav-bar] {
+    background: #f9f9f9;
+  }
+  sunny-routed-content,
+  rainy-routed-content,
+  foggy-routed-content {
+    display: block;
+    padding: 12px;
+  }
+}
+
+.demo-tab-group {
+  border: 1px solid #e0e0e0;
+  .md-tab-header {
+    background: #f9f9f9;
+  }
+  .md-tab-body {
+    padding: 12px;
+  }
+}

src/demo-app/tabs/tabs-demo.ts

@@ -0,0 +1,65 @@
+import {Component, ViewEncapsulation} from '@angular/core';
+import {Router} from '@angular/router';
+import {Observable} from 'rxjs/Observable';
+
+@Component({
+  moduleId: module.id,
+  selector: 'tabs-demo',
+  templateUrl: 'tabs-demo.html',
+  styleUrls: ['tabs-demo.css'],
+  encapsulation: ViewEncapsulation.None,
+})
+export class TabsDemo {
+  tabLinks = [
+    { label: 'Sun', link: 'sunny-tab'},
+    { label: 'Rain', link: 'rainy-tab'},
+    { label: 'Fog', link: 'foggy-tab'},
+  ];
+  activeLinkIndex = 0;
+
+  tabs = [
+    { label: 'Tab One', content: 'This is the body of the first tab' },
+    { label: 'Tab Two', content: 'This is the body of the second tab' },
+    { label: 'Tab Three', content: 'This is the body of the third tab' },
+  ];
+
+  asyncTabs: Observable<any>;
+
+  constructor(private router: Router) {
+    this.asyncTabs = Observable.create((observer: any) => {
+      setTimeout(() => {
+        observer.next(this.tabs);
+      }, 1000);
+    });
+
+    // Initialize the index by checking if a tab link is contained in the url.
+    // This is not an ideal check and can be removed if routerLink exposes if it is active.
+    // https://github.com/angular/angular/pull/12525
+    this.activeLinkIndex =
+        this.tabLinks.findIndex(routedTab => router.url.indexOf(routedTab.link) != -1);
+  }
+}
+
+
+@Component({
+  moduleId: module.id,
+  selector: 'sunny-routed-content',
+  template: 'This is the routed body of the sunny tab.',
+})
+export class SunnyTabContent {}
+
+
+@Component({
+  moduleId: module.id,
+  selector: 'rainy-routed-content',
+  template: 'This is the routed body of the rainy tab.',
+})
+export class RainyTabContent {}
+
+
+@Component({
+  moduleId: module.id,
+  selector: 'foggy-routed-content',
+  template: 'This is the routed body of the foggy tab.',
+})
+export class FoggyTabContent {}

src/lib/index.ts

@@ -20,5 +20,6 @@ export * from './slider/index';
 export * from './slide-toggle/index';
 export * from './snack-bar/index';
 export * from './tabs/index';
+export * from './tabs/tab-nav-bar/index';
 export * from './toolbar/index';
 export * from './tooltip/index';

src/lib/tabs/_tabs-common.scss

@@ -0,0 +1,40 @@
+@import '../core/style/variables';
+
+$md-tab-bar-height: 48px !default;
+
+// Mixin styles for labels that are contained within the tab header.
+@mixin tab-label {
+  line-height: $md-tab-bar-height;
+  height: $md-tab-bar-height;
+  padding: 0 12px;
+  font-size: $md-body-font-size-base;
+  font-family: $md-font-family;
+  font-weight: 500;
+  cursor: pointer;
+  box-sizing: border-box;
+  color: currentColor;
+  opacity: 0.6;
+  min-width: 160px;
+  text-align: center;
+  &:focus {
+    outline: none;
+    opacity: 1;
+  }
+}
+
+// Mixin styles for the top section of the view; contains the tab labels.
+@mixin tab-header {
+  overflow: hidden;
+  position: relative;
+  display: flex;
+  flex-direction: row;
+  flex-shrink: 0;
+}
+
+// Mixin styles for the ink bar that displays near the active tab in the header.
+@mixin ink-bar {
+  position: absolute;
+  bottom: 0;
+  height: 2px;
+  transition: 350ms ease-out;
+}

src/lib/tabs/_tabs-theme.scss

@@ -8,7 +8,8 @@
   $warn: map-get($theme, warn);
   $background: map-get($theme, background);
   $foreground: map-get($theme, foreground);
-
+
+  [md-tab-nav-bar],
   .md-tab-header {
     border-bottom: 1px solid md-color($background, status-bar);
   }

src/lib/tabs/tab-group.scss

@@ -1,41 +1,20 @@
 @import '../core/style/variables';
-
-
-$md-tab-bar-height: 48px !default;
+@import 'tabs-common';
 
 :host {
   display: flex;
   flex-direction: column;
   font-family: $md-font-family;
 }
 
-// The top section of the view; contains the tab labels
+// Styling for the heading containing the tab labels
 .md-tab-header {
-  overflow: hidden;
-  position: relative;
-  display: flex;
-  flex-direction: row;
-  flex-shrink: 0;
+  @include tab-header;
 }
 
-// Wraps each tab label 
+// Wraps each tab label
 .md-tab-label {
-  line-height: $md-tab-bar-height;
-  height: $md-tab-bar-height;
-  padding: 0 12px;
-  font-size: $md-body-font-size-base;
-  font-family: $md-font-family;
-  font-weight: 500;
-  cursor: pointer;
-  box-sizing: border-box;
-  color: currentColor;
-  opacity: 0.6;
-  min-width: 160px;
-  text-align: center;
-  &:focus {
-    outline: none;
-    opacity: 1;
-  }
+  @include tab-label;
 }
 
 @media ($md-xsmall) {
@@ -44,9 +23,9 @@ $md-tab-bar-height: 48px !default;
   }
 }
 
-.md-tab-disabled {
-  cursor: default;
-  pointer-events: none;
+// The ink bar that displays next to the active tab
+md-ink-bar {
+  @include ink-bar;
 }
 
 // The bottom section of the view; contains the tab bodies 
@@ -69,10 +48,8 @@ $md-tab-bar-height: 48px !default;
   }
 }
 
-// The colored bar that underlines the active tab 
-md-ink-bar {
-  position: absolute;
-  bottom: 0;
-  height: 2px;
-  transition: 350ms ease-out;
-}
+// Styling for any tab that is marked disabled
+.md-tab-disabled {
+  cursor: default;
+  pointer-events: none;
+}

src/lib/tabs/tab-nav-bar/index.ts

@@ -0,0 +1 @@
+export * from './tab-nav-bar';

src/lib/tabs/tab-nav-bar/tab-nav-bar.html

@@ -0,0 +1,2 @@
+<ng-content></ng-content>
+<md-ink-bar></md-ink-bar>