Skip to content

Counter Icon badge #1081

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 2 commits into from
Dec 17, 2020
Merged

Counter Icon badge #1081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d18800
add counterIcon badge
lidord-wix Dec 16, 2020
751fc11
remove counterIcon prop
lidord-wix Dec 17, 2020
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
Binary file added demo/src/assets/icons/bell.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/src/assets/icons/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/src/assets/icons/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 10 additions & 2 deletions demo/src/screens/componentScreens/BadgesScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ const BadgesSpace = 30;
const plusIcon = require('../../assets/icons/chevronUp.png');
const minusIcon = require('../../assets/icons/chevronDown.png');
const star = require('../../assets/icons/star.png');
const search = require('../../assets/icons/search.png');

const bell = require('../../assets/icons/bell.png');

export default class BadgesScreen extends Component {
constructor(props) {
Expand Down Expand Up @@ -137,6 +136,15 @@ export default class BadgesScreen extends Component {
</Text>
</View>
</View>

<Text text50 marginB-10 row center marginT-25>
Counter Icon Badges
</Text>
<View row paddingH-15>
<Badge marginR-10 withCounterIcon label={'9999'} labelFormatterLimit={3} icon={bell} backgroundColor={Colors.red30} iconStyle={{height: 18, width: 18}}/>
<Badge marginR-10 withCounterIcon label={'4'} icon={bell} backgroundColor={Colors.red30} color={Colors.blue30} iconStyle={{height: 18, width: 18}}/>
</View>

</ScrollView>
);
}
Expand Down
22 changes: 18 additions & 4 deletions src/components/badge/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {ImageSourcePropType, ImageStyle, StyleProp, StyleSheet, Text, TextStyle,
import {View as AnimatableView} from 'react-native-animatable';
import {extractAccessibilityProps, extractAnimationProps} from '../../commons/modifiers';
import {asBaseComponent} from '../../commons/new';
import {BorderRadiuses, Colors, Typography} from '../../style';
import {BorderRadiuses, Colors, Spacings, Typography} from '../../style';
import TouchableOpacity from '../touchableOpacity';
import Image from '../image';
import View from '../view';
Expand Down Expand Up @@ -143,6 +143,15 @@ class Badge extends PureComponent<BadgeProps> {
height: badgeHeight,
minWidth: badgeHeight
};
if (icon && label) {
style.paddingRight = 6;
style.paddingLeft = 4;
style.height = Spacings.s5;
if (borderWidth) {
style.height += borderWidth * 2;
}
return style;
}

const isPimple = label === undefined;
if (isPimple || icon) {
Expand Down Expand Up @@ -213,7 +222,8 @@ class Badge extends PureComponent<BadgeProps> {
}

renderIcon() {
const {icon, iconStyle, iconProps, borderColor} = this.props;
const {icon, iconStyle, iconProps, borderColor, label} = this.props;
const flex = label ? 0 : 1;
return (
<Image
source={icon!}
Expand All @@ -222,7 +232,7 @@ class Badge extends PureComponent<BadgeProps> {
borderColor={borderColor}
{...iconProps}
style={{
flex: 1,
flex,
...iconStyle
}}
/>
Expand All @@ -237,6 +247,7 @@ class Badge extends PureComponent<BadgeProps> {
containerStyle,
hitSlop,
icon,
label,
onPress,
testId,
testID,
Expand Down Expand Up @@ -265,7 +276,10 @@ class Badge extends PureComponent<BadgeProps> {
hitSlop={hitSlop}
{...animationProps}
>
{icon ? this.renderIcon() : this.renderLabel()}
<View flex row centerV>
{icon && this.renderIcon()}
{label && this.renderLabel()}
</View>
</Container>
</View>
);
Expand Down