Skip to content

Feat/Badge - Add onPress. #519

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 4 commits into from
Sep 1, 2019
Merged

Feat/Badge - Add onPress. #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5014bae
Added onPress
ArnonZ Aug 31, 2019
f1d6801
Merge branch 'master' into feat/badge-onpress
ArnonZ Aug 31, 2019
d313eae
Revert of unneeded styling
ArnonZ Aug 31, 2019
318e8e7
Unneeded file commit
ArnonZ Aug 31, 2019
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
36 changes: 3 additions & 33 deletions demo/src/screens/componentScreens/BadgesScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,8 @@ export default class BadgesScreen extends Component {
<Text text50 row center marginB-15>
Badges
</Text>
<View row center>
<View center marginH-10>
<Badge label={'10'} backgroundColor={Colors.blue30} />
<Badge
label={'10'}
containerStyle={{marginTop: BadgesSpace}}
backgroundColor={Colors.blue30}
borderWidth={3}
borderColor={Colors.blue50}
/>
<Badge
size="small"
label={'10'}
containerStyle={{marginTop: BadgesSpace}}
backgroundColor={Colors.blue30}
/>
</View>

<View center marginH-10>
<View row center style={{alignItems: 'flex-start'}}>
<View center paddingH-10>
<Badge label={this.state.value.toString()} backgroundColor={Colors.red30} />
<Badge
label={this.state.value.toString()}
Expand All @@ -63,7 +46,7 @@ export default class BadgesScreen extends Component {
/>
</View>

<View center marginH-10>
<View center paddingH-10>
<Badge label={'9999'} labelFormatterLimit={3} />
<Badge
label={'999'}
Expand All @@ -74,19 +57,6 @@ export default class BadgesScreen extends Component {
/>
<Badge labelFormatterLimit={1} size="small" label={'99999999'} containerStyle={{marginTop: BadgesSpace}} />
</View>

<View center marginH-10>
<Badge size={28} label={'9999'} labelFormatterLimit={3} />
<Badge
size={28}
label={'999'}
labelFormatterLimit={2}
containerStyle={{marginTop: BadgesSpace}}
borderWidth={2}
borderColor={Colors.white}
/>
<Badge size={28} labelFormatterLimit={1} label={'99999999'} containerStyle={{marginTop: BadgesSpace}} />
</View>
</View>

<View row paddingT-20 marginB-15>
Expand Down
20 changes: 17 additions & 3 deletions src/components/badge/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import {StyleSheet, Text, ViewPropTypes} from 'react-native';
import {View as AnimatableView} from 'react-native-animatable';
import {PureBaseComponent} from '../../commons';
import {BorderRadiuses, Colors, ThemeManager, Typography} from '../../style';
import View from '../view';
import Image from '../image';
import TouchableOpacity from '../touchableOpacity';
import View from '../view';

const LABEL_FORMATTER_VALUES = [1, 2, 3, 4];

Expand Down Expand Up @@ -192,13 +193,24 @@ export default class Badge extends PureBaseComponent {

render() {
// TODO: remove testId after deprecation
const {borderWidth, backgroundColor, borderColor, containerStyle, icon, testId, testID, ...others} = this.props;
const {
activeOpacity,
borderWidth,
backgroundColor,
borderColor,
containerStyle,
icon,
onPress,
testId,
testID,
...others
} = this.props;
const backgroundStyle = backgroundColor && {backgroundColor};
const sizeStyle = this.getBadgeSizeStyle();
const borderStyle = borderWidth ? this.getBorderStyling() : undefined;

const animationProps = this.extractAnimationProps();
const Container = !_.isEmpty(animationProps) ? AnimatableView : View;
const Container = !_.isEmpty(animationProps) ? AnimatableView : onPress ? TouchableOpacity : View;
if (!_.isEmpty(animationProps)) {
console.warn(
'Badge component will soon stop supporting animationProps.' +
Expand All @@ -213,6 +225,8 @@ export default class Badge extends PureBaseComponent {
testID={testID || testId}
pointerEvents={'none'}
style={[sizeStyle, this.styles.badge, borderStyle, backgroundStyle]}
onPress={onPress}
activeOpacity={activeOpacity}
{...animationProps}
>
{icon ? this.renderIcon() : this.renderLabel()}
Expand Down