@momo-kits/foundation 0.81.36 → 0.81.37

package/Application/Components.tsx

@@ -183,7 +183,7 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
     const canGoBack = navigator?.ref.current?.canGoBack();
     if (!canGoBack && navigator?.trackingInfo) {
       const currentRoute = navigator?.ref?.current.getCurrentRoute();
-      navigator?.maxApi?.trackEvent('service_icon_clicked', {
+      navigator?.maxApi?.trackEvent?.('service_icon_clicked', {
         feature_code: navigator.trackingInfo.code,
         app_id: navigator.trackingInfo.appId,
         miniapp_version: navigator.trackingInfo.buildNumber,
@@ -242,9 +242,8 @@ const HeaderBackground: React.FC<HeaderBackgroundProps> = ({
   animatedValue,
   useBorder = false,
 }) => {
-  const {theme, config} = useContext(ApplicationContext);
-  let headerImage =
-    config?.navigationBar?.headerBar ?? theme.assets?.headerBackground;
+  const {theme} = useContext(ApplicationContext);
+  let headerImage = theme.assets?.headerBackground;
   if (image === null) {
     headerImage = undefined;
   }

package/Application/ModalScreen.tsx

@@ -95,7 +95,8 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
   const insets = useSafeAreaInsets();
   const {theme, navigator} = useContext(ApplicationContext);
   const [keyboardSnap, setKeyboardSnap] = useState(0);
-  const {screen, options, snapPoint}: BottomSheetParams = props.route.params;
+  const {screen, options, snapPoint, indicatorColor}: BottomSheetParams =
+    props.route.params;
   const Component = useRef(screen).current;
   const navigation = new Navigation(props.navigation, theme);
   const params = {
@@ -167,14 +168,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
         handleComponent={null}
         backdropComponent={backdropComponent}>
         <BottomSheetView accessibilityLabel={'BottomSheet'}>
-          <View
-            style={[
-              styles.sheetContainer,
-              {
-                backgroundColor,
-                paddingBottom: Math.min(insets.bottom, 20) + Spacing.S,
-              },
-            ]}>
+          <View style={[styles.sheetContainer, {backgroundColor}]}>
             <View style={styles.indicatorContainer}>
               <View
                 style={[
@@ -233,6 +227,12 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
                 ),
               }}
             />
+            <View
+              style={{
+                height: Math.min(insets.bottom, 20),
+                backgroundColor: indicatorColor ?? backgroundColor,
+              }}
+            />
           </View>
         </BottomSheetView>
       </BottomSheetModal>

package/Application/NavigationContainer.tsx

@@ -29,7 +29,11 @@ const NavigationContainer: React.FC<NavigationContainerProps> = ({
   const navigator = useRef(new Navigator(navigationRef));
   const [showGrid, setShowGrid] = useState(false);
   const [language, setLanguage] = useState<'vi' | 'en'>('vi');
-  const [config, setConfig] = useState(undefined);
+  const [config, setConfig] = useState<any>(undefined);
+  let assets = theme.assets;
+  if (config) {
+    assets = {...assets, headerBackground: config.navigationBar?.headerBar};
+  }
 
   /**
    * handle mini language & listen change
@@ -83,7 +87,10 @@ const NavigationContainer: React.FC<NavigationContainerProps> = ({
       <BottomSheetModalProvider>
         <ApplicationContext.Provider
           value={{
-            theme,
+            theme: {
+              ...theme,
+              assets: assets,
+            },
             navigator: navigator.current,
             showGrid,
             language,

package/Application/StackScreen.tsx

@@ -47,14 +47,14 @@ const StackScreen: React.FC<ScreenParams> = props => {
         pre_screen_name = routes[routesLength - 2]?.params?.screen?.name;
       }
 
-      navigator?.maxApi?.trackEvent('service_frame_displayed', {
+      navigator?.maxApi?.trackEvent?.('service_frame_displayed', {
         ...tracking,
         pre_screen_name,
         trigger_id: '111378000000000000',
       });
 
       return props.navigation.addListener('beforeRemove', () => {
-        navigator?.maxApi?.trackEvent('service_icon_clicked', {
+        navigator?.maxApi?.trackEvent?.('service_icon_clicked', {
           ...tracking,
           trigger_id: '111154000000000000',
           icon_name: 'back',

package/Application/index.ts

@@ -1,20 +1,21 @@
 import {NavigationContainer} from './NavigationContainer';
 import Screen from '../Layout/Screen';
 import {
-  NavigationButton,
-  HeaderTitle,
-  HeaderLeft,
+  HeaderAnimated,
   HeaderBackground,
+  HeaderCustom,
+  HeaderLeft,
   HeaderRightAction,
+  HeaderTitle,
   HeaderToolkitAction,
-  HeaderCustom,
-  HeaderAnimated,
+  NavigationButton,
 } from './Components';
 import BottomTab from './BottomTab';
 import {createContext} from 'react';
 import {defaultContext} from '../Consts';
 
 const ApplicationContext = createContext(defaultContext);
+
 export {
   NavigationContainer,
   ApplicationContext,

package/Application/types.ts

@@ -119,6 +119,7 @@ export interface BottomSheetParams extends ScreenParams {
   [key: string]: any;
   onDismiss?: () => void;
   snapPoint?: '30%' | '50%' | '70%' | '90%' | 'content';
+  indicatorColor?: string;
 }
 
 export type NavigationButtonProps = {

package/Image/index.tsx

@@ -47,6 +47,7 @@ const Image: React.FC<ImageProps> = ({
       source={source}
       style={[styles.container, style]}
       onProgress={() => {
+        error.current = false;
         if (status !== 'loading' && loading) {
           setStatus('loading');
         }

package/Layout/Card.tsx

@@ -27,6 +27,7 @@ const Card: React.FC<CardProps> = ({
   style,
   backgroundImage,
   useShadow = false,
+  ...props
 }) => {
   const {showGrid} = useContext(ApplicationContext);
   const {numberOfColumns} = useGridSystem();
@@ -141,6 +142,7 @@ const Card: React.FC<CardProps> = ({
   return (
     <GridContext.Provider value={gridContext}>
       <View
+        {...props}
         accessibilityLabel={`Card`}
         style={[
           style,

package/Layout/Screen.tsx

@@ -12,6 +12,7 @@ import {useHeaderHeight} from '@react-navigation/stack';
 import {useSafeAreaInsets} from 'react-native-safe-area-context';
 import React, {
   forwardRef,
+  Fragment,
   ReactNode,
   useContext,
   useEffect,
@@ -101,7 +102,7 @@ const Screen = forwardRef(
     ref,
   ) => {
     const animatedValue = useRef<Animated.Value | undefined>(undefined);
-    const {theme, config} = useContext(ApplicationContext);
+    const {theme} = useContext(ApplicationContext);
     const insets = useSafeAreaInsets();
     const heightHeader = useHeaderHeight();
     const currentTint = useRef(Colors.black_01);
@@ -117,8 +118,7 @@ const Screen = forwardRef(
     }
 
     if (headerType == 'extended') {
-      headerBackground =
-        config?.navigationBar?.headerBar ?? theme.assets?.headerBackground;
+      headerBackground = theme.assets?.headerBackground;
     }
 
     useEffect(() => {
@@ -260,25 +260,33 @@ const Screen = forwardRef(
     /**
      * build content for screen
      */
-    const renderContent = () => {
-      const results = validateChildren(children, [Section, Card]);
+    const renderContent = (children: any): any => {
+      const results = validateChildren(children, [Section, Card, undefined]);
       if (Array.isArray(results)) {
         return results.map((item, index) => {
-          const space = item.props?.useMargin === false ? 0 : Spacing.M;
-          return (
-            <View
-              key={`ScreenItem${index}`}
-              style={{
-                marginTop: space,
-                flex: item.props?.expanded ? 1 : undefined,
-              }}>
-              {item}
-            </View>
-          );
+          const space = item?.props?.useMargin === false ? 0 : Spacing.M;
+          if (item?.type == Fragment) {
+            return renderContent(item?.props?.children);
+          }
+          if (item) {
+            return (
+              <View
+                key={`ScreenItem${index}`}
+                style={{
+                  marginTop: space,
+                  flex: item.props?.expanded ? 1 : undefined,
+                }}>
+                {item}
+              </View>
+            );
+          }
         });
       } else {
         const item: any = children;
         const space = item?.props?.useMargin === false ? 0 : Spacing.M;
+        if (item?.type == Fragment) {
+          return renderContent(item?.props?.children);
+        }
         return (
           <View
             key={`ScreenItem`}
@@ -327,7 +335,7 @@ const Screen = forwardRef(
               style={[styles.screenBanner, {maxHeight: 210 + layoutOffset}]}>
               {renderHeader()}
             </View>
-            {renderContent()}
+            {renderContent(children)}
           </Component>
           {Footer && (
             <View

package/Layout/Section.tsx

@@ -33,6 +33,7 @@ const Section: React.FC<SectionProps> = ({
   useMargin = true,
   backgroundImage,
   style,
+  ...props
 }) => {
   const {showGrid} = useContext(ApplicationContext);
   const {numberOfColumns} = useGridSystem();
@@ -148,6 +149,7 @@ const Section: React.FC<SectionProps> = ({
         },
       }}>
       <View
+        {...props}
         accessibilityLabel={`Section`}
         style={[
           style,

package/Popup/PopupNotify.tsx

@@ -51,12 +51,12 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
         component_name: id,
         error_code: error ? error : undefined,
       };
-      navigator?.maxApi?.trackEvent('service_component_displayed', {
+      navigator?.maxApi?.trackEvent?.('service_component_displayed', {
         ...tracking,
         trigger_id: '111012100000000000',
       });
       return () => {
-        navigator?.maxApi?.trackEvent('service_popup_dismissed', {
+        navigator?.maxApi?.trackEvent?.('service_popup_dismissed', {
           ...tracking,
           trigger_id: '111154100000000001',
           action_type: closeAction.current,

package/Popup/PopupPromotion.tsx

@@ -34,12 +34,12 @@ const PopupPromotion: React.FC<PopupPromotionProps> = ({
         component_type: 'popup',
         component_name: id,
       };
-      navigator?.maxApi?.trackEvent('service_component_displayed', {
+      navigator?.maxApi?.trackEvent?.('service_component_displayed', {
         ...tracking,
         trigger_id: '111012100000000000',
       });
       return () => {
-        navigator?.maxApi?.trackEvent('service_popup_dismissed', {
+        navigator?.maxApi?.trackEvent?.('service_popup_dismissed', {
           ...tracking,
           trigger_id: '111154100000000001',
           action_type: closeAction.current,

package/package.json

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