Skip to content

improve iOS Modal slide-up, fade-in animation performance #404

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

improve iOS Modal slide-up, fade-in animation performance #404

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions __tests__/Datepicker.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,10 @@ describe('DatePicker', () => {
datePicker.setModalVisible(true);

expect(wrapper.state('modalVisible')).toEqual(true);
expect(wrapper.state('animatedHeight')._animation._toValue).toBeGreaterThan(200);
expect(wrapper.state('animatedHeight')._animation._toValue).toEqual(0);

datePicker.setModalVisible(false);
expect(wrapper.state('animatedHeight')._animation._toValue).toEqual(0);
expect(wrapper.state('animatedHeight')._animation._toValue).toBeGreaterThan(200);
});

it('onPressCancel', () => {
Expand Down
154 changes: 90 additions & 64 deletions datepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ class DatePicker extends Component {
this.state = {
date: this.getDate(),
modalVisible: false,
animatedHeight: new Animated.Value(0),
animatedHeight: new Animated.Value(props.height),
opacity: new Animated.Value(0),
allowPointerEvents: true
};

Expand Down Expand Up @@ -62,21 +63,39 @@ class DatePicker extends Component {
// slide animation
if (visible) {
this.setState({modalVisible: visible});
return Animated.timing(
this.state.animatedHeight,
{
toValue: height,
duration: duration
}
).start();
Animated.parallel([
Animated.timing(
this.state.animatedHeight,
{
toValue: 0,
duration: duration
}
),
Animated.timing(
this.state.opacity,
{
toValue: 1,
duration: duration
}
)
]).start();
} else {
return Animated.timing(
this.state.animatedHeight,
{
toValue: 0,
duration: duration
}
).start(() => {
Animated.parallel([
Animated.timing(
this.state.animatedHeight,
{
toValue: height,
duration: duration
}
),
Animated.timing(
this.state.opacity,
{
toValue: 0,
duration: duration
}
)
]).start(() => {
this.setState({modalVisible: visible});
});
}
Expand Down Expand Up @@ -341,7 +360,8 @@ class DatePicker extends Component {
cancelBtnTestID,
confirmBtnTestID,
allowFontScaling,
locale
locale,
height
} = this.props;

const dateInputStyle = [
Expand All @@ -363,7 +383,7 @@ class DatePicker extends Component {
<View style={dateInputStyle}>
{this.getTitleElement()}
</View>
:
:
<View/>
}
{this._renderIcon()}
Expand All @@ -377,60 +397,66 @@ class DatePicker extends Component {
<View
style={{flex: 1}}
>
<TouchableComponent
style={Style.datePickerMask}
activeOpacity={1}
underlayColor={'#00000077'}
onPress={this.onPressMask}
>
<Animated.View style={{flex: 1, opacity: this.state.opacity}}>
<TouchableComponent
underlayColor={'#fff'}
style={{flex: 1}}
style={Style.datePickerMask}
activeOpacity={1}
underlayColor={'#00000077'}
onPress={this.onPressMask}
>
<Animated.View
style={[Style.datePickerCon, {height: this.state.animatedHeight}, customStyles.datePickerCon]}
<TouchableComponent
underlayColor={'#fff'}
style={{flex: 1}}
>
<View pointerEvents={this.state.allowPointerEvents ? 'auto' : 'none'}>
<DatePickerIOS
date={this.state.date}
mode={mode}
minimumDate={minDate && this.getDate(minDate)}
maximumDate={maxDate && this.getDate(maxDate)}
onDateChange={this.onDateChange}
minuteInterval={minuteInterval}
timeZoneOffsetInMinutes={timeZoneOffsetInMinutes ? timeZoneOffsetInMinutes : null}
style={[Style.datePicker, customStyles.datePicker]}
locale={locale}
/>
</View>
<TouchableComponent
underlayColor={'transparent'}
onPress={this.onPressCancel}
style={[Style.btnText, Style.btnCancel, customStyles.btnCancel]}
testID={cancelBtnTestID}
<Animated.View
style={[
Style.datePickerCon,
{height, transform: [{translateY: this.state.animatedHeight}]},
customStyles.datePickerCon
]}
>
<Text
allowFontScaling={allowFontScaling}
style={[Style.btnTextText, Style.btnTextCancel, customStyles.btnTextCancel]}
<View pointerEvents={this.state.allowPointerEvents ? 'auto' : 'none'}>
<DatePickerIOS
date={this.state.date}
mode={mode}
minimumDate={minDate && this.getDate(minDate)}
maximumDate={maxDate && this.getDate(maxDate)}
onDateChange={this.onDateChange}
minuteInterval={minuteInterval}
timeZoneOffsetInMinutes={timeZoneOffsetInMinutes ? timeZoneOffsetInMinutes : null}
style={[Style.datePicker, customStyles.datePicker]}
locale={locale}
/>
</View>
<TouchableComponent
underlayColor={'transparent'}
onPress={this.onPressCancel}
style={[Style.btnText, Style.btnCancel, customStyles.btnCancel]}
testID={cancelBtnTestID}
>
{cancelBtnText}
</Text>
</TouchableComponent>
<TouchableComponent
underlayColor={'transparent'}
onPress={this.onPressConfirm}
style={[Style.btnText, Style.btnConfirm, customStyles.btnConfirm]}
testID={confirmBtnTestID}
>
<Text allowFontScaling={allowFontScaling}
style={[Style.btnTextText, customStyles.btnTextConfirm]}
<Text
allowFontScaling={allowFontScaling}
style={[Style.btnTextText, Style.btnTextCancel, customStyles.btnTextCancel]}
>
{cancelBtnText}
</Text>
</TouchableComponent>
<TouchableComponent
underlayColor={'transparent'}
onPress={this.onPressConfirm}
style={[Style.btnText, Style.btnConfirm, customStyles.btnConfirm]}
testID={confirmBtnTestID}
>
{confirmBtnText}
</Text>
</TouchableComponent>
</Animated.View>
<Text allowFontScaling={allowFontScaling}
style={[Style.btnTextText, customStyles.btnTextConfirm]}
>
{confirmBtnText}
</Text>
</TouchableComponent>
</Animated.View>
</TouchableComponent>
</TouchableComponent>
</TouchableComponent>
</Animated.View>
</View>
</Modal>}
</View>
Expand Down