Skip to content

feat(tabs): add ripples to the tab group and nav bar links #1700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 14, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib/tabs/tab-group.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="md-tab-header" role="tablist"
(keydown)="handleKeydown($event)">
<div class="md-tab-label" role="tab" md-tab-label-wrapper
<div class="md-tab-label" role="tab" md-tab-label-wrapper md-ripple
*ngFor="let tab of _tabs; let i = index"
[id]="_getTabLabelId(i)"
[tabIndex]="selectedIndex == i ? 0 : -1"
Expand Down
1 change: 1 addition & 0 deletions src/lib/tabs/tab-group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
// Wraps each tab label
.md-tab-label {
@include tab-label;
position: relative;
}

@media ($md-xsmall) {
Expand Down
4 changes: 3 additions & 1 deletion src/lib/tabs/tab-nav-bar/tab-nav-bar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
// Wraps each link in the header
[md-tab-link] {
@include tab-label;
text-decoration: none;
text-decoration: none; // Removes anchor underline styling
position: relative;
overflow: hidden; // Keeps the ripple from extending outside the element bounds
}

@media ($md-xsmall) {
Expand Down
14 changes: 14 additions & 0 deletions src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {Component, Input, ViewChild, ElementRef, ViewEncapsulation, Directive} from '@angular/core';
import {MdInkBar} from '../ink-bar';
import {MdRipple} from '../../core/ripple/ripple';

/**
* Navigation component matching the styles of the tab group header.
Expand Down Expand Up @@ -41,3 +42,16 @@ export class MdTabLink {

constructor(private _mdTabNavBar: MdTabNavBar, private _element: ElementRef) {}
}

/**
* Simple directive that extends the ripple and matches the selector of the MdTabLink. This
* adds the ripple behavior to nav bar labels.
*/
@Directive({
selector: '[md-tab-link]',
})
export class MdTabLinkRipple extends MdRipple {
constructor(private _element: ElementRef) {
super(_element);
}
}
10 changes: 5 additions & 5 deletions src/lib/tabs/tabs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ import {
} from '../core';
import {MdTabLabel} from './tab-label';
import {MdTabLabelWrapper} from './tab-label-wrapper';
import {MdTabNavBar, MdTabLink} from './tab-nav-bar/tab-nav-bar';
import {MdTabNavBar, MdTabLink, MdTabLinkRipple} from './tab-nav-bar/tab-nav-bar';
import {MdInkBar} from './ink-bar';
import {Observable} from 'rxjs/Observable';
import 'rxjs/add/operator/map';
import {MdRippleModule} from '../core/ripple/ripple';


/** Used to generate unique ID's for each tab component */
let nextId = 0;

/** A simple change event emitted on focus or selection changes. */
export class MdTabChangeEvent {
index: number;
Expand Down Expand Up @@ -375,11 +375,11 @@ export class MdTabBody implements OnInit {
}

@NgModule({
imports: [CommonModule, PortalModule],
imports: [CommonModule, PortalModule, MdRippleModule],
// Don't export MdInkBar or MdTabLabelWrapper, as they are internal implementation details.
exports: [MdTabGroup, MdTabLabel, MdTab, MdTabNavBar, MdTabLink],
exports: [MdTabGroup, MdTabLabel, MdTab, MdTabNavBar, MdTabLink, MdTabLinkRipple],
declarations: [MdTabGroup, MdTabLabel, MdTab, MdInkBar, MdTabLabelWrapper,
MdTabNavBar, MdTabLink, MdTabBody],
MdTabNavBar, MdTabLink, MdTabBody, MdTabLinkRipple],
})
export class MdTabsModule {
static forRoot(): ModuleWithProviders {
Expand Down