Skip to content

Infra/ migrate chip to designTokens #1937

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
Apr 4, 2022
Merged

Infra/ migrate chip to designTokens #1937

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
42058fb
migrate chip to designTokens
lidord-wix Apr 4, 2022
ada1668
set default dismissColor
lidord-wix Apr 4, 2022
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
28 changes: 16 additions & 12 deletions demo/src/screens/componentScreens/ChipScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export default class ChipScreen extends Component {
renderExample = (text: string, chip: JSX.Element) => {
return (
<View row spread marginB-12>
<Text text70>{text}</Text>
<Text text70 $textDefault>{text}</Text>
{chip}
</View>
);
Expand All @@ -91,30 +91,34 @@ export default class ChipScreen extends Component {
return (
<View style={{padding: 20}}>
{this.state.showDialog && this.renderPickerDialog()}
<Text marginB-20 text40>
<Text marginB-20 text40 $textDefault>
Chip
</Text>
<Text marginB-10 text70BO>
<Text marginB-10 text70BO $textDefault>
Default
</Text>
{this.renderExample('Label', <Chip label={'Chip'}/>)}
{this.renderExample('Label + onPress', <Chip label={'Chip'} onPress={() => Alert.alert('onPress')}/>)}
{this.renderExample('Label + onDismiss',
<Chip
label={'Chip'}
iconColor={Colors.black}
iconProps={{tintColor: Colors.$iconDefault}}
onDismiss={() => Alert.alert('onDismiss')}
onPress={() => Alert.alert('onPress')}
dismissIconStyle={{width: 10, height: 10}}
/>)}
{this.renderExample('Icon',
<Chip iconSource={checkmark} iconStyle={{width: 24, height: 24}} iconProps={{tintColor: Colors.black}}/>)}
<Chip
iconSource={checkmark}
iconStyle={{width: 24, height: 24}}
iconProps={{tintColor: Colors.$iconDefault}}
/>)}
{this.renderExample('Left icon',
<Chip
label={'Chip'}
iconSource={checkmark}
iconStyle={{width: 24, height: 24}}
iconProps={{tintColor: Colors.black}}
iconProps={{tintColor: Colors.$iconDefault}}
/>)}
{this.renderExample('Right icon + onPress + dynamic label',
<Chip
Expand All @@ -135,7 +139,7 @@ export default class ChipScreen extends Component {
label: '4',
labelStyle: {
...Typography.text80R,
color: Colors.grey20
color: Colors.$textNeutralHeavy
}
}}
/>)}
Expand All @@ -148,7 +152,7 @@ export default class ChipScreen extends Component {
}}
/>)}

<Text marginT-20 marginB-10 text70BO>
<Text marginT-20 marginB-10 text70BO $textDefault>
Custom
</Text>
<View center row>
Expand All @@ -163,6 +167,7 @@ export default class ChipScreen extends Component {
iconSource={checkmark}
label={'Chip'}
labelStyle={{color: Colors.white}}
iconProps={{tintColor: Colors.white}}
containerStyle={{borderColor: Colors.green20, backgroundColor: Colors.green20, marginLeft: Spacings.s3}}
/>
<Chip
Expand All @@ -171,7 +176,6 @@ export default class ChipScreen extends Component {
label={'Chip'}
labelStyle={{color: Colors.red20, marginHorizontal: Spacings.s3, ...Typography.text70BO}}
iconStyle={{width: 16, height: 16}}
iconColor={Colors.black}
avatarProps={{source: avatarImage, size: 28}}
onDismiss={() => Alert.alert('onDismiss')}
dismissIconStyle={{width: 10, height: 10, marginRight: Spacings.s3}}
Expand All @@ -188,10 +192,10 @@ export default class ChipScreen extends Component {
labelStyle={{marginRight: Spacings.s1}}
badgeProps={{
label: '44',
backgroundColor: Colors.white,
backgroundColor: Colors.$backgroundDefault,
borderWidth: 2,
borderColor: Colors.black,
labelStyle: {color: Colors.black}
borderColor: Colors.$backgroundInverted,
labelStyle: {color: Colors.$textDefault}
}}
containerStyle={{
borderWidth: 0,
Expand Down
7 changes: 5 additions & 2 deletions src/components/chip/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React, {useCallback} from 'react';
import {StyleSheet, StyleProp, ViewStyle, ViewProps, ImageStyle, TextStyle, ImageSourcePropType} from 'react-native';
import Assets from '../../assets';
import {asBaseComponent} from '../../commons/new';
import {BorderRadiuses, Spacings} from 'style';
import {BorderRadiuses, Spacings, Colors} from 'style';
import Avatar, {AvatarProps} from '../avatar';
import Badge, {BadgeProps} from '../badge';
import Text from '../text';
Expand Down Expand Up @@ -145,7 +145,7 @@ const Chip = ({
borderRadius = BorderRadiuses.br100,
containerStyle,
onDismiss,
dismissColor,
dismissColor = Colors.$iconDefault,
dismissIcon = Assets.icons.x,
dismissIconStyle,
dismissContainerStyle,
Expand All @@ -172,6 +172,7 @@ const Chip = ({
<Icon
source={isLeftIcon ? iconSource : rightIconSource}
testID={`${testID}.icon`}
tintColor={Colors.$iconDefault}
{...iconProps}
style={[getMargins('iconSource'), iconStyle]}
/>
Expand Down Expand Up @@ -228,6 +229,7 @@ const Chip = ({
<Text
text90M
numberOfLines={1}
$textDefault
style={[styles.label, getMargins('label'), labelStyle]}
testID={`${testID}.label`}
>
Expand Down Expand Up @@ -338,6 +340,7 @@ const styles = StyleSheet.create({
justifyContent: 'center',
flexDirection: 'row',
borderWidth: 1,
borderColor: Colors.$backgroundInverted,
borderRadius: BorderRadiuses.br100
},
label: {
Expand Down