Skip to content

[Slider] added sliderStyle prop #4282

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

Closed
krebbl wants to merge 6 commits into from
Closed

[Slider] added sliderStyle prop #4282

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
90242a6
[Slider] added sliderStyle prop
krebbl May 17, 2016
ef36738
[Slider] Removed trailing spaces, changed prop order
krebbl May 17, 2016
62345ba
[Slider] fixed order of sliderStyle prop
krebbl May 17, 2016
c00bae6
[Slider] fixed order of sliderStyle prop in defaults
krebbl May 17, 2016
e28dc9e
[Slider] move extending slider style to render method
krebbl May 18, 2016
a388a53
[Slider] assign sliderStyle on slider.style
krebbl Jun 15, 2016
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: 6 additions & 1 deletion src/Slider/Slider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,10 @@ class Slider extends Component {
* Whether or not the slider is required in a form.
*/
required: PropTypes.bool,
/**
* Override the inline-styles of the inner slider element.
*/
sliderStyle: PropTypes.object,
/**
* The granularity the slider can step through values.
*/
Expand All @@ -232,6 +236,7 @@ class Slider extends Component {
max: 1,
min: 0,
required: true,
sliderStyle: {},
step: 0.01,
style: {},
};
Expand Down Expand Up @@ -542,7 +547,7 @@ class Slider extends Component {

const {prepareStyles} = this.context.muiTheme;
const styles = getStyles(this.props, this.context, this.state);
const sliderStyles = styles.slider;
const sliderStyles = Object.assign({}, styles.slider, this.props.sliderStyle);
Copy link
Copy Markdown
Contributor

@nathanmarks nathanmarks Jun 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can probably just assign onto styles.slider.


let handleStyles = {};
let percent = this.state.percent;
Expand Down
⚡