Skip to content

Commit 0bba2dc

Browse files
committed
Merge remote-tracking branch 'upstream/master' into virtual-scroll
2 parents 8565c60 + c880faa commit 0bba2dc

File tree

169 files changed

+6662
-4297
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+6662
-4297
lines changed

BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ filegroup(
2929
"rxjs",
3030
"tsickle",
3131
"tslib",
32+
"tslint",
3233
"tsutils",
3334
"typescript",
3435
"zone.js",

CHANGELOG.md

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,51 @@
1+
<a name="6.0.0-rc.2"></a>
2+
# [6.0.0-rc.2](https://github.com/angular/material2/compare/6.0.0-rc.0...6.0.0-rc.2) (2018-04-11)
3+
4+
5+
### Features
6+
7+
* **coercion:** add utility for coercing CSS values ([#10654](https://github.com/angular/material2/issues/10654)) ([e30824c](https://github.com/angular/material2/commit/e30824c))
8+
* **icon:** allow SVG icons to be registered from strings ([#10757](https://github.com/angular/material2/issues/10757)) ([57efa13](https://github.com/angular/material2/commit/57efa13)), closes [#3132](https://github.com/angular/material2/issues/3132)
9+
* **overlay:** add the ability to set the default offsets on FlexibleConnectedPositionStrategy ([#10555](https://github.com/angular/material2/issues/10555)) ([bcff93e](https://github.com/angular/material2/commit/bcff93e))
10+
* **table:** support native table selectors ([#10594](https://github.com/angular/material2/issues/10594)) ([7774da2](https://github.com/angular/material2/commit/7774da2))
11+
12+
13+
### Bug Fixes
14+
15+
* **autocomplete:** panel width not being updated on window resize ([#10629](https://github.com/angular/material2/issues/10629)) ([2dc4e70](https://github.com/angular/material2/commit/2dc4e70))
16+
* **badge:** incorrectly handling rtl ([#10630](https://github.com/angular/material2/issues/10630)) ([9c1f8a9](https://github.com/angular/material2/commit/9c1f8a9))
17+
* **button-toggle:** changed after checked error for repeated toggles with a preselected value ([#10612](https://github.com/angular/material2/issues/10612)) ([9a3d3e8](https://github.com/angular/material2/commit/9a3d3e8))
18+
* **button-toggle:** setting blank aria-label attribute by default ([#10605](https://github.com/angular/material2/issues/10605)) ([95dba59](https://github.com/angular/material2/commit/95dba59))
19+
* **datepicker:** avoid accidental form submissions through calendar buttons ([#10515](https://github.com/angular/material2/issues/10515)) ([edb57f9](https://github.com/angular/material2/commit/edb57f9)), closes [#10514](https://github.com/angular/material2/issues/10514)
20+
* **datepicker:** close datepicker popup on alt + up arrow ([#10662](https://github.com/angular/material2/issues/10662)) ([446ef66](https://github.com/angular/material2/commit/446ef66))
21+
* **datepicker:** export `MatCalendarHeader` ([#10633](https://github.com/angular/material2/issues/10633)) ([5df1af6](https://github.com/angular/material2/commit/5df1af6))
22+
* **datepicker:** nested animation not working ([#10355](https://github.com/angular/material2/issues/10355)) ([9fff92f](https://github.com/angular/material2/commit/9fff92f)), closes [#9134](https://github.com/angular/material2/issues/9134)
23+
* **datepicker:** overly broad selector in theme ([#10372](https://github.com/angular/material2/issues/10372)) ([5b7a6a3](https://github.com/angular/material2/commit/5b7a6a3))
24+
* **datepicker:** reformat valid values on blur ([#10777](https://github.com/angular/material2/issues/10777)) ([603dfa4](https://github.com/angular/material2/commit/603dfa4)), closes [#10645](https://github.com/angular/material2/issues/10645)
25+
* **focus-monitor:** hitting ngzone when using focusVia ([#10608](https://github.com/angular/material2/issues/10608)) ([b38b966](https://github.com/angular/material2/commit/b38b966))
26+
* **focus-trap:** wrong element being checked when logging deprecation warning ([#10578](https://github.com/angular/material2/issues/10578)) ([52493d1](https://github.com/angular/material2/commit/52493d1))
27+
* **form-field:** run change detection when prefix or suffix changes ([#10670](https://github.com/angular/material2/issues/10670)) ([515cc06](https://github.com/angular/material2/commit/515cc06))
28+
* **form-field:** server-side rendering error with outline appearance ([#10719](https://github.com/angular/material2/issues/10719)) ([39887da](https://github.com/angular/material2/commit/39887da))
29+
* **overlay:** centered flexible positioning not working in some browsers ([#10701](https://github.com/angular/material2/issues/10701)) ([dfc3b02](https://github.com/angular/material2/commit/dfc3b02))
30+
* **overlay:** incorrect bottom offset using upward-flowing flexible position with a viewport margin ([#10650](https://github.com/angular/material2/issues/10650)) ([306b704](https://github.com/angular/material2/commit/306b704))
31+
* **platform:** change isBrowser check to use Angular PLATFORM_ID ([#10659](https://github.com/angular/material2/issues/10659)) ([f023579](https://github.com/angular/material2/commit/f023579))
32+
* **progress-spinner:** set spinner width to match diameter. ([#10314](https://github.com/angular/material2/issues/10314)) ([c64cb7e](https://github.com/angular/material2/commit/c64cb7e))
33+
* **sidenav:** remove dependency on OverlayModule ([#10357](https://github.com/angular/material2/issues/10357)) ([27ef2dc](https://github.com/angular/material2/commit/27ef2dc))
34+
* **slide-toggle:** run timeout outside the NgZone ([#10655](https://github.com/angular/material2/issues/10655)) ([6f7765e](https://github.com/angular/material2/commit/6f7765e))
35+
* **stepper:** header icon collapsing with very long labels ([#10341](https://github.com/angular/material2/issues/10341)) ([5b5f2ee](https://github.com/angular/material2/commit/5b5f2ee)), closes [#10332](https://github.com/angular/material2/issues/10332)
36+
* **stepper:** horizontal stepper cutting off bottom part of content ([#10644](https://github.com/angular/material2/issues/10644)) ([4fbde10](https://github.com/angular/material2/commit/4fbde10)), closes [#10634](https://github.com/angular/material2/issues/10634)
37+
* **table:** MatTableDataSource incorrectly sorting zero ([#10561](https://github.com/angular/material2/issues/10561)) ([bcb5697](https://github.com/angular/material2/commit/bcb5697)), closes [#10556](https://github.com/angular/material2/issues/10556)
38+
* **table,sort,paginator:** incorrect spacing in rtl ([#10617](https://github.com/angular/material2/issues/10617)) ([46ca6ce](https://github.com/angular/material2/commit/46ca6ce))
39+
* **tabs:** hide mat-tab-nav-bar ink bar when no link is active ([#9701](https://github.com/angular/material2/issues/9701)) ([51206ee](https://github.com/angular/material2/commit/51206ee)), closes [#9671](https://github.com/angular/material2/issues/9671)
40+
* **tabs:** tab content portal not being cleaned up on destroy ([#10661](https://github.com/angular/material2/issues/10661)) ([2e3393a](https://github.com/angular/material2/commit/2e3393a))
41+
* **theme:** apply base theme classes at location the theme is included ([#10737](https://github.com/angular/material2/issues/10737)) ([2aba8ab](https://github.com/angular/material2/commit/2aba8ab))
42+
* **tooltip:** error when updating position while closed ([#10704](https://github.com/angular/material2/issues/10704)) ([6449ae1](https://github.com/angular/material2/commit/6449ae1))
43+
* **tree:** fix exported symbol cannot be named error. ([#10626](https://github.com/angular/material2/issues/10626)) ([6729b6d](https://github.com/angular/material2/commit/6729b6d))
44+
* **tree:** fix nested node cannot expand/collapse multiple times ([#10671](https://github.com/angular/material2/issues/10671)) ([5570beb](https://github.com/angular/material2/commit/5570beb))
45+
* **tree:** fix nested node is not working ([#10635](https://github.com/angular/material2/issues/10635)) ([7857b92](https://github.com/angular/material2/commit/7857b92))
46+
47+
48+
149
<a name="6.0.0-rc.1"></a>
250
# [6.0.0-rc.1](https://github.com/angular/material2/compare/6.0.0-rc.0...6.0.0-rc.1) (2018-04-05)
351

CODING_STANDARDS.md

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -126,21 +126,6 @@ class ConfigBuilder {
126126
}
127127
```
128128

129-
#### RxJS
130-
When dealing with RxJS operators, import the pipeable operator (e.g.
131-
`import {map} from 'rxjs/operators/map'`), as opposed to using the "patch" imports which pollute the
132-
user's global Observable object (e.g. `import 'rxjs/add/operator/map'`):
133-
134-
```ts
135-
// NO
136-
import 'rxjs/add/operator/map';
137-
someObservable.map(...).subscribe(...);
138-
139-
// YES
140-
import {map} from 'rxjs/operators/map';
141-
someObservable.pipe(map(...)).subscribe(...);
142-
```
143-
144129
#### Access modifiers
145130
* Omit the `public` keyword as it is the default behavior.
146131
* Use `private` when appropriate and possible, prefixing the name with an underscore.

WORKSPACE

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ workspace(name = "angular_material")
33
# Add nodejs rules
44
http_archive(
55
name = "build_bazel_rules_nodejs",
6-
url = "https://github.com/bazelbuild/rules_nodejs/archive/0.6.0.zip",
7-
strip_prefix = "rules_nodejs-0.6.0",
8-
sha256 = "e8a2bb5ca51fbafb244bc507bcebcae33a63d969f47413b319a8dcce032845bf",
6+
url = "https://github.com/bazelbuild/rules_nodejs/archive/99166f8eb7fc628ca561acf9f9a51a1c26edadad.zip",
7+
strip_prefix = "rules_nodejs-99166f8eb7fc628ca561acf9f9a51a1c26edadad",
8+
sha256 = "338e8495e5d1fa16de7190106c5675372ff4a347f6004e203e84a168db96281e",
99
)
1010

1111
# NOTE: this rule installs nodejs, npm, and yarn, but does NOT install
@@ -28,9 +28,9 @@ sass_repositories()
2828
# Add TypeScript rules
2929
http_archive(
3030
name = "build_bazel_rules_typescript",
31-
url = "https://github.com/bazelbuild/rules_typescript/archive/df4a1a561d88e187438ac7791a5ac33995f2d317.zip",
32-
strip_prefix = "rules_typescript-df4a1a561d88e187438ac7791a5ac33995f2d317",
33-
sha256 = "51a84f156eeddf126e9370b5c193b4709eeb330448e2de5afcda40232e0b56bc",
31+
url = "https://github.com/bazelbuild/rules_typescript/archive/0.11.1.zip",
32+
strip_prefix = "rules_typescript-0.11.1",
33+
sha256 = "7406bea7954e1c906f075115dfa176551a881119f6820b126ea1eacb09f34a1a",
3434
)
3535

3636
# Setup TypeScript Bazel workspace

build-config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
*/
55
const {join} = require('path');
66

7-
const package = require('./package.json');
7+
const packageJson = require('./package.json');
88

99
/** Current version of the project*/
10-
const buildVersion = package.version;
10+
const buildVersion = packageJson.version;
1111

1212
/**
1313
* Required Angular version for all Angular Material packages. This version will be used

guides/schematics.md

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
Angular Material comes packaged with Angular CLI schematics to make
2+
creating Material applications easier.
3+
4+
## Install Schematics
5+
Schematics come packaged with Angular Material, so once you have
6+
installed the npm package, they will be available via the Angular CLI.
7+
8+
If you run it will automatically install Angular Material for you
9+
and run the shell schematic.
10+
11+
```
12+
ng add @angular/material
13+
```
14+
15+
## Packaged Schematics
16+
Angular Material has 4 schematics it comes packaged with:
17+
18+
- Material Shell
19+
- Navigation
20+
- Dashboard
21+
- Table
22+
23+
### Shell Schematic
24+
The shell schematic will help you quickly add Material to a new project.
25+
This schematic will:
26+
27+
- Ensure project depedencies in `package.json`
28+
- Ensure project depedencies in your app module
29+
- Adds Prebuilt or Setup Custom Theme
30+
- Adds Roboto fonts to your index.html
31+
- Apply simple CSS reset to body
32+
33+
```
34+
ng add @angular/material
35+
```
36+
37+
### Navigation Schematic
38+
The navigation schematic will create a new component that includes
39+
a toolbar with the app name and the side nav responsive based on Material
40+
breakpoints.
41+
42+
```
43+
ng generate @angular/material:material-nav
44+
```
45+
46+
### Dashboard Schematic
47+
The dashboard schematic will create a new component that contains
48+
a dynamic grid list of cards.
49+
50+
```
51+
ng generate @angular/material:material-dashboard
52+
```
53+
54+
### Table Schematic
55+
The table schematic will create a new table component pre-configured
56+
with a datasource for sorting and pagination.
57+
58+
```
59+
ng generate @angular/material:material-table
60+
```

0 commit comments

Comments
 (0)