Skip to content

Commit 2d598fb

Browse files
authored
Merge branch 'angular:main' into chips-group
2 parents 393bc19 + 96117bc commit 2d598fb

File tree

205 files changed

+2321
-2379
lines changed

Some content is hidden

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

205 files changed

+2321
-2379
lines changed

CHANGELOG.md

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,48 @@
1+
<a name="20.2.0-next.2"></a>
2+
# 20.2.0-next.2 "archerite-asparagus" (2025-07-30)
3+
### cdk
4+
| Commit | Type | Description |
5+
| -- | -- | -- |
6+
| [88d4ffda6](https://github.com/angular/components/commit/88d4ffda6904661a49b9de973ba640a1cde24ee8) | fix | **drag-drop:** incorrect index when returning item in mixed list ([#31592](https://github.com/angular/components/pull/31592)) |
7+
| [c386d0ee1](https://github.com/angular/components/commit/c386d0ee146a6b29479f2d4761d8a06df942524d) | fix | **listbox:** coerce tabindex value ([#31597](https://github.com/angular/components/pull/31597)) |
8+
### material
9+
| Commit | Type | Description |
10+
| -- | -- | -- |
11+
| [20e6e92c0](https://github.com/angular/components/commit/20e6e92c06c74487793713d0323c2aa997a70035) | feat | **core:** add an m2-theme API to define system vars ([#31616](https://github.com/angular/components/pull/31616)) |
12+
| [3dfe50aef](https://github.com/angular/components/commit/3dfe50aefeb3561b1992d186302db9af380aab07) | fix | **core:** align gm3 colors ([#31485](https://github.com/angular/components/pull/31485)) |
13+
| [993a9a393](https://github.com/angular/components/commit/993a9a39301f757b78a97641f5863b8fa1f83f8c) | fix | **core:** fill in m2 system token values ([#31615](https://github.com/angular/components/pull/31615)) |
14+
| [5d681219f](https://github.com/angular/components/commit/5d681219f29c350378ebaec32c64b3fbce10fcd4) | fix | **core:** use different prefix for m2-theme ([#31621](https://github.com/angular/components/pull/31621)) |
15+
| [471d3237e](https://github.com/angular/components/commit/471d3237e247a2cac939624adf4ef757bcaf214d) | fix | **radio:** rendering artifacts at some zoom levels ([#31612](https://github.com/angular/components/pull/31612)) |
16+
| [8576ccf1d](https://github.com/angular/components/commit/8576ccf1df6f1c898044d8587e51469c7c27ba31) | fix | **schematics:** set generated font family on body ([#31618](https://github.com/angular/components/pull/31618)) |
17+
| [9e14c5566](https://github.com/angular/components/commit/9e14c5566535601620c9bfa29786c828ddf3dc2d) | fix | **slider:** tick marks not showing dynamically ([#31608](https://github.com/angular/components/pull/31608)) |
18+
| [9e25efb6f](https://github.com/angular/components/commit/9e25efb6f0d1e02e79e537b2252c38ce7f5e34ed) | fix | **table:** return undefined sort and paginator ([#31593](https://github.com/angular/components/pull/31593)) |
19+
| [092c0f73d](https://github.com/angular/components/commit/092c0f73d8838ac23daeb1772b4a40fa68bebb98) | fix | **testing:** Modify input filtering to more broadly search for ([#31596](https://github.com/angular/components/pull/31596)) |
20+
### cdk-experimental
21+
| Commit | Type | Description |
22+
| -- | -- | -- |
23+
| [647616e2e](https://github.com/angular/components/commit/647616e2eb5b60050c827f5ba3cb1560b6867547) | fix | **listbox:** make CdkOption public ([#31588](https://github.com/angular/components/pull/31588)) |
24+
25+
<!-- CHANGELOG SPLIT MARKER -->
26+
27+
<a name="20.1.4"></a>
28+
# 20.1.4 "alabandite-animal" (2025-07-30)
29+
### cdk
30+
| Commit | Type | Description |
31+
| -- | -- | -- |
32+
| [512066a90](https://github.com/angular/components/commit/512066a907555f0e31ab2315c90b0f07f860a023) | fix | **drag-drop:** incorrect index when returning item in mixed list ([#31592](https://github.com/angular/components/pull/31592)) |
33+
| [b5fb4cb47](https://github.com/angular/components/commit/b5fb4cb479d73e01c51eac05af634cbbe1d7ce98) | fix | **listbox:** coerce tabindex value ([#31597](https://github.com/angular/components/pull/31597)) |
34+
### material
35+
| Commit | Type | Description |
36+
| -- | -- | -- |
37+
| [3e4625d1c](https://github.com/angular/components/commit/3e4625d1cf8c87313465633c0843892d34da0130) | fix | **core:** align gm3 colors ([#31485](https://github.com/angular/components/pull/31485)) |
38+
| [3de927f9d](https://github.com/angular/components/commit/3de927f9d003312604a833e80df8eff77c4a96d7) | fix | **core:** fill in m2 system token values ([#31615](https://github.com/angular/components/pull/31615)) |
39+
| [d18da5664](https://github.com/angular/components/commit/d18da5664c9a85f48d3d44aad98264cc2d031e1b) | fix | **radio:** rendering artifacts at some zoom levels ([#31612](https://github.com/angular/components/pull/31612)) |
40+
| [25d12df5b](https://github.com/angular/components/commit/25d12df5b6af747c560dbd678a999ae96e3c7b13) | fix | **schematics:** set generated font family on body ([#31618](https://github.com/angular/components/pull/31618)) |
41+
| [4ae4fe22d](https://github.com/angular/components/commit/4ae4fe22d54f139dcd606b71d489f9678acf5ce0) | fix | **slider:** tick marks not showing dynamically ([#31608](https://github.com/angular/components/pull/31608)) |
42+
| [6e252739b](https://github.com/angular/components/commit/6e252739b0dd0d6990bdf6c08545e2df6c9949e2) | fix | **testing:** Modify input filtering to more broadly search for ([#31596](https://github.com/angular/components/pull/31596)) |
43+
44+
<!-- CHANGELOG SPLIT MARKER -->
45+
146
<a name="20.2.0-next.1"></a>
247
# 20.2.0-next.1 "tantalum-tomato" (2025-07-23)
348
### cdk

WORKSPACE

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ http_archive(
158158
load("@aspect_rules_ts//ts:repositories.bzl", "rules_ts_dependencies")
159159

160160
rules_ts_dependencies(
161-
# Obtained by: curl --silent https://registry.npmjs.org/typescript/5.8.3 | jq -r '.dist.integrity'
162-
ts_integrity = "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
161+
# Obtained by: curl --silent https://registry.npmjs.org/typescript/5.9.2 | jq -r '.dist.integrity'
162+
ts_integrity = "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
163163
ts_version_from = "//:package.json",
164164
)
165165

@@ -177,6 +177,13 @@ http_archive(
177177
url = "https://github.com/aspect-build/rules_jasmine/releases/download/v2.0.0/rules_jasmine-v2.0.0.tar.gz",
178178
)
179179

180+
http_archive(
181+
name = "jq.bzl",
182+
sha256 = "7b63435aa19cc6a0cfd1a82fbdf2c7a2f0a94db1a79ff7a4469ffa94286261ab",
183+
strip_prefix = "jq.bzl-0.1.0",
184+
url = "https://github.com/bazel-contrib/jq.bzl/releases/download/v0.1.0/jq.bzl-v0.1.0.tar.gz",
185+
)
186+
180187
load("@aspect_rules_jasmine//jasmine:dependencies.bzl", "rules_jasmine_dependencies")
181188

182189
rules_jasmine_dependencies()
@@ -199,7 +206,7 @@ setup_dependencies_2()
199206

200207
git_repository(
201208
name = "rules_angular",
202-
commit = "652e5b0ef9be65ca738e11d5d01424b64344b466",
209+
commit = "8bf9ae3fa3017ec12877908533001daed9c6ce83",
203210
remote = "https://github.com/devversion/rules_angular.git",
204211
)
205212

docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,6 @@
7979
"sass": "1.89.2",
8080
"shelljs": "^0.10.0",
8181
"ts-node": "10.9.2",
82-
"typescript": "~5.8.2"
82+
"typescript": "~5.9.2"
8383
}
8484
}

docs/src/app/shared/guide-items/guide-items.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ const GUIDES: GuideItem[] = [
5252
id: 'creating-a-custom-stepper-using-the-cdk-stepper',
5353
name: 'Custom stepper using the CdkStepper',
5454
document: '/docs-content/guides/creating-a-custom-stepper-using-the-cdk-stepper.md.html',
55-
overview: 'Create a custom stepper components using Angular CDK.',
55+
overview: 'Create a custom stepper component using Angular CDK.',
5656
},
5757
{
5858
id: 'using-component-harnesses',

docs/tsconfig.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
"strictInjectionParameters": true,
3333
"strictInputAccessModifiers": true,
3434
"strictTemplates": true,
35+
"strictInputTypes": true,
36+
"strictOutputEventTypes": true,
37+
"strictDomEventTypes": true,
3538
"typeCheckHostBindings": true
3639
}
3740
}

goldens/material/slider/index.api.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ export class MatSlider implements AfterViewInit, OnDestroy, _MatSlider {
103103
}): void;
104104
// (undocumented)
105105
_setTransition(withAnimation: boolean): void;
106-
showTickMarks: boolean;
106+
get showTickMarks(): boolean;
107+
set showTickMarks(value: boolean);
107108
// (undocumented)
108109
_startThumbTransform: string;
109110
protected startValueIndicatorText: string;

goldens/material/table/index.api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,10 @@ export class MatTableDataSource<T, P extends MatPaginator = MatPaginator> extend
186186
filterPredicate: (data: T, filter: string) => boolean;
187187
_orderData(data: T[]): T[];
188188
_pageData(data: T[]): T[];
189-
get paginator(): P | null;
189+
get paginator(): P | null | undefined;
190190
set paginator(paginator: P | null | undefined);
191191
_renderChangesSubscription: Subscription | null;
192-
get sort(): MatSort | null;
192+
get sort(): MatSort | null | undefined;
193193
set sort(sort: MatSort | null | undefined);
194194
sortData: (data: T[], sort: MatSort) => T[];
195195
sortingDataAccessor: (data: T, sortHeaderId: string) => string | number;

guides/creating-a-custom-stepper-using-the-cdk-stepper.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Creating a custom stepper using the CDK stepper
22

3-
The [CDK stepper](https://material.angular.dev/cdk/stepper/overview) allows to build a custom stepper which you can completely style yourself without any specific Material Design styling.
3+
The [CDK stepper](https://material.angular.dev/cdk/stepper/overview) allows you to build a custom stepper which you can completely style yourself without any specific Material Design styling.
44

5-
In this guide, we'll learn how we can build our own custom stepper using the CDK stepper. Here is what we'll build by the end of this guide:
5+
In this guide, we'll learn how to build our own custom stepper using the CDK stepper. Here is what we'll build by the end of this guide:
66

77
<!-- example(cdk-custom-stepper-without-form) -->
88

@@ -126,7 +126,7 @@ If you want to iterate over your steps and use your own custom component you can
126126

127127
The above example allows the user to freely navigate between all steps. The `CdkStepper` additionally provides the linear mode which requires the user to complete previous steps before proceeding.
128128

129-
A simple example without using forms could look this way:
129+
A simple example without using forms could look like this:
130130

131131
**app.component.html**
132132

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"ci-docs-monitor-test": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only scripts/docs-deploy/monitoring/ci-test.mts",
5353
"prepare": "husky"
5454
},
55-
"version": "20.2.0-next.1",
55+
"version": "20.2.0-next.2",
5656
"dependencies": {
5757
"@angular-devkit/core": "catalog:",
5858
"@angular-devkit/schematics": "catalog:",
@@ -145,14 +145,14 @@
145145
"tsickle": "0.46.3",
146146
"tslint": "^6.1.3",
147147
"tsutils": "^3.21.0",
148-
"typescript": "5.8.3",
148+
"typescript": "5.9.2",
149149
"vrsource-tslint-rules": "6.0.0",
150150
"yargs": "^18.0.0",
151151
"zx": "^8.0.0"
152152
},
153153
"pnpm": {
154154
"overrides": {
155-
"typescript": "5.8.3"
155+
"typescript": "5.9.2"
156156
},
157157
"onlyBuiltDependencies": [],
158158
"packageExtensions": {

0 commit comments

Comments
 (0)