diff --git a/demo/src/screens/componentScreens/ChipScreen.tsx b/demo/src/screens/componentScreens/ChipScreen.tsx index 8fad886506..dab40a8377 100644 --- a/demo/src/screens/componentScreens/ChipScreen.tsx +++ b/demo/src/screens/componentScreens/ChipScreen.tsx @@ -1,17 +1,16 @@ import _ from 'lodash'; import React, {Component} from 'react'; import {Alert} from 'react-native'; -import {Chip, Colors, Spacings, Text, Typography, View, Dialog, WheelPickerDialog} from 'react-native-ui-lib'; +import {Chip, Colors, Spacings, Text, Typography, View, Dialog, WheelPickerDialog, Image} from 'react-native-ui-lib'; const avatarImage = { uri: 'https://randomuser.me/api/portraits/women/24.jpg' }; const checkmark = require('../../assets/icons/check-small.png'); const chevron = require('../../assets/icons/chevronDown.png'); - +const bell = require('../../assets/icons/bell.png'); export default class ChipScreen extends Component { - colors = [ {value: Colors.red10, label: 'Red'}, {value: Colors.blue10, label: 'Blue'}, @@ -31,7 +30,7 @@ export default class ChipScreen extends Component { openDialog = () => { this.toggleDialog(true); - } + }; closeDialog = () => { this.toggleDialog(false); @@ -73,13 +72,7 @@ export default class ChipScreen extends Component { const {showDialog} = this.state; return ( - + {this.renderContent()} ); @@ -104,59 +97,34 @@ export default class ChipScreen extends Component { Default - {this.renderExample( - 'Label', - - )} - {this.renderExample( - 'Label + onPress', - Alert.alert('onPress')}/> - )} - {this.renderExample( - 'Label + onDismiss', + {this.renderExample('Label', )} + {this.renderExample('Label + onPress', Alert.alert('onPress')}/>)} + {this.renderExample('Label + onDismiss', Alert.alert('onDismiss')} onPress={() => Alert.alert('onPress')} dismissIconStyle={{width: 10, height: 10}} - /> - )} - {this.renderExample( - 'Icon', - - )} - {this.renderExample( - 'Left icon', + />)} + {this.renderExample('Icon', + )} + {this.renderExample('Left icon', - )} - {this.renderExample( - 'Right icon + onPress + dynamic label', + />)} + {this.renderExample('Right icon + onPress + dynamic label', - )} - {this.renderExample( - 'Label + Avatar', - - )} - {this.renderExample( - 'Label + Counter', + />)} + {this.renderExample('Label + Avatar', )} + {this.renderExample('Label + Counter', - )} - {this.renderExample( - 'Label + Badge', + />)} + {this.renderExample('Label + Badge', - )} + />)} Custom @@ -234,6 +199,36 @@ export default class ChipScreen extends Component { }} /> + + } + label={'Chip'} + /> + } + leftElement={} + label={'Chip'} + /> + + + + + + } + label={'Chip'} + /> + } + label={'Chip'} + /> + ); } diff --git a/generatedTypes/components/chip/index.d.ts b/generatedTypes/components/chip/index.d.ts index cf7362aaaf..d96632c93c 100644 --- a/generatedTypes/components/chip/index.d.ts +++ b/generatedTypes/components/chip/index.d.ts @@ -76,6 +76,14 @@ export declare type ChipProps = ViewProps & TouchableOpacityProps & { * Right icon's source */ rightIconSource?: ImageSourcePropType; + /** + * Left custom element + */ + leftElement?: JSX.Element; + /** + * Right custom element + */ + rightElement?: JSX.Element; /** * Adds a dismiss button and serves as its callback */ @@ -170,6 +178,14 @@ declare const _default: React.ComponentClass {avatarProps && renderAvatar()} {iconSource && renderIcon('left')} + {leftElement} {label && renderLabel()} + {rightElement} {rightIconSource && renderIcon('right')} {badgeProps && renderBadge()} {onDismiss && renderOnDismiss()}