[Slider] Remove style-propable mixin and react-dom #3332
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,4 @@ | ||
| import React from 'react'; | ||
| import Transitions from './styles/transitions'; | ||
| import FocusRipple from './ripples/focus-ripple'; | ||
| import getMuiTheme from './styles/getMuiTheme'; | ||
|
|
@@ -40,6 +38,122 @@ const valueInRangePropType = (props, propName, componentName) => { | |
| } | ||
| }; | ||
|
|
||
| const getStyles = (props, state) => { | ||
| const { | ||
| slider, | ||
| } = state.muiTheme; | ||
|
|
||
| const fillGutter = slider.handleSize / 2; | ||
| const disabledGutter = slider.trackSize + slider.handleSizeDisabled / 2; | ||
| const calcDisabledSpacing = props.disabled ? ` - ${disabledGutter}px` : ''; | ||
|
|
||
| const styles = { | ||
| root: { | ||
| touchCallout: 'none', | ||
| userSelect: 'none', | ||
| cursor: 'default', | ||
| height: slider.handleSizeActive, | ||
| position: 'relative', | ||
| marginTop: 24, | ||
| marginBottom: 48, | ||
| }, | ||
| track: { | ||
| position: 'absolute', | ||
| top: (slider.handleSizeActive - slider.trackSize) / 2, | ||
| left: 0, | ||
| width: '100%', | ||
| height: slider.trackSize, | ||
| }, | ||
| filledAndRemaining: { | ||
| position: 'absolute', | ||
| top: 0, | ||
| height: '100%', | ||
| transition: Transitions.easeOut(null, 'margin'), | ||
| }, | ||
| handle: { | ||
| boxSizing: 'border-box', | ||
| position: 'absolute', | ||
| cursor: 'pointer', | ||
| pointerEvents: 'inherit', | ||
| top: 0, | ||
| left: '0%', | ||
| zIndex: 1, | ||
| margin: `${(slider.trackSize / 2)}px 0 0 0`, | ||
| width: slider.handleSize, | ||
| height: slider.handleSize, | ||
| backgroundColor: slider.selectionColor, | ||
| backgroundClip: 'padding-box', | ||
| border: '0px solid transparent', | ||
| borderRadius: '50%', | ||
| transform: 'translate(-50%, -50%)', | ||
| transition: | ||
| `${Transitions.easeOut('450ms', 'background')}, ${ | ||
| Transitions.easeOut('450ms', 'border-color')}, ${ | ||
| Transitions.easeOut('450ms', 'width')}, ${ | ||
| Transitions.easeOut('450ms', 'height')}`, | ||
| overflow: 'visible', | ||
| outline: 'none', | ||
| }, | ||
| handleWhenDisabled: { | ||
| boxSizing: 'content-box', | ||
| cursor: 'not-allowed', | ||
| backgroundColor: slider.trackColor, | ||
| width: slider.handleSizeDisabled, | ||
| height: slider.handleSizeDisabled, | ||
| border: 'none', | ||
| }, | ||
| handleWhenPercentZero: { | ||
| border: `${slider.trackSize}px solid ${slider.handleColorZero}`, | ||
| backgroundColor: slider.handleFillColor, | ||
| boxShadow: 'none', | ||
| }, | ||
| handleWhenPercentZeroAndDisabled: { | ||
| cursor: 'not-allowed', | ||
| width: slider.handleSizeDisabled, | ||
| height: slider.handleSizeDisabled, | ||
| }, | ||
| handleWhenPercentZeroAndFocused: { | ||
| border: `${slider.trackSize}px solid ${slider.trackColorSelected}`, | ||
| }, | ||
| handleWhenActive: { | ||
| width: slider.handleSizeActive, | ||
| height: slider.handleSizeActive, | ||
| }, | ||
| ripple: { | ||
| height: slider.handleSize, | ||
| width: slider.handleSize, | ||
| overflow: 'visible', | ||
| }, | ||
| rippleWhenPercentZero: { | ||
| top: -slider.trackSize, | ||
| left: -slider.trackSize, | ||
| }, | ||
| rippleInner: { | ||
| height: '300%', | ||
| width: '300%', | ||
| top: -slider.handleSize, | ||
| left: -slider.handleSize, | ||
| }, | ||
| rippleColor: { | ||
| fill: state.percent === 0 ? slider.handleColorZero : slider.rippleColor, | ||
| }, | ||
| }; | ||
| styles.filled = Object.assign({}, styles.filledAndRemaining, { | ||
| left: 0, | ||
| backgroundColor: (props.disabled) ? slider.trackColor : slider.selectionColor, | ||
| marginRight: fillGutter, | ||
| width: `calc(${(state.percent * 100)}%${calcDisabledSpacing})`, | ||
| }); | ||
| styles.remaining = Object.assign({}, styles.filledAndRemaining, { | ||
| right: 0, | ||
| backgroundColor: (state.hovered || state.focused) | ||
| && !props.disabled ? slider.trackColorSelected : slider.trackColor, | ||
| marginLeft: fillGutter, | ||
| width: `calc(${((1 - state.percent) * 100)}%${calcDisabledSpacing})`, | ||
| }); | ||
|
|
||
| return styles; | ||
| }; | ||
|
|
||
| const Slider = React.createClass({ | ||
|
|
||
|
|
@@ -142,10 +256,6 @@ const Slider = React.createClass({ | |
| muiTheme: React.PropTypes.object, | ||
| }, | ||
|
|
||
| getDefaultProps() { | ||
| return { | ||
| disabled: false, | ||
|
|
@@ -192,119 +302,6 @@ const Slider = React.createClass({ | |
| } | ||
| }, | ||
|
|
||
|
|
||
| // Needed to prevent text selection when dragging the slider handler. | ||
| // In the future, we should consider use <input type="range"> to avoid | ||
|
|
@@ -437,7 +434,7 @@ const Slider = React.createClass({ | |
| }, | ||
|
|
||
| _getTrackLeft() { | ||
| return this.refs.track.getBoundingClientRect().left; | ||
| }, | ||
|
|
||
| handleMouseUp(e) { | ||
|
|
@@ -472,7 +469,7 @@ const Slider = React.createClass({ | |
| }, | ||
|
|
||
| _dragX(e, pos) { | ||
| const max = this.refs.track.clientWidth; | ||
| if (pos < 0) pos = 0; else if (pos > max) pos = max; | ||
| this._updateWithChangeEvent(e, pos / max); | ||
| }, | ||
|
|
@@ -492,77 +489,76 @@ const Slider = React.createClass({ | |
| let percent = this.state.percent; | ||
| if (percent > 1) percent = 1; else if (percent < 0) percent = 0; | ||
|
|
||
| const styles = getStyles(this.props, this.state); | ||
| const sliderStyles = Object.assign({}, styles.root, this.props.style); | ||
| const handleStyles = percent === 0 ? Object.assign( | ||
| {}, | ||
| styles.handle, | ||
| styles.handleWhenPercentZero, | ||
| this.state.active && styles.handleWhenActive, | ||
| (this.state.hovered || this.state.focused) && !this.props.disabled | ||
| && styles.handleWhenPercentZeroAndFocused, | ||
| this.props.disabled && styles.handleWhenPercentZeroAndDisabled | ||
| ) : Object.assign( | ||
| {}, | ||
| styles.handle, | ||
| this.state.active && styles.handleWhenActive, | ||
| this.props.disabled && styles.handleWhenDisabled, | ||
| { | ||
| left: `${(percent * 100)}%`, | ||
| } | ||
| ); | ||
| const rippleStyle = Object.assign( | ||
| {}, | ||
| styles.ripple, | ||
| percent === 0 && styles.rippleWhenPercentZero | ||
| ); | ||
| const rippleShowCondition = (this.state.hovered || this.state.focused) && !this.state.active; | ||
|
|
||
| let focusRipple; | ||
| if (!this.props.disabled && !this.props.disableFocusRipple) { | ||
| focusRipple = ( | ||
| <FocusRipple | ||
| ref="focusRipple" | ||
| key="focusRipple" | ||
| style={rippleStyle} | ||
| innerStyle={styles.rippleInner} | ||
| show={rippleShowCondition} | ||
| muiTheme={this.state.muiTheme} | ||
| color={styles.rippleColor.fill} | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| let handleDragProps = {}; | ||
| if (!this.props.disabled) { | ||
| handleDragProps = { | ||
| onTouchStart: this._onHandleTouchStart, | ||
| onMouseDown: this._onHandleMouseDown, | ||
| }; | ||
| } | ||
|
|
||
| const { | ||
| prepareStyles, | ||
| } = this.state.muiTheme; | ||
|
|
||
| return ( | ||
| <div {...others} style={prepareStyles(Object.assign({}, this.props.style))}> | ||
| <span>{this.props.description}</span> | ||
| <span>{this.props.error}</span> | ||
| <div | ||
| style={prepareStyles(sliderStyles)} | ||
| onFocus={this.handleFocus} | ||
| onBlur={this.handleBlur} | ||
| onMouseDown={this.handleMouseDown} | ||
| onMouseEnter={this.handleMouseEnter} | ||
| onMouseLeave={this.handleMouseLeave} | ||
| onMouseUp={this.handleMouseUp} | ||
| > | ||
| <div ref="track" style={prepareStyles(styles.track)}> | ||
| <div style={prepareStyles(styles.filled)}></div> | ||
| <div style={prepareStyles(styles.remaining)}></div> | ||
| <div style={prepareStyles(handleStyles)} tabIndex={0} {...handleDragProps}> | ||
|
There was a problem hiding this comment. On L37, we can save an allocation by taking the empty object off. let handleDragProps; // = {}; removed
if (!this.props.disabled) {
handleDragProps = {
onTouchStart: this._onHandleTouchStart,
onMouseDown: this._onHandleMouseDown,
};
}
// Or write as
const handleDragProps = !this.props.disabled && {
onTouchStart: this._onHandleTouchStart,
onMouseDown: this._onHandleMouseDown,
};There was a problem hiding this comment. I can stick with your first approach, since the last one will initialise the variable with false or an object |
||
| {focusRipple} | ||
| </div> | ||
| </div> | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see what you mean with these:
handleWhenDisabled,handledWhenPercentZero,handleWhenPercentZeroAndDisabled`, etc. it would be nice if we could replace all of these wit ha single handle key so that the we didn't need Object.assign call below.This can probably be solved by ternary for some keys or if there's too much, something like what we did with badge should work.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
They were already in the code actually. I will try hard to change that, but it will take some time because there are a lot of cases that need to be handled (pun intended 😄)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah I know! Not your fault. 😄
😆