feat(tab-bar): Add focusOnActivate flag

packages/mdc-tab-bar/README.md

@@ -96,6 +96,11 @@ Mixin | Description
 
 ## `MDCTabBar` Properties and Methods
 
+Property | Value Type | Description
+--- | --- | ---
+`focusOnActivate` | `boolean` (write-only) | Sets whether tabs focus themselves when activated. Defaults to `true`.
+`useAutomaticActivation` | `boolean` (write-only) | Sets how tabs activate in response to keyboard interaction. Automatic (`true`) activates as soon as a tab is focused with arrow keys; manual (`false`) activates only when the user presses space/enter. The default is automatic (`true`).
+
 Method Signature | Description
 --- | ---
 `activateTab(index: number) => void` | Activates the tab at the given index.
@@ -136,6 +141,7 @@ Method Signature | Description
 Method Signature | Description
 --- | ---
 `activateTab(index: number) => void` | Activates the tab at the given index.
+`setUseAutomaticActivation(useAutomaticActivation: boolean) => void` | Sets how tabs activate in response to keyboard interaction. Automatic (`true`) activates as soon as a tab is focused with arrow keys; manual (`false`) activates only when the user presses space/enter.
 `handleKeyDown(evt: Event) => void` | Handles the logic for the `"keydown"` event.
 `handleTabInteraction(evt: Event) => void` | Handles the logic for the `"MDCTab:interacted"` event.
 `scrollIntoView(index: number) => void` | Scrolls the Tab at the given index into view.

packages/mdc-tab-bar/index.js

@@ -67,6 +67,10 @@ class MDCTabBar extends MDCComponent {
     return new MDCTabBar(root);
   }
 
+  set focusOnActivate(focusOnActivate) {
+    this.tabList_.forEach((tab) => tab.focusOnActivate = focusOnActivate);
+  }
+
   set useAutomaticActivation(useAutomaticActivation) {
     this.foundation_.setUseAutomaticActivation(useAutomaticActivation);
   }

packages/mdc-tab/README.md

@@ -141,7 +141,8 @@ Mixin | Description
 
 Property | Value Type | Description
 --- | --- | ---
-`active` | `boolean` | Allows getting the active state of the tab.
+`active` | `boolean` (read-only) | Allows getting the active state of the tab.
+`focusOnActivate` | `boolean` (write-only) | Sets whether the tab should focus itself when activated. Defaults to `true`.
 
 Method Signature | Description
 --- | ---
@@ -182,6 +183,7 @@ Method Signature | Description
 --- | ---
 `handleClick() => void` | Handles the logic for the `"click"` event.
 `isActive() => boolean` | Returns whether the tab is active.
+`setFocusOnActivate(focusOnActivate: boolean) => void` | Sets whether the tab should focus itself when activated.
 `activate(previousIndicatorClientRect: ClientRect=) => void` | Activates the tab. `previousIndicatorClientRect` is an optional argument.
 `deactivate() => void` | Deactivates the tab.
 `computeDimensions() => MDCTabDimensions` | Returns the dimensions of the tab.

packages/mdc-tab/foundation.js

