@momo-kits/avatar 0.0.2-beta → 0.0.4

package/Avatar.js

@@ -2,13 +2,19 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import {
-    View, StyleSheet, TouchableOpacity
+    View, StyleSheet, TouchableOpacity, Dimensions
 } from 'react-native';
 import { get, isEqual } from 'lodash';
 import {
- ValueUtil, Colors, Text, IconSource, Image
+ ValueUtil, Colors, Text, IconSource, Image, ScaleSize
 } from '@momo-kits/core';
 
+export const AvatarQuality = {
+    low: 'low',
+    medium: 'medium',
+    high: 'high',
+};
+
 export const AvatarSize = {
     tiny: 'tiny',
     small: 'small',
@@ -76,7 +82,7 @@ const styles = StyleSheet.create({
     }
 });
 
-const subIconSize = StyleSheet.create({
+const subIconSize = (width) => ({
     tiny: {
         width: 8,
         height: 8,
@@ -176,7 +182,7 @@ const subIconSize = StyleSheet.create({
     }
 });
 
-const avatarSize = StyleSheet.create({
+const avatarSize = (width) => ({
     tiny: {
         width: 16,
         height: 16,
@@ -264,21 +270,21 @@ const avatarSize = StyleSheet.create({
     }
 });
 
-const shortName = StyleSheet.create({
+const shortName = (width) => ({
     tiny: {
-        fontSize: 5
+        fontSize: ScaleSize(5, width)
     },
     small: {
-        fontSize: 11
+        fontSize: ScaleSize(11, width)
     },
     medium: {
-        fontSize: 15
+        fontSize: ScaleSize(15, width)
     },
     large: {
-        fontSize: 20
+        fontSize: ScaleSize(20, width)
     },
     giant: {
-        fontSize: 25
+        fontSize: ScaleSize(25, width)
     }
 });
 
@@ -288,8 +294,31 @@ export default class Avatar extends Component {
         this.state = {
             hideSource: false,
             ownUpdate: false,
-            source: props.source
+            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) {
+                        this.setState({ dimensions: window });
+                    }
+                }
+            );
+        }
+    }
+
+    componentWillUnmount() {
+        const { scaleSize } = this.props;
+        if (scaleSize) {
+            this.subscription?.remove?.();
+        }
     }
 
     static getDerivedStateFromProps(nextProps, prevState) {
@@ -334,49 +363,66 @@ export default class Avatar extends Component {
     }
 
     isValidImageUrl = (source) => {
-        const validSource = source && (((source.uri && this.isUrl(source.uri)) || (typeof source === 'number')));
+        const validSource = source && source.uri && this.isUrl(source.uri);
         return validSource;
     }
 
+    mapAvatarQuality = (url, quality) => {
+        if (!quality || quality === AvatarQuality.medium) {
+            return url;
+        }
+        if (quality === AvatarQuality.low) {
+            return url.replace('.png', '_s64.png');
+        }
+        if (quality === AvatarQuality.high) {
+            return url.replace('.png', '_s512.png');
+        }
+
+        return url;
+    }
+
     mapStyleFromSize = (size) => {
-        const avatarStyle = avatarSize.small;
+        const { dimensions } = this.state;
+        const avatarStyle = avatarSize(dimensions?.width > 0 ? dimensions?.width : null).small;
         if (typeof size === 'object') return size;
-        if (avatarSize[size]) return avatarSize[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.tiny;
+                shortNameStyle = shortName(dimensions?.width > 0 ? dimensions?.width : null).tiny;
                 break;
             }
             case AvatarSize.small: {
-                shortNameStyle = shortName.small;
+                shortNameStyle = shortName(dimensions?.width > 0 ? dimensions?.width : null).small;
                 break;
             }
             case AvatarSize.medium: {
-                shortNameStyle = shortName.medium;
+                shortNameStyle = shortName(dimensions?.width > 0 ? dimensions?.width : null).medium;
                 break;
             }
             case AvatarSize.large: {
-                shortNameStyle = shortName.large;
+                shortNameStyle = shortName(dimensions?.width > 0 ? dimensions?.width : null).large;
                 break;
             }
             case AvatarSize.giant: {
-                shortNameStyle = shortName.giant;
+                shortNameStyle = shortName(dimensions?.width > 0 ? dimensions?.width : null).giant;
                 break;
             }
             default:
-                shortNameStyle = shortName.small;
+                shortNameStyle = shortName(dimensions?.width > 0 ? dimensions?.width : null).small;
         }
         return shortNameStyle;
     }
 
     mapSubIconSize = (size) => {
-        const subIconStyle = subIconSize.small;
-        if (subIconSize[size]) return subIconSize[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;
     }
 
@@ -393,8 +439,11 @@ export default class Avatar extends Component {
         };
     }
 
-    onLoadSourceError = () => {
-        this.setState({ hideSource: true, ownUpdate: true });
+    onLoadSourceError = (imageSource) => {
+        if(this.imageSource?.uri !== imageSource?.uri){
+            this.imageSource = imageSource;
+            this.setState({ hideSource: true, ownUpdate: true });
+        }
     }
 
     renderSubIcon = () => {
@@ -433,13 +482,24 @@ export default class Avatar extends Component {
 
     render() {
         const {
-            size, source, name, resizeMode, style, onPress, isShowLoading, loading, cached, extraPropsImage
+            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 />}
@@ -449,7 +509,7 @@ export default class Avatar extends Component {
                             cached={cached}
                             loading={loading || isShowLoading}
                             source={imageSource}
-                            onError={this.onLoadSourceError}
+                            onError={() => this.onLoadSourceError(imageSource)}
                             style={avatarStyle}
                             resizeMode={resizeMode}
                             {...extraPropsImage}
@@ -472,6 +532,7 @@ export default class Avatar extends Component {
 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
@@ -483,10 +544,13 @@ Avatar.propTypes = {
     onPress: PropTypes.func,
     loading: PropTypes.bool,
     cached: PropTypes.bool,
+    scaleSize: PropTypes.bool,
     extraPropsImage: PropTypes.object
 };
 
 Avatar.defaultProps = {
     resizeMode: 'cover',
-    cached: true
+    cached: true,
+    scaleSize: false,
+    quality: 'medium',
 };

package/Avatar.web.js

@@ -2,14 +2,20 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import {
-    View, StyleSheet, TouchableOpacity, Image
+    View, StyleSheet, TouchableOpacity, Image, Dimensions
 } from 'react-native';
 import { get, isEqual } from 'lodash';
-import ValueUtils from '../../utils/ValueUtil';
-import Colors from '../../colors';
-import { Icons } from '../../icons';
-import Text from '../typography';
-import { ColorCore } from '../../colors/colorCore';
+import ValueUtil from '../../core/utils/ValueUtil';
+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';
+
+export const AvatarQuality = {
+    low: 'low',
+    medium: 'medium',
+    high: 'high',
+};
 
 export const AvatarSize = {
     tiny: 'tiny',
@@ -78,7 +84,7 @@ const styles = StyleSheet.create({
     }
 });
 
-const subIconSize = StyleSheet.create({
+const subIconSize = (width) => ({
     tiny: {
         width: 8,
         height: 8,
@@ -178,7 +184,7 @@ const subIconSize = StyleSheet.create({
     }
 });
 
-const avatarSize = StyleSheet.create({
+const avatarSize = (width) => ({
     tiny: {
         width: 16,
         height: 16,
@@ -266,21 +272,21 @@ const avatarSize = StyleSheet.create({
     }
 });
 
-const shortName = StyleSheet.create({
+const shortName = (width) => ({
     tiny: {
-        fontSize: 5
+        fontSize: ScaleSize(5, width)
     },
     small: {
-        fontSize: 11
+        fontSize: ScaleSize(11, width)
     },
     medium: {
-        fontSize: 15
+        fontSize: ScaleSize(15, width)
     },
     large: {
-        fontSize: 20
+        fontSize: ScaleSize(20, width)
     },
     giant: {
-        fontSize: 25
+        fontSize: ScaleSize(25, width)
     }
 });
 
@@ -290,10 +296,32 @@ export default class Avatar extends Component {
         this.state = {
             hideSource: false,
             ownUpdate: false,
-            source: props.source
+            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 });
+                    }
+                }
+            );
+        }
+    }
+
+    componentWillUnmount() {
+        const { scaleSize } = this.props;
+        if (scaleSize) {
+            this.subscription?.remove?.();
+        }
+    }
+
     static getDerivedStateFromProps(nextProps, prevState) {
         if (prevState.ownUpdate) {
             return {
@@ -336,49 +364,66 @@ export default class Avatar extends Component {
     }
 
     isValidImageUrl = (source) => {
-        const validSource = source && (((source.uri && this.isUrl(source.uri)) || (typeof source === 'number')));
+        const validSource = source && source.uri && this.isUrl(source.uri);
         return validSource;
     }
 
+    mapAvatarQuality = (url, quality) => {
+        if (!quality || quality === AvatarQuality.medium) {
+            return url;
+        }
+        if (quality === AvatarQuality.low) {
+            return url.replace('.png', '_s64.png');
+        }
+        if (quality === AvatarQuality.high) {
+            return url.replace('.png', '_s512.png');
+        }
+
+        return url;
+    }
+
     mapStyleFromSize = (size) => {
-        const avatarStyle = avatarSize.small;
+        const { dimensions } = this.state;
+        const avatarStyle = avatarSize(dimensions?.width || null).small;
         if (typeof size === 'object') return size;
-        if (avatarSize[size]) return avatarSize[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.tiny;
+                shortNameStyle = shortName(dimensions?.width || null).tiny;
                 break;
             }
             case AvatarSize.small: {
-                shortNameStyle = shortName.small;
+                shortNameStyle = shortName(dimensions?.width || null).small;
                 break;
             }
             case AvatarSize.medium: {
-                shortNameStyle = shortName.medium;
+                shortNameStyle = shortName(dimensions?.width || null).medium;
                 break;
             }
             case AvatarSize.large: {
-                shortNameStyle = shortName.large;
+                shortNameStyle = shortName(dimensions?.width || null).large;
                 break;
             }
             case AvatarSize.giant: {
-                shortNameStyle = shortName.giant;
+                shortNameStyle = shortName(dimensions?.width || null).giant;
                 break;
             }
             default:
-                shortNameStyle = shortName.small;
+                shortNameStyle = shortName(dimensions?.width || null).small;
         }
         return shortNameStyle;
     }
 
     mapSubIconSize = (size) => {
-        const subIconStyle = subIconSize.small;
-        if (subIconSize[size]) return subIconSize[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;
     }
 
@@ -391,7 +436,7 @@ export default class Avatar extends Component {
             height: containerWidth,
             borderRadius: containerWidth / 2,
             borderWidth,
-            borderColor: ColorCore.black_01
+            borderColor: Colors.black_01
         };
     }
 
@@ -403,14 +448,14 @@ export default class Avatar extends Component {
         const { subIcon, size, subIconSource } = this.props;
         if ((!subIcon || subIcon === SubIconType.none) && !subIconSource) return <View />;
         const subIconSizeStyle = this.mapSubIconSize(size);
-        const iconSource = ValueUtils.getImageSource(subIconSource);
+        const iconSource = ValueUtil.getImageSource(subIconSource);
         return (
             <View style={styles.subIcon}>
                 {subIcon === SubIconType.momo
                     ? (
                         <Image
                             style={[styles.subIconImage, subIconSizeStyle]}
-                            source={Icons.ic_round_momo_tiny}
+                            source={IconSource.ic_round_momo_tiny}
                         />
                     )
                     : <View />}
@@ -435,16 +480,27 @@ export default class Avatar extends Component {
 
     render() {
         const {
-            size, source, name, resizeMode, style, onPress, isShowLoading, loading, cached, extraPropsImage
+            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 = ValueUtils.getImageSource(source);
+        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, avatarStyle, style]}>
-                {(showName || hideSource) ? this.renderShortName(name, avatarStyle, size) : null}
+            <View style={[styles.container, containerSize, style]}>
+                {(showName || hideSource) ? this.renderShortName(name, avatarStyle, size) : <View />}
                 {this.isValidImageUrl(imageSource) && !hideSource
                     ? (
                         <Image
@@ -472,54 +528,27 @@ export default class Avatar extends Component {
 }
 
 Avatar.propTypes = {
-     /**
-   * The default name when image load fail.
-   */
     name: PropTypes.string,
-    /**
-   * How resize should the avatar be?
-   */
     resizeMode: PropTypes.string,
-    /**
-   * How large should the avatar be?
-   */
-    size: PropTypes.oneOf(['tiny', 'small', 'medium', 'large', 'giant', 'size8', 'size24', 'size36', 'size44', 'size48', 'size52', 'size56', 'size64', 'size72', 'size80', 'size88', 'size96']),
-    /**
-   * What source Avatar to use?
-   */
+    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]),
-    /**
-   * What subIcon Avatar to use?
-   */
     subIcon: PropTypes.oneOf(['momo', 'online', 'key', 'none']),
-     /**
-   * What custom subIcon Avatar to use?
-   */
     subIconSource: PropTypes.oneOfType([PropTypes.shape({ uri: PropTypes.string }), PropTypes.number, PropTypes.string]),
-     /**
-   * What custom style Avatar to use?
-   */
     style: PropTypes.oneOfType([PropTypes.array, PropTypes.object]),
-   /**
-   * Optional click handler.
-   */
     onPress: PropTypes.func,
-    /**
-   * Optional loading handler.
-   */
     loading: PropTypes.bool,
-    /**
-   * Optional cached handler.
-   */
     cached: PropTypes.bool,
-    /**
-   * Optional extra prop of Image.
-   */
+    scaleSize: PropTypes.bool,
     extraPropsImage: PropTypes.object
 };
 
 Avatar.defaultProps = {
     resizeMode: 'cover',
-    size: 'medium',
-    cached: true
+    cached: true,
+    scaleSize: false,
+    quality: 'medium',
 };

package/package.json

@@ -1,17 +1,16 @@
 {
-    "name": "@momo-kits/avatar",
-    "version": "0.0.2-beta",
-    "private": false,
-    "main": "index.js",
-    "dependencies": {},
-    "peerDependencies": {
-      "react-native": ">=0.55",
-      "prop-types": "^15.7.2",
-      "react": "16.9.0",
-      "lodash": "^4.17.15",
-      "@momo-kits/core": ">=0.0.5-beta"
-    },
-    "devDependencies": {},
-    "license": "MoMo"
-  }
-  
+  "name": "@momo-kits/avatar",
+  "version": "0.0.4",
+  "private": false,
+  "main": "index.js",
+  "dependencies": {},
+  "peerDependencies": {
+    "react-native": ">=0.55",
+    "prop-types": "^15.7.2",
+    "react": "16.9.0",
+    "@momo-kits/core": ">=0.0.5-beta",
+    "lodash": "^4.17.15"
+  },
+  "devDependencies": {},
+  "license": "MoMo"
+}