Skip to content

Commit 0e94e28

Browse files
fix(slider): renames withTickMarks to tickmarks and withLabel to labeled
PiperOrigin-RevId: 537962866
1 parent 2434257 commit 0e94e28

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

slider/demo/demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ const collection =
2121
new Knob('min', {ui: numberInput(), defaultValue: 0}),
2222
new Knob('max', {ui: numberInput(), defaultValue: 100}),
2323
new Knob('step', {ui: numberInput(), defaultValue: 1}),
24-
new Knob('withTickMarks', {ui: boolInput(), defaultValue: false}),
25-
new Knob('withLabel', {ui: boolInput(), defaultValue: false}),
24+
new Knob('tickmarks', {ui: boolInput(), defaultValue: false}),
25+
new Knob('labeled', {ui: boolInput(), defaultValue: false}),
2626
new Knob('disabled', {ui: boolInput(), defaultValue: false}),
2727
]);
2828

slider/demo/stories.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ export interface StoryKnobs {
1919
max: number;
2020
step: number;
2121
range: boolean;
22-
withTickMarks: boolean;
23-
withLabel: boolean;
22+
tickmarks: boolean;
23+
labeled: boolean;
2424
disabled: boolean;
2525
}
2626

@@ -45,8 +45,8 @@ const standard: MaterialStoryInit<StoryKnobs> = {
4545
.max=${knobs.max}
4646
.step=${knobs.step ?? 1}
4747
.range=${knobs.range}
48-
.withTickMarks=${knobs.withTickMarks}
49-
.withLabel=${knobs.withLabel ?? false}
48+
.tickmarks=${knobs.tickmarks}
49+
.labeled=${knobs.labeled ?? false}
5050
.disabled=${knobs.disabled ?? false}
5151
></md-slider>
5252
</label>`;
@@ -66,8 +66,8 @@ const multiValue: MaterialStoryInit<StoryKnobs> = {
6666
.min=${knobs.min}
6767
.max=${knobs.max}
6868
.step=${knobs.step ?? 1}
69-
.withTickMarks=${knobs.withTickMarks}
70-
.withLabel=${knobs.withLabel ?? true}
69+
.tickmarks=${knobs.tickmarks}
70+
.labeled=${knobs.labeled ?? true}
7171
.disabled=${knobs.disabled ?? false}
7272
></md-slider>
7373
</label>`;
@@ -135,8 +135,8 @@ const customStyling: MaterialStoryInit<StoryKnobs> = {
135135
.valueEnd=${(knobs.valueEnd)}
136136
.valueStartLabel=${'😔'}
137137
.valueEndLabel=${'😌'}
138-
withTickMarks
139-
withLabel
138+
tickmarks
139+
labeled
140140
.min=${knobs.min}
141141
.max=${knobs.max ?? 30}
142142
.step=${knobs.step ?? 1}

slider/lib/_slider.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ $_md-sys-shape: tokens.md-sys-shape-values();
166166
background-color: var(--_inactive-track-color);
167167
}
168168

169-
.track.tickMarks::before {
169+
.track.tickmarks::before {
170170
background-image: _get-tick-image(
171171
'var(--_with-tick-marks-inactive-container-color)'
172172
);
@@ -197,7 +197,7 @@ $_md-sys-shape: tokens.md-sys-shape-values();
197197
}
198198
}
199199

200-
.track.tickMarks::after {
200+
.track.tickmarks::after {
201201
background-image: _get-tick-image(
202202
'var(--_with-tick-marks-active-container-color)'
203203
);
@@ -207,8 +207,8 @@ $_md-sys-shape: tokens.md-sys-shape-values();
207207
background-color: var(--_disabled-active-track-color);
208208
}
209209

210-
:host([disabled]) .track.tickMarks::before,
211-
:host([disabled]) .track.tickMarks::after {
210+
:host([disabled]) .track.tickmarks::before,
211+
:host([disabled]) .track.tickmarks::after {
212212
background-image: _get-tick-image(
213213
'var(--_with-tick-marks-disabled-container-color)'
214214
);

slider/lib/slider.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@ export class Slider extends LitElement {
113113
/**
114114
* Whether or not to show tick marks.
115115
*/
116-
@property({type: Boolean}) withTickMarks = false;
116+
@property({type: Boolean}) tickmarks = false;
117117

118118
/**
119119
* Whether or not to show a value label when activated.
120120
*/
121-
@property({type: Boolean}) withLabel = false;
121+
@property({type: Boolean}) labeled = false;
122122

123123
/**
124124
* Whether or not to show a value range. When false, the slider displays
@@ -346,7 +346,7 @@ export class Slider extends LitElement {
346346
}
347347

348348
private renderTrack() {
349-
const trackClasses = {'tickMarks': this.withTickMarks};
349+
const trackClasses = {'tickmarks': this.tickmarks};
350350
return html`<div class="track ${classMap(trackClasses)}"></div>`;
351351
}
352352

@@ -367,8 +367,8 @@ export class Slider extends LitElement {
367367
onTop,
368368
isOverlapping
369369
})}">
370-
<div class="handleNub"><md-elevation></md-elevation></div>
371-
${when(this.withLabel, () => this.renderLabel(label))}
370+
<div class="handleNub"><md-elevation></md-elevation></div>
371+
${when(this.labeled, () => this.renderLabel(label))}
372372
<md-focus-ring for=${name}></md-focus-ring>
373373
<md-ripple for=${name} class=${name} ?disabled=${
374374
this.disabled}></md-ripple>

slider/slider_test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -300,15 +300,15 @@ describe('<md-slider>', () => {
300300
});
301301

302302
describe('value label', () => {
303-
it('shows on focus when withLabel is true', async () => {
303+
it('shows on focus when labeled is true', async () => {
304304
const {harness} = await setupTest();
305-
harness.element.withLabel = true;
305+
harness.element.labeled = true;
306306
await harness.element.updateComplete;
307307
harness.element.focus();
308308
expect(harness.isLabelShowing()).toBeTrue();
309309
});
310310

311-
it('does now show when withLabel is false', async () => {
311+
it('does now show when labeled is false', async () => {
312312
const {harness} = await setupTest();
313313
await harness.element.updateComplete;
314314
harness.element.focus();
@@ -317,7 +317,7 @@ describe('<md-slider>', () => {
317317

318318
it('hides after blur', async () => {
319319
const {harness} = await setupTest();
320-
harness.element.withLabel = true;
320+
harness.element.labeled = true;
321321
await harness.element.updateComplete;
322322
harness.element.focus();
323323
expect(harness.isLabelShowing()).toBeTrue();
@@ -327,7 +327,7 @@ describe('<md-slider>', () => {
327327

328328
it('shows value label on hover', async () => {
329329
const {harness} = await setupTest();
330-
harness.element.withLabel = true;
330+
harness.element.labeled = true;
331331
await harness.element.updateComplete;
332332
await harness.startHover();
333333
expect(harness.isLabelShowing()).toBeTrue();

0 commit comments

Comments
 (0)