@momo-kits/avatar 0.0.61-beta.9 → 0.0.62-alpha.2

package/Avatar.js

@@ -1,22 +1,15 @@
 /* eslint-disable indent */
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import {
-    View,
-    StyleSheet,
-    TouchableOpacity,
-    Dimensions,
-    Platform,
-} from 'react-native';
-import { get, isEqual } from 'lodash';
 import {
-    ValueUtil,
     Colors,
-    Text,
-    IconSource,
     Image,
+    Radius,
     ScaleSize,
-} from '@momo-kits/core';
+    Text,
+    ValueUtil,
+} from '@momo-kits/core-v2';
+import PropTypes from 'prop-types';
+import React from 'react';
+import { StyleSheet, TouchableOpacity, View } from 'react-native';
 
 export const AvatarQuality = {
     low: 'low',
@@ -30,43 +23,8 @@ export const AvatarSize = {
     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',
 };
 
-const COLORS = [
-    '#3683f3',
-    '#ea63af',
-    '#f94889',
-    '#82b6da',
-    '#2fc093',
-    '#7b4a41',
-    '#ff97bc',
-    '#4130d7',
-    '#c3c3c3',
-    '#f7ae2f',
-    '#b04595',
-    '#57b748',
-    '#ff8900',
-    '#7841bf',
-    '#be3f3e',
-    '#c51515',
-    '#8e6472',
-    '#fed27d',
-    '#ff6f5d',
-    '#05b8ae',
-];
-
 export const SubIconType = {
     momo: 'momo',
     online: 'online',
@@ -80,12 +38,11 @@ const styles = StyleSheet.create({
         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,
@@ -106,6 +63,11 @@ const styles = StyleSheet.create({
         bottom: 0,
         right: 0,
     },
+    topIcon: {
+        position: 'absolute',
+        top: 0,
+        right: 0,
+    },
     subIconImage: {
         width: 22,
         height: 22,
@@ -117,268 +79,137 @@ const styles = StyleSheet.create({
     },
 });
 
-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,
-    },
-    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),
-    },
-    middle: {
-        fontSize: ScaleSize(16, width),
-    },
-    large: {
-        fontSize: ScaleSize(20, width),
-    },
-    giant: {
-        fontSize: ScaleSize(25, width),
-    },
-});
-
-export default class Avatar extends Component {
-    constructor(props) {
-        super(props);
-        this.color = props.custom
-            ? this.getAvatarColor(props.name)
-            : Colors.pink_10;
-        this.state = {
-            hideSource: false,
-            ownUpdate: false,
-            source: props.source,
-            dimensions: {},
-        };
-        this.imageSource = '';
-    }
-
-    componentDidMount() {
-        const { scaleSize } = this.props;
-        if (scaleSize) {
-            this.subscription = Dimensions.addEventListener(
-                'change',
-                ({ window }) => {
-                    if (
-                        window?.height > 0 &&
-                        window?.width > 0 &&
-                        Platform.OS === 'android'
-                    ) {
-                        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: 16,
+                height: 16,
+            };
+        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(8),
+                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 = ValueUtil.getImageSource(source);
+
+    const getContactShortName = (name) => {
         if (!name) return '';
         const shortNameList = name.split(' ', 2);
         const alphabet = [];
@@ -389,57 +220,18 @@ export default class Avatar extends Component {
         });
         return alphabet.join('');
     };
-
-    hashUrl(url) {
-        let hash = 0;
-        let char;
-        if (url?.length === 0) return hash;
-        for (let i = 0; i < url?.length; i++) {
-            char = url?.charCodeAt(i);
-            hash = (hash << 5) - hash + char;
-            hash &= hash; // Convert to 32bit integer
-        }
-        return hash;
-    }
-
-    renderShortName = (name, avatarStyle, size, color) => {
-        if (name) {
-            const shortedName = this.getContactShortName(name);
-            const shortNameStyle = this.mapShortNameStyle(size);
-            return (
-                <View
-                    style={[
-                        styles.shortNameView,
-                        avatarStyle,
-                        { backgroundColor: color },
-                    ]}>
-                    <Text.H4
-                        style={[
-                            this.props.custom
-                                ? styles.shortNameTextCustom
-                                : styles.shortNameText,
-                            shortNameStyle,
-                        ]}>
-                        {shortedName}
-                    </Text.H4>
-                </View>
-            );
-        }
-        return <View />;
-    };
-
-    isUrl(url) {
+    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);
+    const isValidImageUrl = (source) => {
+        const validSource = source && source.uri && isUrl(source.uri);
         return validSource;
     };
 
-    mapAvatarQuality = (url, quality) => {
+    const mapAvatarQuality = (url, quality) => {
         if (!quality || quality === AvatarQuality.medium) {
             return url;
         }
@@ -453,227 +245,150 @@ export default class Avatar extends Component {
         return url;
     };
 
-    mapStyleFromSize = (size) => {
-        const { dimensions } = this.state;
-        const avatarStyle = avatarSize(
-            dimensions?.width > 0 ? dimensions?.width : null,
-        ).small;
-        if (typeof size === 'object') return size;
-        if (avatarSize(dimensions?.width > 0 ? dimensions?.width : null)[size])
-            return avatarSize(dimensions?.width > 0 ? dimensions?.width : null)[
-                size
-            ];
-        return avatarStyle;
-    };
-
-    mapShortNameStyle = (size) => {
-        let shortNameStyle = {};
-        const { dimensions } = this.state;
-        switch (size) {
-            case AvatarSize.tiny: {
-                shortNameStyle = shortName(
-                    dimensions?.width > 0 ? dimensions?.width : null,
-                ).tiny;
-                break;
-            }
-            case AvatarSize.small: {
-                shortNameStyle = shortName(
-                    dimensions?.width > 0 ? dimensions?.width : null,
-                ).small;
-                break;
-            }
-            case AvatarSize.medium: {
-                shortNameStyle = shortName(
-                    dimensions?.width > 0 ? dimensions?.width : null,
-                ).medium;
-                break;
-            }
-            case AvatarSize.size48: {
-                shortNameStyle = shortName(dimensions?.width || null).middle;
-                break;
-            }
-            case AvatarSize.large: {
-                shortNameStyle = shortName(
-                    dimensions?.width > 0 ? dimensions?.width : null,
-                ).large;
-                break;
-            }
-            case AvatarSize.giant: {
-                shortNameStyle = shortName(
-                    dimensions?.width > 0 ? dimensions?.width : null,
-                ).giant;
-                break;
-            }
-            default:
-                shortNameStyle = shortName(
-                    dimensions?.width > 0 ? dimensions?.width : null,
-                ).small;
-        }
-        return shortNameStyle;
-    };
-
-    mapSubIconSize = (size) => {
-        const { dimensions } = this.state;
-        const subIconStyle = subIconSize(
-            dimensions?.width > 0 ? dimensions?.width : null,
-        ).small;
-        if (subIconSize(dimensions?.width > 0 ? dimensions?.width : null)[size])
-            return subIconSize(
-                dimensions?.width > 0 ? 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,
-        };
-    };
-
-    onLoadSourceError = (imageSource) => {
+    const onLoadSourceError = (imageSource) => {
         if (this.imageSource?.uri !== imageSource?.uri) {
             this.imageSource = imageSource;
             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}>
                     <Image
-                        style={[styles.subIconImage, subIconSizeStyle]}
-                        source={IconSource.ic_round_momo_tiny}
-                    />
-                ) : (
-                    <View />
-                )}
-                {subIcon === SubIconType.online ? (
-                    <View
-                        style={[styles.subIconImageOnline, subIconSizeStyle]}
+                        source={subIcon}
+                        style={[
+                            {
+                                width: iconWidth,
+                                height: iconHeight,
+                                borderRadius: iconRadius,
+                                bottom: iconWidth / 2 - 2,
+                                right: iconWidth / 2 - 2,
+                            },
+                        ]}
                     />
-                ) : (
-                    <View />
-                )}
+                </View>
+            );
+        }
+    };
 
-                {iconSource && subIconSource && !subIcon ? (
+    const renderTopIcon = () => {
+        if (topIcon && shape === 'circle' && size !== 'tiny') {
+            return (
+                <View style={styles.topIcon}>
                     <Image
-                        style={[styles.subIconImage, subIconSizeStyle]}
-                        source={iconSource}
+                        source={topIcon}
+                        style={[
+                            {
+                                width: iconWidth,
+                                height: iconHeight,
+                                borderRadius: iconRadius,
+                                top: iconWidth / 2 - 2,
+                                right: iconWidth / 2 - 2,
+                            },
+                        ]}
                     />
-                ) : (
-                    <View />
-                )}
-            </View>
-        );
+                </View>
+            );
+        }
     };
 
-    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];
-    }
-
-    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, this.color)
-                ) : (
-                    <View />
-                )}
-                {this.isValidImageUrl(imageSource) && !hideSource ? (
-                    <Image
-                        cached={cached}
-                        loading={loading || isShowLoading}
-                        source={imageSource}
-                        onError={() => this.onLoadSourceError(imageSource)}
-                        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.any,
+    size: PropTypes.oneOf(['tiny', 'small', 'medium', 'large', 'giant']),
     source: PropTypes.oneOfType([
         PropTypes.shape({ uri: PropTypes.string }),
         PropTypes.number,
         PropTypes.string,
     ]),
-    subIcon: PropTypes.oneOf(['momo', 'online', 'key', 'none']),
+    subIcon: PropTypes.string,
+    topIcon: PropTypes.string,
     subIconSource: PropTypes.oneOfType([
         PropTypes.shape({ uri: PropTypes.string }),
         PropTypes.number,
@@ -682,11 +397,8 @@ Avatar.propTypes = {
     style: PropTypes.oneOfType([PropTypes.array, PropTypes.object]),
     onPress: PropTypes.func,
     loading: PropTypes.bool,
-    cached: PropTypes.bool,
-    scaleSize: PropTypes.bool,
     extraPropsImage: PropTypes.object,
-    number: PropTypes.string,
-    custom: PropTypes.bool,
+    shape: PropTypes.oneOf(['circle', 'square']),
 };
 
 Avatar.defaultProps = {
@@ -695,5 +407,8 @@ Avatar.defaultProps = {
     scaleSize: false,
     quality: 'medium',
     size: 'small',
-    custom: false,
+    shape: 'circle',
+    name: '',
 };
+
+export default Avatar;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/avatar",
-    "version": "0.0.61-beta.9",
+    "version": "0.0.62-alpha.2",
     "private": false,
     "main": "index.js",
     "dependencies": {},
@@ -8,7 +8,7 @@
         "react-native": ">=0.55",
         "prop-types": "^15.7.2",
         "react": "16.9.0",
-        "@momo-kits/core": ">=0.0.5-beta",
+        "@momo-kits/core-v2": ">=0.0.5-beta",
         "lodash": "^4.17.15"
     },
     "devDependencies": {},