Skip to content

Commit 6ada284

Browse files
authored
Merge branch 'angular:main' into chips-tb
2 parents bec6583 + fa90911 commit 6ada284

Some content is hidden

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

43 files changed

+2286
-619
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.5.0
1+
7.6.1

.github/workflows/assistant-to-the-branch-manager.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
assistant_to_the_branch_manager:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
16+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1717
with:
1818
persist-credentials: false
1919
- uses: angular/dev-infra/github-actions/branch-manager@5293c189424a61f7255d8171e3d653f983404851

.github/workflows/dev-infra.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ jobs:
1111
labels:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
14+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1515
- uses: angular/dev-infra/github-actions/pull-request-labeling@5293c189424a61f7255d8171e3d653f983404851
1616
with:
1717
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
1818
post_approval_changes:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
21+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2222
- uses: angular/dev-infra/github-actions/post-approval-changes@5293c189424a61f7255d8171e3d653f983404851
2323
with:
2424
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

.github/workflows/docs-preview-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
runs-on: ubuntu-latest
3030
if: ${{ github.event.workflow_run.conclusion == 'success' }}
3131
steps:
32-
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
32+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
3333
with:
3434
token: '${{secrets.GITHUB_TOKEN}}'
3535

.github/workflows/google-internal-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
trigger:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
15+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1616
- uses: angular/dev-infra/github-actions/google-internal-tests@5293c189424a61f7255d8171e3d653f983404851
1717
with:
1818
run-tests-guide-url: http://go/angular-material-presubmit

.github/workflows/preview-deploy-dev-app.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
if: ${{ github.event.workflow_run.conclusion == 'success' }}
2727
steps:
28-
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
28+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2929

3030
- name: Configure Firebase deploy target
3131
run: |

.github/workflows/scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: 'Checkout code'
28-
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
28+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2929
with:
3030
persist-credentials: false
3131

@@ -47,6 +47,6 @@ jobs:
4747

4848
# Upload the results to GitHub's code scanning dashboard.
4949
- name: 'Upload to code-scanning'
50-
uses: github/codeql-action/upload-sarif@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.8
50+
uses: github/codeql-action/upload-sarif@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
5151
with:
5252
sarif_file: results.sarif

MODULE.bazel

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# TODO: Investigate bzlmod and use it where possible.
2+
3+
module(
4+
name = "angular_material",
5+
)

MODULE.bazel.lock

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

goldens/cdk/menu/index.api.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ export class CdkMenuBar extends CdkMenuBase implements AfterContentInit {
8484

8585
// @public
8686
export abstract class CdkMenuBase extends CdkMenuGroup implements Menu, AfterContentInit, OnDestroy {
87+
protected _allItems: QueryList<CdkMenuItem>;
8788
protected closeOpenMenu(menu: MenuStackItem, options?: {
8889
focusParentTrigger?: boolean;
8990
}): void;
@@ -110,7 +111,7 @@ export abstract class CdkMenuBase extends CdkMenuGroup implements Menu, AfterCon
110111
setActiveMenuItem(item: number | CdkMenuItem): void;
111112
protected triggerItem?: CdkMenuItem;
112113
// (undocumented)
113-
static ɵdir: i0.ɵɵDirectiveDeclaration<CdkMenuBase, never, never, { "id": { "alias": "id"; "required": false; }; }, {}, ["items"], never, true, never>;
114+
static ɵdir: i0.ɵɵDirectiveDeclaration<CdkMenuBase, never, never, { "id": { "alias": "id"; "required": false; }; }, {}, ["_allItems"], never, true, never>;
114115
// (undocumented)
115116
static ɵfac: i0.ɵɵFactoryDeclaration<CdkMenuBase, never>;
116117
}
@@ -146,6 +147,7 @@ export class CdkMenuItem implements FocusableOption, FocusableElement, Toggler,
146147
// (undocumented)
147148
protected _ngZone: NgZone;
148149
_onKeydown(event: KeyboardEvent): void;
150+
readonly _parentMenu: Menu | null;
149151
_resetTabIndex(): void;
150152
_setTabIndex(event?: MouseEvent): void;
151153
_tabindex: 0 | -1;

0 commit comments

Comments
 (0)