@momo-kits/avatar 0.0.38-beta → 0.0.42-beta

package/Avatar.js

@@ -2,11 +2,11 @@
 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 AvatarSize = {
@@ -76,7 +76,7 @@ const styles = StyleSheet.create({
     }
 });
 
-const subIconSize = StyleSheet.create({
+const subIconSize = (width) => ({
     tiny: {
         width: 8,
         height: 8,
@@ -176,7 +176,7 @@ const subIconSize = StyleSheet.create({
     }
 });
 
-const avatarSize = StyleSheet.create({
+const avatarSize = (width) => ({
     tiny: {
         width: 16,
         height: 16,
@@ -264,21 +264,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,10 +288,30 @@ 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 }) => {
+                    this.setState({ dimensions: window });
+                }
+            );
+        }
+    }
+
+    componentWillUnmount() {
+        const { scaleSize } = this.props;
+        if (scaleSize) {
+            this.subscription?.remove?.();
+        }
+    }
+
     static getDerivedStateFromProps(nextProps, prevState) {
         if (prevState.ownUpdate) {
             return {
@@ -339,44 +359,47 @@ export default class Avatar extends Component {
     }
 
     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;
     }
 
@@ -483,10 +506,12 @@ 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
 };

package/Avatar.web.js

@@ -2,13 +2,14 @@
 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 '../../core/utils/ValueUtil';
+import ValueUtil from '../../core/utils/ValueUtil';
 import Colors from '../../core/colors';
-import { Icons } from '../../core/icons';
+import { Icons as IconSource } from '../../core/icons';
 import Text from '../../core/components/typography';
+import { RFValueHorizontal as ScaleSize } from '../../core/components/typography/reponsiveSize';
 
 export const AvatarSize = {
     tiny: 'tiny',
@@ -77,7 +78,7 @@ const styles = StyleSheet.create({
     }
 });
 
-const subIconSize = StyleSheet.create({
+const subIconSize = (width) => ({
     tiny: {
         width: 8,
         height: 8,
@@ -177,7 +178,7 @@ const subIconSize = StyleSheet.create({
     }
 });
 
-const avatarSize = StyleSheet.create({
+const avatarSize = (width) => ({
     tiny: {
         width: 16,
         height: 16,
@@ -265,21 +266,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)
     }
 });
 
@@ -289,10 +290,30 @@ 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 }) => {
+                    this.setState({ dimensions: window });
+                }
+            );
+        }
+    }
+
+    componentWillUnmount() {
+        const { scaleSize } = this.props;
+        if (scaleSize) {
+            this.subscription?.remove?.();
+        }
+    }
+
     static getDerivedStateFromProps(nextProps, prevState) {
         if (prevState.ownUpdate) {
             return {
@@ -340,44 +361,47 @@ export default class Avatar extends Component {
     }
 
     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;
     }
 
@@ -402,14 +426,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 />}
@@ -439,11 +463,11 @@ export default class Avatar extends Component {
         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';
         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
@@ -471,54 +495,25 @@ 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?
-   */
+    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
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/avatar",
-  "version": "0.0.38-beta",
+  "version": "0.0.42-beta",
   "private": false,
   "main": "index.js",
   "dependencies": {},