Merge branch 'angular:master' into feature/select-accessibility2

Author: mhaertwig

.circleci/config.yml

@@ -83,6 +83,8 @@ var_13: &attach_release_output
 var_14: &publish_branches_filter
   branches:
     only:
+      - main
+      # TODO(BRANCH_RENAME_CLEANUP): remove
       - master
       # 6.0.x, 7.1.x, etc.
       - /\d+\.\d+\.x/
@@ -134,6 +136,8 @@ var_20: &slack_notify_on_failure
 var_21: &only_main_branch_filter
   branches:
     only:
+      - main
+        # TODO(BRANCH_RENAME_CLEANUP): remove
       - master
 
 # -----------------------------
@@ -668,7 +672,9 @@ workflows:
           filters:
             branches:
               only:
-                # We only want to run the "master" branch against the snapshot builds because
+                # We only want to run the main branch against the snapshot builds because
                 # it's not guaranteed that older versions of Angular Material always work
                 # with the latest Angular version.
+                - main
+                # TODO(BRANCH_RENAME_CLEANUP): remove
                 - master

.circleci/rebase-pr.js

@@ -97,22 +97,31 @@ async function _main() {
 /**
  * Sort a list of fullpath refs into a list and then provide the first entry.
  *
- * The sort order will first find master ref, and then any semver ref, followed
+ * The sort order will first find main branch, and then any semver ref, followed
  * by the rest of the refs in the order provided.
  *
- * Branches are sorted in this order as work is primarily done on master, and
- * otherwise on a semver branch. If neither of those were to match, the most
+ * Branches are sorted in this order as work is primarily done on main branches,
+ * and otherwise on a semver branch. If neither of those were to match, the most
  * likely correct branch will be the first one encountered in the list.
  */
 function getRefFromBranchList(gitOutput) {
   const branches = gitOutput.split('\n').map(b => b.split('/').slice(1).join('').trim());
   return branches.sort((a, b) => {
+    if (a === 'main') {
+      return -1;
+    }
+    if (b === 'main') {
+      return 1;
+    }
+
+    // TODO(BRANCH_RENAME_CLEANUP): remove
     if (a === 'master') {
       return -1;
     }
     if (b === 'master') {
       return 1;
     }
+
     const aIsSemver = semverRegex.test(a);
     const bIsSemver = semverRegex.test(b);
     if (aIsSemver && bIsSemver) {

.github/CODEOWNERS

@@ -8,7 +8,7 @@
 /src/material/card/**                              @andrewseguin
 /src/material/checkbox/**                          @andrewseguin @devversion
 /src/material/chips/**                             @andrewseguin
-/src/material/datepicker/**                        @mmalerba @crisbeto
+/src/material/datepicker/**                        @mmalerba @crisbeto @zarend
 /src/material/dialog/**                            @andrewseguin @crisbeto
 /src/material/divider/**                           @andrewseguin @crisbeto
 /src/material/expansion/**                         @andrewseguin
@@ -47,7 +47,7 @@
 /src/material/core/datetime/**                     @mmalerba
 /src/material/core/density/**                      @devversion
 /src/material/core/error/**                        @crisbeto @mmalerba
-/src/material/core/focus-indicators/**             @jelbourn @zelliott
+/src/material/core/focus-indicators/**             @jelbourn
 /src/material/core/gestures/**                     @andrewseguin
 /src/material/core/label/**                        @mmalerba
 /src/material/core/line/**                         @andrewseguin
@@ -62,20 +62,22 @@
 /src/material/core/util/**                         @andrewseguin
 
 # Miscellaneous components
-/src/google-maps/**                                @crisbeto @mbehrlich
-/src/youtube-player/**                             @crisbeto @nathantate
+/src/google-maps/**                                @crisbeto
+/src/youtube-player/**                             @crisbeto
 
 # CDK
 /src/cdk/*                                         @andrewseguin
 /src/cdk/a11y/**                                   @jelbourn @devversion
 /src/cdk/accordion/**                              @andrewseguin
 /src/cdk/bidi/**                                   @andrewseguin
-/src/cdk/clipboard/**                              @andrewseguin @xkxx
+/src/cdk/clipboard/**                              @andrewseguin
 /src/cdk/coercion/**                               @andrewseguin
 /src/cdk/collections/**                            @crisbeto @andrewseguin
+/src/cdk/dialog/**                                 @jelbourn @crisbeto
 /src/cdk/drag-drop/**                              @crisbeto
 /src/cdk/keycodes/**                               @andrewseguin
 /src/cdk/layout/**                                 @andrewseguin
+/src/cdk/menu/**                                   @mmalerba @crisbeto
 /src/cdk/observers/**                              @andrewseguin @crisbeto
 /src/cdk/overlay/**                                @jelbourn @crisbeto
 /src/cdk/platform/**                               @andrewseguin @devversion
@@ -95,7 +97,7 @@
 
 # Material experimental package
 /src/material-experimental/*                       @andrewseguin
-/src/material-experimental/column-resize/**        @kseamon @andrewseguin
+/src/material-experimental/column-resize/**        @andrewseguin
 /src/material-experimental/mdc-autocomplete/**     @crisbeto
 /src/material-experimental/mdc-button/**           @andrewseguin
 /src/material-experimental/mdc-card/**             @mmalerba
@@ -124,20 +126,18 @@
 /src/material-experimental/mdc-theming/**          @mmalerba
 /src/material-experimental/mdc-typography/**       @mmalerba
 /src/material-experimental/menubar/**              @jelbourn
-/src/material-experimental/popover-edit/**         @kseamon @andrewseguin
-/src/material-experimental/selection/**            @yifange @andrewseguin
+/src/material-experimental/popover-edit/**         @andrewseguin
+/src/material-experimental/selection/**            @andrewseguin
 
 # CDK experimental package
 /src/cdk-experimental/*                            @andrewseguin
-/src/cdk-experimental/column-resize/**             @kseamon @andrewseguin
+/src/cdk-experimental/column-resize/**             @andrewseguin
 /src/cdk-experimental/combobox/**                  @jelbourn
-/src/cdk-experimental/dialog/**                    @jelbourn @crisbeto
-/src/cdk-experimental/menu/**                      @jelbourn
-/src/cdk-experimental/popover-edit/**              @kseamon @andrewseguin
+/src/cdk-experimental/popover-edit/**              @andrewseguin
 /src/cdk-experimental/scrolling/**                 @mmalerba
-/src/cdk-experimental/table-scroll-container/**    @kseamon @andrewseguin
+/src/cdk-experimental/table-scroll-container/**    @andrewseguin
 /src/cdk-experimental/listbox/**                   @jelbourn
-/src/cdk-experimental/selection/**                 @yifange @andrewseguin
+/src/cdk-experimental/selection/**                 @andrewseguin
 
 # Docs examples & guides
 /guides/**                                         @jelbourn
@@ -153,16 +153,16 @@
 /src/dev-app/mdc-autocomplete/**                   @crisbeto
 /src/dev-app/button/**                             @andrewseguin
 /src/dev-app/card/**                               @andrewseguin
+/src/dev-app/cdk-dialog/**                         @crisbeto
 /src/dev-app/cdk-experimental-combobox/**          @jelbourn
 /src/dev-app/cdk-experimental-listbox/**           @jelbourn
-/src/dev-app/cdk-experimental-menu/**              @jelbourn
 /src/dev-app/checkbox/**                           @jelbourn @devversion
 /src/dev-app/chips/**                              @andrewseguin
-/src/dev-app/clipboard/**                          @andrewseguin @xkxx
-/src/dev-app/column-resize/**                      @kseamon @andrewseguin
+/src/dev-app/clipboard/**                          @andrewseguin
+/src/dev-app/column-resize/**                      @andrewseguin
 /src/dev-app/connected-overlay/**                  @jelbourn @crisbeto
 /src/dev-app/dataset/**                            @andrewseguin
-/src/dev-app/datepicker/**                         @mmalerba @crisbeto
+/src/dev-app/datepicker/**                         @mmalerba @crisbeto @zarend
 /src/dev-app/dev-app/**                            @mmalerba
 /src/dev-app/dialog/**                             @andrewseguin @crisbeto
 /src/dev-app/drag-drop/**                          @crisbeto
@@ -172,12 +172,13 @@
 /src/dev-app/expansion/**                          @andrewseguin
 /src/dev-app/focus-origin/**                       @mmalerba
 /src/dev-app/focus-trap/**                         @jelbourn
-/src/dev-app/google-map/**                         @mbehrlich
+/src/dev-app/google-map/**                         @crisbeto
 /src/dev-app/grid-list/**                          @andrewseguin
 /src/dev-app/icon/**                               @andrewseguin
 /src/dev-app/input/**                              @mmalerba
 /src/dev-app/layout/**                             @andrewseguin
-/src/dev-app/input-modality/**                     @jelbourn @zelliott
+/src/dev-app/cdk-menu/**                           @mmalerba @crisbeto
+/src/dev-app/input-modality/**                     @jelbourn
 /src/dev-app/list/**                               @andrewseguin @crisbeto @devversion
 /src/dev-app/live-announcer/**                     @jelbourn
 /src/dev-app/mdc-button/**                         @andrewseguin
@@ -191,7 +192,7 @@
 /src/dev-app/mdc-menu/**                           @crisbeto
 /src/dev-app/mdc-paginator/**                      @crisbeto
 /src/dev-app/mdc-progress-bar/**                   @crisbeto
-/src/dev-app/mdc-progress-spinner/**               @annieyw @mmalerba
+/src/dev-app/mdc-progress-spinner/**               @mmalerba
 /src/dev-app/mdc-radio/**                          @mmalerba
 /src/dev-app/mdc-select/**                         @crisbeto
 /src/dev-app/mdc-snack-bar/**                      @andrewseguin
@@ -207,7 +208,7 @@
 /src/dev-app/paginator/**                          @andrewseguin
 /src/dev-app/platform/**                           @andrewseguin @devversion
 /src/dev-app/portal/**                             @andrewseguin
-/src/dev-app/popover-edit/**                       @kseamon @andrewseguin
+/src/dev-app/popover-edit/**                       @andrewseguin
 /src/dev-app/progress-bar/**                       @andrewseguin @crisbeto
 /src/dev-app/progress-spinner/**                   @andrewseguin @crisbeto
 /src/dev-app/radio/**                              @andrewseguin @devversion
@@ -220,15 +221,15 @@
 /src/dev-app/snack-bar/**                          @andrewseguin @crisbeto
 /src/dev-app/stepper/**                            @mmalerba
 /src/dev-app/table/**                              @andrewseguin
-/src/dev-app/table-scroll-container/**             @kseamon @andrewseguin
+/src/dev-app/table-scroll-container/**             @andrewseguin
 /src/dev-app/tabs/**                               @andrewseguin
 /src/dev-app/toolbar/**                            @devversion
 /src/dev-app/tooltip/**                            @andrewseguin
 /src/dev-app/tree/**                               @andrewseguin
 /src/dev-app/typography/**                         @crisbeto
 /src/dev-app/virtual-scroll/**                     @mmalerba
-/src/dev-app/youtube-player/**                     @nathantate
-/src/dev-app/selection/**                          @yifange @andrewseguin
+/src/dev-app/youtube-player/**                     @crisbeto
+/src/dev-app/selection/**                          @andrewseguin
 
 # E2E app
 /src/e2e-app/*                                     @andrewseguin
@@ -255,7 +256,7 @@
 /src/e2e-app/mdc-input/**                          @devversion
 /src/e2e-app/mdc-menu/**                           @crisbeto
 /src/e2e-app/mdc-progress-bar/**                   @crisbeto
-/src/e2e-app/mdc-progress-spinner/**               @annieyw @mmalerba
+/src/e2e-app/mdc-progress-spinner/**               @mmalerba
 /src/e2e-app/mdc-radio/**                          @mmalerba
 /src/e2e-app/mdc-slider/**                         @andrewseguin
 /src/e2e-app/mdc-slide-toggle/**                   @crisbeto
@@ -292,7 +293,7 @@
 /tools/public_api_guard/cdk/accordion**            @andrewseguin
 /tools/public_api_guard/cdk/bidi**                 @andrewseguin
 /tools/public_api_guard/cdk/cdk**                  @andrewseguin
-/tools/public_api_guard/cdk/clipboard**            @andrewseguin @xkxx
+/tools/public_api_guard/cdk/clipboard**            @andrewseguin
 /tools/public_api_guard/cdk/coercion**             @andrewseguin
 /tools/public_api_guard/cdk/collections**          @crisbeto @andrewseguin
 /tools/public_api_guard/cdk/drag-drop**            @crisbeto
@@ -318,7 +319,7 @@
 /tools/public_api_guard/material/chips**           @andrewseguin
 /tools/public_api_guard/material/chips/testing**   @andrewseguin
 /tools/public_api_guard/material/core**            @andrewseguin
-/tools/public_api_guard/material/datepicker**      @mmalerba @crisbeto
+/tools/public_api_guard/material/datepicker**      @mmalerba @crisbeto @zarend
 /tools/public_api_guard/material/dialog**          @andrewseguin @crisbeto
 /tools/public_api_guard/material/divider**         @andrewseguin @crisbeto
 /tools/public_api_guard/material/expansion**       @andrewseguin
@@ -345,8 +346,8 @@
 /tools/public_api_guard/material/tooltip**         @andrewseguin
 /tools/public_api_guard/material/tree**            @jelbourn @andrewseguin
 /tools/public_api_guard/material/material**        @andrewseguin
-/tools/public_api_guard/google-maps/**             @crisbeto @mbehrlich
-/tools/public_api_guard/youtube-player/**          @andrewseguin @nathantate
+/tools/public_api_guard/google-maps/**             @crisbeto
+/tools/public_api_guard/youtube-player/**          @andrewseguin
 
 # Misc
 /.github/**                                        @angular/dev-infra-components

.github/workflows/dev-infra.yml

@@ -9,6 +9,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2.0.0
-      - uses: angular/dev-infra/github-actions/commit-message-based-labels@44e81e16f235c8bdc846c854128a60987bd2ee38
+      - uses: angular/dev-infra/github-actions/commit-message-based-labels@c9d0bf5e5facaf816f0af90547728fb8752ef97e
         with:
           angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

.github/workflows/feature-requests.yml

@@ -10,6 +10,6 @@ jobs:
     if: github.repository == 'angular/components'
     runs-on: ubuntu-latest
     steps:
-      - uses: angular/dev-infra/github-actions/feature-request@44e81e16f235c8bdc846c854128a60987bd2ee38
+      - uses: angular/dev-infra/github-actions/feature-request@c9d0bf5e5facaf816f0af90547728fb8752ef97e
         with:
           angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

.github/workflows/lock-closed.yml

@@ -9,6 +9,6 @@ jobs:
   lock_closed:
     runs-on: ubuntu-latest
     steps:
-      - uses: angular/dev-infra/github-actions/lock-closed@44e81e16f235c8bdc846c854128a60987bd2ee38
+      - uses: angular/dev-infra/github-actions/lock-closed@c9d0bf5e5facaf816f0af90547728fb8752ef97e
         with:
           lock-bot-key: ${{ secrets.LOCK_BOT_PRIVATE_KEY }}

.github/workflows/scorecard.yml

@@ -4,7 +4,11 @@ on:
   schedule:
     - cron: '0 3 * * 0'
   push:
-    branches: [master]
+    branches: [
+        main,
+        # TODO(BRANCH_RENAME_CLEANUP): remove
+        master,
+      ]
   workflow_dispatch:
 
 # Declare default permissions as read only.

.ng-dev/commit-message.ts

@@ -11,9 +11,7 @@ export const commitMessage: CommitMessageConfig = {
     'multiple', // For when a commit applies to multiple components.
     'cdk-experimental/column-resize',
     'cdk-experimental/combobox',
-    'cdk-experimental/dialog',
     'cdk-experimental/listbox',
-    'cdk-experimental/menu',
     'cdk-experimental/popover-edit',
     'cdk-experimental/scrolling',
     'cdk-experimental/selection',
@@ -24,9 +22,11 @@ export const commitMessage: CommitMessageConfig = {
     'cdk/clipboard',
     'cdk/coercion',
     'cdk/collections',
+    'cdk/dialog',
     'cdk/drag-drop',
     'cdk/keycodes',
     'cdk/layout',
+    'cdk/menu',
     'cdk/observers',
     'cdk/overlay',
     'cdk/platform',

CHANGELOG.md

@@ -1,3 +1,30 @@
+<a name="14.0.0-next.11"></a>
+# 14.0.0-next.11 "madras-macaque" (2022-04-20)
+### cdk
+| Commit | Type | Description |
+| -- | -- | -- |
+| [c04f941fe](https://github.com/angular/components/commit/c04f941fe0cbe18022c97f1481254f3510db5ded) | fix | **portal:** prevent calling `ApplicationRef.detachView` on destroyed instance ([#24775](https://github.com/angular/components/pull/24775)) |
+### material
+| Commit | Type | Description |
+| -- | -- | -- |
+| [a55a8368b](https://github.com/angular/components/commit/a55a8368b30cf8e9ba787ad3530a8c9b66182d7b) | feat | **paginator:** Add `isNextPageEnabled` and `isPreviousPageEnabled` methods to `MatPaginatorHarness` ([#24784](https://github.com/angular/components/pull/24784)) |
+| [1aa5a2064](https://github.com/angular/components/commit/1aa5a206472f523a1ae189acc77a5abe15d71d5e) | feat | **select:** allow user-defined aria-describedby ([#24644](https://github.com/angular/components/pull/24644)) |
+## Special Thanks
+Andrew Kushnir, Kristiyan Kostadinov, Paul Gschwendtner, Richie Foreman, Robin (Robert) Thomas, Zach Arend and renovate[bot]
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="13.3.4"></a>
+# 13.3.4 "adamantium-albatross" (2022-04-20)
+### cdk
+| Commit | Type | Description |
+| -- | -- | -- |
+| [eef47579f](https://github.com/angular/components/commit/eef47579fd5a1e2f1f9423a6ba5bc2a4955142cc) | fix | **portal:** prevent calling `ApplicationRef.detachView` on destroyed instance ([#24775](https://github.com/angular/components/pull/24775)) |
+## Special Thanks
+Andrew Kushnir, Kristiyan Kostadinov, Paul Gschwendtner and Zach Arend
+
+<!-- CHANGELOG SPLIT MARKER -->
+
 <a name="14.0.0-next.10"></a>
 # 14.0.0-next.10 "organza-oatmeal" (2022-04-13)
 ### cdk

CONTRIBUTING.md

@@ -31,7 +31,7 @@ If you would like to chat about the question in real-time, you can reach out via
 
 ## <a name="issue"></a> Found an Issue?
 If you find a bug in the source code or a mistake in the documentation, you can help us by
-[submitting an issue](#submit-issue) to our [GitHub Repository][github]. Including an issue 
+[submitting an issue](#submit-issue) to our [GitHub Repository][github]. Including an issue
 reproduction (via CodePen, JsBin, Plunkr, etc.) is the absolute best way to help the team quickly
 diagnose the problem. Screenshots are also helpful.
 
@@ -40,7 +40,7 @@ You can help the team even more and [submit a Pull Request](#submit-pr) with a f
 ## <a name="feature"></a> Want a Feature?
 You can *request* a new feature by [submitting an issue](#submit-issue) to our [GitHub
 Repository][github]. If you would like to *implement* a new feature, please submit an issue with
-a proposal for your work first, to be sure that we can use it. 
+a proposal for your work first, to be sure that we can use it.
 Please consider what kind of change it is:
 
 * For a **Major Feature**, first open an issue and outline your proposal so that it can be
@@ -194,7 +194,7 @@ Fixes a bug in the Angular Material `button` component where buttons
 cannot be disabled through an binding. This is because the `disabled`
 input did not set the `.mat-button-disabled` class on the host element.
 
-Fixes #1234 
+Fixes #1234
 ```
 
 ### Revert
@@ -221,7 +221,7 @@ The commit message should specify which package is affected by the change. For e
 
 ### Scope
 The scope specifies place of the commit change. For example
-`material/datepicker`, `cdk-experimental/dialog`, etc.
+`material/datepicker`, `cdk/dialog`, etc.
 See full list [here][commit-message-scopes].
 
 ### Subject