Skip to content

Commit c287495

Browse files
author
Tobias Schweizer
committed
Merge branch 'master' into tobiasschweizer/calendar-header-comp
# Conflicts: # package-lock.json # src/demo-app/demo-app/demo-module.ts
2 parents 533739e + cd92571 commit c287495

File tree

177 files changed

+4995
-2256
lines changed

Some content is hidden

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

177 files changed

+4995
-2256
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
/src/cdk/stepper/** @mmalerba
7373
/src/cdk/table/** @andrewseguin
7474
/src/cdk/testing/** @devversion
75+
/src/cdk/text-field/** @mmalerba
7576
/src/cdk/tree/** @tinayuangao
7677

7778
# Moment adapter package
@@ -99,6 +100,7 @@
99100
/src/demo-app/card/** @jelbourn
100101
/src/demo-app/checkbox/** @tinayuangao @devversion
101102
/src/demo-app/chips/** @tinayuangao
103+
/src/demo-app/connected-overlay/** @jelbourn @crisbeto
102104
/src/demo-app/dataset/** @andrewseguin
103105
/src/demo-app/datepicker/** @mmalerba
104106
/src/demo-app/demo-app/** @jelbourn

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,21 @@
114114
* **tabs:** add ability to lazy load tab content ([#8921](https://github.com/angular/material2/issues/8921)) ([6feaf62](https://github.com/angular/material2/commit/6feaf62))
115115

116116

117+
<a name="5.2.4"></a>
118+
## [5.2.4 ash-submarine](https://github.com/angular/material2/compare/5.2.3...5.2.4) (2018-03-06)
119+
120+
121+
### Bug Fixes
122+
123+
* **chips:** Update chips in chip list, and add margin to chip input ([#8579](https://github.com/angular/material2/issues/8579)) ([3074b45](https://github.com/angular/material2/commit/3074b45))
124+
* **expansion-panel:** entire body content being shown on animation start ([#10138](https://github.com/angular/material2/issues/10138)) ([35b66f9](https://github.com/angular/material2/commit/35b66f9)), closes [#10134](https://github.com/angular/material2/issues/10134)
125+
* **menu:** detach lazily-rendered content when the menu is closed ([#10005](https://github.com/angular/material2/issues/10005)) ([37b1a09](https://github.com/angular/material2/commit/37b1a09)), closes [#9915](https://github.com/angular/material2/issues/9915)
126+
* **menu:** Fix [#10005](https://github.com/angular/material2/issues/10005) lint error ([c8ca770](https://github.com/angular/material2/commit/c8ca770))
127+
* **overlay:** hide overlay container when there are no attached overlays ([#10139](https://github.com/angular/material2/issues/10139)) ([d0bc91d](https://github.com/angular/material2/commit/d0bc91d)), closes [#6882](https://github.com/angular/material2/issues/6882) [#10033](https://github.com/angular/material2/issues/10033)
128+
* **paginator:** first/last icons being thrown off on IE and Edge; simplify icon setup ([#9776](https://github.com/angular/material2/issues/9776)) ([85f9491](https://github.com/angular/material2/commit/85f9491))
129+
* **selection-list:** improve accessibility of selection list ([#10137](https://github.com/angular/material2/issues/10137)) ([cbe11d4](https://github.com/angular/material2/commit/cbe11d4)), closes [#9995](https://github.com/angular/material2/issues/9995)
130+
131+
117132
<a name="5.2.3"></a>
118133
## [5.2.3 diamond-silhouette](https://github.com/angular/material2/compare/5.2.2...5.2.3) (2018-02-27)
119134

WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
workspace(name = "angular_material_src")
1+
workspace(name = "angular_material")
22

33
# Add nodejs rules
44
git_repository(

components.bzl

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# List of all @angular/material components / subpackages.
2+
MATERIAL_PACKAGES = [
3+
"autocomplete",
4+
"badge",
5+
"bottom-sheet",
6+
"button-toggle",
7+
"button",
8+
"card",
9+
"checkbox",
10+
"chips",
11+
"core",
12+
"datepicker",
13+
"dialog",
14+
"divider",
15+
"expansion",
16+
"form-field",
17+
"grid-list",
18+
"icon",
19+
"input",
20+
"list",
21+
"menu",
22+
"paginator",
23+
"progress-bar",
24+
"progress-spinner",
25+
"radio",
26+
"select",
27+
"sidenav",
28+
"slide-toggle",
29+
"slider",
30+
"snack-bar",
31+
"sort",
32+
"stepper",
33+
"table",
34+
"tabs",
35+
"toolbar",
36+
"tooltip",
37+
]

package-lock.json

Lines changed: 37 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
"zone.js": "^0.8.12"
4141
},
4242
"devDependencies": {
43+
"@angular-devkit/core": "^0.4.5",
44+
"@angular-devkit/schematics": "^0.4.5",
4345
"@angular/bazel": ">=6.0.0-beta.7 <7.0.0",
4446
"@angular/compiler-cli": ">=6.0.0-beta.7 <7.0.0",
4547
"@angular/http": ">=6.0.0-beta.7 <7.0.0",
@@ -49,6 +51,7 @@
4951
"@angular/upgrade": "^5.0.1",
5052
"@bazel/ibazel": "0.3.1",
5153
"@google-cloud/storage": "^1.1.1",
54+
"@schematics/angular": "^0.4.5",
5255
"@types/chalk": "^0.4.31",
5356
"@types/fs-extra": "^4.0.3",
5457
"@types/glob": "^5.0.33",

schematics/collection.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,33 @@
22
{
33
"$schema": "./node_modules/@angular-devkit/schematics/collection-schema.json",
44
"schematics": {
5+
// Adds Angular Material to an application without changing any templates
6+
"ng-add": {
7+
"description": "Adds Angular Material to the application without affecting any templates",
8+
"factory": "./shell",
9+
"schema": "./shell/schema.json",
10+
"aliases": ["material-shell"]
11+
},
512
// Create a dashboard component
613
"materialDashboard": {
7-
"description": "Create a dashboard component",
14+
"description": "Create a card-based dashboard component",
815
"factory": "./dashboard/index",
916
"schema": "./dashboard/schema.json",
1017
"aliases": [ "material-dashboard" ]
1118
},
1219
// Creates a table component
1320
"materialTable": {
14-
"description": "Create a table component",
21+
"description": "Create a component that displays data with a data-table",
1522
"factory": "./table/index",
1623
"schema": "./table/schema.json",
1724
"aliases": [ "material-table" ]
1825
},
1926
// Creates toolbar and navigation components
2027
"materialNav": {
21-
"description": "Create a responsive navigation component",
28+
"description": "Create a component with a responsive sidenav for navigation",
2229
"factory": "./nav/index",
2330
"schema": "./nav/schema.json",
2431
"aliases": [ "material-nav" ]
25-
},
26-
// Adds Angular Material to an application without changing any templates
27-
"materialShell": {
28-
"description": "Create a Material shell",
29-
"factory": "./shell",
30-
"schema": "./shell/schema.json",
31-
"aliases": ["material-shell"]
3232
}
3333
}
3434
}

schematics/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, <% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }%><% if(changeDetection !== 'Default') { %>, ChangeDetectionStrategy<% }%> } from '@angular/core';
1+
import { Component<% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }%><% if(changeDetection !== 'Default') { %>, ChangeDetectionStrategy<% }%> } from '@angular/core';
22

33
@Component({
44
selector: '<%= selector %>',<% if(inlineTemplate) { %>

schematics/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
class="sidenav"
55
fixedInViewport="true"
66
[attr.role]="isHandset ? 'dialog' : 'navigation'"
7-
[mode]="isHandset ? 'over' : 'side'"
7+
[mode]="(isHandset | async)!.matches ? 'over' : 'side'"
88
[opened]="!(isHandset | async)!.matches">
99
<mat-toolbar color="primary">Menu</mat-toolbar>
1010
<mat-nav-list>

schematics/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, <% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }%><% if(changeDetection !== 'Default') { %>, ChangeDetectionStrategy<% }%> } from '@angular/core';
1+
import { Component<% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }%><% if(changeDetection !== 'Default') { %>, ChangeDetectionStrategy<% }%> } from '@angular/core';
22
import { BreakpointObserver, Breakpoints, BreakpointState } from '@angular/cdk/layout';
33
import { Observable } from 'rxjs/Observable';
44

@@ -11,7 +11,7 @@ import { Observable } from 'rxjs/Observable';
1111
class="sidenav"
1212
fixedInViewport="true"
1313
[attr.role]="isHandset ? 'dialog' : 'navigation'"
14-
[mode]="isHandset ? 'over' : 'side'"
14+
[mode]="(isHandset | async)!.matches ? 'over' : 'side'"
1515
[opened]="!(isHandset | async)!.matches">
1616
<mat-toolbar color="primary">Menu</mat-toolbar>
1717
<mat-nav-list>

0 commit comments

Comments
 (0)