Skip to content

Commit d0c57ea

Browse files
adolgachevadolgachev
authored
Merge branch 'angular:main' into aria-menu-label
2 parents add83a3 + a3f2ec8 commit d0c57ea

File tree

35 files changed

+922
-705
lines changed

35 files changed

+922
-705
lines changed

‎CHANGELOG.md‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,43 @@
1+
<a name="21.2.0-next.2"></a>
2+
# 21.2.0-next.2 "plastic-bottle" (2026-01-29)
3+
### aria
4+
| Commit | Type | Description |
5+
| -- | -- | -- |
6+
| [82a51f367b](https://github.com/angular/components/commit/82a51f367b2741245f77ff694a1a894910cdbdea) | fix | **combobox:** Add announcement for empty results to autocomplete demo ([#32707](https://github.com/angular/components/pull/32707)) |
7+
| [0395ca20f4](https://github.com/angular/components/commit/0395ca20f4cd0bf563b63aa412e1b4956e384f9b) | perf | **grid:** avoid excessive change detections ([#32705](https://github.com/angular/components/pull/32705)) |
8+
### cdk
9+
| Commit | Type | Description |
10+
| -- | -- | -- |
11+
| [c71256dfdb](https://github.com/angular/components/commit/c71256dfdb981a628120d6bbafdc3001836dd9a8) | fix | **listbox:** incorrect wording in error message ([#32697](https://github.com/angular/components/pull/32697)) |
12+
| [e78587f2bf](https://github.com/angular/components/commit/e78587f2bfc87abf06a78cc95da201700b14a962) | fix | **table:** throw when multiple row templates are used with virtual scrolling ([#32682](https://github.com/angular/components/pull/32682)) |
13+
### material
14+
| Commit | Type | Description |
15+
| -- | -- | -- |
16+
| [c70a4737a9](https://github.com/angular/components/commit/c70a4737a9fbe398c535be68bf1bcd625a52d8d2) | fix | **sidenav:** incorrectly trapping focus in some cases ([#32699](https://github.com/angular/components/pull/32699)) |
17+
| [34bcffb9f5](https://github.com/angular/components/commit/34bcffb9f53074b1f9b2a0a2491da1774612b97b) | fix | **timepicker:** make it easier to style timepicker panel ([#32711](https://github.com/angular/components/pull/32711)) |
18+
19+
<!-- CHANGELOG SPLIT MARKER -->
20+
21+
<a name="21.1.2"></a>
22+
# 21.1.2 "glass-bottle" (2026-01-28)
23+
### aria
24+
| Commit | Type | Description |
25+
| -- | -- | -- |
26+
| [1d9918a9de](https://github.com/angular/components/commit/1d9918a9dea48c1d4349233dc8a0d5cee7c48ea8) | fix | **combobox:** Add announcement for empty results to autocomplete demo ([#32707](https://github.com/angular/components/pull/32707)) |
27+
| [81b407d353](https://github.com/angular/components/commit/81b407d353ab8a8b52447d8e2ec9c2d3c4471a1a) | perf | **grid:** avoid excessive change detections ([#32705](https://github.com/angular/components/pull/32705)) |
28+
### cdk
29+
| Commit | Type | Description |
30+
| -- | -- | -- |
31+
| [9b54cb20da](https://github.com/angular/components/commit/9b54cb20daff4faaae64e882da7efccd66c7cc28) | fix | **listbox:** incorrect wording in error message ([#32697](https://github.com/angular/components/pull/32697)) |
32+
| [4b8fc71c08](https://github.com/angular/components/commit/4b8fc71c08024cbac0f6f5221ecbd5ae2263f065) | fix | **table:** throw when multiple row templates are used with virtual scrolling ([#32682](https://github.com/angular/components/pull/32682)) |
33+
### material
34+
| Commit | Type | Description |
35+
| -- | -- | -- |
36+
| [bb69f3ca7d](https://github.com/angular/components/commit/bb69f3ca7daeeaaf30c4c86310c504f9d2925bd5) | fix | **sidenav:** incorrectly trapping focus in some cases ([#32699](https://github.com/angular/components/pull/32699)) |
37+
| [7824225a5b](https://github.com/angular/components/commit/7824225a5b5e9911867e378b8b7529ec852baca2) | fix | **timepicker:** make it easier to style timepicker panel ([#32711](https://github.com/angular/components/pull/32711)) |
38+
39+
<!-- CHANGELOG SPLIT MARKER -->
40+
141
<a name="21.2.0-next.1"></a>
242
# 21.2.0-next.1 "plastic-ant" (2026-01-21)
343
### aria

‎MODULE.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ use_repo(node, "nodejs_toolchains")
7373
pnpm = use_extension("@aspect_rules_js//npm:extensions.bzl", "pnpm")
7474
pnpm.pnpm(
7575
name = "pnpm",
76-
pnpm_version = "10.28.0",
77-
pnpm_version_integrity = "sha512-Bd9x0UIfITmeBT/eVnzqNNRG+gLHZXFEG/wceVbpjjYwiJgtlARl/TRIDU2QoGaLwSNi+KqIAApk6D0LDke+SA==",
76+
pnpm_version = "10.28.2",
77+
pnpm_version_integrity = "sha512-QYcvA3rSL3NI47Heu69+hnz9RI8nJtnPdMCPGVB8MdLI56EVJbmD/rwt9kC1Q43uYCPrsfhO1DzC1lTSvDJiZA==",
7878
)
7979
use_repo(pnpm, "pnpm")
8080

‎MODULE.bazel.lock‎

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

‎README.md‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
The Angular team builds and maintains both common UI components and tools to help you build your
77
own custom components. The team maintains several npm packages.
88

9-
| Package | Description | Docs |
10-
| ------------------------- | ----------------------------------------------------------------------------------- | ---------------- |
11-
| `@angular/cdk` | Library that helps you author custom UI components with common interaction patterns | [Docs][cdk-docs] |
12-
| `@angular/material` | [Material Design][] UI components for Angular applications | [Docs][mat-docs] |
13-
| `@angular/google-maps` | Angular components built on top of the [Google Maps JavaScript API][] | [Docs][map-docs] |
14-
| `@angular/youtube-player` | Angular component built on top of the [YouTube Player API][] | [Docs][ytp-docs] |
9+
| Package | Description | Docs |
10+
| ------------------------- | ------------------------------------------------------------------------------------- | ----------------- |
11+
| `@angular/aria` | Collection of headless, accessible directives that implement common WAI-ARIA patterns | [Docs][aria-docs] |
12+
| `@angular/cdk` | Library that helps you author custom UI components with common interaction patterns | [Docs][cdk-docs] |
13+
| `@angular/material` | [Material Design][] UI components for Angular applications | [Docs][mat-docs] |
14+
| `@angular/google-maps` | Angular components built on top of the [Google Maps JavaScript API][] | [Docs][map-docs] |
15+
| `@angular/youtube-player` | Angular component built on top of the [YouTube Player API][] | [Docs][ytp-docs] |
1516

1617

1718
#### Quick links
@@ -68,6 +69,7 @@ We aim for great user experience with the following screen readers:
6869
[Material Design]: https://material.io
6970
[Google Maps JavaScript API]: https://developers.google.com/maps/documentation/javascript/tutorial
7071
[YouTube Player API]: https://developers.google.com/youtube/iframe_api_reference
72+
[aria-docs]: https://angular.dev/guide/aria/overview
7173
[cdk-docs]: https://material.angular.dev/cdk/categories
7274
[mat-docs]: https://material.angular.dev
7375
[map-docs]: https://github.com/angular/components/blob/main/src/google-maps/README.md

‎docs/defs.bzl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ TEST_DEPS = [
4545
"//docs:node_modules/karma-coverage",
4646
"//docs:node_modules/karma-firefox-launcher",
4747
"//docs:node_modules/karma-jasmine",
48-
"//docs:node_modules/karma-jasmine-html-reporter",
4948
]
5049

5150
# Common dependencies of Angular CLI test suites

‎docs/karma.conf.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ module.exports = function (config) {
1616
require('karma-jasmine'),
1717
require('karma-chrome-launcher'),
1818
require('karma-firefox-launcher'),
19-
require('karma-jasmine-html-reporter'),
2019
require('@angular-devkit/build-angular/plugins/karma'),
2120
],
2221
client: {
@@ -27,7 +26,7 @@ module.exports = function (config) {
2726
reports: ['html', 'lcovonly', 'text-summary'],
2827
fixWebpackSourcePaths: true,
2928
},
30-
reporters: ['progress', 'kjhtml'],
29+
reporters: ['progress'],
3130
port: 9876,
3231
colors: true,
3332
logLevel: config.LOG_INFO,

‎docs/package.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,17 @@
5858
"@angular/cli": "catalog:",
5959
"@angular/compiler-cli": "catalog:",
6060
"@bazel/bazelisk": "^1.12.1",
61-
"@types/jasmine": "5.1.15",
61+
"@types/jasmine": "^6.0.0",
6262
"@types/node": "^22.14.1",
6363
"@types/shelljs": "0.10.0",
6464
"firebase-tools": "15.2.1",
65-
"jasmine-core": "5.13.0",
65+
"jasmine-core": "^6.0.0",
6666
"jasmine-spec-reporter": "7.0.0",
6767
"karma": "~6.4.4",
6868
"karma-chrome-launcher": "^3.1.1",
6969
"karma-coverage": "~2.2.0",
7070
"karma-firefox-launcher": "^2.1.0",
7171
"karma-jasmine": "^5.0.0",
72-
"karma-jasmine-html-reporter": "^2.0.0",
7372
"light-server": "^2.9.1",
7473
"lighthouse": "^13.0.0",
7574
"lighthouse-logger": "~2.0.0",

‎docs/scenes/karma.conf.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ module.exports = function (config) {
2020
require('karma-jasmine'),
2121
require('karma-chrome-launcher'),
2222
require('karma-firefox-launcher'),
23-
require('karma-jasmine-html-reporter'),
2423
require('@angular-devkit/build-angular/plugins/karma'),
2524
],
2625
client: {
@@ -31,7 +30,7 @@ module.exports = function (config) {
3130
reports: ['html', 'lcovonly', 'text-summary'],
3231
fixWebpackSourcePaths: true,
3332
},
34-
reporters: ['progress', 'kjhtml'],
33+
reporters: ['progress'],
3534
port: 9876,
3635
colors: true,
3736
logLevel: config.LOG_INFO,

‎goldens/aria/grid/index.api.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ export class GridCellWidget {
6767
readonly focusTarget: _angular_core.InputSignal<ElementRef<any> | HTMLElement | undefined>;
6868
readonly id: _angular_core.InputSignal<string>;
6969
get isActivated(): Signal<boolean>;
70-
readonly onActivate: _angular_core.OutputEmitterRef<KeyboardEvent | FocusEvent | undefined>;
71-
readonly onDeactivate: _angular_core.OutputEmitterRef<KeyboardEvent | FocusEvent | undefined>;
70+
readonly onActivate: _angular_core.OutputEmitterRef<FocusEvent | KeyboardEvent | undefined>;
71+
readonly onDeactivate: _angular_core.OutputEmitterRef<FocusEvent | KeyboardEvent | undefined>;
7272
readonly _pattern: GridCellWidgetPattern;
7373
protected readonly _tabIndex: Signal<number>;
7474
readonly tabindex: _angular_core.InputSignal<number | undefined>;

‎goldens/aria/private/index.api.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,7 @@ export interface GridInputs extends Omit<GridInputs$1<GridCellPattern>, 'cells'>
407407
// @public
408408
export class GridPattern {
409409
constructor(inputs: GridInputs);
410+
readonly acceptsPointerMove: SignalLike<boolean>;
410411
readonly activeCell: SignalLike<GridCellPattern | undefined>;
411412
readonly activeDescendant: SignalLike<string | undefined>;
412413
readonly anchorCell: SignalLike<GridCellPattern | undefined>;
@@ -780,7 +781,6 @@ export class ToolbarPattern<V> {
780781
setDefaultState(): void;
781782
readonly softDisabled: SignalLike<boolean>;
782783
readonly tabIndex: SignalLike<0 | -1>;
783-
validate(): string[];
784784
}
785785

786786
// @public
@@ -917,6 +917,7 @@ export class TreePattern<V> implements TreeInputs<V> {
917917
readonly treeBehavior: Tree<TreeItemPattern<V>, V>;
918918
readonly typeaheadDelay: SignalLike<number>;
919919
readonly typeaheadRegexp: RegExp;
920+
validate(): string[];
920921
readonly values: WritableSignalLike<V[]>;
921922
readonly visible: () => boolean;
922923
readonly wrap: SignalLike<boolean>;

0 commit comments

Comments
 (0)