@momo-kits/foundation 0.81.8-beta.1 → 0.81.8-beta.2

package/Application/BottomTab.tsx

@@ -8,7 +8,12 @@ import {ApplicationContext} from './index';
 
 const Tab = createBottomTabNavigator();
 
-const BottomTab: React.FC<BottomTabProps> = ({tabs, listeners, navigation}) => {
+const BottomTab: React.FC<BottomTabProps> = ({
+  tabs,
+  listeners,
+  navigation,
+  initialRouteName,
+}) => {
   const {theme} = useContext(ApplicationContext);
 
   const defaultListener = {
@@ -21,7 +26,9 @@ const BottomTab: React.FC<BottomTabProps> = ({tabs, listeners, navigation}) => {
   };
 
   return (
-    <Tab.Navigator backBehavior={'firstRoute'}>
+    <Tab.Navigator
+      initialRouteName={initialRouteName}
+      backBehavior={'firstRoute'}>
       {tabs.map(item => {
         return (
           <Tab.Screen

package/Application/types.ts

@@ -186,6 +186,7 @@ export type BottomTabItemProps = {
 
 export type BottomTabProps = {
   tabs: BottomTabItemProps[];
+  initialRouteName?: string;
   navigation: Navigation;
   listeners?: {
     tabPress?: any;

package/Image/index.tsx

@@ -20,13 +20,12 @@ const Image: React.FC<ImageProps> = ({
   style,
   source,
   accessibilityLabel,
+  loading,
   ...rest
 }) => {
   const {theme} = useContext(ApplicationContext);
   const error = useRef(false);
-  const [status, setStatus] = useState<Status>(
-    rest.loading ? 'loading' : 'success',
-  );
+  const [status, setStatus] = useState<Status>('success');
 
   /**
    * render content loading | fail | rendered
@@ -65,16 +64,18 @@ const Image: React.FC<ImageProps> = ({
       <FastImage
         {...rest}
         source={source}
+        fallback={false}
         style={styles.image}
+        onProgress={() => {
+          if (status != 'loading' && loading) setStatus('loading');
+        }}
         onLoadStart={() => {
           error.current = false;
         }}
         onLoadEnd={() => {
-          if (error.current) {
-            setStatus('error');
-          } else {
-            setStatus('success');
-          }
+          let current: Status = 'success';
+          if (error.current) current = 'error';
+          if (status != current) setStatus(current);
         }}
         onError={() => {
           error.current = true;

package/Popup/PopupNotify.tsx

@@ -1,5 +1,5 @@
-import React, {useContext} from 'react';
-import {StyleSheet, TouchableOpacity, View} from 'react-native';
+import React, {useContext, useState} from 'react';
+import {ScrollView, StyleSheet, TouchableOpacity, View} from 'react-native';
 import {PopupNotifyProps} from './types';
 import {Radius, Spacing, Styles} from '../Consts';
 import {Image} from '../Image';
@@ -19,6 +19,14 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
   onIconClose,
 }) => {
   const {theme, navigator} = useContext(ApplicationContext);
+  const [scrollContent, setScrollContent] = useState(false);
+
+  let descriptionStyle = {};
+  let Description: any = View;
+  if (scrollContent) {
+    Description = ScrollView;
+    descriptionStyle = {height: 80};
+  }
 
   /**
    * on action popup
@@ -143,11 +151,19 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
         <Text typography={'title_xs'} numberOfLines={1}>
           {title}
         </Text>
-        <View style={styles.description}>
-          <Text typography={'paragraph_default'} numberOfLines={3}>
+        <Description style={[styles.description, descriptionStyle]}>
+          <Text
+            typography={'paragraph_default'}
+            numberOfLines={4}
+            onTextLayout={({nativeEvent: {lines}}) => {
+              const enableScroll = lines.length > 3;
+              if (enableScroll != scrollContent) {
+                setScrollContent(enableScroll);
+              }
+            }}>
             {description}
           </Text>
-        </View>
+        </Description>
         {!!information && (
           <View style={styles.information}>
             <Text

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.81.8-beta.1",
+    "version": "0.81.8-beta.2",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {