@momo-kits/foundation 0.80.8-beta.12 → 0.80.8-beta.14

package/Application/Components.tsx

@@ -1,6 +1,5 @@
 import React, {Fragment, useContext, useEffect, useState} from 'react';
 import {
-  Alert,
   Animated,
   DeviceEventEmitter,
   Platform,
@@ -24,6 +23,7 @@ import {
 import {scaleSize, Text} from '../Text';
 import {Icon} from '../Icon';
 import {PopupNotify} from '../Popup';
+import Carousel from '@momo-kits/carousel';
 
 const Touchable =
   Platform.OS === 'android' ? TouchableGesture : TouchableOpacity;
@@ -276,8 +276,7 @@ const HeaderRightAction: React.FC<any> = ({children, ...restProps}) => {
   const validateType = (child: React.ReactElement) => {
     const valid = child?.type === NavigationButton || child?.type == Fragment;
     if (__DEV__ && !valid) {
-      Alert.alert(
-        'Rule',
+      console.warn(
         'HeaderRightAction contains element type of NavigationButton, Please check again.',
       );
     }

package/Image/index.tsx

@@ -1,4 +1,4 @@
-import React, {useContext, useState} from 'react';
+import React, {useContext, useRef, useState} from 'react';
 import {StyleProp, StyleSheet, View, ViewStyle} from 'react-native';
 import FastImage from 'react-native-fast-image';
 import styles from './styles';
@@ -14,6 +14,8 @@ export interface ImageProps extends FastImagePropsWithoutStyle {
   accessibilityLabel?: string;
 }
 
+type Status = 'success' | 'loading' | 'error';
+
 const Image: React.FC<ImageProps> = ({
   style,
   source,
@@ -21,19 +23,20 @@ const Image: React.FC<ImageProps> = ({
   ...rest
 }) => {
   const {theme} = useContext(ApplicationContext);
-  const [loading, setLoading] = useState(rest.loading);
-  const [fail, setFail] = useState(false);
+  const error = useRef(false);
+  const [status, setStatus] = useState<Status>(
+    rest.loading ? 'loading' : 'success',
+  );
 
   /**
    * render content loading | fail | rendered
-   * @returns {JSX.Element}
    */
   const renderContent = () => {
-    if (loading || fail) {
+    if (status == 'loading' || status == 'error') {
       let content = (
         <Skeleton style={[StyleSheet.absoluteFill, styles.image]} />
       );
-      if (fail) {
+      if (status == 'error') {
         content = (
           <View style={Styles.flexCenter}>
             <Icon source="media_fail" color={theme.colors.text.disable} />
@@ -63,12 +66,19 @@ const Image: React.FC<ImageProps> = ({
         {...rest}
         source={source}
         style={styles.image}
-        onLoad={() => {
-          setFail(false);
-          setLoading(rest.loading);
+        onLoadStart={() => {
+          error.current = false;
+        }}
+        onLoadEnd={() => {
+          if (error.current) {
+            setStatus('error');
+          } else {
+            setStatus('success');
+          }
+        }}
+        onError={() => {
+          error.current = true;
         }}
-        onLoadEnd={() => setLoading(false)}
-        onError={() => setFail(true)}
       />
       {renderContent()}
     </View>

package/Layout/Card.tsx

@@ -7,7 +7,7 @@ import Item from './Item';
 import {Image} from '../Image';
 import {ApplicationContext} from '../Application';
 import styles from './styles';
-import {Colors, Radius, Shadow, Spacing} from '../Consts';
+import {Colors, Shadow, Spacing} from '../Consts';
 
 export interface CardProps extends ViewProps {
   /**
@@ -140,15 +140,12 @@ const Card: React.FC<CardProps> = ({
       <View
         accessibilityLabel={`Card`}
         style={[
-          {
-            backgroundColor: theme.colors.background.surface,
-            borderRadius: Radius.M,
-          },
           style,
           styles.card,
           {
             width: widthSection,
             marginHorizontal: gridContext.margin,
+            backgroundColor: theme.colors.background.surface,
           },
           useShadow && Shadow.Light,
         ]}>

package/Layout/Screen.tsx

@@ -24,6 +24,7 @@ import {
   HeaderTitle,
 } from '../Application';
 import Navigation from '../Application/Navigation';
+import styles from './styles';
 
 export interface ScreenProps extends ViewProps {
   children: React.ReactNode;
@@ -238,14 +239,7 @@ const Screen = forwardRef(
       <View
         style={[Styles.flex, {backgroundColor}]}
         accessibilityLabel={`ScreenContainer`}>
-        <View
-          style={{
-            position: 'absolute',
-            width: '100%',
-            maxHeight: 215,
-          }}>
-          {renderHeader()}
-        </View>
+        <View style={styles.screenBanner}>{renderHeader()}</View>
         <KeyboardAvoidingView
           style={[Styles.flex, {paddingTop: marginHeader}]}
           enabled={enableKeyboardAvoidingView}

package/Layout/styles.ts

@@ -1,7 +1,12 @@
 import {StyleSheet} from 'react-native';
-import {Spacing} from '../Consts';
+import {Radius, Spacing} from '../Consts';
 
 export default StyleSheet.create({
+  screenBanner: {
+    position: 'absolute',
+    width: '100%',
+    maxHeight: 215,
+  },
   boxGrid: {
     position: 'absolute',
     top: 0,
@@ -35,6 +40,7 @@ export default StyleSheet.create({
   card: {
     flexDirection: 'row',
     flexWrap: 'wrap',
+    borderRadius: Radius.M,
     paddingTop: undefined,
     paddingBottom: undefined,
     paddingLeft: undefined,

package/Layout/utils.ts

@@ -1,4 +1,4 @@
-import {Alert, Dimensions} from 'react-native';
+import {Dimensions} from 'react-native';
 import React, {Fragment, ReactElement, useEffect, useState} from 'react';
 
 /**
@@ -17,14 +17,12 @@ const validateChildren = (
       childrenType => child?.type === childrenType || child?.type == Fragment,
     );
     if (!valid) {
-      Alert.alert(
-        'Component Kits',
+      console.warn(
         `Wrong children type for this component, expected are ${childrenTypes
           .map(type => type.displayName)
           .join(', ')}.`,
       );
     }
-    return valid;
   };
 
   if (Array.isArray(children)) {

package/package.json

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