Skip to content

Commit

Permalink
Merge branch 'angular:main' into mat-select-Support-PageUp-and-PageDown
Browse files Browse the repository at this point in the history
  • Loading branch information
forsti0506 authored Aug 25, 2022
2 parents 3e1d4f2 + 45fed00 commit 791051e
Show file tree
Hide file tree
Showing 833 changed files with 26,063 additions and 22,205 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ var_2: &docker-browser-image cimg/node:16.14.0-browsers
# **Note**: When updating the beginning of the cache key, also update the cache key to match
# the new cache key prefix. This allows us to take advantage of CircleCI's fallback caching.
# Read more here: https://circleci.com/docs/2.0/caching/#restoring-cache.
var_3: &cache_key v10-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-{{ checksum "WORKSPACE" }}-{{ checksum "yarn.lock" }}
var_3: &cache_key v11-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-{{ checksum "WORKSPACE" }}-{{ checksum "yarn.lock" }}
# We want to invalidate the cache if the postinstall patches change. In order to apply new
# patches, a clean version of the node modules is needed. Additionally, we invalidate the cache
# if the Bazel version changes. We do this because otherwise the `bazelisk` cache folder will
# contain all previously used versions and ultimately cause the cache restoring to be slower.
var_4: &cache_fallback_key v10-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-
var_4: &cache_fallback_key v11-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-

