Skip to content

Commit de3f664

Browse files
vursenweb-padawan
andauthored
fix: sync step property with slotted range input (#10972)
Co-authored-by: web-padawan <iamkulykov@gmail.com>
1 parent 2ddb304 commit de3f664

7 files changed

Lines changed: 128 additions & 8 deletions

File tree

‎packages/slider/src/vaadin-range-slider.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class RangeSlider extends SliderMixin(
122122
super.update(props);
123123

124124
const [startValue, endValue] = this.__value;
125-
const { min, max } = this.__getConstraints();
125+
const { min, max, step } = this.__getConstraints();
126126

127127
render(
128128
html`
@@ -132,6 +132,7 @@ class RangeSlider extends SliderMixin(
132132
slot="input"
133133
.min="${min}"
134134
.max="${max}"
135+
.step="${step}"
135136
.value="${startValue}"
136137
tabindex="0"
137138
@keydown="${this.__onKeyDown}"
@@ -144,6 +145,7 @@ class RangeSlider extends SliderMixin(
144145
slot="input"
145146
.min="${min}"
146147
.max="${max}"
148+
.step="${step}"
147149
.value="${endValue}"
148150
tabindex="0"
149151
@keydown="${this.__onKeyDown}"

‎packages/slider/src/vaadin-slider-mixin.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ export const SliderMixin = (superClass) =>
3232
*/
3333
step: {
3434
type: Number,
35+
sync: true,
3536
},
3637

3738
/** @private */
@@ -54,8 +55,7 @@ export const SliderMixin = (superClass) =>
5455
* @private
5556
*/
5657
__updateValue(value, index = this.__thumbIndex) {
57-
const { min, max } = this.__getConstraints();
58-
const step = this.step || 1;
58+
const { min, max, step } = this.__getConstraints();
5959

6060
const minValue = this.__value[index - 1] || min;
6161
const maxValue = this.__value[index + 1] || max;
@@ -79,6 +79,7 @@ export const SliderMixin = (superClass) =>
7979
return {
8080
min: this.min || 0,
8181
max: this.max || 100,
82+
step: this.step || 1,
8283
};
8384
}
8485

‎packages/slider/src/vaadin-slider.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class Slider extends SliderMixin(
116116
super.update(props);
117117

118118
const [value] = this.__value;
119-
const { min, max } = this.__getConstraints();
119+
const { min, max, step } = this.__getConstraints();
120120

121121
render(
122122
html`
@@ -127,6 +127,7 @@ class Slider extends SliderMixin(
127127
.min="${min}"
128128
.max="${max}"
129129
.value="${value}"
130+
.step="${step}"
130131
tabindex="0"
131132
@input="${this.__onInput}"
132133
@change="${this.__onChange}"

‎packages/slider/test/dom/__snapshots__/range-slider.test.snap.js‎

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
/* @web/test-runner snapshot v1 */
22
export const snapshots = {};
33

4-
snapshots["vaadin-range-slider host default"] =
4+
snapshots["vaadin-range-slider host default"] =
55
`<vaadin-range-slider>
66
<input
77
id="slider-0"
88
max="100"
99
min="0"
1010
slot="input"
11+
step="1"
1112
tabindex="0"
1213
type="range"
1314
>
@@ -16,6 +17,7 @@ snapshots["vaadin-range-slider host default"] =
1617
max="100"
1718
min="0"
1819
slot="input"
20+
step="1"
1921
tabindex="0"
2022
type="range"
2123
>
@@ -30,6 +32,7 @@ snapshots["vaadin-range-slider host value"] =
3032
max="100"
3133
min="0"
3234
slot="input"
35+
step="1"
3336
tabindex="0"
3437
type="range"
3538
>
@@ -38,6 +41,7 @@ snapshots["vaadin-range-slider host value"] =
3841
max="100"
3942
min="0"
4043
slot="input"
44+
step="1"
4145
tabindex="0"
4246
type="range"
4347
>
@@ -52,6 +56,7 @@ snapshots["vaadin-range-slider host min"] =
5256
max="100"
5357
min="20"
5458
slot="input"
59+
step="1"
5560
tabindex="0"
5661
type="range"
5762
>
@@ -60,6 +65,7 @@ snapshots["vaadin-range-slider host min"] =
6065
max="100"
6166
min="20"
6267
slot="input"
68+
step="1"
6369
tabindex="0"
6470
type="range"
6571
>
@@ -74,6 +80,7 @@ snapshots["vaadin-range-slider host max"] =
7480
max="80"
7581
min="0"
7682
slot="input"
83+
step="1"
7784
tabindex="0"
7885
type="range"
7986
>
@@ -82,14 +89,39 @@ snapshots["vaadin-range-slider host max"] =
8289
max="80"
8390
min="0"
8491
slot="input"
92+
step="1"
8593
tabindex="0"
8694
type="range"
8795
>
8896
</vaadin-range-slider>
8997
`;
9098
/* end snapshot vaadin-range-slider host max */
9199

92-
snapshots["vaadin-range-slider shadow default"] =
100+
snapshots["vaadin-range-slider host step"] =
101+
`<vaadin-range-slider>
102+
<input
103+
id="slider-8"
104+
max="100"
105+
min="0"
106+
slot="input"
107+
step="10"
108+
tabindex="0"
109+
type="range"
110+
>
111+
<input
112+
id="slider-9"
113+
max="100"
114+
min="0"
115+
slot="input"
116+
step="10"
117+
tabindex="0"
118+
type="range"
119+
>
120+
</vaadin-range-slider>
121+
`;
122+
/* end snapshot vaadin-range-slider host step */
123+
124+
snapshots["vaadin-range-slider shadow default"] =
93125
`<div part="track">
94126
<div
95127
part="track-fill"
@@ -181,3 +213,26 @@ snapshots["vaadin-range-slider shadow max"] =
181213
`;
182214
/* end snapshot vaadin-range-slider shadow max */
183215

216+
snapshots["vaadin-range-slider shadow step"] =
217+
`<div part="track">
218+
<div
219+
part="track-fill"
220+
style="inset-inline: 20% 40%;"
221+
>
222+
</div>
223+
</div>
224+
<div
225+
part="thumb thumb-start"
226+
style="inset-inline-start: 20%;"
227+
>
228+
</div>
229+
<div
230+
part="thumb thumb-end"
231+
style="inset-inline-start: 60%;"
232+
>
233+
</div>
234+
<slot name="input">
235+
</slot>
236+
`;
237+
/* end snapshot vaadin-range-slider shadow step */
238+

‎packages/slider/test/dom/__snapshots__/slider.test.snap.js‎

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
/* @web/test-runner snapshot v1 */
22
export const snapshots = {};
33

4-
snapshots["vaadin-slider host default"] =
4+
snapshots["vaadin-slider host default"] =
55
`<vaadin-slider>
66
<input
77
id="slider-0"
88
max="100"
99
min="0"
1010
slot="input"
11+
step="1"
1112
tabindex="0"
1213
type="range"
1314
>
@@ -22,6 +23,7 @@ snapshots["vaadin-slider host value"] =
2223
max="100"
2324
min="0"
2425
slot="input"
26+
step="1"
2527
tabindex="0"
2628
type="range"
2729
>
@@ -36,6 +38,7 @@ snapshots["vaadin-slider host min"] =
3638
max="100"
3739
min="20"
3840
slot="input"
41+
step="1"
3942
tabindex="0"
4043
type="range"
4144
>
@@ -50,14 +53,30 @@ snapshots["vaadin-slider host max"] =
5053
max="80"
5154
min="0"
5255
slot="input"
56+
step="1"
5357
tabindex="0"
5458
type="range"
5559
>
5660
</vaadin-slider>
5761
`;
5862
/* end snapshot vaadin-slider host max */
5963

60-
snapshots["vaadin-slider shadow default"] =
64+
snapshots["vaadin-slider host step"] =
65+
`<vaadin-slider>
66+
<input
67+
id="slider-4"
68+
max="100"
69+
min="0"
70+
slot="input"
71+
step="10"
72+
tabindex="0"
73+
type="range"
74+
>
75+
</vaadin-slider>
76+
`;
77+
/* end snapshot vaadin-slider host step */
78+
79+
snapshots["vaadin-slider shadow default"] =
6180
`<div part="track">
6281
<div
6382
part="track-fill"
@@ -129,3 +148,21 @@ snapshots["vaadin-slider shadow max"] =
129148
`;
130149
/* end snapshot vaadin-slider shadow max */
131150

151+
snapshots["vaadin-slider shadow step"] =
152+
`<div part="track">
153+
<div
154+
part="track-fill"
155+
style="inset-inline: 0px 50%;"
156+
>
157+
</div>
158+
</div>
159+
<div
160+
part="thumb"
161+
style="inset-inline-start: 50%;"
162+
>
163+
</div>
164+
<slot name="input">
165+
</slot>
166+
`;
167+
/* end snapshot vaadin-slider shadow step */
168+

‎packages/slider/test/dom/range-slider.test.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ describe('vaadin-range-slider', () => {
3535
slider.value = [20, 60];
3636
await expect(slider).dom.to.equalSnapshot();
3737
});
38+
39+
it('step', async () => {
40+
slider.step = 10;
41+
slider.value = [20, 60];
42+
await expect(slider).dom.to.equalSnapshot();
43+
});
3844
});
3945

4046
describe('shadow', async () => {
@@ -58,5 +64,11 @@ describe('vaadin-range-slider', () => {
5864
slider.value = [20, 60];
5965
await expect(slider).shadowDom.to.equalSnapshot();
6066
});
67+
68+
it('step', async () => {
69+
slider.step = 10;
70+
slider.value = [20, 60];
71+
await expect(slider).shadowDom.to.equalSnapshot();
72+
});
6173
});
6274
});

‎packages/slider/test/dom/slider.test.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ describe('vaadin-slider', () => {
3535
slider.value = 20;
3636
await expect(slider).dom.to.equalSnapshot();
3737
});
38+
39+
it('step', async () => {
40+
slider.step = 10;
41+
slider.value = 50;
42+
await expect(slider).dom.to.equalSnapshot();
43+
});
3844
});
3945

4046
describe('shadow', async () => {
@@ -58,5 +64,11 @@ describe('vaadin-slider', () => {
5864
slider.value = 20;
5965
await expect(slider).shadowDom.to.equalSnapshot();
6066
});
67+
68+
it('step', async () => {
69+
slider.step = 10;
70+
slider.value = 50;
71+
await expect(slider).shadowDom.to.equalSnapshot();
72+
});
6173
});
6274
});

0 commit comments

Comments
 (0)