Merge branch 'master' of https://github.com/angular/material2

Author: kdinev

.clang-format

@@ -4,9 +4,11 @@ ColumnLimit:     100
 
 TabWidth:                2
 ContinuationIndentWidth: 4
-MaxEmptyLinesToKeep    : 2
+MaxEmptyLinesToKeep:     2
 
 AllowShortBlocksOnASingleLine:              false
 AllowShortIfStatementsOnASingleLine:        false
 AllowShortLoopsOnASingleLine:               false
 AllowShortFunctionsOnASingleLine:           Empty
+JavaScriptWrapImports:                      true
+

.huskyrc.json

@@ -0,0 +1,5 @@
+{
+  "hooks": {
+    "pre-commit": "check-clang-format \"\\`yarn format\\`\""
+  }
+}

CHANGELOG.md

@@ -1,3 +1,19 @@
+## 7.3.2 "jute-box" (2019-02-11)
+
+
+### Bug Fixes
+
+* **autocomplete:** set aria-haspopup ([#15079](https://github.com/angular/material2/issues/15079)) ([45bd5d4](https://github.com/angular/material2/commit/45bd5d4))
+* **checkbox:** unable to click to select if text is marked ([#15062](https://github.com/angular/material2/issues/15062)) ([4819c5b](https://github.com/angular/material2/commit/4819c5b)), closes [#14967](https://github.com/angular/material2/issues/14967)
+* **drag-drop:** set class when item or list is disabled ([#14769](https://github.com/angular/material2/issues/14769)) ([c543cf6](https://github.com/angular/material2/commit/c543cf6)), closes [#14760](https://github.com/angular/material2/issues/14760)
+* **drag-drop:** standalone draggable drag class not being applied with OnPush change detection ([#14727](https://github.com/angular/material2/issues/14727)) ([2f63195](https://github.com/angular/material2/commit/2f63195))
+* **icon:** add notranslate class ([#14889](https://github.com/angular/material2/issues/14889)) ([39fa928](https://github.com/angular/material2/commit/39fa928))
+* **menu:** prevent removal of mat-elevation class ([#15035](https://github.com/angular/material2/issues/15035)) ([8069641](https://github.com/angular/material2/commit/8069641))
+* **slide-toggle:** input element should use switch role ([#15073](https://github.com/angular/material2/issues/15073)) ([3af7748](https://github.com/angular/material2/commit/3af7748)), closes [#14949](https://github.com/angular/material2/issues/14949)
+* **tree:** opposite direction padding not being reset on change ([#14816](https://github.com/angular/material2/issues/14816)) ([ae4a5ae](https://github.com/angular/material2/commit/ae4a5ae))
+
+
+
 ## 7.3.1 "liquidcrystal-sandwich" (2019-02-04)
 
 

README.md

@@ -26,11 +26,15 @@ and which pieces are blocked) and make a comment.
 Also see our [`help wanted`](https://github.com/angular/material2/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
 label.
 
-High level stuff planned for Q4 2018 (October - Dec):
-* Improve our own build and automation tooling
-* Fix bugs and reduce some technical debt inside Google
-* Working on long-term plans on how to collaborate with the MDC Web team
-* Designs for advanced table improvements (column resize, selection directives, inline-edit)
+#### High level stuff planned for Q1 → Q2 2019 (January - June):
+* Most of the Angular Material team is on loan to the framework team
+  helping with [Ivy](https://blog.angular.io/a-plan-for-version-8-0-and-ivy-b3318dfc19f7).
+  We've been using the Angular CDK and Angular Material tests to validate code paths as well
+  as helping debug issues in switching Google applications to the new rendering pipeline.
+* We're also working with the Material Design team on a strategy to collaborate more deeply.
+  We'll have more to share on this once our plans are further along.
+* Assorted bugfixes and minor feature improvements.
+* Design for API enhancements to the tree component to improve ergonomics.
 
 
 #### Available features

guides/theming-your-components.md

@@ -93,7 +93,7 @@ For example:
   // Get a relative color for a hue ('lighter' or 'darker')
   outline-color: mat-color($accent, lighter);
 
-  // Get a constrast color for a hue by adding `-contrast` to any other key.
+  // Get a contrast color for a hue by adding `-contrast` to any other key.
   border-color: mat-color($primary, '100-contrast');
 }
 ```

package.json

@@ -12,7 +12,7 @@
     "node": ">= 5.4.1"
   },
   "scripts": {
-    "build": "gulp :publish:build-releases",
+    "build": "gulp build-release-packages",
     "dev-app": "gulp serve:devapp",
     "test": "gulp test",
     "lint": "gulp lint",
@@ -24,9 +24,10 @@
     "stage-release": "ts-node --project tools/release/ tools/release/stage-release.ts",
     "publish-release": "ts-node --project tools/release/ tools/release/publish-release.ts",
     "check-release-output": "ts-node --project tools/release tools/release/check-release-output.ts",
-    "preinstall": "node ./tools/npm/check-npm.js"
+    "preinstall": "node ./tools/npm/check-npm.js",
+    "format": "git-clang-format"
   },
-  "version": "7.3.1",
+  "version": "7.3.2",
   "requiredAngularVersion": ">=7.0.0",
   "dependencies": {
     "@angular/animations": "^7.2.1",
@@ -79,6 +80,7 @@
     "axe-webdriverjs": "^1.1.1",
     "browser-sync": "^2.26.3",
     "chalk": "^1.1.3",
+    "clang-format": "^1.2.4",
     "codelyzer": "^4.5.0",
     "conventional-changelog": "^3.0.5",
     "dgeni": "^0.4.10",
@@ -98,6 +100,7 @@
     "hammerjs": "^2.0.8",
     "highlight.js": "^9.11.0",
     "http-rewrite-middleware": "^0.1.6",
+    "husky": "^1.3.1",
     "inquirer": "^6.2.0",
     "jasmine-core": "^3.3.0",
     "karma": "^3.1.4",

scripts/saucelabs/start-tunnel.sh

@@ -2,7 +2,7 @@
 
 set -e -o pipefail
 
-tunnelFileName="sc-4.5.3-linux.tar.gz"
+tunnelFileName="sc-4.5.1-linux.tar.gz"
 tunnelUrl="https://saucelabs.com/downloads/${tunnelFileName}"
 
 tunnelTmpDir="/tmp/material-saucelabs"

src/cdk/a11y/_a11y.scss

@@ -18,13 +18,12 @@
   }
 }
 
-/**
- * Applies styles for users in high contrast mode. Note that this only applies
- * to Microsoft browsers. Chrome can be included by checking for the `html[hc]`
- * attribute, however Chrome handles high contrast differently.
- * @param target Which kind of high contrast setting to target. Defaults to `active`, can be
- *    `white-on-black` or `black-on-white`.
- */
+// Applies styles for users in high contrast mode. Note that this only applies
+// to Microsoft browsers. Chrome can be included by checking for the `html[hc]`
+// attribute, however Chrome handles high contrast differently.
+//
+// @param target Which kind of high contrast setting to target. Defaults to `active`, can be
+//    `white-on-black` or `black-on-white`.
 @mixin cdk-high-contrast($target: active) {
   @media (-ms-high-contrast: $target) {
     @content;

src/cdk/a11y/live-announcer/live-announcer-token.ts

@@ -0,0 +1,39 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {InjectionToken} from '@angular/core';
+
+// The tokens for the live announcer are defined in a separate file from LiveAnnouncer
+// as a workaround for https://github.com/angular/angular/issues/22559
+
+/** Possible politeness levels. */
+export type AriaLivePoliteness = 'off' | 'polite' | 'assertive';
+
+export const LIVE_ANNOUNCER_ELEMENT_TOKEN =
+    new InjectionToken<HTMLElement | null>('liveAnnouncerElement', {
+      providedIn: 'root',
+      factory: LIVE_ANNOUNCER_ELEMENT_TOKEN_FACTORY,
+    });
+
+/** @docs-private */
+export function LIVE_ANNOUNCER_ELEMENT_TOKEN_FACTORY(): null {
+  return null;
+}
+
+/** Object that can be used to configure the default options for the LiveAnnouncer. */
+export interface LiveAnnouncerDefaultOptions {
+  /** Default politeness for the announcements. */
+  politeness?: AriaLivePoliteness;
+
+  /** Default duration for the announcement messages. */
+  duration?: number;
+}
+
+/** Injection token that can be used to configure the default options for the LiveAnnouncer. */
+export const LIVE_ANNOUNCER_DEFAULT_OPTIONS =
+    new InjectionToken<LiveAnnouncerDefaultOptions>('LIVE_ANNOUNCER_DEFAULT_OPTIONS');

src/cdk/a11y/live-announcer/live-announcer-tokens.ts

@@ -4,7 +4,11 @@ import {ComponentFixture, fakeAsync, flush, inject, TestBed, tick} from '@angula
 import {By} from '@angular/platform-browser';
 import {A11yModule} from '../index';
 import {LiveAnnouncer} from './live-announcer';
-import {LIVE_ANNOUNCER_ELEMENT_TOKEN} from './live-announcer-token';
+import {
+  LIVE_ANNOUNCER_ELEMENT_TOKEN,
+  LIVE_ANNOUNCER_DEFAULT_OPTIONS,
+  LiveAnnouncerDefaultOptions,
+} from './live-announcer-tokens';
 
 
 describe('LiveAnnouncer', () => {
@@ -189,6 +193,47 @@ describe('LiveAnnouncer', () => {
       expect(customLiveElement.textContent).toBe('Custom Element');
     }));
   });
+
+  describe('with a default options', () => {
+    beforeEach(() => {
+      return TestBed.configureTestingModule({
+        imports: [A11yModule],
+        declarations: [TestApp],
+        providers: [{
+          provide: LIVE_ANNOUNCER_DEFAULT_OPTIONS,
+          useValue: {
+            politeness: 'assertive',
+            duration: 1337
+          } as LiveAnnouncerDefaultOptions
+        }],
+      });
+    });
+
+    beforeEach(inject([LiveAnnouncer], (la: LiveAnnouncer) => {
+      announcer = la;
+      ariaLiveElement = getLiveElement();
+    }));
+
+    it('should pick up the default politeness from the injection token', fakeAsync(() => {
+      announcer.announce('Hello');
+
+      tick(2000);
+
+      expect(ariaLiveElement.getAttribute('aria-live')).toBe('assertive');
+    }));
+
+    it('should pick up the default politeness from the injection token', fakeAsync(() => {
+      announcer.announce('Hello');
+
+      tick(100);
+      expect(ariaLiveElement.textContent).toBe('Hello');
+
+      tick(1337);
+      expect(ariaLiveElement.textContent).toBeFalsy();
+    }));
+
+  });
+
 });
 
 describe('CdkAriaLive', () => {

src/cdk/a11y/live-announcer/live-announcer.spec.ts

@@ -21,11 +21,13 @@ import {
   SkipSelf,
 } from '@angular/core';
 import {Subscription} from 'rxjs';
-import {LIVE_ANNOUNCER_ELEMENT_TOKEN} from './live-announcer-token';
-
+import {
+  AriaLivePoliteness,
+  LiveAnnouncerDefaultOptions,
+  LIVE_ANNOUNCER_ELEMENT_TOKEN,
+  LIVE_ANNOUNCER_DEFAULT_OPTIONS,
+} from './live-announcer-tokens';
 
-/** Possible politeness levels. */
-export type AriaLivePoliteness = 'off' | 'polite' | 'assertive';
 
 @Injectable({providedIn: 'root'})
 export class LiveAnnouncer implements OnDestroy {
@@ -36,7 +38,9 @@ export class LiveAnnouncer implements OnDestroy {
   constructor(
       @Optional() @Inject(LIVE_ANNOUNCER_ELEMENT_TOKEN) elementToken: any,
       private _ngZone: NgZone,
-      @Inject(DOCUMENT) _document: any) {
+      @Inject(DOCUMENT) _document: any,
+      @Optional() @Inject(LIVE_ANNOUNCER_DEFAULT_OPTIONS)
+      private _defaultOptions?: LiveAnnouncerDefaultOptions) {
 
     // We inject the live element and document as `any` because the constructor signature cannot
     // reference browser globals (HTMLElement, Document) on non-browser environments, since having
@@ -82,8 +86,9 @@ export class LiveAnnouncer implements OnDestroy {
   announce(message: string, politeness?: AriaLivePoliteness, duration?: number): Promise<void>;
 
   announce(message: string, ...args: any[]): Promise<void> {
-    let politeness: AriaLivePoliteness;
-    let duration: number;
+    const defaultOptions = this._defaultOptions;
+    let politeness: AriaLivePoliteness | undefined;
+    let duration: number | undefined;
 
     if (args.length === 1 && typeof args[0] === 'number') {
       duration = args[0];
@@ -94,8 +99,17 @@ export class LiveAnnouncer implements OnDestroy {
     this.clear();
     clearTimeout(this._previousTimeout);
 
+    if (!politeness) {
+      politeness =
+          (defaultOptions && defaultOptions.politeness) ? defaultOptions.politeness : 'polite';
+    }
+
+    if (duration == null && defaultOptions) {
+      duration = defaultOptions.duration;
+    }
+
     // TODO: ensure changing the politeness works on all environments we support.
-    this._liveElement.setAttribute('aria-live', politeness! || 'polite');
+    this._liveElement.setAttribute('aria-live', politeness);
 
     // This 100ms timeout is necessary for some browser + screen-reader combinations:
     // - Both JAWS and NVDA over IE11 will not announce anything without a non-zero timeout.

src/cdk/a11y/live-announcer/live-announcer.ts

@@ -12,7 +12,7 @@ export * from './key-manager/list-key-manager';
 export * from './focus-trap/focus-trap';
 export * from './interactivity-checker/interactivity-checker';
 export * from './live-announcer/live-announcer';
-export * from './live-announcer/live-announcer-token';
+export * from './live-announcer/live-announcer-tokens';
 export * from './focus-monitor/focus-monitor';
 export * from './fake-mousedown';
 export * from './a11y-module';

src/cdk/a11y/public-api.ts

@@ -20,7 +20,7 @@ export class MyWidget implements OnDestroy {
   constructor(dir: Directionality) {
     this.isRtl = dir.value === 'rtl';
 
-    _dirChangeSubscription = dir.change.subscribe(() => {
+    this._dirChangeSubscription = dir.change.subscribe(() => {
       this.flipDirection();
     });
   }

src/cdk/bidi/bidi.md

@@ -47,9 +47,10 @@ export class Dir implements Directionality, AfterContentInit, OnDestroy {
   get dir(): Direction { return this._dir; }
   set dir(value: Direction) {
     const old = this._dir;
+    const normalizedValue = value ? value.toLowerCase() : value;
 
     this._rawDir = value;
-    this._dir = (value === 'ltr' || value === 'rtl') ? value : 'ltr';
+    this._dir = (normalizedValue === 'ltr' || normalizedValue === 'rtl') ? normalizedValue : 'ltr';
 
     if (old !== this._dir && this._isInitialized) {
       this.change.emit(this._dir);

src/cdk/bidi/dir.ts

@@ -11,7 +11,12 @@ describe('Directionality', () => {
 
     TestBed.configureTestingModule({
       imports: [BidiModule],
-      declarations: [ElementWithDir, ElementWithPredefinedAutoDir, InjectsDirectionality],
+      declarations: [
+        ElementWithDir,
+        ElementWithPredefinedAutoDir,
+        InjectsDirectionality,
+        ElementWithPredefinedUppercaseDir,
+      ],
       providers: [{provide: DIR_DOCUMENT, useFactory: () => fakeDocument}],
     }).compileComponents();
   }));
@@ -134,6 +139,13 @@ describe('Directionality', () => {
         expect(fixture.componentInstance.dir.value).toBe('ltr');
       });
 
+    it('should be case-insensitive', () => {
+      const fixture = TestBed.createComponent(ElementWithPredefinedUppercaseDir);
+      fixture.detectChanges();
+
+      expect(fixture.componentInstance.dir.value).toBe('rtl');
+    });
+
   });
 });
 
@@ -158,6 +170,14 @@ class ElementWithPredefinedAutoDir {
   @ViewChild(Dir) dir: Dir;
 }
 
+@Component({
+  template: '<div dir="RTL"></div>'
+})
+class ElementWithPredefinedUppercaseDir {
+  @ViewChild(Dir) dir: Dir;
+}
+
+
 /** Test component with Dir directive. */
 @Component({
   selector: 'injects-directionality',