Skip to content

Commit 75fc818

Browse files
DBowen33DBowen33
authored
Merge branch 'angular:main' into slider-fix-pt2
2 parents 0c7fd89 + 5dc2de2 commit 75fc818

File tree

8 files changed

+79
-52
lines changed

8 files changed

+79
-52
lines changed

‎.circleci/bazel.rc‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎.circleci/config.yml‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,46 @@
1+
<a name="19.0.0-rc.2"></a>
2+
# 19.0.0-rc.2 "barium-binoculars" (2024-11-13)
3+
### cdk
4+
| Commit | Type | Description |
5+
| -- | -- | -- |
6+
| [8141e45a8](https://github.com/angular/components/commit/8141e45a892a9f5bb6643a3ce606845d9a302251) | fix | **listbox:** make tabindex zoneless compatible ([#29970](https://github.com/angular/components/pull/29970)) |
7+
| [a78f47551](https://github.com/angular/components/commit/a78f475510b49aa6ddd9052ef6fdfc1e0c0c15d4) | fix | **table:** set explicit role on all cells ([#29987](https://github.com/angular/components/pull/29987)) |
8+
| [fda61f565](https://github.com/angular/components/commit/fda61f565093cb9f8de5b3339de01ac92cc6926f) | fix | **testing:** allow use of `plaintext-only` for `contenteditable` ([#29999](https://github.com/angular/components/pull/29999)) |
9+
| [f6066c23f](https://github.com/angular/components/commit/f6066c23feee5a23d870104860f1e18bb9f3db83) | fix | **tree:** warn if mixed node types are used within the same tree |
10+
### material
11+
| Commit | Type | Description |
12+
| -- | -- | -- |
13+
| [de6c20686](https://github.com/angular/components/commit/de6c20686c441ff39b872b69c725c3c46b1f3a93) | fix | **bottom-sheet:** add `height` `minHeight` `maxHeight` to config ([#29794](https://github.com/angular/components/pull/29794)) |
14+
| [d0d59b784](https://github.com/angular/components/commit/d0d59b784abdde79bebaf9cff6d316c952228fa7) | fix | **core:** change ng-add to use mat.theme ([#29990](https://github.com/angular/components/pull/29990)) |
15+
| [b7f509c5b](https://github.com/angular/components/commit/b7f509c5bf943c2b3bc11f72183b90545f6571a7) | fix | **core:** incorrect validation in get-theme-color ([#29994](https://github.com/angular/components/pull/29994)) |
16+
| [d55ec612c](https://github.com/angular/components/commit/d55ec612cc66b42971c9da2677bc6e54017dd271) | fix | **core:** update prebuilt themes to use mat.theme ([#29989](https://github.com/angular/components/pull/29989)) |
17+
| [482009bac](https://github.com/angular/components/commit/482009bac173bd4453d20dfec283e3cab23d2af0) | fix | **schematics:** add explicit system variable prefix schematic ([#29980](https://github.com/angular/components/pull/29980)) |
18+
| [75631fb0b](https://github.com/angular/components/commit/75631fb0b305891ea22e422f8bd9d9d991c1d6ef) | fix | **sidenav:** prevent the content from jumping when hydrated ([#29991](https://github.com/angular/components/pull/29991)) |
19+
| [bb66db738](https://github.com/angular/components/commit/bb66db73867df02f55feed8fca4daf7cb9d8dc83) | fix | **snack-bar:** prevent override of snack bar action button color ([#27511](https://github.com/angular/components/pull/27511)) |
20+
### youtube-player
21+
| Commit | Type | Description |
22+
| -- | -- | -- |
23+
| [09da06b42](https://github.com/angular/components/commit/09da06b42e2aad668bbdeb9adecdad401b0d8df6) | fix | ready event not emitting |
24+
| [288598750](https://github.com/angular/components/commit/2885987500f9005fbdf981c700b516096896868b) | fix | startSeconds not applied when using placeholder |
25+
26+
<!-- CHANGELOG SPLIT MARKER -->
27+
28+
<a name="18.2.13"></a>
29+
# 18.2.13 "strontium-sauce" (2024-11-13)
30+
### cdk
31+
| Commit | Type | Description |
32+
| -- | -- | -- |
33+
| [1ea3ba383](https://github.com/angular/components/commit/1ea3ba38337d8b59518c073c95e0ca64e6fd5db3) | fix | **listbox:** make tabindex zoneless compatible ([#29970](https://github.com/angular/components/pull/29970)) |
34+
| [890036064](https://github.com/angular/components/commit/890036064a825ddc44068d4b6fc71edfd7ddb43c) | fix | **table:** set explicit role on all cells ([#29987](https://github.com/angular/components/pull/29987)) |
35+
| [3c7de8400](https://github.com/angular/components/commit/3c7de8400b60558b1c39d13278d7a325ade2be1a) | fix | **testing:** allow use of `plaintext-only` for `contenteditable` ([#29999](https://github.com/angular/components/pull/29999)) |
36+
### material
37+
| Commit | Type | Description |
38+
| -- | -- | -- |
39+
| [c643f04ef](https://github.com/angular/components/commit/c643f04ef042eb16606c8b490854db79e413a34d) | fix | **core:** incorrect validation in get-theme-color ([#29994](https://github.com/angular/components/pull/29994)) |
40+
| [aed9094f9](https://github.com/angular/components/commit/aed9094f9c33bbb2134ae9551f8c5d4db4b24356) | fix | **snack-bar:** prevent override of snack bar action button color ([#27511](https://github.com/angular/components/pull/27511)) |
41+
42+
<!-- CHANGELOG SPLIT MARKER -->
43+
144
<a name="18.2.12"></a>
245
# 18.2.12 "galaxite-galaxy" (2024-11-06)
346
### material

‎src/cdk/scrolling/virtual-scroll-viewport.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ cdk-virtual-scroll-viewport {
3939
overflow: auto;
4040
will-change: scroll-position;
4141
contain: strict;
42-
-webkit-overflow-scrolling: touch;
4342
}
4443

4544
// Wrapper element for the rendered content. This element will be transformed to push the rendered

‎src/cdk/testing/selenium-webdriver/selenium-web-driver-element.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,11 @@ export class SeleniumWebDriverElement implements TestElement {
161161
async setContenteditableValue(value: string): Promise<void> {
162162
const contenteditableAttr = await this.getAttribute('contenteditable');
163163

164-
if (contenteditableAttr !== '' && contenteditableAttr !== 'true') {
164+
if (
165+
contenteditableAttr !== '' &&
166+
contenteditableAttr !== 'true' &&
167+
contenteditableAttr !== 'plaintext-only'
168+
) {
165169
throw new Error('setContenteditableValue can only be called on a `contenteditable` element.');
166170
}
167171

‎src/cdk/testing/testbed/unit-test-element.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,11 @@ export class UnitTestElement implements TestElement {
196196
async setContenteditableValue(value: string): Promise<void> {
197197
const contenteditableAttr = await this.getAttribute('contenteditable');
198198

199-
if (contenteditableAttr !== '' && contenteditableAttr !== 'true') {
199+
if (
200+
contenteditableAttr !== '' &&
201+
contenteditableAttr !== 'true' &&
202+
contenteditableAttr !== 'plaintext-only'
203+
) {
200204
throw new Error('setContenteditableValue can only be called on a `contenteditable` element.');
201205
}
202206

‎src/material/core/style/_menu-common.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ $icon-margin: 16px !default;
1818
min-width: $overlay-min-width;
1919
max-width: $overlay-max-width;
2020
overflow: auto;
21-
-webkit-overflow-scrolling: touch; // for momentum scroll on mobile
2221
}
2322

2423
@mixin item-base() {

‎src/material/sidenav/drawer.scss‎

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,14 @@ $drawer-over-drawer-z-index: 4;
2828
@include drawer-stacking-context();
2929

3030
@include token-utils.use-tokens(
31-
tokens-mat-sidenav.$prefix, tokens-mat-sidenav.get-token-slots()) {
31+
tokens-mat-sidenav.$prefix,
32+
tokens-mat-sidenav.get-token-slots()
33+
) {
3234
@include token-utils.create-token-slot(color, content-text-color);
3335
@include token-utils.create-token-slot(background-color, content-background-color);
3436
}
3537

3638
box-sizing: border-box;
37-
-webkit-overflow-scrolling: touch;
3839

3940
// Need this to take up space in the layout.
4041
display: block;
@@ -58,8 +59,10 @@ $drawer-over-drawer-z-index: 4;
5859
}
5960

6061
// Note that the `NoopAnimationsModule` is being handled inside of the component code.
61-
&.ng-animate-disabled, .ng-animate-disabled & {
62-
.mat-drawer-backdrop, .mat-drawer-content {
62+
&.ng-animate-disabled,
63+
.ng-animate-disabled & {
64+
.mat-drawer-backdrop,
65+
.mat-drawer-content {
6366
transition: none;
6467
}
6568
}
@@ -84,7 +87,9 @@ $drawer-over-drawer-z-index: 4;
8487
visibility: visible;
8588

8689
@include token-utils.use-tokens(
87-
tokens-mat-sidenav.$prefix, tokens-mat-sidenav.get-token-slots()) {
90+
tokens-mat-sidenav.$prefix,
91+
tokens-mat-sidenav.get-token-slots()
92+
) {
8893
@include token-utils.create-token-slot(background-color, scrim-color);
8994
}
9095
}
@@ -128,7 +133,9 @@ $drawer-over-drawer-z-index: 4;
128133
@include drawer-stacking-context($drawer-over-drawer-z-index);
129134

130135
@include token-utils.use-tokens(
131-
tokens-mat-sidenav.$prefix, tokens-mat-sidenav.get-token-slots()) {
136+
tokens-mat-sidenav.$prefix,
137+
tokens-mat-sidenav.get-token-slots()
138+
) {
132139
@include token-utils.create-token-slot(color, container-text-color);
133140
@include token-utils.create-token-slot(box-shadow, container-elevation-shadow);
134141
@include token-utils.create-token-slot(background-color, container-background-color);
@@ -147,14 +154,15 @@ $drawer-over-drawer-z-index: 4;
147154
overflow-y: auto; // TODO(kara): revisit scrolling behavior for drawers
148155
transform: translate3d(-100%, 0, 0);
149156

150-
151-
&, [dir='rtl'] &.mat-drawer-end {
157+
&,
158+
[dir='rtl'] &.mat-drawer-end {
152159
@include cdk.high-contrast {
153160
border-right: $high-contrast-border;
154161
}
155162
}
156163

157-
[dir='rtl'] &, &.mat-drawer-end {
164+
[dir='rtl'] &,
165+
&.mat-drawer-end {
158166
@include cdk.high-contrast {
159167
border-left: $high-contrast-border;
160168
border-right: none;
@@ -170,7 +178,9 @@ $drawer-over-drawer-z-index: 4;
170178
transform: translate3d(100%, 0, 0);
171179

172180
@include token-utils.use-tokens(
173-
tokens-mat-sidenav.$prefix, tokens-mat-sidenav.get-token-slots()) {
181+
tokens-mat-sidenav.$prefix,
182+
tokens-mat-sidenav.get-token-slots()
183+
) {
174184
@include token-utils.create-token-slot(border-top-left-radius, container-shape);
175185
@include token-utils.create-token-slot(border-bottom-left-radius, container-shape);
176186
border-top-right-radius: 0;
@@ -180,7 +190,9 @@ $drawer-over-drawer-z-index: 4;
180190

181191
[dir='rtl'] & {
182192
@include token-utils.use-tokens(
183-
tokens-mat-sidenav.$prefix, tokens-mat-sidenav.get-token-slots()) {
193+
tokens-mat-sidenav.$prefix,
194+
tokens-mat-sidenav.get-token-slots()
195+
) {
184196
@include token-utils.create-token-slot(border-top-left-radius, container-shape);
185197
@include token-utils.create-token-slot(border-bottom-left-radius, container-shape);
186198
border-top-right-radius: 0;
@@ -215,7 +227,9 @@ $drawer-over-drawer-z-index: 4;
215227
box-shadow: none;
216228

217229
@include token-utils.use-tokens(
218-
tokens-mat-sidenav.$prefix, tokens-mat-sidenav.get-token-slots()) {
230+
tokens-mat-sidenav.$prefix,
231+
tokens-mat-sidenav.get-token-slots()
232+
) {
219233
@include token-utils.create-token-slot(border-right-color, container-divider-color);
220234
border-right-width: 1px;
221235
border-right-style: solid;
@@ -251,7 +265,6 @@ $drawer-over-drawer-z-index: 4;
251265
width: 100%;
252266
height: 100%;
253267
overflow: auto;
254-
-webkit-overflow-scrolling: touch;
255268
}
256269

257270
.mat-sidenav-fixed {

0 commit comments

Comments
 (0)