feat(tabs): animate tab change, include optional dynamic height (#1788)

Author: andrewseguin

e2e/components/tabs/tabs.e2e.ts

@@ -11,17 +11,17 @@ describe('tabs', () => {
       browser.get('/tabs');
       tabGroup = element(by.css('md-tab-group'));
       tabLabels = element.all(by.css('.md-tab-label'));
-      tabBodies = element.all(by.css('.md-tab-body'));
+      tabBodies = element.all(by.css('md-tab-body'));
     });
 
     it('should change tabs when the label is clicked', () => {
       tabLabels.get(1).click();
-      expect(getActiveStates(tabLabels)).toEqual([false, true, false]);
-      expect(getActiveStates(tabBodies)).toEqual([false, true, false]);
+      expect(getLabelActiveStates(tabLabels)).toEqual([false, true, false]);
+      expect(getBodyActiveStates(tabBodies)).toEqual([false, true, false]);
 
       tabLabels.get(0).click();
-      expect(getActiveStates(tabLabels)).toEqual([true, false, false]);
-      expect(getActiveStates(tabBodies)).toEqual([true, false, false]);
+      expect(getLabelActiveStates(tabLabels)).toEqual([true, false, false]);
+      expect(getBodyActiveStates(tabBodies)).toEqual([true, false, false]);
     });
 
     it('should change focus with keyboard interaction', () => {
@@ -49,18 +49,13 @@ describe('tabs', () => {
   });
 });
 
-/**
- * A helper function to perform the sendKey action
- * @param key
- */
+/** A helper function to perform the sendKey action. */
 function pressKey(key: string) {
   browser.actions().sendKeys(key).perform();
 }
 
 /**
- * Returns an array of true/false that represents the focus states of the provided elements
- * @param elements
- * @returns {webdriver.promise.Promise<Promise<boolean>[]>|webdriver.promise.Promise<T[]>}
+ * Returns an array of true/false that represents the focus states of the provided elements.
  */
 function getFocusStates(elements: ElementArrayFinder) {
   return elements.map(element => {
@@ -72,21 +67,19 @@ function getFocusStates(elements: ElementArrayFinder) {
   });
 }
 
-/**
- * Returns an array of true/false that represents the active states for the provided elements
- * @param elements
- * @returns {webdriver.promise.Promise<Promise<boolean>[]>|webdriver.promise.Promise<T[]>}
- */
-function getActiveStates(elements: ElementArrayFinder) {
-  return getClassStates(elements, 'md-tab-active');
+/** Returns an array of true/false that represents the active states for the provided elements. */
+function getLabelActiveStates(elements: ElementArrayFinder) {
+  return getClassStates(elements, 'md-tab-label-active');
+}
+
+/** Returns an array of true/false that represents the active states for the provided elements */
+function getBodyActiveStates(elements: ElementArrayFinder) {
+  return getClassStates(elements, 'md-tab-body-active');
 }
 
 /**
  * Returns an array of true/false values that represents whether the provided className is on
- * each element
- * @param elements
- * @param className
- * @returns {webdriver.promise.Promise<Promise<boolean>[]>|webdriver.promise.Promise<T[]>}
+ * each element.
  */
 function getClassStates(elements: ElementArrayFinder, className: string) {
   return elements.map(element => {

src/demo-app/tabs/tabs-demo.html

@@ -14,14 +14,84 @@ <h1>Tab Nav Bar</h1>
 </div>
 
 
-<h1>Tab Group Demo</h1>
+<h1>Tab Group Demo - Dynamic Height</h1>
 
-<md-tab-group class="demo-tab-group">
-  <md-tab *ngFor="let tab of tabs; let i = index" [disabled]="i == 1">
+<md-tab-group class="demo-tab-group" md-dynamic-height>
+  <md-tab *ngFor="let tab of tabs" [disabled]="tab.disabled">
+    <template md-tab-label>{{tab.label}}</template>
+    {{tab.content}}
+    <br>
+    <br>
+    <div *ngIf="tab.extraContent">
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla venenatis ante augue.
+      Phasellus volutpat neque ac dui mattis vulputate. Etiam consequat aliquam cursus.
+      In sodales pretium ultrices. Maecenas lectus est, sollicitudin consectetur felis nec,
+      feugiat ultricies mi. Aliquam erat volutpat. Nam placerat, tortor in ultrices porttitor,
+      orci enim rutrum enim, vel tempor sapien arcu a tellus. Vivamus convallis sodales ante varius
+      gravida. Curabitur a purus vel augue ultrices ultricies id a nisl. Nullam malesuada consequat
+      diam, a facilisis tortor volutpat et. Sed urna dolor, aliquet vitae posuere vulputate, euismod
+      ac lorem. Sed felis risus, pulvinar at interdum quis, vehicula sed odio. Phasellus in enim
+      venenatis, iaculis tortor eu, bibendum ante. Donec ac tellus dictum neque volutpat blandit.
+      Praesent efficitur faucibus risus, ac auctor purus porttitor vitae. Phasellus ornare dui nec
+      orci posuere, nec luctus mauris semper.
+      <br>
+      <br>
+      Morbi viverra, ante vel aliquet tincidunt, leo dolor pharetra quam, at semper massa orci nec
+      magna. Donec posuere nec sapien sed laoreet. Etiam cursus nunc in condimentum facilisis.
+      Etiam in tempor tortor. Vivamus faucibus egestas enim, at convallis diam pulvinar vel.
+      Cras ac orci eget nisi maximus cursus. Nunc urna libero, viverra sit amet nisl at, hendrerit
+      tempor turpis. Maecenas facilisis convallis mi vel tempor. Nullam vitae nunc leo. Cras sed
+      nisl consectetur, rhoncus sapien sit amet, tempus sapien.
+      <br>
+      <br>
+      Integer turpis erat, porttitor vitae mi faucibus, laoreet interdum tellus. Curabitur posuere
+      molestie dictum. Morbi eget congue risus, quis rhoncus quam. Suspendisse vitae hendrerit erat,
+      at posuere mi. Cras eu fermentum nunc. Sed id ante eu orci commodo volutpat non ac est.
+      Praesent ligula diam, congue eu enim scelerisque, finibus commodo lectus.
+    </div>
+    <br>
+    <br>
+    <md-input placeholder="Tab Label" [(ngModel)]="tab.label"></md-input>
+  </md-tab>
+</md-tab-group>
+
+
+<h1>Tab Group Demo - Fixed Height</h1>
+
+<md-tab-group class="demo-tab-group" style="height: 200px">
+  <md-tab *ngFor="let tab of tabs" [disabled]="tab.disabled">
     <template md-tab-label>{{tab.label}}</template>
     {{tab.content}}
     <br>
     <br>
+    <div *ngIf="tab.extraContent">
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla venenatis ante augue.
+      Phasellus volutpat neque ac dui mattis vulputate. Etiam consequat aliquam cursus.
+      In sodales pretium ultrices. Maecenas lectus est, sollicitudin consectetur felis nec,
+      feugiat ultricies mi. Aliquam erat volutpat. Nam placerat, tortor in ultrices porttitor,
+      orci enim rutrum enim, vel tempor sapien arcu a tellus. Vivamus convallis sodales ante varius
+      gravida. Curabitur a purus vel augue ultrices ultricies id a nisl. Nullam malesuada consequat
+      diam, a facilisis tortor volutpat et. Sed urna dolor, aliquet vitae posuere vulputate, euismod
+      ac lorem. Sed felis risus, pulvinar at interdum quis, vehicula sed odio. Phasellus in enim
+      venenatis, iaculis tortor eu, bibendum ante. Donec ac tellus dictum neque volutpat blandit.
+      Praesent efficitur faucibus risus, ac auctor purus porttitor vitae. Phasellus ornare dui nec
+      orci posuere, nec luctus mauris semper.
+      <br>
+      <br>
+      Morbi viverra, ante vel aliquet tincidunt, leo dolor pharetra quam, at semper massa orci nec
+      magna. Donec posuere nec sapien sed laoreet. Etiam cursus nunc in condimentum facilisis.
+      Etiam in tempor tortor. Vivamus faucibus egestas enim, at convallis diam pulvinar vel.
+      Cras ac orci eget nisi maximus cursus. Nunc urna libero, viverra sit amet nisl at, hendrerit
+      tempor turpis. Maecenas facilisis convallis mi vel tempor. Nullam vitae nunc leo. Cras sed
+      nisl consectetur, rhoncus sapien sit amet, tempus sapien.
+      <br>
+      <br>
+      Integer turpis erat, porttitor vitae mi faucibus, laoreet interdum tellus. Curabitur posuere
+      molestie dictum. Morbi eget congue risus, quis rhoncus quam. Suspendisse vitae hendrerit erat,
+      at posuere mi. Cras eu fermentum nunc. Sed id ante eu orci commodo volutpat non ac est.
+      Praesent ligula diam, congue eu enim scelerisque, finibus commodo lectus.
+    </div>
+    <br>
     <br>
     <md-input placeholder="Tab Label" [(ngModel)]="tab.label"></md-input>
   </md-tab>

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

@@ -16,7 +16,7 @@
   .md-tab-header {
     background: #f9f9f9;
   }
-  .md-tab-body {
+  .md-tab-body-content {
     padding: 12px;
   }
 }

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

@@ -18,9 +18,21 @@ export class TabsDemo {
   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'},
+    {
+      label: 'Tab One',
+      content: 'This is the body of the first tab'},
+    {
+      label: 'Tab Two',
+      disabled: true,
+      content: 'This is the body of the second tab'},
+    {
+      label: 'Tab Three',
+      extraContent: true,
+      content: 'This is the body of the third tab'},
+    {
+      label: 'Tab Four',
+      content: 'This is the body of the fourth tab'
+    },
   ];
 
   asyncTabs: Observable<any>;

src/lib/core/portal/portal-directives.ts

@@ -57,7 +57,9 @@ export class PortalHostDirective extends BasePortalHost implements OnDestroy {
   }
 
   set portal(p: Portal<any>) {
-    this._replaceAttachedPortal(p);
+    if (p) {
+      this._replaceAttachedPortal(p);
+    }
   }
 
   ngOnDestroy() {

src/lib/core/style/_layout-common.scss

@@ -0,0 +1,8 @@
+// This mixin ensures an element spans to fill the nearest ancestor with defined positioning.
+@mixin md-fill {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}

src/lib/core/style/_sidenav-common.scss

@@ -2,7 +2,7 @@
 // TODO(kara): animation for menu opening
 
 @import '../core/style/button-common';
-@import '../core/style/sidenav-common';
+@import '../core/style/layout-common';
 @import '../core/style/menu-common';
 
 $md-menu-vertical-padding: 8px !default;

src/lib/menu/menu.scss

@@ -1,6 +1,6 @@
 @import '../core/style/variables';
 @import '../core/style/elevation';
-@import '../core/style/sidenav-common';
+@import '../core/style/layout-common';
 
 
 // Mixin to help with defining LTR/RTL 'transform: translate3d()' values.
@@ -57,7 +57,7 @@ md-sidenav-layout {
 
   // TODO(hansl): Update this with a more robust solution.
   &[fullscreen] {
-    @include md-fullscreen();
+    @include md-fill();
 
     &.md-sidenav-opened {
       overflow: hidden;
@@ -66,7 +66,7 @@ md-sidenav-layout {
 }
 
 .md-sidenav-backdrop {
-  @include md-fullscreen();
+  @include md-fill();
 
   display: block;
 

src/lib/sidenav/sidenav.scss

@@ -2,6 +2,8 @@
 
 $md-tab-bar-height: 48px !default;
 
+$md-tab-animation-duration: 500ms !default;
+
 // Mixin styles for labels that are contained within the tab header.
 @mixin tab-label {
   line-height: $md-tab-bar-height;
@@ -36,5 +38,5 @@ $md-tab-bar-height: 48px !default;
   position: absolute;
   bottom: 0;
   height: 2px;
-  transition: 350ms ease-out;
-}
+  transition: $md-tab-animation-duration $ease-in-out-curve-function;
+}