Skip to content

Commit 52db8b3

Browse files
authored
refactor: update slider to fully contain thumbs inside the track (#10990)
1 parent 9e949fe commit 52db8b3

8 files changed

Lines changed: 243 additions & 212 deletions

File tree

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

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@ import { css } from 'lit';
88

99
export const sliderStyles = css`
1010
:host {
11-
display: inline-flex;
12-
align-items: center;
11+
display: inline-grid;
1312
box-sizing: border-box;
14-
position: relative;
1513
width: 100%;
16-
height: var(--_thumb-size);
1714
user-select: none;
1815
-webkit-user-select: none;
19-
border-radius: var(--vaadin-slider-track-border-radius, var(--vaadin-radius-m));
20-
--_thumb-size: var(--vaadin-slider-thumb-size, 1lh);
16+
--_track-radius: var(--vaadin-slider-track-border-radius, var(--vaadin-radius-m));
17+
--_thumb-width: var(--vaadin-slider-thumb-width, 1lh);
18+
--_thumb-height: var(--vaadin-slider-thumb-height, 1lh);
2119
--_track-size: var(--vaadin-slider-track-size, 0.25lh);
2220
}
2321
@@ -38,13 +36,21 @@ export const sliderStyles = css`
3836
--vaadin-slider-fill-background: var(--vaadin-background-color);
3937
}
4038
39+
#controls {
40+
position: relative;
41+
box-sizing: border-box;
42+
min-width: 100%;
43+
display: grid;
44+
grid-template-rows: var(--_thumb-height);
45+
}
46+
4147
[part='track'] {
4248
box-sizing: border-box;
43-
position: absolute;
4449
height: var(--_track-size);
45-
width: 100%;
4650
background: var(--vaadin-slider-track-background, var(--vaadin-background-container));
47-
border-radius: inherit;
51+
border-radius: var(--_track-radius);
52+
align-self: center;
53+
pointer-events: none;
4854
}
4955
5056
[part='track-fill'] {
@@ -54,13 +60,14 @@ export const sliderStyles = css`
5460
background: var(--vaadin-slider-fill-background, var(--vaadin-text-color));
5561
border-start-start-radius: inherit;
5662
border-end-start-radius: inherit;
63+
pointer-events: none;
5764
}
5865
5966
[part~='thumb'] {
6067
position: absolute;
6168
box-sizing: border-box;
62-
width: var(--_thumb-size);
63-
height: var(--_thumb-size);
69+
width: var(--_thumb-width);
70+
height: var(--_thumb-height);
6471
transform: translateX(-50%);
6572
background: var(--vaadin-slider-fill-background, var(--vaadin-text-color));
6673
border-radius: 50%;
@@ -74,9 +81,10 @@ export const sliderStyles = css`
7481
7582
/* visually hidden */
7683
::slotted(input) {
77-
flex: 1;
84+
position: absolute;
85+
inset: 0;
7886
font: inherit;
79-
height: var(--_thumb-size);
87+
height: var(--_thumb-height);
8088
opacity: 0 !important;
8189
margin: 0 !important;
8290
pointer-events: none;

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

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,26 @@ class RangeSlider extends SliderMixin(
8484
const endPercent = this.__getPercentFromValue(endValue);
8585

8686
return html`
87-
<div part="track">
87+
<div id="controls">
88+
<div part="track">
89+
<div
90+
part="track-fill"
91+
style="${styleMap({
92+
insetInlineStart: `${startPercent}%`,
93+
insetInlineEnd: `${100 - endPercent}%`,
94+
})}"
95+
></div>
96+
</div>
8897
<div
89-
part="track-fill"
90-
style="${styleMap({
91-
insetInlineStart: `${startPercent}%`,
92-
insetInlineEnd: `${100 - endPercent}%`,
93-
})}"
98+
part="thumb thumb-start"
99+
style="${styleMap({ insetInlineStart: this.__getThumbPosition(startPercent) })}"
94100
></div>
101+
<div
102+
part="thumb thumb-end"
103+
style="${styleMap({ insetInlineStart: this.__getThumbPosition(endPercent) })}"
104+
></div>
105+
<slot name="input"></slot>
95106
</div>
96-
<div part="thumb thumb-start" style="${styleMap({ insetInlineStart: `${startPercent}%` })}"></div>
97-
<div part="thumb thumb-end" style="${styleMap({ insetInlineStart: `${endPercent}%` })}"></div>
98-
<slot name="input"></slot>
99107
`;
100108
}
101109

@@ -253,8 +261,7 @@ class RangeSlider extends SliderMixin(
253261
}
254262
}
255263

256-
const percent = this.__getEventPercent(event);
257-
const value = this.__getValueFromPercent(percent);
264+
const value = this.__getEventValue(event);
258265

259266
// First thumb position from the "end"
260267
const index = this.__value.findIndex((v) => value - v < 0);

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,22 @@ export const SliderMixin = (superClass) =>
163163
return this.__getValueFromPercent(percent);
164164
}
165165

166+
/**
167+
* @param {number} percent
168+
* @return {string}
169+
* @private
170+
*/
171+
__getThumbPosition(percent) {
172+
const controlSize = `calc(100% - var(--_thumb-width))`;
173+
return `calc(var(--_thumb-width) / 2 + ${controlSize} * ${percent} / 100)`;
174+
}
175+
166176
/**
167177
* @param {PointerEvent} event
168178
* @private
169179
*/
170180
__onMouseDown(event) {
171-
const part = event.composedPath()[0].getAttribute('part');
172-
if (!part || (!part.startsWith('track') && !part.startsWith('thumb'))) {
181+
if (!event.composedPath().includes(this.$.controls)) {
173182
return;
174183
}
175184

@@ -189,8 +198,7 @@ export const SliderMixin = (superClass) =>
189198
}
190199

191200
// Only handle pointerdown on the thumb, track or track-fill
192-
const part = event.composedPath()[0].getAttribute('part');
193-
if (!part || (!part.startsWith('track') && !part.startsWith('thumb'))) {
201+
if (!event.composedPath().includes(this.$.controls)) {
194202
return;
195203
}
196204

@@ -201,8 +209,8 @@ export const SliderMixin = (superClass) =>
201209

202210
this.__thumbIndex = this.__getThumbIndex(event);
203211

204-
// Update value on track click
205-
if (part.startsWith('track')) {
212+
// Update value on click within a track, but outside a thumb.
213+
if (event.composedPath()[0] === this.$.controls) {
206214
const newValue = this.__getEventValue(event);
207215
this.__updateValue(newValue, this.__thumbIndex);
208216
this.__commitValue();

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,19 @@ class Slider extends SliderMixin(
8080
const percent = this.__getPercentFromValue(value);
8181

8282
return html`
83-
<div part="track">
84-
<div
85-
part="track-fill"
86-
style="${styleMap({
87-
insetInlineStart: 0,
88-
insetInlineEnd: `${100 - percent}%`,
89-
})}"
90-
></div>
83+
<div id="controls">
84+
<div part="track">
85+
<div
86+
part="track-fill"
87+
style="${styleMap({
88+
insetInlineStart: 0,
89+
insetInlineEnd: `${100 - percent}%`,
90+
})}"
91+
></div>
92+
</div>
93+
<div part="thumb" style="${styleMap({ insetInlineStart: this.__getThumbPosition(percent) })}"></div>
94+
<slot name="input"></slot>
9195
</div>
92-
<div part="thumb" style="${styleMap({ insetInlineStart: `${percent}%` })}"></div>
93-
<slot name="input"></slot>
9496
`;
9597
}
9698

0 commit comments

Comments
 (0)