Skip to content

Allow Animations, onPressIn/Out, and Global Button Styles #4

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 6 commits into
base: master
Choose a base branch
from
Open

Allow Animations, onPressIn/Out, and Global Button Styles #4

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bd012a5
Make TouchableOpacity into a Animated.TouchableOpacity
zolrath Nov 9, 2016
5d4c494
Change Animated Location
zolrath Nov 9, 2016
ec6980f
Wrap LinearGradient in Animated
zolrath Nov 9, 2016
4a7a213
Expose onPressIn/onPressout
zolrath Nov 9, 2016
15569e2
Add global buttonStyle before currentButtonSTate.buttonStyle
zolrath Nov 9, 2016
e28c207
Allow global onPress with state specific onPress overrides
zolrath Nov 9, 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
20 changes: 13 additions & 7 deletions src/ButtonComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Component, PropTypes } from 'react';
import { StyleSheet, View, TouchableOpacity } from 'react-native';
import { StyleSheet, View, TouchableOpacity, Animated } from 'react-native';
import LinearGradient from 'react-native-linear-gradient';
import Button from './common/Button';

Expand All @@ -16,6 +16,8 @@ const propTypes = {
style: PropTypes.oneOfType([PropTypes.number, PropTypes.object]),
progressSize: PropTypes.number,
onPress: PropTypes.func,
onPressIn: PropTypes.func,
onPressOut: PropTypes.func,
};

const defaultProps = {
Expand All @@ -28,6 +30,8 @@ const defaultProps = {
height: 50,
};

const AnimatedLinearGradient = Animated.createAnimatedComponent(LinearGradient);

class ButtonComponent extends Component {
static propTypes = propTypes;
static defaultProps = defaultProps;
Expand Down Expand Up @@ -112,29 +116,31 @@ class ButtonComponent extends Component {

if (type === 'primary') {
content = (
<LinearGradient
<AnimatedLinearGradient
start={gradientStart}
end={gradientEnd}
colors={backgroundColors}
collapsable={false}
style={[styles.button, shape, currentButtonState.buttonStyle]}
style={[styles.button, shape, this.props.buttonStyle, currentButtonState.buttonStyle]}
>
{this.renderButton({ textStyle: styles.text })}
</LinearGradient>
</AnimatedLinearGradient>
);
} else {
const border = type === 'border' && styles.border;
content = (
<View style={[styles.button, border, shape, currentButtonState.buttonStyle]}>
<Animated.View style={[styles.button, border, shape, this.props.buttonStyle, currentButtonState.buttonStyle]}>
{this.renderButton({ textStyle: styles.secondaryText })}
</View>
</Animated.View>
);
}

return (
<TouchableOpacity
accessibilityTraits="button"
onPress={currentButtonState.onPress}
onPress={currentButtonState.onPress || this.props.onPress}
onPressIn={currentButtonState.onPressIn || this.props.onPressIn}
onPressOut={currentButtonState.onPressOut || this.props.onPressOut}
activeOpacity={0.9}
style={[styles.container, { width: buttonWidth, height: buttonHeight }, this.props.style]}
>
Expand Down