@momo-kits/avatar 0.0.61-alpha.10 → 0.0.61-alpha.12

package/Avatar.js

@@ -8,30 +8,15 @@ import {
     ValueUtil,
 } from '@momo-kits/core-v2';
 import PropTypes from 'prop-types';
-import React from 'react';
+import React, { useState } from 'react';
 import { StyleSheet, TouchableOpacity, View } from 'react-native';
 
-export const AvatarQuality = {
+const AvatarQuality = {
     low: 'low',
     medium: 'medium',
     high: 'high',
 };
 
-export const AvatarSize = {
-    tiny: 'tiny',
-    small: 'small',
-    medium: 'medium',
-    large: 'large',
-    giant: 'giant',
-};
-
-export const SubIconType = {
-    momo: 'momo',
-    online: 'online',
-    key: 'key',
-    none: 'none',
-};
-
 const styles = StyleSheet.create({
     container: {
         justifyContent: 'center',
@@ -118,8 +103,8 @@ const avatarSize = (size) => {
     switch (size) {
         case 'tiny':
             return {
-                width: 16,
-                height: 16,
+                width: 24,
+                height: 24,
             };
         case 'small': {
             return {
@@ -154,30 +139,32 @@ const shortName = (size) => {
     switch (size) {
         case 'tiny':
             return {
-                fontSize: ScaleSize(8),
+                fontSize: ScaleSize(10),
                 lineHeight: 16,
             };
         case 'small':
             return {
-                fontSize: ScaleSize(14),
-                lineHeight: 20,
+                fontSize: ScaleSize(15),
+                lineHeight: 22,
             };
         case 'medium':
             return {
-                fontSize: ScaleSize(18),
+                fontSize: ScaleSize(15),
                 lineHeight: 22,
             };
         case 'large':
             return {
-                fontSize: ScaleSize(25),
+                fontSize: ScaleSize(15),
+                lineHeight: 22,
             };
         case 'giant':
             return {
-                fontSize: ScaleSize(32),
+                fontSize: ScaleSize(15),
+                lineHeight: 22,
             };
         default:
             return {
-                fontSize: ScaleSize(18),
+                fontSize: ScaleSize(15),
                 lineHeight: 22,
             };
     }
@@ -205,8 +192,9 @@ const Avatar = ({
         borderRadius: iconRadius,
     } = subIconSize(size);
 
-    const imageSource = ValueUtil.getImageSource(source);
-
+    const [imageSource, setImageSource] = useState(
+        ValueUtil.getImageSource(source),
+    );
     const getContactShortName = (name) => {
         if (!name) return '';
         const shortNameList = name.split(' ', 2);
@@ -225,8 +213,7 @@ const Avatar = ({
     };
 
     const isValidImageUrl = (source) => {
-        const validSource = source && source.uri && isUrl(source.uri);
-        return validSource;
+        return source && source.uri && isUrl(source.uri);
     };
 
     const mapAvatarQuality = (url, quality) => {
@@ -243,30 +230,40 @@ const Avatar = ({
         return url;
     };
 
-    const onLoadSourceError = (imageSource) => {
-        if (this.imageSource?.uri !== imageSource?.uri) {
-            this.imageSource = imageSource;
-            this.setState({ hideSource: true, ownUpdate: true });
-        }
+    const onLoadSourceError = (source) => {
+        setImageSource(source);
     };
 
     const renderSubIcon = () => {
         // const subIconSizeStyle = this.mapSubIconSize(size);
         if (subIcon && shape === 'circle' && size !== 'tiny') {
             return (
-                <View style={styles.subIcon}>
-                    <Image
-                        source={subIcon}
-                        style={[
-                            {
-                                width: iconWidth,
-                                height: iconHeight,
-                                borderRadius: iconRadius,
-                                bottom: iconWidth / 2 - 2,
-                                right: iconWidth / 2 - 2,
-                            },
-                        ]}
-                    />
+                <View
+                    style={[
+                        styles.subIcon,
+                        size === 'large' && {
+                            bottom: 2,
+                            right: 2,
+                        },
+                        size === 'giant' && {
+                            bottom: 4,
+                            right: 4,
+                        },
+                    ]}>
+                    {typeof subIcon === 'string' ? (
+                        <Image
+                            source={subIcon}
+                            style={[
+                                {
+                                    width: iconWidth,
+                                    height: iconHeight,
+                                    borderRadius: iconRadius,
+                                },
+                            ]}
+                        />
+                    ) : (
+                        subIcon()
+                    )}
                 </View>
             );
         }
@@ -275,7 +272,18 @@ const Avatar = ({
     const renderTopIcon = () => {
         if (topIcon && shape === 'circle' && size !== 'tiny') {
             return (
-                <View style={styles.topIcon}>
+                <View
+                    style={[
+                        styles.topIcon,
+                        size === 'large' && {
+                            top: 2,
+                            right: 2,
+                        },
+                        size === 'giant' && {
+                            top: 4,
+                            right: 4,
+                        },
+                    ]}>
                     <Image
                         source={topIcon}
                         style={[
@@ -283,8 +291,6 @@ const Avatar = ({
                                 width: iconWidth,
                                 height: iconHeight,
                                 borderRadius: iconRadius,
-                                top: iconWidth / 2 - 2,
-                                right: iconWidth / 2 - 2,
                             },
                         ]}
                     />
@@ -313,7 +319,12 @@ const Avatar = ({
                         styles.shortNameView,
                     ]}>
                     <Text
-                        style={{ fontSize, lineHeight, color: Colors.pink_03 }}>
+                        weight="regular"
+                        style={{
+                            fontSize,
+                            lineHeight,
+                            color: Colors.pink_03,
+                        }}>
                         {shortedName}
                     </Text>
                 </View>
@@ -354,8 +365,8 @@ const Avatar = ({
 
     return (
         <TouchableOpacity
-            activeOpacity={!!onPress ? 0.5 : 1}
-            style={[style]}
+            activeOpacity={onPress ? 0.5 : 1}
+            style={style}
             onPress={onPressIcon}>
             <View
                 style={{
@@ -380,28 +391,18 @@ Avatar.propTypes = {
         PropTypes.number,
         PropTypes.string,
     ]),
-    subIcon: PropTypes.string,
+    subIcon: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
     topIcon: PropTypes.string,
-    subIconSource: PropTypes.oneOfType([
-        PropTypes.shape({ uri: PropTypes.string }),
-        PropTypes.number,
-        PropTypes.string,
-    ]),
+
     style: PropTypes.oneOfType([PropTypes.array, PropTypes.object]),
     onPress: PropTypes.func,
     loading: PropTypes.bool,
-    extraPropsImage: PropTypes.object,
-    custom: PropTypes.bool,
     shape: PropTypes.oneOf(['circle', 'square']),
 };
 
 Avatar.defaultProps = {
-    resizeMode: 'cover',
-    cached: true,
-    scaleSize: false,
     quality: 'medium',
     size: 'small',
-    custom: false,
     shape: 'circle',
     name: '',
 };

package/Avatar.web.js

@@ -2,7 +2,11 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import {
-    View, StyleSheet, TouchableOpacity, Image, Dimensions
+    View,
+    StyleSheet,
+    TouchableOpacity,
+    Image,
+    Dimensions,
 } from 'react-native';
 import { get, isEqual } from 'lodash';
 import ValueUtil from '../../core/utils/ValueUtil';
@@ -10,354 +14,193 @@ import Colors from '../../core/colors';
 import { Icons as IconSource } from '../../core/icons';
 import Text from '../../core/components/typography';
 import { RFValueHorizontal as ScaleSize } from '../../core/components/typography/reponsiveSize';
+import { Radius } from '@momo-kits/core-v2';
 
-export const AvatarQuality = {
+const AvatarQuality = {
     low: 'low',
     medium: 'medium',
     high: 'high',
 };
 
-const COLORS = [
-    '#3683f3',
-    '#ea63af',
-    '#f94889',
-    '#82b6da',
-    '#2fc093',
-    '#7b4a41',
-    '#ff97bc',
-    '#4130d7',
-    '#c3c3c3',
-    '#f7ae2f',
-    '#b04595',
-    '#57b748',
-    '#ff8900',
-    '#7841bf',
-    '#be3f3e',
-    '#c51515',
-    '#8e6472',
-    '#fed27d',
-    '#ff6f5d',
-    '#05b8ae',
-];
-
-export const AvatarSize = {
-    tiny: 'tiny',
-    small: 'small',
-    medium: 'medium',
-    large: 'large',
-    giant: 'giant',
-    size8: 'size8',
-    size24: 'size24',
-    size36: 'size36',
-    size44: 'size44',
-    size48: 'size48',
-    size52: 'size52',
-    size56: 'size56',
-    size64: 'size64',
-    size72: 'size72',
-    size80: 'size80',
-    size88: 'size88',
-    size96: 'size96'
-};
-
-export const SubIconType = {
-    momo: 'momo',
-    online: 'online',
-    key: 'key',
-    none: 'none'
-};
-
 const styles = StyleSheet.create({
     container: {
         justifyContent: 'center',
-        alignItems: 'center'
+        alignItems: 'center',
     },
     shortNameView: {
+        backgroundColor: Colors.pink_09,
         justifyContent: 'center',
         alignItems: 'center',
-
-        backgroundColor: Colors.very_light_pink_four,
-        width: '100%',
-        height: '100%'
+        borderWidth: 1,
+        borderColor: Colors.black_04,
     },
     shortNameText: {
         // fontSize: 17,
-        color: '#f6f6f6'
+        color: Colors.pink_03,
+    },
+    shortNameTextCustom: {
+        color: '#f6f6f6',
     },
     absolute: {
         position: 'absolute',
         top: 0,
         left: 0,
         right: 0,
-        bottom: 0
+        bottom: 0,
     },
     subIcon: {
         position: 'absolute',
         bottom: 0,
-        right: 0
+        right: 0,
+    },
+    topIcon: {
+        position: 'absolute',
+        top: 0,
+        right: 0,
     },
     subIconImage: {
         width: 22,
-        height: 22
+        height: 22,
     },
     subIconImageOnline: {
         backgroundColor: Colors.kiwi_green,
         borderColor: 'white',
-        borderWidth: 1
-    }
-});
-
-const subIconSize = (width) => ({
-    tiny: {
-        width: 8,
-        height: 8,
-        borderRadius: 4
-    },
-    small: {
-        width: 10,
-        height: 10,
-        borderRadius: 5
-    },
-    medium: {
-        width: 12,
-        height: 12,
-        borderRadius: 6
-    },
-    large: {
-        width: 16,
-        height: 16,
-        borderRadius: 8
+        borderWidth: 1,
     },
-    size8: {
-        width: 8,
-        height: 8,
-        borderRadius: 4
-    },
-    size24: {
-        width: 10,
-        height: 10,
-        borderRadius: 5
-    },
-    size36: {
-        width: 10,
-        height: 10,
-        borderRadius: 5
-    },
-    size44: {
-        width: 14,
-        height: 14,
-        borderRadius: 7
-    },
-    size48: {
-        width: 14,
-        height: 14,
-        borderRadius: 7
-    },
-    size52: {
-        width: 16,
-        height: 16,
-        borderRadius: 8
-    },
-    size56: {
-        width: 16,
-        height: 16,
-        borderRadius: 8
-    },
-    size64: {
-        width: 16,
-        height: 16,
-        borderRadius: 8,
-        top: -2,
-        left: -2,
-    },
-    size72: {
-        width: 18,
-        height: 18,
-        borderRadius: 9,
-        top: -3,
-        left: -3,
-    },
-    size80: {
-        width: 18,
-        height: 18,
-        borderRadius: 9,
-        top: -3,
-        left: -3,
-    },
-    size88: {
-        width: 18,
-        height: 18,
-        borderRadius: 9,
-        top: -4,
-        left: -4,
-    },
-    size96: {
-        width: 20,
-        height: 20,
-        borderRadius: 10,
-        top: -4,
-        left: -4,
-    },
-    giant: {
-        top: -5,
-        left: -5,
-        width: 24,
-        height: 24,
-        borderRadius: 12
-    }
 });
 
-const avatarSize = (width) => ({
-    tiny: {
-        width: 16,
-        height: 16,
-        borderRadius: 8
-    },
-    small: {
-        width: 32,
-        height: 32,
-        borderRadius: 16
-    },
-    medium: {
-        width: 40,
-        height: 40,
-        borderRadius: 20
-    },
-    large: {
-        width: 60,
-        height: 60,
-        borderRadius: 30
-    },
-    giant: {
-        width: 120,
-        height: 120,
-        borderRadius: 60
-    },
-    size8: {
-        width: 8,
-        height: 8,
-        borderRadius: 4
-    },
-    size24: {
-        width: 24,
-        height: 24,
-        borderRadius: 12
-    },
-    size36: {
-        width: 36,
-        height: 36,
-        borderRadius: 18
-    },
-    size44: {
-        width: 44,
-        height: 44,
-        borderRadius: 22
-    },
-    size48: {
-        width: 48,
-        height: 48,
-        borderRadius: 24
-    },
-    size52: {
-        width: 52,
-        height: 52,
-        borderRadius: 26
-    },
-    size56: {
-        width: 56,
-        height: 56,
-        borderRadius: 28
-    },
-    size64: {
-        width: 64,
-        height: 64,
-        borderRadius: 32
-    },
-    size72: {
-        width: 72,
-        height: 72,
-        borderRadius: 36
-    },
-    size80: {
-        width: 80,
-        height: 80,
-        borderRadius: 40
-    },
-    size88: {
-        width: 88,
-        height: 88,
-        borderRadius: 44
-    },
-    size96: {
-        width: 96,
-        height: 96,
-        borderRadius: 48
-    }
-});
-
-const shortName = (width) => ({
-    tiny: {
-        fontSize: ScaleSize(5, width)
-    },
-    small: {
-        fontSize: ScaleSize(11, width)
-    },
-    medium: {
-        fontSize: ScaleSize(15, width)
-    },
-    large: {
-        fontSize: ScaleSize(20, width)
-    },
-    giant: {
-        fontSize: ScaleSize(25, width)
-    }
-});
-
-export default class Avatar extends Component {
-    constructor(props) {
-        super(props);
-        this.color = this.getAvatarColor(props.name);
-        this.state = {
-            hideSource: false,
-            ownUpdate: false,
-            source: props.source,
-            dimensions: {}
-        };
-    }
-
-    componentDidMount() {
-        const { scaleSize } = this.props;
-        if (scaleSize) {
-            this.subscription = Dimensions.addEventListener(
-                'change',
-                ({ window }) => {
-                    if(window?.height > 0 && window?.width > 0) {
-                        this.setState({ dimensions: window });
-                    }
-                }
-            );
-        }
+const subIconSize = (size) => {
+    switch (size) {
+        case 'giant':
+            return {
+                width: 12,
+                height: 12,
+                borderRadius: 6,
+            };
+        case 'small':
+            return {
+                width: 8,
+                height: 8,
+                borderRadius: 4,
+            };
+        case 'medium':
+            return {
+                width: 12,
+                height: 12,
+                borderRadius: 6,
+            };
+        case 'large':
+            return {
+                width: 12,
+                height: 12,
+                borderRadius: 6,
+            };
+        default:
+            return {
+                width: 12,
+                height: 12,
+                borderRadius: 6,
+            };
     }
+};
 
-    componentWillUnmount() {
-        const { scaleSize } = this.props;
-        if (scaleSize) {
-            this.subscription?.remove?.();
+const avatarSize = (size) => {
+    switch (size) {
+        case 'tiny':
+            return {
+                width: 24,
+                height: 24,
+            };
+        case 'small': {
+            return {
+                width: 32,
+                height: 32,
+            };
         }
+        case 'medium':
+            return {
+                width: 40,
+                height: 40,
+            };
+        case 'large':
+            return {
+                width: 56,
+                height: 56,
+            };
+        case 'giant':
+            return {
+                width: 72,
+                height: 72,
+            };
+        default:
+            return {
+                width: 40,
+                height: 40,
+            };
     }
+};
 
-    static getDerivedStateFromProps(nextProps, prevState) {
-        if (prevState.ownUpdate) {
+const shortName = (size) => {
+    switch (size) {
+        case 'tiny':
             return {
-                ownUpdate: false,
+                fontSize: ScaleSize(10),
+                lineHeight: 16,
+            };
+        case 'small':
+            return {
+                fontSize: ScaleSize(15),
+                lineHeight: 22,
+            };
+        case 'medium':
+            return {
+                fontSize: ScaleSize(15),
+                lineHeight: 22,
+            };
+        case 'large':
+            return {
+                fontSize: ScaleSize(15),
+                lineHeight: 22,
+            };
+        case 'giant':
+            return {
+                fontSize: ScaleSize(15),
+                lineHeight: 22,
+            };
+        default:
+            return {
+                fontSize: ScaleSize(15),
+                lineHeight: 22,
             };
-        } if (!isEqual(nextProps.source, prevState.source)) {
-            return { source: nextProps.source, hideSource: false };
-        }
-        return null;
     }
+};
 
-    getContactShortName = (name) => {
+const Avatar = ({
+    resizeMode,
+    cached,
+    quality,
+    size,
+    shape,
+    name,
+    source,
+    onPress,
+    style,
+    subIcon,
+    topIcon,
+    loading,
+}) => {
+    const { width, height } = avatarSize(size);
+    const { fontSize, lineHeight } = shortName(size);
+    const {
+        width: iconWidth,
+        height: iconHeight,
+        borderRadius: iconRadius,
+    } = subIconSize(size);
+
+    const [imageSource, setImageSource] = useState(
+        ValueUtil.getImageSource(source),
+    );
+    const getContactShortName = (name) => {
         if (!name) return '';
         const shortNameList = name.split(' ', 2);
         const alphabet = [];
@@ -367,32 +210,18 @@ export default class Avatar extends Component {
             }
         });
         return alphabet.join('');
-    }
-
-    renderShortName = (name, avatarStyle, size) => {
-        if (name) {
-            const shortedName = this.getContactShortName(name);
-            const shortNameStyle = this.mapShortNameStyle(size);
-            return (
-                <View style={[styles.shortNameView, avatarStyle]}>
-                    <Text.H4 style={[styles.shortNameText, shortNameStyle]}>{shortedName}</Text.H4>
-                </View>
-            );
-        }
-        return <View />;
-    }
-
-    isUrl(url) {
-        const expression = /(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-/]))?/gi;
+    };
+    const isUrl = (url) => {
+        const expression =
+            /(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-/]))?/gi;
         return expression.test(url);
-    }
+    };
 
-    isValidImageUrl = (source) => {
-        const validSource = source && source.uri && this.isUrl(source.uri);
-        return validSource;
-    }
+    const isValidImageUrl = (source) => {
+        return source && source.uri && isUrl(source.uri);
+    };
 
-    mapAvatarQuality = (url, quality) => {
+    const mapAvatarQuality = (url, quality) => {
         if (!quality || quality === AvatarQuality.medium) {
             return url;
         }
@@ -404,185 +233,181 @@ export default class Avatar extends Component {
         }
 
         return url;
-    }
-
-    mapStyleFromSize = (size) => {
-        const { dimensions } = this.state;
-        const avatarStyle = avatarSize(dimensions?.width || null).small;
-        if (typeof size === 'object') return size;
-        if (avatarSize(dimensions?.width || null)[size]) return avatarSize(dimensions?.width || null)[size];
-        return avatarStyle;
-    }
-
-    mapShortNameStyle = (size) => {
-        let shortNameStyle = {};
-        const { dimensions } = this.state;
-        switch (size) {
-            case AvatarSize.tiny: {
-                shortNameStyle = shortName(dimensions?.width || null).tiny;
-                break;
-            }
-            case AvatarSize.small: {
-                shortNameStyle = shortName(dimensions?.width || null).small;
-                break;
-            }
-            case AvatarSize.medium: {
-                shortNameStyle = shortName(dimensions?.width || null).medium;
-                break;
-            }
-            case AvatarSize.large: {
-                shortNameStyle = shortName(dimensions?.width || null).large;
-                break;
-            }
-            case AvatarSize.giant: {
-                shortNameStyle = shortName(dimensions?.width || null).giant;
-                break;
-            }
-            default:
-                shortNameStyle = shortName(dimensions?.width || null).small;
-        }
-        return shortNameStyle;
-    }
-
-    mapSubIconSize = (size) => {
-        const { dimensions } = this.state;
-        const subIconStyle = subIconSize(dimensions?.width || null).small;
-        if (subIconSize(dimensions?.width || null)[size]) return subIconSize(dimensions?.width || null)[size];
-        return subIconStyle;
-    }
-
-    extractSize = (avatarStyle) => {
-        const { style } = this.props;
-        const borderWidth = get(style, 'borderWidth', 1);
-        const containerWidth = Math.round(avatarStyle.width + 2 + borderWidth);
-        return {
-            width: containerWidth,
-            height: containerWidth,
-            borderRadius: containerWidth / 2,
-            borderWidth,
-            borderColor: Colors.black_01
-        };
-    }
-
-    getAvatarColor(name) {
-        const shortName = this.getContactShortName(name)
-        if (!shortName) return "#d5d6d6"
-        const firstLetter = shortName[0].charCodeAt(0)
-        let colorIndex = Number(firstLetter) % 26
-        if (colorIndex > 19) colorIndex = 25 - colorIndex
-        return COLORS[colorIndex]
-    }
+    };
 
+    const onLoadSourceError = (source) => {
+        setImageSource(source);
+    };
 
-    onLoadSourceError = () => {
-        this.setState({ hideSource: true, ownUpdate: true });
-    }
-
-    renderSubIcon = () => {
-        const { subIcon, size, subIconSource } = this.props;
-        if ((!subIcon || subIcon === SubIconType.none) && !subIconSource) return <View />;
-        const subIconSizeStyle = this.mapSubIconSize(size);
-        const iconSource = ValueUtil.getImageSource(subIconSource);
-        return (
-            <View style={styles.subIcon}>
-                {subIcon === SubIconType.momo
-                    ? (
+    const renderSubIcon = () => {
+        // const subIconSizeStyle = this.mapSubIconSize(size);
+        if (subIcon && shape === 'circle' && size !== 'tiny') {
+            return (
+                <View
+                    style={[
+                        styles.subIcon,
+                        size === 'large' && {
+                            bottom: 2,
+                            right: 2,
+                        },
+                        size === 'giant' && {
+                            bottom: 4,
+                            right: 4,
+                        },
+                    ]}>
+                    {typeof subIcon === 'string' ? (
                         <Image
-                            style={[styles.subIconImage, subIconSizeStyle]}
-                            source={IconSource.ic_round_momo_tiny}
+                            source={subIcon}
+                            style={[
+                                {
+                                    width: iconWidth,
+                                    height: iconHeight,
+                                    borderRadius: iconRadius,
+                                },
+                            ]}
                         />
-                    )
-                    : <View />}
-                {subIcon === SubIconType.online
-                    ? <View style={[styles.subIconImageOnline, subIconSizeStyle]} /> : <View />}
+                    ) : (
+                        subIcon()
+                    )}
+                </View>
+            );
+        }
+    };
 
-                {iconSource && subIconSource && !subIcon ? (
+    const renderTopIcon = () => {
+        if (topIcon && shape === 'circle' && size !== 'tiny') {
+            return (
+                <View
+                    style={[
+                        styles.topIcon,
+                        size === 'large' && {
+                            top: 2,
+                            right: 2,
+                        },
+                        size === 'giant' && {
+                            top: 4,
+                            right: 4,
+                        },
+                    ]}>
                     <Image
-                        style={[styles.subIconImage, subIconSizeStyle]}
-                        source={iconSource}
+                        source={topIcon}
+                        style={[
+                            {
+                                width: iconWidth,
+                                height: iconHeight,
+                                borderRadius: iconRadius,
+                            },
+                        ]}
                     />
-                )
-                    : <View />}
-            </View>
-        );
-    }
+                </View>
+            );
+        }
+    };
 
-    onPress = () => {
-        const { onPress } = this.props;
+    const onPressIcon = () => {
         if (onPress && typeof onPress === 'function') onPress();
-    }
-
-    render() {
-        const {
-            size, source, name, resizeMode, style, onPress, isShowLoading, loading, cached, extraPropsImage, quality
-        } = this.props;
-        const { hideSource } = this.state;
-        const avatarStyle = this.mapStyleFromSize(size);
-        const containerSize = this.extractSize(avatarStyle);
-        const imageSource = ValueUtil.getImageSource(source);
-        const showName = typeof imageSource === 'object' && Object.keys(imageSource).length === 0 && typeof imageSource !== 'number';
-        // add priority high for avatar
-        if (imageSource?.uri) {
-            imageSource.priority = 'high';
-            imageSource.uri = this.mapAvatarQuality(imageSource.uri, quality);
-            // if doest not have time query, set default cache time to 1 day
-            if (!imageSource.uri?.includes('?') && cached) {
-                const midnight = new Date().setHours(0, 0, 0, 0);
-                imageSource.uri = `${imageSource.uri}?time=${midnight}`;
-            }
-        }
+    };
 
-        const inner = (
-            <View style={[styles.container, containerSize, style]}>
-                {(showName || hideSource) ? this.renderShortName(name, avatarStyle, size) : <View />}
-                {this.isValidImageUrl(imageSource) && !hideSource
-                    ? (
-                        <Image
-                            cached={cached}
-                            loading={loading || isShowLoading}
-                            source={imageSource}
-                            onError={this.onLoadSourceError}
-                            style={avatarStyle}
-                            resizeMode={resizeMode}
-                            {...extraPropsImage}
-                        />
-                    ) : <View />}
-                {this.renderSubIcon()}
-            </View>
-        );
-        if (onPress) {
+    const renderShortName = () => {
+        if (name) {
+            const shortedName = getContactShortName(name);
+            // const shortNameStyle = mapShortNameStyle(size);
             return (
-                <TouchableOpacity activeOpacity={onPress ? 0.5 : 1} onPress={this.onPress}>
-                    {inner}
-                </TouchableOpacity>
+                <View
+                    style={[
+                        {
+                            width,
+                            height,
+                            borderRadius:
+                                shape === 'circle' ? width / 2 : Radius.XS,
+                        },
+                        styles.shortNameView,
+                    ]}>
+                    <Text
+                        weight="regular"
+                        style={{
+                            fontSize,
+                            lineHeight,
+                            color: Colors.pink_03,
+                        }}>
+                        {shortedName}
+                    </Text>
+                </View>
             );
         }
-        return inner;
+        return <View />;
+    };
+
+    if (imageSource?.uri) {
+        imageSource.priority = 'high';
+        imageSource.uri = mapAvatarQuality(imageSource.uri, quality);
+        // if doest not have time query, set default cache time to 1 day
+        if (!imageSource.uri?.includes('?') && cached) {
+            const midnight = new Date().setHours(0, 0, 0, 0);
+            imageSource.uri = `${imageSource.uri}?time=${midnight}`;
+        }
     }
-}
+
+    const renderImage = () => {
+        return (
+            <Image
+                cached={cached}
+                resizeMode={resizeMode}
+                onLoadSourceError={() => onLoadSourceError(source)}
+                source={source}
+                loading={loading}
+                style={[
+                    {
+                        width,
+                        height,
+                        borderRadius:
+                            shape === 'circle' ? width / 2 : Radius.XS,
+                    },
+                ]}
+            />
+        );
+    };
+
+    return (
+        <TouchableOpacity
+            activeOpacity={onPress ? 0.5 : 1}
+            style={style}
+            onPress={onPressIcon}>
+            <View
+                style={{
+                    alignSelf: 'baseline',
+                }}>
+                {!!imageSource && isValidImageUrl(imageSource)
+                    ? renderImage()
+                    : renderShortName()}
+                {renderTopIcon()}
+                {renderSubIcon()}
+            </View>
+        </TouchableOpacity>
+    );
+};
 
 Avatar.propTypes = {
     name: PropTypes.string,
-    resizeMode: PropTypes.string,
     quality: PropTypes.oneOf(['low', 'medium', 'high']),
-    size: PropTypes.oneOf(['tiny', 'small', 'medium', 'large', 'giant', 'size8', 'size24', 'size36', 'size44', 'size48', 'size52', 'size56', 'size64', 'size72', 'size80', 'size88', 'size96',
-        PropTypes.shape({
-            width: PropTypes.number, height: PropTypes.number, borderRadius: PropTypes.number
-        })]),
-    source: PropTypes.oneOfType([PropTypes.shape({ uri: PropTypes.string }), PropTypes.number, PropTypes.string]),
-    subIcon: PropTypes.oneOf(['momo', 'online', 'key', 'none']),
-    subIconSource: PropTypes.oneOfType([PropTypes.shape({ uri: PropTypes.string }), PropTypes.number, PropTypes.string]),
+    size: PropTypes.oneOf(['tiny', 'small', 'medium', 'large', 'giant']),
+    source: PropTypes.oneOfType([
+        PropTypes.shape({ uri: PropTypes.string }),
+        PropTypes.number,
+        PropTypes.string,
+    ]),
+    subIcon: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
+    topIcon: PropTypes.string,
+
     style: PropTypes.oneOfType([PropTypes.array, PropTypes.object]),
     onPress: PropTypes.func,
     loading: PropTypes.bool,
-    cached: PropTypes.bool,
-    scaleSize: PropTypes.bool,
-    extraPropsImage: PropTypes.object
+    shape: PropTypes.oneOf(['circle', 'square']),
 };
 
 Avatar.defaultProps = {
-    resizeMode: 'cover',
-    cached: true,
-    scaleSize: false,
     quality: 'medium',
+    size: 'small',
+    shape: 'circle',
+    name: '',
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/avatar",
-    "version": "0.0.61-alpha.10",
+    "version": "0.0.61-alpha.12",
     "private": false,
     "main": "index.js",
     "dependencies": {},