Skip to content

Commit 46d18a0

Browse files
authored
test(material/slider): improve slider demo (#25995)
1 parent 03baff3 commit 46d18a0

File tree

4 files changed

+31
-33
lines changed

4 files changed

+31
-33
lines changed

src/dev-app/slider/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ ng_module(
1111
],
1212
deps = [
1313
"//src/material/button-toggle",
14+
"//src/material/checkbox",
1415
"//src/material/slider",
1516
"//src/material/tabs",
1617
"@npm//@angular/forms",

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

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
<h1>Color Picker</h1>
1+
<mat-checkbox [color]="colorModel" [(ngModel)]="discrete">Discrete</mat-checkbox>
2+
<br>
3+
<mat-checkbox [color]="colorModel" [(ngModel)]="showTickMarks">Show tick marks</mat-checkbox>
4+
<br>
25
<mat-button-toggle-group [(ngModel)]="colorModel" aria-label="Slider color options">
36
<mat-button-toggle value="primary">Primary</mat-button-toggle>
47
<mat-button-toggle value="accent">Accent</mat-button-toggle>
58
<mat-button-toggle value="warn">Warn</mat-button-toggle>
69
</mat-button-toggle-group>
710

8-
<br><br><br>
9-
10-
<mat-tab-group color="{{colorModel}}">
11+
<mat-tab-group [color]="colorModel">
1112
<mat-tab label="Reactive form controls">
1213
<table class="demo-data-table">
1314
<tr>
@@ -34,12 +35,10 @@ <h1>Color Picker</h1>
3435
</table>
3536

3637
<input class="demo-native-slider" type="range" [formControl]="control" #nativeSlider1 />
37-
<br>
38-
<mat-slider discrete showTickMarks color="{{colorModel}}">
38+
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel">
3939
<input matSliderThumb [formControl]="control" #ngThumb1 />
4040
</mat-slider>
41-
<br>
42-
<mat-slider discrete showTickMarks color="{{colorModel}}">
41+
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel">
4342
<input matSliderStartThumb [formControl]="control" #ngStartThumb1 />
4443
<input matSliderEndThumb #ngEndThumb1 />
4544
</mat-slider>
@@ -91,15 +90,11 @@ <h1>Color Picker</h1>
9190
</tr>
9291
</table>
9392

94-
<br>
95-
9693
<input class="demo-native-slider" type="range" #nativeSlider2 [(ngModel)]="valueModel" [min]="minModel" [max]="maxModel" [step]="stepModel" [disabled]="disabledModel" />
97-
<br>
98-
<mat-slider discrete showTickMarks color="{{colorModel}}" [min]="minModel" [max]="maxModel" [step]="stepModel" [disabled]="disabledModel">
94+
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel" [min]="minModel" [max]="maxModel" [step]="stepModel" [disabled]="disabledModel">
9995
<input matSliderThumb #ngThumb2 [(ngModel)]="valueModel" />
10096
</mat-slider>
101-
<br>
102-
<mat-slider discrete showTickMarks color="{{colorModel}}" [min]="minModel" [max]="maxModel" [step]="stepModel" [disabled]="disabledModel">
97+
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel" [min]="minModel" [max]="maxModel" [step]="stepModel" [disabled]="disabledModel">
10398
<input matSliderStartThumb #ngStartThumb2 [(ngModel)]="valueModel" />
10499
<input matSliderEndThumb #ngEndThumb2 />
105100
</mat-slider>
@@ -152,12 +147,10 @@ <h1>Color Picker</h1>
152147
</table>
153148

154149
<input class="demo-native-slider" type="range" #nativeSlider3 [value]="value" [min]="min" [max]="max" [step]="step" [disabled]="disabled" />
155-
<br>
156-
<mat-slider discrete showTickMarks color="{{colorModel}}" [min]="min" [max]="max" [step]="step" [disabled]="disabled">
150+
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel" [min]="min" [max]="max" [step]="step" [disabled]="disabled">
157151
<input matSliderThumb #ngThumb3 [value]="value" />
158152
</mat-slider>
159-
<br>
160-
<mat-slider discrete showTickMarks color="{{colorModel}}" [min]="min" [max]="max" [step]="step" [disabled]="disabled">
153+
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel" [min]="min" [max]="max" [step]="step" [disabled]="disabled">
161154
<input matSliderStartThumb #ngStartThumb3 [value]="value" />
162155
<input matSliderEndThumb #ngEndThumb3 />
163156
</mat-slider>
@@ -179,11 +172,10 @@ <h1>Color Picker</h1>
179172
</tr>
180173
</table>
181174

182-
<mat-slider discrete showTickMarks color="{{colorModel}}">
175+
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel">
183176
<input matSliderThumb #ngThumb4 [(value)]="twoWayValue" />
184177
</mat-slider>
185-
<br>
186-
<mat-slider discrete showTickMarks color="{{colorModel}}">
178+
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel">
187179
<input matSliderStartThumb #ngStartThumb4 [(value)]="twoWayValue" />
188180
<input matSliderEndThumb #ngEndThumb4 />
189181
</mat-slider>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,5 @@
4444
border: 1px solid;
4545
border-radius: 5px;
4646
min-width: 300px;
47+
margin-top: 30px;
4748
}

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

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
1111
import {MatSliderModule} from '@angular/material/slider';
1212
import {MatTabsModule} from '@angular/material/tabs';
1313
import {MatButtonToggleModule} from '@angular/material/button-toggle';
14+
import {MatCheckboxModule} from '@angular/material/checkbox';
1415

1516
@Component({
1617
selector: 'slider-demo',
1718
templateUrl: 'slider-demo.html',
1819
standalone: true,
1920
imports: [
2021
FormsModule,
22+
MatCheckboxModule,
2123
MatButtonToggleModule,
2224
MatSliderModule,
2325
MatTabsModule,
@@ -26,22 +28,24 @@ import {MatButtonToggleModule} from '@angular/material/button-toggle';
2628
styleUrls: ['slider-demo.css'],
2729
})
2830
export class SliderDemo {
29-
colorModel: string = 'primary';
31+
discrete = true;
32+
showTickMarks = true;
33+
colorModel = 'primary';
3034

3135
noop = () => {};
32-
min: string = '0';
33-
max: string = '100';
34-
step: string = '0';
35-
value: string = '0';
36-
disabled: boolean = false;
36+
min = '0';
37+
max = '100';
38+
step = '0';
39+
value = '0';
40+
disabled = false;
3741

38-
twoWayValue: number = 0;
42+
twoWayValue = 0;
3943

40-
minModel: number = 0;
41-
maxModel: number = 100;
42-
valueModel: number = 0;
43-
stepModel: number = 0;
44-
disabledModel: boolean = false;
44+
minModel = 0;
45+
maxModel = 100;
46+
valueModel = 0;
47+
stepModel = 0;
48+
disabledModel = false;
4549

4650
control = new FormControl('0');
4751

0 commit comments

Comments
 (0)