Skip to content

fix: Pad in slider so the thumb does not render outside the bounds of the root element #25378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
behowell merged 7 commits into from
Oct 27, 2022
Merged

fix: Pad in slider so the thumb does not render outside the bounds of the root element #25378

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4689880
fix: Pad in slider so the thumb does not render outside the bounds of…
behowell Oct 25, 2022
35e4b37
Update test snapshots
behowell Oct 25, 2022
9493edc
Restore thumb as a child of root, and use grid for layout.
behowell Oct 26, 2022
5ecea2d
Remove unnecessary padding on vertical
behowell Oct 26, 2022
c5f958e
Use relative positioning on thumb and remove gridTemplateAreas
behowell Oct 27, 2022
9f2896a
Use absolute positioning on the thumb
behowell Oct 27, 2022
0ed7414
Update screener stories
behowell Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions change/@fluentui-react-slider-d63d5490-c622-4a65-aadd-13489fb0c0b2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Pad in slider so the thumb does not render outside the bounds of the root element",
"packageName": "@fluentui/react-slider",
"email": "[email protected]",
"dependentChangeType": "patch"
}
29 changes: 19 additions & 10 deletions packages/react-components/react-slider/src/components/Slider/useSliderStyles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const useRootStyles = makeStyles({
root: {
position: 'relative',
display: 'inline-grid',
gridTemplateAreas: '"slider"',
gridTemplateAreas: '". . ." ". slider ." ". . ."',
touchAction: 'none',
alignItems: 'center',
justifyItems: 'center',
Expand All @@ -54,12 +54,15 @@ const useRootStyles = makeStyles({
horizontal: {
minWidth: '120px',
height: `var(${thumbSizeVar})`,
gridTemplateRows: `1fr var(${thumbSizeVar}) 1fr`,
gridTemplateColumns: `1fr calc(100% - var(${thumbSizeVar})) 1fr`,
},

vertical: {
width: `var(${thumbSizeVar})`,
minHeight: '120px',
gridTemplateColumns: `var(${thumbSizeVar})`,
gridTemplateRows: `1fr calc(100% - var(${thumbSizeVar})) 1fr`,
gridTemplateColumns: `1fr var(${thumbSizeVar}) 1fr`,
},

enabled: {
Expand Down Expand Up @@ -181,6 +184,10 @@ const useRailStyles = makeStyles({
const useThumbStyles = makeStyles({
thumb: {
position: 'absolute',
gridRowStart: 'slider',
gridRowEnd: 'slider',
gridColumnStart: 'slider',
gridColumnEnd: 'slider',
width: `var(${thumbSizeVar})`,
height: `var(${thumbSizeVar})`,
pointerEvents: 'none',
Expand All @@ -189,7 +196,6 @@ const useThumbStyles = makeStyles({
...shorthands.borderRadius(tokens.borderRadiusCircular),
boxShadow: `0 0 0 calc(var(${thumbSizeVar}) * .2) ${tokens.colorNeutralBackground1} inset`,
backgroundColor: `var(${thumbColorVar})`,
transform: 'translateX(-50%)',
'::before': {
position: 'absolute',
top: '0px',
Expand All @@ -208,10 +214,13 @@ const useThumbStyles = makeStyles({
},
},
horizontal: {
transform: 'translate(-50%, -50%)',
top: '50%',
left: `var(${sliderProgressVar})`,
},
vertical: {
transform: 'translateY(50%)',
transform: 'translate(-50%, 50%)',
left: '50%',
bottom: `var(${sliderProgressVar})`,
},
});
Expand All @@ -222,19 +231,19 @@ const useThumbStyles = makeStyles({
const useInputStyles = makeStyles({
input: {
opacity: 0,
gridRowStart: 'slider',
gridRowEnd: 'slider',
gridColumnStart: 'slider',
gridColumnEnd: 'slider',
gridRowStart: '1',
gridRowEnd: '-1',
gridColumnStart: '1',
gridColumnEnd: '-1',
...shorthands.padding(0),
...shorthands.margin(0),
},
horizontal: {
height: `var(${thumbSizeVar})`,
width: `calc(100% + var(${thumbSizeVar}))`,
width: '100%',
},
vertical: {
height: `calc(100% + var(${thumbSizeVar}))`,
height: '100%',
width: `var(${thumbSizeVar})`,
'-webkit-appearance': 'slider-vertical',
},
Expand Down