Skip to content

Commit 68424d8

Browse files
committed
feat(material/slider): improve slider demo
1 parent 6011b7d commit 68424d8

File tree

3 files changed

+21
-12
lines changed

3 files changed

+21
-12
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: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
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>
10+
<br>
11+
<br>
12+
<br>
713

8-
<br><br><br>
9-
10-
<mat-tab-group color="{{colorModel}}">
14+
<mat-tab-group [color]="colorModel">
1115
<mat-tab label="Reactive form controls">
1216
<table class="demo-data-table">
1317
<tr>
@@ -35,11 +39,11 @@ <h1>Color Picker</h1>
3539

3640
<input class="demo-native-slider" type="range" [formControl]="control" #nativeSlider1 />
3741
<br>
38-
<mat-slider discrete showTickMarks color="{{colorModel}}">
42+
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel">
3943
<input matSliderThumb [formControl]="control" #ngThumb1 />
4044
</mat-slider>
4145
<br>
42-
<mat-slider discrete showTickMarks color="{{colorModel}}">
46+
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel">
4347
<input matSliderStartThumb [formControl]="control" #ngStartThumb1 />
4448
<input matSliderEndThumb #ngEndThumb1 />
4549
</mat-slider>
@@ -95,11 +99,11 @@ <h1>Color Picker</h1>
9599

96100
<input class="demo-native-slider" type="range" #nativeSlider2 [(ngModel)]="valueModel" [min]="minModel" [max]="maxModel" [step]="stepModel" [disabled]="disabledModel" />
97101
<br>
98-
<mat-slider discrete showTickMarks color="{{colorModel}}" [min]="minModel" [max]="maxModel" [step]="stepModel" [disabled]="disabledModel">
102+
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel" [min]="minModel" [max]="maxModel" [step]="stepModel" [disabled]="disabledModel">
99103
<input matSliderThumb #ngThumb2 [(ngModel)]="valueModel" />
100104
</mat-slider>
101105
<br>
102-
<mat-slider discrete showTickMarks color="{{colorModel}}" [min]="minModel" [max]="maxModel" [step]="stepModel" [disabled]="disabledModel">
106+
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel" [min]="minModel" [max]="maxModel" [step]="stepModel" [disabled]="disabledModel">
103107
<input matSliderStartThumb #ngStartThumb2 [(ngModel)]="valueModel" />
104108
<input matSliderEndThumb #ngEndThumb2 />
105109
</mat-slider>
@@ -153,11 +157,11 @@ <h1>Color Picker</h1>
153157

154158
<input class="demo-native-slider" type="range" #nativeSlider3 [value]="value" [min]="min" [max]="max" [step]="step" [disabled]="disabled" />
155159
<br>
156-
<mat-slider discrete showTickMarks color="{{colorModel}}" [min]="min" [max]="max" [step]="step" [disabled]="disabled">
160+
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel" [min]="min" [max]="max" [step]="step" [disabled]="disabled">
157161
<input matSliderThumb #ngThumb3 [value]="value" />
158162
</mat-slider>
159163
<br>
160-
<mat-slider discrete showTickMarks color="{{colorModel}}" [min]="min" [max]="max" [step]="step" [disabled]="disabled">
164+
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel" [min]="min" [max]="max" [step]="step" [disabled]="disabled">
161165
<input matSliderStartThumb #ngStartThumb3 [value]="value" />
162166
<input matSliderEndThumb #ngEndThumb3 />
163167
</mat-slider>
@@ -179,11 +183,11 @@ <h1>Color Picker</h1>
179183
</tr>
180184
</table>
181185

182-
<mat-slider discrete showTickMarks color="{{colorModel}}">
186+
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel">
183187
<input matSliderThumb #ngThumb4 [(value)]="twoWayValue" />
184188
</mat-slider>
185189
<br>
186-
<mat-slider discrete showTickMarks color="{{colorModel}}">
190+
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel">
187191
<input matSliderStartThumb #ngStartThumb4 [(value)]="twoWayValue" />
188192
<input matSliderEndThumb #ngEndThumb4 />
189193
</mat-slider>

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

Lines changed: 4 additions & 0 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,6 +28,8 @@ import {MatButtonToggleModule} from '@angular/material/button-toggle';
2628
styleUrls: ['slider-demo.css'],
2729
})
2830
export class SliderDemo {
31+
discrete: boolean = true;
32+
showTickMarks: boolean = true;
2933
colorModel: string = 'primary';
3034

3135
noop = () => {};

0 commit comments

Comments
 (0)