Skip to content

[Slider] Lowest value for vertical should be at the bottom #13090

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
eps1lon merged 4 commits into from
Oct 4, 2018
Merged

[Slider] Lowest value for vertical should be at the bottom #13090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3fb2928
[Slider] Lowest value for vertical should be at the bottom
eps1lon Oct 2, 2018
89a8529
[Slider] Fix lagging transition on vertical slider
eps1lon Oct 3, 2018
cfa773b
[Slider] Fix thumb position on horizontal sliders
eps1lon Oct 3, 2018
cd38ecf
[docs] Document how to improve actionable area
eps1lon Oct 3, 2018
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
4 changes: 2 additions & 2 deletions docs/src/pages/lab/slider/CustomIconSlider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class CustomIconSlider extends React.Component {
<div className={classes.root}>
<Typography id="slider-image">Image thumb</Typography>
<Slider
className={classes.slider}
classes={{ container: classes.slider }}
value={value}
aria-labelledby="slider-image"
onChange={this.handleChange}
Expand All @@ -51,11 +51,11 @@ class CustomIconSlider extends React.Component {
/>
<Typography id="slider-icon">Icon thumb</Typography>
<Slider
className={classes.slider}
value={value}
aria-labelledby="slider-icon"
onChange={this.handleChange}
classes={{
container: classes.slider,
thumbIconWrapper: classes.thumbIconWrapper,
}}
thumb={<LensIcon style={{ color: '#2196f3' }} />}
Expand Down
6 changes: 3 additions & 3 deletions docs/src/pages/lab/slider/DisabledSlider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ function DisabledSlider(props) {

return (
<div className={classes.root}>
<Slider className={classes.slider} value={0} disabled />
<Slider className={classes.slider} value={50} disabled />
<Slider className={classes.slider} value={100} disabled />
<Slider classes={{ container: classes.slider }} value={0} disabled />
<Slider classes={{ container: classes.slider }} value={50} disabled />
<Slider classes={{ container: classes.slider }} value={100} disabled />
</div>
);
}
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/lab/slider/SimpleSlider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class SimpleSlider extends React.Component {
<div className={classes.root}>
<Typography id="label">Slider label</Typography>
<Slider
className={classes.slider}
classes={{ container: classes.slider }}
value={value}
aria-labelledby="label"
onChange={this.handleChange}
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/lab/slider/StepSlider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class StepSlider extends React.Component {
return (
<div className={classes.root}>
<Slider
className={classes.slider}
classes={{ container: classes.slider }}
value={value}
min={0}
max={6}
Expand Down
7 changes: 6 additions & 1 deletion docs/src/pages/lab/slider/VerticalSlider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ class VerticalSlider extends React.Component {

return (
<div className={classes.root}>
<Slider value={value} onChange={this.handleChange} vertical />
<Slider
classes={{ container: classes.slider }}
value={value}
onChange={this.handleChange}
vertical
/>
</div>
);
}
Expand Down
26 changes: 13 additions & 13 deletions packages/material-ui-lab/src/Slider/Slider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const styles = theme => {

const trackTransitions = theme.transitions.create(['width', 'height'], commonTransitionsOptions);
const thumbCommonTransitions = theme.transitions.create(
['width', 'height', 'left', 'right', 'top', 'box-shadow'],
['width', 'height', 'left', 'right', 'bottom', 'box-shadow'],
commonTransitionsOptions,
);
// no transition on the position
Expand Down Expand Up @@ -76,6 +76,7 @@ export const styles = theme => {
transform: 'translate(-50%, 0)',
left: '50%',
top: 'initial',
bottom: 0,
width: 2,
},
},
Expand Down Expand Up @@ -120,6 +121,9 @@ export const styles = theme => {
'&$jumped': {
boxShadow: `0px 0px 0px ${pressedOutlineRadius * 2}px ${colors.thumbOutline}`,
},
'&$vertical': {
transform: 'translate(-50%, +50%)',
},
},
/* Class applied to the thumb element if custom thumb icon provided. */
thumbIconWrapper: {
Expand Down Expand Up @@ -152,10 +156,10 @@ function roundToStep(number, step) {

function getOffset(node) {
const { pageYOffset, pageXOffset } = global;
const { left, top } = node.getBoundingClientRect();
const { left, bottom } = node.getBoundingClientRect();

return {
top: top + pageYOffset,
bottom: bottom + pageYOffset,
left: left + pageXOffset,
};
}
Expand All @@ -176,10 +180,10 @@ function getMousePosition(event) {

function calculatePercent(node, event, isVertical, isRtl) {
const { width, height } = node.getBoundingClientRect();
const { top, left } = getOffset(node);
const { bottom, left } = getOffset(node);
const { x, y } = getMousePosition(event);

const value = isVertical ? y - top : x - left;
const value = isVertical ? bottom - y : x - left;
const onePercent = (isVertical ? height : width) / 100;

return isRtl && !isVertical ? 100 - clamp(value / onePercent) : clamp(value / onePercent);
Expand Down Expand Up @@ -413,6 +417,7 @@ class Slider extends React.Component {
[classes.jumped]: !disabled && currentState === 'jumped',
[classes.focused]: !disabled && currentState === 'focused',
[classes.activated]: !disabled && currentState === 'activated',
[classes.vertical]: vertical,
};

const className = classNames(
Expand All @@ -428,17 +433,12 @@ class Slider extends React.Component {
[classes.vertical]: vertical,
});

const trackBeforeClasses = classNames(classes.track, classes.trackBefore, commonClasses, {
[classes.vertical]: vertical,
});

const trackAfterClasses = classNames(classes.track, classes.trackAfter, commonClasses, {
[classes.vertical]: vertical,
});
const trackBeforeClasses = classNames(classes.track, classes.trackBefore, commonClasses);
const trackAfterClasses = classNames(classes.track, classes.trackAfter, commonClasses);

const trackProperty = vertical ? 'height' : 'width';
const horizontalMinimumPosition = theme.direction === 'ltr' ? 'left' : 'right';
const thumbProperty = vertical ? 'top' : horizontalMinimumPosition;
const thumbProperty = vertical ? 'bottom' : horizontalMinimumPosition;
const inlineTrackBeforeStyles = { [trackProperty]: this.calculateTrackBeforeStyles(percent) };
const inlineTrackAfterStyles = { [trackProperty]: this.calculateTrackAfterStyles(percent) };
const inlineThumbStyles = { [thumbProperty]: `${percent}%` };
Expand Down
⚡