[fix] Switch thumb positioning

This commit is contained in:
Nicolas Gallagher
2017-01-02 23:25:15 -08:00
parent 5e4c8e520a
commit 1a87657500
2 changed files with 27 additions and 19 deletions
@@ -120,6 +120,7 @@ rn-userSelect:none"
rn-flexShrink:0
rn-font:inherit
rn-left:0%
rn-listStyle:none
rn-marginTop:0px
rn-marginRight:0px
@@ -134,15 +135,12 @@ rn-userSelect:none"
rn-position:relative
rn-textAlign:inherit
rn-textDecoration:none
rn-transform:translateZ(0px)
rn-transitionDuration:0.1s"
style={
Object {
"WebkitTransform": "translateX(0%)",
"backgroundColor": "#FAFAFA",
"height": "20px",
"msTransform": "translateX(0%)",
"transform": "translateX(0%)",
"width": "20px",
}
} />
@@ -296,6 +294,7 @@ rn-userSelect:none"
rn-flexShrink:0
rn-font:inherit
rn-left:0%
rn-listStyle:none
rn-marginTop:0px
rn-marginRight:0px
@@ -310,14 +309,11 @@ rn-userSelect:none"
rn-position:relative
rn-textAlign:inherit
rn-textDecoration:none
rn-transform:translateZ(0px)
rn-transitionDuration:0.1s"
style={
Object {
"WebkitTransform": "translateX(0%)",
"height": "20px",
"msTransform": "translateX(0%)",
"transform": "translateX(0%)",
"width": "20px",
}
} />
@@ -472,6 +468,7 @@ rn-userSelect:none"
rn-flexShrink:0
rn-font:inherit
rn-left:0%
rn-listStyle:none
rn-marginTop:0px
rn-marginRight:0px
@@ -486,15 +483,12 @@ rn-userSelect:none"
rn-position:relative
rn-textAlign:inherit
rn-textDecoration:none
rn-transform:translateZ(0px)
rn-transitionDuration:0.1s"
style={
Object {
"WebkitTransform": "translateX(0%)",
"backgroundColor": "#FAFAFA",
"height": "20px",
"msTransform": "translateX(0%)",
"transform": "translateX(0%)",
"width": "20px",
}
} />
@@ -649,11 +643,12 @@ rn-userSelect:none"
rn-flexShrink:0
rn-font:inherit
rn-left:100%
rn-listStyle:none
rn-marginTop:0px
rn-marginRight:0px
rn-marginBottom:0px
rn-marginLeft:0px
rn-minHeight:0px
rn-minWidth:0px
rn-paddingTop:0px
@@ -663,15 +658,13 @@ rn-userSelect:none"
rn-position:relative
rn-textAlign:inherit
rn-textDecoration:none
rn-transform:translateZ(0px)
rn-transitionDuration:0.1s"
style={
Object {
"WebkitTransform": "translateX(100%)",
"backgroundColor": "#009688",
"height": "20px",
"msTransform": "translateX(100%)",
"transform": "translateX(100%)",
"marginLeft": "-20px",
"width": "20px",
}
} />
+17 -2
View File
@@ -91,7 +91,6 @@ class Switch extends Component {
{
backgroundColor: thumbCurrentColor,
height: thumbHeight,
transform: [ { translateX: value ? '100%' : '0%' } ],
width: thumbWidth
},
disabled && styles.disabledThumb
@@ -111,7 +110,16 @@ class Switch extends Component {
return (
<View {...other} style={rootStyle}>
<View style={trackStyle} />
<View ref={this._setThumbRef} style={thumbStyle} />
<View
ref={this._setThumbRef}
style={[
thumbStyle,
value && styles.thumbOn,
{
marginLeft: value ? multiplyStyleLengthValue(thumbWidth, -1) : 0
}
]}
/>
{nativeControl}
</View>
);
@@ -162,8 +170,15 @@ const styles = StyleSheet.create({
alignSelf: 'flex-start',
borderRadius: '100%',
boxShadow: thumbDefaultBoxShadow,
left: '0%',
transform: [
{ translateZ: 0 }
],
transitionDuration: '0.1s'
},
thumbOn: {
left: '100%'
},
disabledThumb: {
backgroundColor: '#BDBDBD'
},