Skip to content

Commit 19c3618

Browse files
simonkovtyksimonkovtyk
authored
Merge branch 'angular:main' into main
2 parents 720b929 + bb7563a commit 19c3618

Some content is hidden

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

50 files changed

+434
-288
lines changed

‎CHANGELOG.md‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
<a name="19.0.0-next.10"></a>
2+
# 19.0.0-next.10 "plastic-moose" (2024-10-23)
3+
### material
4+
| Commit | Type | Description |
5+
| -- | -- | -- |
6+
| [b519b4785b](https://github.com/angular/components/commit/b519b4785b1da26becdb88e3810d606b9bddedfc) | feat | **core:** default to color-scheme theme type ([#29907](https://github.com/angular/components/pull/29907)) |
7+
| [ea0d1ba7b7](https://github.com/angular/components/commit/ea0d1ba7b776e021ecfa27b80c921a22b98e3c40) | feat | **core:** deprecate the core mixin ([#29906](https://github.com/angular/components/pull/29906)) |
8+
| [4b49d73542](https://github.com/angular/components/commit/4b49d73542a4b10c8d5bd67a7258bfdd44a8e329) | feat | **core:** switch system prefix from sys to mat-sys ([#29908](https://github.com/angular/components/pull/29908)) |
9+
| [3fc1f9a1b0](https://github.com/angular/components/commit/3fc1f9a1b026b9cd0ec666bc623169d1ba5a9532) | feat | **schematics:** Update custom theme schematic to work with light-dark and use theme-overrides mixin ([#29911](https://github.com/angular/components/pull/29911)) |
10+
| [5153a5cd4b](https://github.com/angular/components/commit/5153a5cd4bdd69649f07ba6596cad56bfd9eb2b1) | fix | **chips:** emitting end event multiple times when holding down key ([#29894](https://github.com/angular/components/pull/29894)) |
11+
| [5ad133d073](https://github.com/angular/components/commit/5ad133d07341fa8647e81277e7f1b9f54b15059a) | fix | **core:** allow optgroup overrides through core-overrides ([#29897](https://github.com/angular/components/pull/29897)) |
12+
| [a8e40ec341](https://github.com/angular/components/commit/a8e40ec341103a4f3fa84bd446067dd37cbf6d50) | fix | **core:** correctly identify color input ([#29909](https://github.com/angular/components/pull/29909)) |
13+
| [0064b4218b](https://github.com/angular/components/commit/0064b4218b375b30b65bf1c13530d8620f20d980) | fix | **tabs:** remove IE animation workaround ([#29899](https://github.com/angular/components/pull/29899)) |
14+
### google-maps
15+
| Commit | Type | Description |
16+
| -- | -- | -- |
17+
| [a6709497fc](https://github.com/angular/components/commit/a6709497fc6e5eca110db5374f7d6ca4b2ca5a58) | fix | expose all clusterer types ([#29905](https://github.com/angular/components/pull/29905)) |
18+
19+
<!-- CHANGELOG SPLIT MARKER -->
20+
21+
<a name="18.2.10"></a>
22+
# 18.2.10 "plastic-monkey" (2024-10-23)
23+
### material
24+
| Commit | Type | Description |
25+
| -- | -- | -- |
26+
| [501faa9a54](https://github.com/angular/components/commit/501faa9a547c043e8abef5cb75acca930f31fa2e) | fix | **chips:** emitting end event multiple times when holding down key ([#29894](https://github.com/angular/components/pull/29894)) |
27+
| [4a0397a1c7](https://github.com/angular/components/commit/4a0397a1c7527b1e56a1aedebe5dfc262327e134) | fix | **tabs:** remove IE animation workaround ([#29899](https://github.com/angular/components/pull/29899)) |
28+
29+
<!-- CHANGELOG SPLIT MARKER -->
30+
131
<a name="18.2.9"></a>
232
# 18.2.9 "curite-castle" (2024-10-17)
333
### material

‎guides/material-2.md‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -108,19 +108,6 @@ custom theme with Sass, or by importing a pre-built theme CSS file.
108108
A **theme file** is a Sass file that calls Angular Material Sass mixins to output color,
109109
typography, and density CSS styles.
110110

111-
#### The `core` mixin
112-
113-
Angular Material defines a mixin named `core` that includes prerequisite styles for common
114-
features used by multiple components, such as ripples. The `core` mixin must be included exactly
115-
once for your application, even if you define multiple themes. Including the `core` mixin multiple
116-
times will result in duplicate CSS in your application.
117-
118-
```scss
119-
@use '@angular/material' as mat;
120-
121-
@include mat.core();
122-
```
123-
124111
#### Defining a theme
125112

126113
Angular Material represents a theme as a Sass map that contains your color, typography, and density
@@ -190,8 +177,6 @@ theme Sass mixins.
190177
```scss
191178
@use '@angular/material' as mat;
192179

193-
@include mat.core();
194-
195180
$my-primary: mat.m2-define-palette(mat.$m2-indigo-palette, 500);
196181
$my-accent: mat.m2-define-palette(mat.$m2-pink-palette, A200, A100, A400);
197182

@@ -225,8 +210,6 @@ uses every single component, this will produce unnecessary CSS.
225210
```scss
226211
@use '@angular/material' as mat;
227212

228-
@include mat.core();
229-
230213
$my-primary: mat.m2-define-palette(mat.$m2-indigo-palette, 500);
231214
$my-accent: mat.m2-define-palette(mat.$m2-pink-palette, A200, A100, A400);
232215

@@ -337,8 +320,6 @@ CSS rule declaration. See the [documentation for Sass mixins][sass-mixins] for f
337320
```scss
338321
@use '@angular/material' as mat;
339322

340-
@include mat.core();
341-
342323
// Define a dark theme
343324
$dark-theme: mat.m2-define-dark-theme((
344325
color: (
@@ -470,7 +451,6 @@ the custom theme API.
470451
```scss
471452
@use '@angular/material' as mat;
472453

473-
@include mat.core();
474454
@include mat.strong-focus-indicators();
475455

476456
$my-primary: mat.m2-define-palette(mat.$m2-indigo-palette, 500);
@@ -502,7 +482,6 @@ of the custom theme API.
502482
```scss
503483
@use '@angular/material' as mat;
504484

505-
@include mat.core();
506485
@include mat.strong-focus-indicators((
507486
border-style: dotted,
508487
border-width: 4px,
@@ -812,8 +791,6 @@ defining multiple themes](#defining-multiple-themes).
812791
```scss
813792
@use '@angular/material' as mat;
814793

815-
@include mat.core();
816-
817794
$my-primary: mat.m2-define-palette(mat.$indigo-palette, 500);
818795
$my-accent: mat.m2-define-palette(mat.$pink-palette, A200, A100, A400);
819796
$my-typography: mat.m2-define-typography-config();
@@ -1064,8 +1041,6 @@ the other theme mixins in your application.
10641041
@use '@angular/material' as mat;
10651042
@use './path/to/carousel-theme' as carousel;
10661043

1067-
@include mat.core();
1068-
10691044
$my-primary: mat.m2-define-palette(mat.$m2-indigo-palette, 500);
10701045
$my-accent: mat.m2-define-palette(mat.$m2-pink-palette, A200, A100, A400);
10711046

‎guides/theming-your-components.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,6 @@ the other theme mixins in your application.
229229
@use '@angular/material' as mat;
230230
@use './path/to/carousel-theme' as carousel;
231231

232-
@include mat.core();
233-
234232
$my-theme: mat.define-theme((
235233
color: (
236234
theme-type: light,

‎guides/theming.md‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,6 @@ familiarity with CSS and Sass basics, including variables, functions, and mixins
2828
A **theme file** is a Sass file that calls Angular Material Sass mixins to output color,
2929
typography, and density CSS styles.
3030

31-
#### The `core` mixin
32-
33-
Angular Material defines a mixin named `core` that includes prerequisite styles for common
34-
features used by multiple components, such as ripples. The `core` mixin must be included exactly
35-
once for your application, even if you define multiple themes. Including the `core` mixin multiple
36-
times will result in duplicate CSS in your application.
37-
38-
```scss
39-
@use '@angular/material' as mat;
40-
41-
@include mat.core();
42-
```
43-
4431
#### Defining a theme
4532

4633
Angular Material represents a theme as a Sass map that contains your color, typography, and density
@@ -218,8 +205,6 @@ theme Sass mixins.
218205
```scss
219206
@use '@angular/material' as mat;
220207

221-
@include mat.core();
222-
223208
$my-theme: mat.define-theme((
224209
color: (
225210
theme-type: light,
@@ -250,8 +235,6 @@ uses every single component, this will produce unnecessary CSS.
250235
```scss
251236
@use '@angular/material' as mat;
252237

253-
@include mat.core();
254-
255238
$my-theme: mat.define-theme((
256239
color: (
257240
theme-type: light,
@@ -335,8 +318,6 @@ CSS rule declaration. See the [documentation for Sass mixins][sass-mixins] for f
335318
```scss
336319
@use '@angular/material' as mat;
337320

338-
@include mat.core();
339-
340321
// Define a dark theme
341322
$dark-theme: mat.define-theme((
342323
color: (
@@ -500,7 +481,6 @@ the custom theme API.
500481
```scss
501482
@use '@angular/material' as mat;
502483

503-
@include mat.core();
504484
@include mat.strong-focus-indicators();
505485

506486
$my-theme: mat.define-theme((
@@ -531,7 +511,6 @@ of the custom theme API.
531511
```scss
532512
@use '@angular/material' as mat;
533513

534-
@include mat.core();
535514
@include mat.strong-focus-indicators((
536515
border-style: dotted,
537516
border-width: 4px,

‎integration/yarn-pnp-compat/src/styles.scss‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ $theme: mat.m2-define-light-theme((
88
density: 0
99
));
1010

11-
@include mat.core();
12-
1311
@include mat.all-component-themes($theme);
1412

1513
html,

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"ci-notify-slack-failure": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only scripts/circleci/notify-slack-job-failure.mts",
5555
"prepare": "husky"
5656
},
57-
"version": "19.0.0-next.9",
57+
"version": "19.1.0-next.0",
5858
"dependencies": {
5959
"@angular/animations": "^19.0.0-next.10",
6060
"@angular/common": "^19.0.0-next.10",

‎src/cdk-experimental/popover-edit/popover-edit.spec.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import {DataSource} from '@angular/cdk/collections';
33
import {DOWN_ARROW, LEFT_ARROW, RIGHT_ARROW, TAB, UP_ARROW} from '@angular/cdk/keycodes';
44
import {CdkTableModule} from '@angular/cdk/table';
55
import {dispatchKeyboardEvent} from '@angular/cdk/testing/private';
6-
import {CommonModule} from '@angular/common';
76
import {
87
ChangeDetectorRef,
98
Component,
@@ -399,7 +398,7 @@ describe('CDK Popover Edit', () => {
399398

400399
beforeEach(fakeAsync(() => {
401400
TestBed.configureTestingModule({
402-
imports: [CdkTableModule, CdkPopoverEditModule, CommonModule, FormsModule, BidiModule],
401+
imports: [CdkTableModule, CdkPopoverEditModule, FormsModule, BidiModule],
403402
declarations: [componentClass],
404403
});
405404
fixture = TestBed.createComponent<BaseTestComponent>(componentClass);

‎src/cdk/listbox/listbox.spec.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
SPACE,
1010
UP_ARROW,
1111
} from '@angular/cdk/keycodes';
12-
import {CommonModule} from '@angular/common';
1312
import {Component, Type, signal} from '@angular/core';
1413
import {TestBed, fakeAsync, tick} from '@angular/core/testing';
1514
import {FormControl, ReactiveFormsModule} from '@angular/forms';
@@ -532,7 +531,6 @@ describe('CdkOption and CdkListbox', () => {
532531
it('should allow custom function to compare option values', () => {
533532
const {fixture, listbox, options} = setupComponent<ListboxWithObjectValues, {name: string}>(
534533
ListboxWithObjectValues,
535-
[CommonModule],
536534
);
537535
listbox.value = [{name: 'Banana'}];
538536
fixture.detectChanges();

‎src/cdk/portal/portal.spec.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import {CommonModule} from '@angular/common';
21
import {
32
AfterViewInit,
43
ApplicationRef,
@@ -24,7 +23,6 @@ describe('Portals', () => {
2423
TestBed.configureTestingModule({
2524
imports: [
2625
PortalModule,
27-
CommonModule,
2826
PortalTestApp,
2927
UnboundPortalTestApp,
3028
ArbitraryViewContainerRefComponent,
@@ -728,7 +726,7 @@ class ChocolateInjector {
728726
selector: 'pizza-msg',
729727
template: '<p>Pizza</p><p>{{snack}}</p><ng-content></ng-content>',
730728
standalone: true,
731-
imports: [PortalModule, CommonModule],
729+
imports: [PortalModule],
732730
})
733731
class PizzaMsg {
734732
snack = inject(Chocolate, {optional: true});

‎src/cdk/scrolling/virtual-scroll-viewport.spec.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {
66
ScrollDispatcher,
77
ScrollingModule,
88
} from '@angular/cdk/scrolling';
9-
import {CommonModule} from '@angular/common';
109
import {
1110
ApplicationRef,
1211
Component,
@@ -1004,7 +1003,7 @@ describe('CdkVirtualScrollViewport', () => {
10041003

10051004
beforeEach(waitForAsync(() => {
10061005
TestBed.configureTestingModule({
1007-
imports: [ScrollingModule, CommonModule, DelayedInitializationVirtualScroll],
1006+
imports: [ScrollingModule, DelayedInitializationVirtualScroll],
10081007
});
10091008
fixture = TestBed.createComponent(DelayedInitializationVirtualScroll);
10101009
testComponent = fixture.componentInstance;
@@ -1034,7 +1033,7 @@ describe('CdkVirtualScrollViewport', () => {
10341033

10351034
beforeEach(waitForAsync(() => {
10361035
TestBed.configureTestingModule({
1037-
imports: [ScrollingModule, CommonModule, VirtualScrollWithAppendOnly],
1036+
imports: [ScrollingModule, VirtualScrollWithAppendOnly],
10381037
});
10391038
fixture = TestBed.createComponent(VirtualScrollWithAppendOnly);
10401039
testComponent = fixture.componentInstance;
@@ -1441,7 +1440,7 @@ class VirtualScrollWithItemInjectingViewContainer {
14411440
`,
14421441
encapsulation: ViewEncapsulation.None,
14431442
standalone: true,
1444-
imports: [ScrollingModule, CommonModule],
1443+
imports: [ScrollingModule],
14451444
})
14461445
class DelayedInitializationVirtualScroll {
14471446
@ViewChild(CdkVirtualScrollViewport, {static: true}) viewport: CdkVirtualScrollViewport;
@@ -1480,7 +1479,7 @@ class DelayedInitializationVirtualScroll {
14801479
`,
14811480
encapsulation: ViewEncapsulation.None,
14821481
standalone: true,
1483-
imports: [ScrollingModule, CommonModule],
1482+
imports: [ScrollingModule],
14841483
})
14851484
class VirtualScrollWithAppendOnly {
14861485
@ViewChild(CdkVirtualScrollViewport, {static: true}) viewport: CdkVirtualScrollViewport;

0 commit comments

Comments
 (0)