@@ -72,8 +72,8 @@ class MDCTabFoundation extends MDCFoundation {
   constructor(adapter) {
     super(Object.assign(MDCTabFoundation.defaultAdapter, adapter));
 
-    /** @private {function(?Event): undefined} */
-    this.handleClick_ = () => this.handleClick();
+    /** @private {boolean} */
+    this.focusOnActivate_ = true;
   }
 
   /**
@@ -93,6 +93,14 @@ class MDCTabFoundation extends MDCFoundation {
     return this.adapter_.hasClass(cssClasses.ACTIVE);
   }
 
+  /**
+   * Sets whether the tab should focus itself when activated
+   * @param {boolean}
+   */
+  setFocusOnActivate(focusOnActivate) {
+    this.focusOnActivate_ = focusOnActivate;
+  }
+
   /**
    * Activates the Tab
    * @param {!ClientRect=} previousIndicatorClientRect
@@ -102,7 +110,9 @@ class MDCTabFoundation extends MDCFoundation {
     this.adapter_.setAttr(strings.ARIA_SELECTED, 'true');
     this.adapter_.setAttr(strings.TABINDEX, '0');
     this.adapter_.activateIndicator(previousIndicatorClientRect);
-    this.adapter_.focus();
+    if (this.focusOnActivate_) {
+      this.adapter_.focus();
+    }
   }
 
   /**

packages/mdc-tab/index.js

@@ -118,6 +118,10 @@ class MDCTab extends MDCComponent {
     return this.foundation_.isActive();
   }
 
+  set focusOnActivate(focusOnActivate) {
+    this.foundation_.setFocusOnActivate(focusOnActivate);
+  }
+
   /**
    * Activates the tab
    * @param {!ClientRect=} computeIndicatorClientRect

test/unit/mdc-tab-bar/mdc-tab-bar.test.js

@@ -66,6 +66,7 @@ class FakeTab {
     this.computeIndicatorClientRect = td.function();
     this.computeDimensions = td.function();
     this.active = false;
+    this.focusOnActivate = true;
   }
 }
 
@@ -109,6 +110,34 @@ function setupTest() {
   return {root, component};
 }
 
+function setupMockFoundationTest() {
+  const root = getFixture();
+  const MockFoundationConstructor = td.constructor(MDCTabBarFoundation);
+  const mockFoundation = new MockFoundationConstructor();
+  const component = new MDCTabBar(root, mockFoundation, (el) => new FakeTab(el), (el) => new FakeTabScroller(el));
+  return {root, component, mockFoundation};
+}
+
+test('focusOnActivate setter updates setting on all tabs', () => {
+  const {component} = setupTest();
+
+  component.focusOnActivate = false;
+  component.tabList_.forEach((tab) => assert.isFalse(tab.focusOnActivate));
+
+  component.focusOnActivate = true;
+  component.tabList_.forEach((tab) => assert.isTrue(tab.focusOnActivate));
+});
+
+test('useAutomaticActivation setter calls foundation#setUseAutomaticActivation', () => {
+  const {component, mockFoundation} = setupMockFoundationTest();
+
+  component.useAutomaticActivation = false;
+  td.verify(mockFoundation.setUseAutomaticActivation(false));
+
+  component.useAutomaticActivation = true;
+  td.verify(mockFoundation.setUseAutomaticActivation(true));
+});
+
 test('#adapter.scrollTo calls scrollTo of the child tab scroller', () => {
   const {component} = setupTest();
   component.getDefaultFoundation().adapter_.scrollTo(123);

test/unit/mdc-tab/foundation.test.js

@@ -75,12 +75,26 @@ test('#activate activates the indicator', () => {
   td.verify(mockAdapter.activateIndicator({width: 100, left: 200}));
 });
 
-test('#activate focuses the root node', () => {
+test('#activate focuses the root node by default', () => {
   const {foundation, mockAdapter} = setupTest();
   foundation.activate({width: 100, left: 200});
   td.verify(mockAdapter.focus());
 });
 
+test('#activate focuses the root node if focusOnActivate is true', () => {
+  const {foundation, mockAdapter} = setupTest();
+  foundation.setFocusOnActivate(true);
+  foundation.activate({width: 100, left: 200});
+  td.verify(mockAdapter.focus());
+});
+
+test('#activate does not focus the root node if focusOnActivate is false', () => {
+  const {foundation, mockAdapter} = setupTest();
+  foundation.setFocusOnActivate(false);
+  foundation.activate({width: 100, left: 200});
+  td.verify(mockAdapter.focus(), {times: 0});
+});
+
 test('#deactivate does nothing if not active', () => {
   const {foundation, mockAdapter} = setupTest();
   foundation.deactivate();

test/unit/mdc-tab/mdc-tab.test.js

@@ -165,12 +165,18 @@ function setupMockFoundationTest(root = getFixture()) {
   return {root, component, mockFoundation};
 }
 
-test('#active getter calls isActive', () => {
+test('#active getter calls foundation.isActive', () => {
   const {component, mockFoundation} = setupMockFoundationTest();
   component.active;
   td.verify(mockFoundation.isActive(), {times: 1});
 });
 
+test('#focusOnActivate setter calls foundation.setFocusOnActivate', () => {
+  const {component, mockFoundation} = setupMockFoundationTest();
+  component.focusOnActivate = false;
+  td.verify(mockFoundation.setFocusOnActivate(false), {times: 1});
+});
+
 test('#activate() calls activate', () => {
   const {component, mockFoundation} = setupMockFoundationTest();
   component.activate();