Merge branch 'master' into tobiasschweizer/calendar-header-comp

# Conflicts:
#	src/demo-app/datepicker/datepicker-demo.ts
#	src/lib/datepicker/datepicker.ts

Author: Tobias Schweizer

.circleci/config.yml

@@ -36,6 +36,7 @@ jobs:
       # This may be unnecessary once rules_nodejs uses nodejs 8
       - run: bazel run @nodejs//:npm run postinstall
       - run: bazel build src/...
+      - run: bazel test src/...
       - save_cache:
           key: material2-{{ .Branch }}-{{ checksum "package-lock.json" }}
           paths:

.github/CODEOWNERS

@@ -32,6 +32,7 @@
 /src/lib/tabs/**                                   @andrewseguin
 /src/lib/toolbar/**                                @devversion
 /src/lib/tooltip/**                                @andrewseguin
+/src/lib/badge/**                                  @amcdnl
 
 # Angular Material core
 /src/lib/core/*                                    @jelbourn
@@ -129,6 +130,7 @@
 /src/demo-app/toolbar/**                           @devversion
 /src/demo-app/tooltip/**                           @andrewseguin
 /src/demo-app/typography/**                        @crisbeto
+/src/demo-app/badge/**                             @amcdnl
 
 # E2E app
 /e2e/*                                             @jelbourn

.travis.yml

@@ -18,24 +18,29 @@ addons:
 branches:
   only:
   - master
+  - 5.2.x
 
 jobs:
   include:
     - env: "MODE=lint"
     - env: "MODE=aot"
     - env: "MODE=payload"
     - env: "MODE=prerender"
-    # Closure Compiler CI check is temporarily disabled until a new version of
-    # the tool is released with https://github.com/google/closure-compiler/pull/2600
-    # - env: "MODE=closure-compiler"
     - env: "MODE=e2e"
     - env: "MODE=saucelabs_required"
     - env: "MODE=browserstack_required"
     - env: "MODE=travis_required"
     - env: "DEPLOY_MODE=build-artifacts"
+      if: type = push
     - env: "DEPLOY_MODE=docs-content"
+      if: type = push
     - env: "DEPLOY_MODE=screenshot-tool"
+      if: type = cron
     - env: "DEPLOY_MODE=dashboard"
+      if: type = cron
+    # Closure Compiler CI check is temporarily disabled until a new version of
+    # the tool is released with https://github.com/google/closure-compiler/pull/2600
+    # - env: "MODE=closure-compiler"
 env:
   global:
   - LOGS_DIR=/tmp/angular-material2-build/logs

BUILD.bazel

@@ -14,22 +14,67 @@ filegroup(
   # TODO(alexeagle): figure out what to do
   srcs = glob(["/".join(["node_modules", pkg, "**", ext]) for pkg in [
     "@angular",
-    "jasmine",
-    "typescript",
-    "tslib",
-    "zone.js",
     "@types",
-    "tsickle",
-    "hammerjs",
-    "protobufjs",
     "bytebuffer",
-    "reflect-metadata",
+    "hammerjs",
+    "jasmine",
     "minimist",
     "moment",
+    "protobufjs",
+    "protractor",
+    "reflect-metadata",
+    "tsickle",
+    "tslib",
+    "tsutils",
+    "typescript",
+    "zone.js",
   ] for ext in [
     "*.js",
     "*.json",
     "*.d.ts",
-  ]]),
+  ]] + [
+    "node_modules/http-server/**",
+  ]),
+)
+
+
+# Glob pattern that matches all Angular testing bundles.
+ANGULAR_TESTING = [
+  "node_modules/@angular/*/bundles/*-testing.umd.js",
+  # The compiler and the dynamic platform-browser should be visible only in tests
+  "node_modules/@angular/compiler/bundles/*.umd.js",
+  "node_modules/@angular/platform-browser-dynamic/bundles/*.umd.js",
+]
+
+filegroup(
+  name = "angular_bundles",
+  srcs = glob(["node_modules/@angular/*/bundles/*.umd.js"], exclude = ANGULAR_TESTING),
+)
+
+filegroup(
+  name = "angular_test_bundles",
+  testonly = 1,
+  srcs = glob(ANGULAR_TESTING),
 )
 
+filegroup(
+  name = "tslib_bundle",
+  testonly = 1,
+  srcs = glob(["node_modules/tslib/tslib.js"]),
+)
+
+# Files necessary for unit tests that use zonejs
+filegroup(
+  name = "web_test_bootstrap_scripts",
+  # The order of these deps is important.
+  # Do not sort.
+  srcs = [
+    "//:node_modules/reflect-metadata/Reflect.js",
+    "//:node_modules/zone.js/dist/zone.js",
+    "//:node_modules/zone.js/dist/async-test.js",
+    "//:node_modules/zone.js/dist/sync-test.js",
+    "//:node_modules/zone.js/dist/fake-async-test.js",
+    "//:node_modules/zone.js/dist/proxy.js",
+    "//:node_modules/zone.js/dist/jasmine-patch.js",
+  ],
+)

CHANGELOG.md

@@ -1,3 +1,43 @@
+<a name="6.0.0-beta-0"></a>
+# [6.0.0-beta-0](https://github.com/angular/material2/compare/5.2.0...6.0.0-beta-0) (2018-02-12)
+
+
+### Bug Fixes
+
+* **overlay:** validate that ConnectedPositionStrategy positions are passed in correctly at runtime ([#9466](https://github.com/angular/material2/issues/9466)) ([6a8ce02](https://github.com/angular/material2/commit/6a8ce02))
+
+
+### Features
+
+* add bottom sheet component ([#9764](https://github.com/angular/material2/issues/9764)) ([bbf62cd](https://github.com/angular/material2/commit/bbf62cd))
+* **datepicker:** @Output for year and month selected in multiyear/year ([#9678](https://github.com/angular/material2/issues/9678)) ([c2e108e](https://github.com/angular/material2/commit/c2e108e))
+* **expansion:** add accordion expand/collapse all ([#6929](https://github.com/angular/material2/issues/6929)) ([#7461](https://github.com/angular/material2/issues/7461)) ([3aceb73](https://github.com/angular/material2/commit/3aceb73))
+* **form-field, chip:** merge new form-field and chip features to master ([#9762](https://github.com/angular/material2/issues/9762)) ([4a5287c](https://github.com/angular/material2/commit/4a5287c)), closes [#9743](https://github.com/angular/material2/issues/9743) [#9759](https://github.com/angular/material2/issues/9759) [#9767](https://github.com/angular/material2/issues/9767)
+* **schematics:** add initial schematics utils ([#9451](https://github.com/angular/material2/issues/9451)) ([673d56e](https://github.com/angular/material2/commit/673d56e))
+* **tabs:** add ability to lazy load tab content ([#8921](https://github.com/angular/material2/issues/8921)) ([6feaf62](https://github.com/angular/material2/commit/6feaf62))
+
+
+
+<a name="5.2.1"></a>
+## [5.2.1 ghillie-soup](https://github.com/angular/material2/compare/5.2.0...5.2.1) (2018-02-12)
+
+
+### Bug Fixes
+
+* **autocomplete:** escape key inconsistency on IE ([#9777](https://github.com/angular/material2/issues/9777)) ([180750e](https://github.com/angular/material2/commit/180750e))
+* **button:** better accessibility for flat buttons in high-contrast ([#9783](https://github.com/angular/material2/issues/9783)) ([0d0c6d4](https://github.com/angular/material2/commit/0d0c6d4))
+* **datepicker:** add max/min filter to multi year and year views ([#9727](https://github.com/angular/material2/issues/9727)) ([0793142](https://github.com/angular/material2/commit/0793142))
+* **datepicker:** changed after checked error if focused datepicker inputs turn disabled ([#9717](https://github.com/angular/material2/issues/9717)) ([01ad7bd](https://github.com/angular/material2/commit/01ad7bd)), closes [#9559](https://github.com/angular/material2/issues/9559)
+* **global-position-strategy:** ignoring width and height from OverlayConfig ([#9774](https://github.com/angular/material2/issues/9774)) ([b425a46](https://github.com/angular/material2/commit/b425a46)), closes [#9715](https://github.com/angular/material2/issues/9715)
+* **overlay:** dimension not updated after init ([#8765](https://github.com/angular/material2/issues/8765)) ([c36b512](https://github.com/angular/material2/commit/c36b512))
+* **select:** options inside option group not being rendered when wrapped with ng-container ([#9769](https://github.com/angular/material2/issues/9769)) ([38fddfe](https://github.com/angular/material2/commit/38fddfe)), closes [#9736](https://github.com/angular/material2/issues/9736)
+* **selection-list:** external changes to selection model not being reflected ([#9846](https://github.com/angular/material2/issues/9846)) ([82df181](https://github.com/angular/material2/commit/82df181)), closes [#9838](https://github.com/angular/material2/issues/9838)
+* **slider:** invisible in high contrast mode ([#9792](https://github.com/angular/material2/issues/9792)) ([94bbffc](https://github.com/angular/material2/commit/94bbffc))
+* **slider:** unable to reset value by setting it back to undefined ([#9768](https://github.com/angular/material2/issues/9768)) ([c2e2744](https://github.com/angular/material2/commit/c2e2744)), closes [#9740](https://github.com/angular/material2/issues/9740)
+* **radio:** add aria-describedby passthrough to radio button input ([#9741](https://github.com/angular/material2/issues/9741)) ([cd159f5](https://github.com/angular/material2/commit/cd159f5))
+
+
+
 <a name="5.2.0"></a>
 # [5.2.0 selenium-scramble](https://github.com/angular/material2/compare/5.1.0...5.2.0) (2018-02-05)
 

WORKSPACE

@@ -26,11 +26,11 @@ sass_repositories()
 git_repository(
   name = "build_bazel_rules_typescript",
   remote = "https://github.com/bazelbuild/rules_typescript.git",
-  commit = "89d2c75066bea3d9c942f29dd1d2ea543c58d6d5",
+  tag = "0.10.0",
 )
 
 # Setup TypeScript Bazel workspace
-load("@build_bazel_rules_typescript//:setup.bzl", "ts_setup_workspace")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
 ts_setup_workspace()
 
 # Add Angular rules

guides/creating-a-custom-form-field-control.md

@@ -157,23 +157,43 @@ private _placeholder: string;
 
 #### `ngControl`
 
-This property allows the form field control to specify the `@angular/forms` control that is bound to
-this component. Since we haven't set up our component to act as a `ControlValueAccessor`, we'll just
-set this to `null` in our component. In any real component, you would probably want to implement
-`ControlValueAccessor` so that your component can work with `formControl` and `ngModel`.
+This property allows the form field control to specify the `@angular/forms` control that is bound to this component. Since we haven't set up our component to act as a `ControlValueAccessor`, we'll just set this to `null` in our component. 
 
 ```ts
-ngControl = null;
+ngControl: NgControl = null;
 ```
 
-If you did implement `ControlValueAccessor`, you could simply inject the `NgControl` and make it
-publicly available. (For additional information about `ControlValueAccessor` see the
-[API docs](https://angular.io/api/forms/ControlValueAccessor).)
+It is likely you will want to implement `ControlValueAccessor` so that your component can work with `formControl` and `ngModel`. If you do implement `ControlValueAccessor` you will need to get a reference to the `NgControl` associated with your control and make it publicly available. 
+
+The easy way is to add it as a public property to your constructor and let dependency injection handle it:
 
 ```ts
-constructor(..., @Optional() @Self() public ngControl: NgControl) { ... }
+constructor(
+  ..., 
+  @Optional() @Self() public ngControl: NgControl,
+  ...,
+) { }
 ```
 
+Note that if your component implements `ControlValueAccessor`, it may already be set up to provide `NG_VALUE_ACCESSOR` (in the `providers` part of the component's decorator, or possibly in a module declaration). If so you may get a *cannot instantiate cyclic dependency* error. 
+
+To resolve this, remove the `NG_VALUE_ACCESSOR` provider and instead set the value accessor directly:
+
+```ts
+constructor(
+  ..., 
+  @Optional() @Self() public ngControl: NgControl,
+  ...,
+) {
+  // Setting the value accessor directly (instead of using
+  // the providers) to avoid running into a circular import.
+  if (this.ngControl != null) { this.ngControl.valueAccessor = this; }
+}
+```
+
+For additional information about `ControlValueAccessor` see the [API docs](https://angular.io/api/forms/ControlValueAccessor).
+
+
 #### `focused`
 
 This property indicates whether or not the form field control should be considered to be in a