# Settings common to each job
var_5: &job_defaults
Expand Down
677 changes: 337 additions & 340 deletions .github/CODEOWNERS

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .github/workflows/dev-infra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3.0.2
- uses: angular/dev-infra/github-actions/commit-message-based-labels@71057522079cc2ae10687a07fb6ab456790be63c
- uses: angular/dev-infra/github-actions/commit-message-based-labels@49325e7427f843ce61cda339b49461179e3ad0df
with:
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
post_approval_changes:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3.0.2
- uses: angular/dev-infra/github-actions/post-approval-changes@71057522079cc2ae10687a07fb6ab456790be63c
- uses: angular/dev-infra/github-actions/post-approval-changes@49325e7427f843ce61cda339b49461179e3ad0df
with:
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
2 changes: 1 addition & 1 deletion .github/workflows/lock-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ jobs:
lock_closed:
runs-on: ubuntu-latest
steps:
- uses: angular/dev-infra/github-actions/lock-closed@71057522079cc2ae10687a07fb6ab456790be63c
- uses: angular/dev-infra/github-actions/lock-closed@49325e7427f843ce61cda339b49461179e3ad0df
with:
lock-bot-key: ${{ secrets.LOCK_BOT_PRIVATE_KEY }}
20 changes: 9 additions & 11 deletions .ng-dev/commit-message.mts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ export const commitMessage: CommitMessageConfig = {
'multiple', // For when a commit applies to multiple components.
'cdk-experimental/column-resize',
'cdk-experimental/combobox',
'cdk-experimental/listbox',
'cdk-experimental/popover-edit',
'cdk-experimental/scrolling',
'cdk-experimental/selection',
Expand All @@ -26,6 +25,7 @@ export const commitMessage: CommitMessageConfig = {
'cdk/drag-drop',
'cdk/keycodes',
'cdk/layout',
'cdk/listbox',
'cdk/menu',
'cdk/observers',
'cdk/overlay',
Expand All @@ -43,18 +43,16 @@ export const commitMessage: CommitMessageConfig = {
'material/button',
'material/card',
'material/checkbox',
'material-experimental/mdc-core',
'material/dialog',
'material/form-field',
'material/input',
'material/paginator',
'material/progress-bar',
'material-experimental/mdc-progress-spinner',
'material/progress-spinner',
'material/slide-toggle',
'material-experimental/mdc-snack-bar',
'material-experimental/mdc-table',
'material-experimental/mdc-tabs',
'material-experimental/mdc-tooltip',
'material/snack-bar',
'material/table',
'material/tabs',
'material-experimental/menubar',
'material-experimental/popover-edit',
'material-experimental/selection',
Expand Down Expand Up @@ -91,7 +89,7 @@ export const commitMessage: CommitMessageConfig = {
'material/prebuilt-themes',
'material/legacy-prebuilt-themes',
'material/legacy-progress-bar',
'material/progress-spinner',
'material/legacy-progress-spinner',
'material/radio',
'material/legacy-radio',
'material/schematics',
Expand All @@ -101,11 +99,11 @@ export const commitMessage: CommitMessageConfig = {
'material/legacy-slide-toggle',
'material/slider',
'material/legacy-slider',
'material/snack-bar',
'material/legacy-snack-bar',
'material/sort',
'material/stepper',
'material/table',
'material/tabs',
'material/legacy-table',
'material/legacy-tabs',
'material/testing',
'material/theming',
'material/toolbar',
Expand Down
43 changes: 43 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,46 @@
<a name="14.2.0-rc.0"></a>
# 14.2.0-rc.0 "plastic-duck" (2022-08-19)
### cdk
| Commit | Type | Description |
| -- | -- | -- |
| [0fb2e9a5f7](https://github.com/angular/components/commit/0fb2e9a5f7e5cc19540977ec665c686f51c8ad9b) | feat | **listbox:** add listbox to cdk ([#25380](https://github.com/angular/components/pull/25380)) ([#25474](https://github.com/angular/components/pull/25474)) |
| [200556ea96](https://github.com/angular/components/commit/200556ea9604cc7cd25ef807dd5f20181c700302) | fix | **dialog:** fall back to node injector token doesn't exist in template injector ([#25406](https://github.com/angular/components/pull/25406)) |
| [0ba8c759fe](https://github.com/angular/components/commit/0ba8c759fe15e2f2ce876ae1eb28b032692262dd) | fix | **overlay:** backdropClass type mismatch ([#25487](https://github.com/angular/components/pull/25487)) |
### material
| Commit | Type | Description |
| -- | -- | -- |
| [b20876d86b](https://github.com/angular/components/commit/b20876d86b5d0650cc8079411a73fe7e5d8312b0) | fix | **button-toggle:** toggle name falling out of sync if name changes ([#24713](https://github.com/angular/components/pull/24713)) |
| [ab8f6fead4](https://github.com/angular/components/commit/ab8f6fead478dbbea2a59ccb66b0fcecf302271d) | fix | **expansion:** fix lint issue ([#25469](https://github.com/angular/components/pull/25469)) |
### expansion
| Commit | Type | Description |
| -- | -- | -- |
| [27bf7e93a1](https://github.com/angular/components/commit/27bf7e93a1ab319a3d4dfbc903e7705e1787e4e3) | fix | fix expansion `.mat-expansion-panel-header` styles ([#20019](https://github.com/angular/components/pull/20019)) |
## Special Thanks
Andrew Seguin, Dmitrii Kuzmin, Kristiyan Kostadinov, Miles Malerba, ko-tori and swseverance

<!-- CHANGELOG SPLIT MARKER -->

<a name="14.1.3"></a>
# 14.1.3 "rubber-chicken" (2022-08-19)
### cdk
| Commit | Type | Description |
| -- | -- | -- |
| [f661a9300e](https://github.com/angular/components/commit/f661a9300ec78a4914dbe29dbc4b9275ef2e3758) | fix | **dialog:** fall back to node injector token doesn't exist in template injector ([#25406](https://github.com/angular/components/pull/25406)) |
| [b9f09aa741](https://github.com/angular/components/commit/b9f09aa741cbddb9cb81ecd9960860de082813b5) | fix | **overlay:** backdropClass type mismatch ([#25487](https://github.com/angular/components/pull/25487)) |
### material
| Commit | Type | Description |
| -- | -- | -- |
| [d1ef7e23c6](https://github.com/angular/components/commit/d1ef7e23c633886ce5e8082e85dc7f7424c9b997) | fix | **button-toggle:** toggle name falling out of sync if name changes ([#24713](https://github.com/angular/components/pull/24713)) |
| [19df7cf940](https://github.com/angular/components/commit/19df7cf940aa21ffd6c083bbdd8721329ced392d) | fix | **expansion:** fix lint issue ([#25469](https://github.com/angular/components/pull/25469)) |
### expansion
| Commit | Type | Description |
| -- | -- | -- |
| [b1450b1cb5](https://github.com/angular/components/commit/b1450b1cb52c041f0e01d4b00139e54380a8d102) | fix | fix expansion `.mat-expansion-panel-header` styles ([#20019](https://github.com/angular/components/pull/20019)) |
## Special Thanks
Andrew Seguin, Dmitrii Kuzmin, Kristiyan Kostadinov, ko-tori and swseverance

<!-- CHANGELOG SPLIT MARKER -->

<a name="14.2.0-next.2"></a>
# 14.2.0-next.2 "maple-mantis" (2022-08-11)
### material
Expand Down
2 changes: 1 addition & 1 deletion goldens/tsec-exemption.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"../src/cdk/a11y/aria-describer/aria-reference.ts",
"../src/material/checkbox/checkbox.ts",
"../src/material/list/interactive-list-base.ts",
"../src/material-experimental/mdc-progress-spinner/progress-spinner.ts",
"../src/material/progress-spinner/progress-spinner.ts",
"../src/material/slide-toggle/slide-toggle.ts",
"../src/material/icon/icon-registry.ts",
"../src/material/icon/icon.ts"
Expand Down
2 changes: 1 addition & 1 deletion guides/creating-a-custom-form-field-control.md
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ click. In our case we'll just focus the first `<input>` if the user isn't about
```ts
onContainerClick(event: MouseEvent) {
if ((event.target as Element).tagName.toLowerCase() != 'input') {
this.elRef.nativeElement.querySelector('input').focus();
this._elementRef.nativeElement.querySelector('input').focus();
}
}
```
Expand Down
2 changes: 1 addition & 1 deletion integration/harness-e2e-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"karma-jasmine-html-reporter": "~1.7.0",
"selenium-webdriver": "3.6.0",
"ts-node": "~10.7.0",
"typescript": "file:../../node_modules/typescript",
"typescript": "~4.7.2",
"wait-on": "^6.0.0"
}
}
Loading

0 comments on commit 791051e

Please sign in to comment.