Skip to content

fix animation and small padding when in landscape #25

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
merged 1 commit into from
Feb 21, 2016
Merged

fix animation and small padding when in landscape #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
fix animation and small padding when in landscape
  • Loading branch information
@jimthedev
jimthedev committed Feb 19, 2016
commit 67edcfe009cf9de8751d29dcfea4e370e8b67767
23 changes: 13 additions & 10 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

import React, {
StyleSheet,
PropTypes,
View,
StyleSheet,
PropTypes,
View,
Text,
Animated,
Platform,
Expand All @@ -18,6 +18,9 @@ let PickerItem = Picker.Item;
let width = Dimensions.get('window').width;
let height = Dimensions.get('window').height;

const longSide = width > height ? width : height;
const shortSide = width > height ? height : width;

export default class PickerAny extends React.Component {

static propTypes = {
Expand Down Expand Up @@ -102,7 +105,7 @@ export default class PickerAny extends React.Component {
let thirdPickedDataIndex;
let cascadeData = {};
let slideAnim = (this.state && this.state.slideAnim ? this.state.slideAnim : new Animated.Value(-props.pickerHeight));

if(pickerStyle === 'parallel'){
//compatible single wheel sence
if(selectedValue.constructor !== Array){
Expand Down Expand Up @@ -364,7 +367,7 @@ export default class PickerAny extends React.Component {
else{
this.pickedValue.splice(0, 2, value, cascadeData.secondWheelData[0]);
}

this.setState({
selectedValue: 'wheel1'+value,
firstPickedData: value,
Expand Down Expand Up @@ -393,12 +396,12 @@ export default class PickerAny extends React.Component {
onValueChange={(index) => {
let thirdWheelData = pickerData[this.state.firstPickedData][this.state.secondWheelData[index]];
if(thirdWheelData){
this.pickedValue.splice(1, 2, this.state.secondWheelData[index], thirdWheelData[0]);
this.pickedValue.splice(1, 2, this.state.secondWheelData[index], thirdWheelData[0]);
}
else{
this.pickedValue.splice(1, 1, this.state.secondWheelData[index]);
}

this.setState({
secondPickedDataIndex: index,
thirdWheelData,
Expand Down Expand Up @@ -464,11 +467,11 @@ export default class PickerAny extends React.Component {
}
return wheel;
}

render(){
return (
<Animated.View style={[styles.picker, {
width: this.state.pickerWidth,
width: longSide,
height: this.state.pickerHeight,
bottom: this.state.slideAnim
}, this.state.style]}>
Expand All @@ -485,7 +488,7 @@ export default class PickerAny extends React.Component {
onPress={this._pickerFinish.bind(this)}>{this.state.pickerBtnText}</Text>
</View>
</View>
<View style={styles.pickerWrap}>
<View style={[styles.pickerWrap, { width: this.state.pickerWidth }]}>
{this._renderWheel(this.state.pickerData)}
</View>
</Animated.View>
Expand Down