Merge branch 'master' into fix/toggle

Author: cal-smith

src/content-switcher/content-switcher-option.directive.ts

@@ -15,6 +15,7 @@ export class ContentSwitcherOption {
 		this._active = value;
 		this.selectedClass = value;
 		this.ariaSelected = value;
+		this.tabindex = value ? "0" : "-1";
 	}
 
 	get active() {
@@ -29,6 +30,7 @@ export class ContentSwitcherOption {
 	@HostBinding("class.bx--content-switcher--selected") selectedClass = false;
 	@HostBinding("attr.role") role = "tab";
 	@HostBinding("attr.aria-selected") ariaSelected = false;
+	@HostBinding("attr.tabIndex") tabindex = "-1";
 
 	protected _active = false;
 
@@ -37,4 +39,16 @@ export class ContentSwitcherOption {
 		this.active = true;
 		this.selected.emit(true);
 	}
+
+	@HostListener("focus")
+	onFocus() {
+		this.active = true;
+	}
+
+	@HostListener("blur", ["$event"])
+	onBlur(event) {
+		if (event.relatedTarget) {
+			this.active = false;
+		}
+	}
 }

src/content-switcher/content-switcher.component.ts

@@ -5,9 +5,12 @@ import {
 	QueryList,
 	Output,
 	EventEmitter,
-	AfterViewInit
+	AfterViewInit,
+	HostListener,
+	ElementRef
 } from "@angular/core";
 import { ContentSwitcherOption } from "./content-switcher-option.directive";
+import { isFocusInLastItem, isFocusInFirstItem } from "./../common/tab.service";
 
 /**
  *
@@ -31,7 +34,10 @@ export class ContentSwitcher implements AfterViewInit {
 
 	@ContentChildren(ContentSwitcherOption) options: QueryList<ContentSwitcherOption>;
 
+	constructor(protected elementRef: ElementRef) {}
+
 	ngAfterViewInit() {
+		this.options.first.active = true;
 		this.options.forEach(option => {
 			option.selected.subscribe(_ => {
 				const active = option;
@@ -44,4 +50,43 @@ export class ContentSwitcher implements AfterViewInit {
 			});
 		});
 	}
+
+	@HostListener("keydown", ["$event"])
+	hostkeys(event: KeyboardEvent) {
+		const buttonList = Array.from<any>(this.elementRef.nativeElement.querySelectorAll(".bx--content-switcher-btn"));
+
+		switch (event.key) {
+			case "Right": // IE specific value
+			case "ArrowRight":
+				event.preventDefault();
+				if (!isFocusInLastItem(event, buttonList))  {
+					const index = buttonList.findIndex(item => item === event.target);
+					buttonList[index + 1].focus();
+				} else {
+					buttonList[0].focus();
+				}
+				break;
+
+			case "Left": // IE specific value
+			case "ArrowLeft":
+				event.preventDefault();
+				if (!isFocusInFirstItem(event, buttonList))  {
+					const index = buttonList.findIndex(item => item === event.target);
+					buttonList[index - 1].focus();
+				} else {
+					buttonList[buttonList.length - 1].focus();
+				}
+				break;
+
+			case "Home":
+				event.preventDefault();
+				buttonList[0].focus();
+				break;
+
+			case "End":
+				event.preventDefault();
+				buttonList[buttonList.length - 1].focus();
+				break;
+		}
+	}
 }

src/index.ts

@@ -12,6 +12,7 @@ export * from "./forms/forms.module";
 export * from "./i18n/i18n.module";
 export * from "./icon/icon.module";
 export * from "./input/input.module";
+export * from "./link/link.module";
 export * from "./list-group/list-group.module";
 export * from "./loading/loading.module";
 export * from "./modal/modal.module";
@@ -26,5 +27,3 @@ export * from "./switch/switch.module";
 export * from "./table/table.module";
 export * from "./tabs/tabs.module";
 export * from "./tiles/tiles.module";
-export * from "./toggle/toggle.module";
-export * from "./utils/position";

src/link/link.directive.ts

@@ -0,0 +1,47 @@
+import {
+	Directive,
+	HostBinding,
+	Input
+} from "@angular/core";
+
+/**
+ * A convinence directive for applying styling to a link.
+ *
+ * Example:
+ *
+ * ```hmtl
+ * <a href="#" ibmLink>A link</a>
+ * ```
+ *
+ * See the [vanilla carbon docs](http://www.carbondesignsystem.com/components/link/code) for more detail.
+ */
+@Directive({
+	selector: "[ibmLink]"
+})
+
+export class Link {
+	@HostBinding("class.bx--link") baseClass = true;
+
+	/**
+	 * Automatically set to `-1` when link is disabled.
+	 * @memberof Link
+	 */
+	@HostBinding("attr.tabindex") tabindex;
+
+	/**
+	 * Set to true to disable link.
+	 * @memberof Link
+	 */
+	@Input()
+	@HostBinding("attr.aria-disabled")
+	set disabled(disabled: boolean) {
+		this._disabled = disabled;
+		this.tabindex = this.disabled ? -1 : null;
+	}
+
+	get disabled(): boolean {
+		return this._disabled;
+	}
+
+	private _disabled;
+}

src/link/link.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from "@angular/core";
+import { CommonModule } from "@angular/common";
+
+import { Link } from "./link.directive";
+
+export { Link } from "./link.directive";
+
+@NgModule({
+	declarations: [
+		Link
+	],
+	exports: [
+		Link
+	],
+	imports: [
+		CommonModule
+	]
+})
+export class LinkModule {}

src/link/link.spec.ts

@@ -0,0 +1,50 @@
+import { TestBed, ComponentFixture } from "@angular/core/testing";
+import { Component, Input, DebugElement } from "@angular/core";
+import { By } from "@angular/platform-browser";
+
+import { Link } from "./link.directive";
+
+describe("Link", () => {
+	it("should create a Link", () => {
+		TestBed.configureTestingModule({
+			declarations: [TestLinkComponent, Link]
+		});
+
+		let fixture: ComponentFixture<TestLinkComponent> = TestBed.createComponent(TestLinkComponent);
+		let component: TestLinkComponent = fixture.componentInstance;
+		fixture.detectChanges();
+
+		expect(component).toBeTruthy();
+		const directiveEl = fixture.debugElement.query(By.directive(Link));
+		expect(directiveEl).not.toBeNull();
+		expect(directiveEl.attributes["aria-disabled"]).toBe(null);
+		expect(directiveEl.attributes["tabindex"]).toBe(null);
+		expect(directiveEl.attributes["href"]).toBe("https://angular.carbondesignsystem.com/");
+	});
+
+	it("should create a disabled link", () => {
+		TestBed.configureTestingModule({
+			declarations: [TestDisabledLinkComponent, Link]
+		});
+
+		let fixture: ComponentFixture<TestDisabledLinkComponent> = TestBed.createComponent(TestDisabledLinkComponent);
+		let component: TestDisabledLinkComponent = fixture.componentInstance;
+		fixture.detectChanges();
+
+		const directiveEl = fixture.debugElement.query(By.directive(Link));
+		expect(directiveEl.attributes["aria-disabled"]).toBe("true");
+		expect(directiveEl.attributes["tabindex"]).toBe("-1");
+	});
+});
+
+@Component({
+	template: `<a href="https://angular.carbondesignsystem.com/" ibmLink>link</a>`
+})
+class TestLinkComponent {
+}
+
+@Component({
+	template: `<a href="https://angular.carbondesignsystem.com/" [disabled]="1+1===2" ibmLink>link</a>`
+})
+class TestDisabledLinkComponent {
+}

src/link/link.stories.ts

@@ -0,0 +1,22 @@
+import { storiesOf, moduleMetadata } from "@storybook/angular";
+import { withKnobs, boolean } from "@storybook/addon-knobs/angular";
+
+import { LinkModule } from "../";
+
+storiesOf("Link", module)
+	.addDecorator(
+		moduleMetadata({
+			imports: [
+				LinkModule
+			]
+		})
+	)
+	.addDecorator(withKnobs)
+	.add("Basic", () => ({
+		template: `
+			<a href="#" ibmLink [disabled]="disabled">link</a>
+		`,
+		props: {
+			disabled: boolean("disabled", false)
+		}
+	}));