Skip to content

Commit b863b14

Browse files
authored
feat(material/slider): switch implementation to use MDC (#25420)
Switches the slider module to use MDC by default. BREAKING CHANGE: * `mat-slider` has a new API that requires a `<input matSliderThumb>` element.
1 parent 00d5f27 commit b863b14

File tree

85 files changed

+7429
-7131
lines changed

Some content is hidden

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

85 files changed

+7429
-7131
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
/src/material/select/** @crisbeto
3030
/src/material/sidenav/** @mmalerba
3131
/src/material/legacy-slide-toggle/** @devversion
32-
/src/material/slider/** @mmalerba
32+
/src/material/legacy-slider/** @mmalerba
3333
/src/material/snack-bar/** @andrewseguin @crisbeto
3434
/src/material/sort/** @andrewseguin
3535
/src/material/stepper/** @mmalerba
@@ -126,8 +126,8 @@
126126
/src/material/progress-bar/** @andrewseguin
127127
/src/material/radio/** @mmalerba
128128
/src/material-experimental/mdc-snack-bar/** @andrewseguin
129-
/src/material/slide-toggle/** @crisbeto
130-
/src/material-experimental/mdc-slider/** @devversion
129+
/src/material/slide-toggle/** @crisbeto
130+
/src/material/slider/** @devversion
131131
/src/material-experimental/mdc-tabs/** @crisbeto
132132
/src/material-experimental/mdc-tooltip/** @crisbeto
133133
/src/material-experimental/mdc-table/** @andrewseguin

.ng-dev/commit-message.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ export const commitMessage: CommitMessageConfig = {
5353
'material/progress-bar',
5454
'material-experimental/mdc-progress-spinner',
5555
'material/slide-toggle',
56-
'material-experimental/mdc-slider',
5756
'material-experimental/mdc-snack-bar',
5857
'material-experimental/mdc-table',
5958
'material-experimental/mdc-tabs',
@@ -101,6 +100,7 @@ export const commitMessage: CommitMessageConfig = {
101100
'material/sidenav',
102101
'material/legacy-slide-toggle',
103102
'material/slider',
103+
'material/legacy-slider',
104104
'material/snack-bar',
105105
'material/sort',
106106
'material/stepper',

src/components-examples/material/progress-bar/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ng_module(
1919
"//src/material/legacy-progress-bar",
2020
"//src/material/legacy-progress-bar/testing",
2121
"//src/material/legacy-radio",
22-
"//src/material/slider",
22+
"//src/material/legacy-slider",
2323
"@npm//@angular/forms",
2424
"@npm//@angular/platform-browser",
2525
"@npm//@angular/platform-browser-dynamic",

src/components-examples/material/progress-bar/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {FormsModule} from '@angular/forms';
44
import {MatLegacyCardModule} from '@angular/material/legacy-card';
55
import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar';
66
import {MatLegacyRadioModule} from '@angular/material/legacy-radio';
7-
import {MatSliderModule} from '@angular/material/slider';
7+
import {MatLegacySliderModule} from '@angular/material/legacy-slider';
88
import {ProgressBarBufferExample} from './progress-bar-buffer/progress-bar-buffer-example';
99
import {ProgressBarConfigurableExample} from './progress-bar-configurable/progress-bar-configurable-example';
1010
import {ProgressBarDeterminateExample} from './progress-bar-determinate/progress-bar-determinate-example';
@@ -36,7 +36,7 @@ const EXAMPLES = [
3636
MatLegacyCardModule,
3737
MatLegacyProgressBarModule,
3838
MatLegacyRadioModule,
39-
MatSliderModule,
39+
MatLegacySliderModule,
4040
FormsModule,
4141
],
4242
declarations: EXAMPLES,

src/components-examples/material/progress-spinner/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ ng_module(
1717
"//src/cdk/testing/testbed",
1818
"//src/material/legacy-card",
1919
"//src/material/legacy-radio",
20+
"//src/material/legacy-slider",
2021
"//src/material/progress-spinner",
2122
"//src/material/progress-spinner/testing",
22-
"//src/material/slider",
2323
"@npm//@angular/forms",
2424
"@npm//@angular/platform-browser",
2525
"@npm//@angular/platform-browser-dynamic",

src/components-examples/material/progress-spinner/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {FormsModule} from '@angular/forms';
44
import {MatLegacyCardModule} from '@angular/material/legacy-card';
55
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
66
import {MatLegacyRadioModule} from '@angular/material/legacy-radio';
7-
import {MatSliderModule} from '@angular/material/slider';
7+
import {MatLegacySliderModule} from '@angular/material/legacy-slider';
88
import {ProgressSpinnerConfigurableExample} from './progress-spinner-configurable/progress-spinner-configurable-example';
99
import {ProgressSpinnerOverviewExample} from './progress-spinner-overview/progress-spinner-overview-example';
1010
import {ProgressSpinnerHarnessExample} from './progress-spinner-harness/progress-spinner-harness-example';
@@ -27,7 +27,7 @@ const EXAMPLES = [
2727
MatLegacyCardModule,
2828
MatProgressSpinnerModule,
2929
MatLegacyRadioModule,
30-
MatSliderModule,
30+
MatLegacySliderModule,
3131
FormsModule,
3232
],
3333
declarations: EXAMPLES,

src/components-examples/material/slider/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ ng_module(
1818
"//src/material/legacy-card",
1919
"//src/material/legacy-checkbox",
2020
"//src/material/legacy-input",
21-
"//src/material/slider",
22-
"//src/material/slider/testing",
21+
"//src/material/legacy-slider",
22+
"//src/material/legacy-slider/testing",
2323
"@npm//@angular/forms",
2424
"@npm//@angular/platform-browser",
2525
"@npm//@angular/platform-browser-dynamic",
@@ -43,8 +43,8 @@ ng_test_library(
4343
":slider",
4444
"//src/cdk/testing",
4545
"//src/cdk/testing/testbed",
46-
"//src/material/slider",
47-
"//src/material/slider/testing",
46+
"//src/material/legacy-slider",
47+
"//src/material/legacy-slider/testing",
4848
"@npm//@angular/platform-browser-dynamic",
4949
],
5050
)

src/components-examples/material/slider/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {FormsModule} from '@angular/forms';
44
import {MatLegacyCardModule} from '@angular/material/legacy-card';
55
import {MatLegacyCheckboxModule} from '@angular/material/legacy-checkbox';
66
import {MatLegacyInputModule} from '@angular/material/legacy-input';
7-
import {MatSliderModule} from '@angular/material/slider';
7+
import {MatLegacySliderModule} from '@angular/material/legacy-slider';
88
import {SliderConfigurableExample} from './slider-configurable/slider-configurable-example';
99
import {SliderFormattingExample} from './slider-formatting/slider-formatting-example';
1010
import {SliderOverviewExample} from './slider-overview/slider-overview-example';
@@ -31,7 +31,7 @@ const EXAMPLES = [
3131
MatLegacyCardModule,
3232
MatLegacyCheckboxModule,
3333
MatLegacyInputModule,
34-
MatSliderModule,
34+
MatLegacySliderModule,
3535
],
3636
declarations: EXAMPLES,
3737
exports: EXAMPLES,

src/components-examples/material/slider/slider-harness/slider-harness-example.spec.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {ComponentFixture, TestBed} from '@angular/core/testing';
22
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
3-
import {MatSliderHarness} from '@angular/material/slider/testing';
3+
import {MatLegacySliderHarness} from '@angular/material/legacy-slider/testing';
44
import {HarnessLoader} from '@angular/cdk/testing';
5-
import {MatSliderModule} from '@angular/material/slider';
5+
import {MatLegacySliderModule} from '@angular/material/legacy-slider';
66
import {SliderHarnessExample} from './slider-harness-example';
77

88
describe('SliderHarnessExample', () => {
@@ -11,7 +11,7 @@ describe('SliderHarnessExample', () => {
1111

1212
beforeEach(async () => {
1313
await TestBed.configureTestingModule({
14-
imports: [MatSliderModule],
14+
imports: [MatLegacySliderModule],
1515
declarations: [SliderHarnessExample],
1616
}).compileComponents();
1717
fixture = TestBed.createComponent(SliderHarnessExample);
@@ -20,27 +20,27 @@ describe('SliderHarnessExample', () => {
2020
});
2121

2222
it('should load all slider harnesses', async () => {
23-
const sliders = await loader.getAllHarnesses(MatSliderHarness);
23+
const sliders = await loader.getAllHarnesses(MatLegacySliderHarness);
2424
expect(sliders.length).toBe(1);
2525
});
2626

2727
it('should get value of slider', async () => {
28-
const slider = await loader.getHarness(MatSliderHarness);
28+
const slider = await loader.getHarness(MatLegacySliderHarness);
2929
expect(await slider.getValue()).toBe(50);
3030
});
3131

3232
it('should get percentage of slider', async () => {
33-
const slider = await loader.getHarness(MatSliderHarness);
33+
const slider = await loader.getHarness(MatLegacySliderHarness);
3434
expect(await slider.getPercentage()).toBe(0.5);
3535
});
3636

3737
it('should get max value of slider', async () => {
38-
const slider = await loader.getHarness(MatSliderHarness);
38+
const slider = await loader.getHarness(MatLegacySliderHarness);
3939
expect(await slider.getMaxValue()).toBe(100);
4040
});
4141

4242
it('should be able to set value of slider', async () => {
43-
const slider = await loader.getHarness(MatSliderHarness);
43+
const slider = await loader.getHarness(MatLegacySliderHarness);
4444
expect(await slider.getValue()).toBe(50);
4545

4646
await slider.setValue(33);

src/dev-app/mdc-slider/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ ng_module(
99
"mdc-slider-demo.html",
1010
],
1111
deps = [
12-
"//src/material-experimental/mdc-slider",
1312
"//src/material-experimental/mdc-tabs",
13+
"//src/material/slider",
1414
"@npm//@angular/forms",
1515
],
1616
)

src/dev-app/mdc-slider/mdc-slider-demo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import {Component} from '@angular/core';
1010
import {FormsModule} from '@angular/forms';
11-
import {MatSliderModule} from '@angular/material-experimental/mdc-slider';
11+
import {MatSliderModule} from '@angular/material/slider';
1212
import {MatTabsModule} from '@angular/material-experimental/mdc-tabs';
1313

1414
@Component({

src/dev-app/slider/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ng_module(
77
srcs = glob(["**/*.ts"]),
88
assets = ["slider-demo.html"],
99
deps = [
10-
"//src/material/slider",
10+
"//src/material/legacy-slider",
1111
"//src/material/tabs",
1212
"@npm//@angular/forms",
1313
],

src/dev-app/slider/slider-demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
import {Component} from '@angular/core';
1010
import {FormsModule} from '@angular/forms';
11-
import {MatSliderModule} from '@angular/material/slider';
11+
import {MatLegacySliderModule} from '@angular/material/legacy-slider';
1212
import {MatTabsModule} from '@angular/material/tabs';
1313

1414
@Component({
1515
selector: 'slider-demo',
1616
templateUrl: 'slider-demo.html',
1717
standalone: true,
18-
imports: [FormsModule, MatSliderModule, MatTabsModule],
18+
imports: [FormsModule, MatLegacySliderModule, MatTabsModule],
1919
})
2020
export class SliderDemo {
2121
demo: number;

src/e2e-app/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ ng_module(
4545
"//src/material-experimental/mdc-button",
4646
"//src/material-experimental/mdc-menu",
4747
"//src/material-experimental/mdc-progress-spinner",
48-
"//src/material-experimental/mdc-slider",
4948
"//src/material-experimental/mdc-table",
5049
"//src/material-experimental/mdc-tabs",
5150
"//src/material/button",
@@ -72,6 +71,7 @@ ng_module(
7271
"//src/material/select",
7372
"//src/material/sidenav",
7473
"//src/material/slide-toggle",
74+
"//src/material/slider",
7575
"//src/material/tabs",
7676
"@npm//@angular/animations",
7777
"@npm//@angular/core",

src/e2e-app/mdc-slider/mdc-slider-e2e-module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {NgModule} from '@angular/core';
10-
import {MatSliderModule} from '@angular/material-experimental/mdc-slider';
10+
import {MatSliderModule} from '@angular/material/slider';
1111
import {MdcSliderE2e} from './mdc-slider-e2e';
1212

1313
@NgModule({

src/material-experimental/_index.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
@forward './mdc-progress-spinner/progress-spinner-theme' as mdc-progress-spinner-* show
3333
mdc-progress-spinner-color, mdc-progress-spinner-typography, mdc-progress-spinner-density,
3434
mdc-progress-spinner-theme;
35-
@forward './mdc-slider/slider-theme' as mdc-slider-* show mdc-slider-color,
36-
mdc-slider-typography, mdc-slider-density, mdc-slider-theme;
3735
@forward './mdc-snack-bar/snack-bar-theme' as mdc-snack-bar-* show mdc-snack-bar-color,
3836
mdc-snack-bar-typography, mdc-snack-bar-density, mdc-snack-bar-theme;
3937
@forward './mdc-table/table-theme' as mdc-table-* show mdc-table-color, mdc-table-typography,

src/material-experimental/config.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ entryPoints = [
1111
"mdc-paginator/testing",
1212
"mdc-progress-spinner",
1313
"mdc-progress-spinner/testing",
14-
"mdc-slider",
15-
"mdc-slider/testing",
1614
"mdc-snack-bar",
1715
"mdc-snack-bar/testing",
1816
"mdc-table",

src/material-experimental/mdc-core/theming/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ sass_library(
2626
"//src/material-experimental/mdc-menu:mdc_menu_scss_lib",
2727
"//src/material-experimental/mdc-paginator:mdc_paginator_scss_lib",
2828
"//src/material-experimental/mdc-progress-spinner:mdc_progress_spinner_scss_lib",
29-
"//src/material-experimental/mdc-slider:mdc_slider_scss_lib",
3029
"//src/material-experimental/mdc-snack-bar:mdc_snack_bar_scss_lib",
3130
"//src/material-experimental/mdc-table:mdc_table_scss_lib",
3231
"//src/material-experimental/mdc-tabs:mdc_tabs_scss_lib",
@@ -39,6 +38,7 @@ sass_library(
3938
"//src/material/input:input_scss_lib",
4039
"//src/material/progress-bar:progress_bar_scss_lib",
4140
"//src/material/slide-toggle:slide_toggle_scss_lib",
41+
"//src/material/slider:slider_scss_lib",
4242
"//src/material/tooltip:tooltip_scss_lib",
4343
],
4444
)

src/material-experimental/mdc-core/theming/_all-theme.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
@use '../../mdc-button/icon-button-theme';
77
@use '../../mdc-list/list-theme';
88
@use '../../mdc-menu/menu-theme';
9-
@use '../../mdc-slider/slider-theme';
109
@use '../../mdc-snack-bar/snack-bar-theme';
1110
@use '../../mdc-tabs/tabs-theme';
1211
@use '../../mdc-table/table-theme';
@@ -33,7 +32,7 @@
3332
@include mat.radio-theme($theme-or-color-config);
3433
@include mat.select-theme($theme-or-color-config);
3534
@include mat.slide-toggle-theme($theme-or-color-config);
36-
@include slider-theme.theme($theme-or-color-config);
35+
@include mat.slider-theme($theme-or-color-config);
3736
@include snack-bar-theme.theme($theme-or-color-config);
3837
@include table-theme.theme($theme-or-color-config);
3938
@include mat.form-field-theme($theme-or-color-config);

0 commit comments

Comments
 (0)