@momo-kits/foundation 0.81.1-optimize.21 → 0.81.1-rc.0

package/Layout/Screen.tsx

@@ -3,6 +3,7 @@ import React, {
   forwardRef,
   Fragment,
   ReactNode,
+  Ref,
   useContext,
   useEffect,
   useRef,
@@ -27,10 +28,11 @@ import Navigation from '../Application/Navigation';
 import {AnimatedHeader, NavigationOptions} from '../Application/types';
 import {Colors, Spacing, Styles} from '../Consts';
 import {FloatingButton, FloatingButtonProps} from './FloatingButton';
-import {Image} from '../Image';
 import {Card, Section, validateChildren} from './index';
 import styles from './styles';
 import {HeaderType} from './types';
+import {InputRef, InputSearchProps} from '../Input';
+import {HeaderExtendHeader} from '../Application/Components';
 
 export interface ScreenProps extends ViewProps {
   /**
@@ -101,6 +103,13 @@ export interface ScreenProps extends ViewProps {
    * Optional. If `true`, the screen content is using grid layout by span.
    */
   useGridLayout?: boolean;
+
+  /**
+   * Optional. specs for input search.
+   */
+  inputSearchProps?: InputSearchProps;
+
+  inputSearchRef?: Ref<InputRef>;
 }
 
 const Screen = forwardRef(
@@ -120,32 +129,132 @@ const Screen = forwardRef(
       floatingButtonProps,
       useGridLayout = true,
       keyboardVerticalOffset,
+      inputSearchProps,
+      inputSearchRef,
     }: ScreenProps,
-    ref,
+    ref: any
   ) => {
-    const animatedValue = useRef<Animated.Value>(new Animated.Value(0));
     const {theme} = useContext(ApplicationContext);
     const insets = useSafeAreaInsets();
     const heightHeader = useHeaderHeight();
+    const animatedValue = useRef<Animated.Value>(new Animated.Value(0));
     const currentTint = useRef(Colors.black_01);
-    const isTab = navigation?.instance?.getState?.()?.type == 'tab';
+    const isTab = navigation?.instance?.getState?.()?.type === 'tab';
 
-    let styleAnimatedHeader: NavigationOptions;
     let handleScroll;
-    let headerBackground: string | undefined = undefined;
     let Component: any = View;
     let keyboardOffset = heightHeader - 20;
-    if (headerType == 'extended' || animatedHeader) {
+    if (headerType === 'extended' || animatedHeader || inputSearchProps) {
       keyboardOffset = -20;
     }
 
-    if (headerType == 'extended') {
-      headerBackground = theme.assets?.headerBackground;
-    }
-
     useEffect(() => {
+      let options: NavigationOptions;
+      /**
+       * handle for basic header type
+       */
+      switch (headerType) {
+        case 'none':
+          options = {
+            headerTransparent: true,
+            headerBackground: () => null,
+            headerShown: false,
+          };
+          break;
+
+        case 'surface':
+          options = {
+            headerTransparent: false,
+            headerShown: true,
+            headerTintColor: theme.colors.text.default,
+            headerBackground: (props: any) => (
+              <HeaderBackground {...props} image={null} useSurface={true} />
+            ),
+            headerTitle: (props: any) => <HeaderTitle {...props} />,
+          };
+          if (inputSearchProps) {
+            options = {
+              headerShown: true,
+              headerTransparent: true,
+              headerTintColor: theme.colors.text.default,
+              headerBackground: () => null,
+              headerTitle: (props: any) => (
+                <HeaderTitle
+                  {...props}
+                  interpolate={{
+                    inputRange: [0, 50],
+                    outputRange: [1, 0],
+                    extrapolate: 'clamp',
+                  }}
+                  animatedValue={animatedValue.current}
+                />
+              ),
+            };
+          }
+          break;
+
+        case 'extended':
+          options = {
+            headerShown: true,
+            headerTransparent: true,
+            headerTintColor: Colors.black_01,
+            headerBackground: () => null,
+            headerTitle: (props: any) => <HeaderTitle {...props} />,
+          };
+          if (inputSearchProps) {
+            options = {
+              headerShown: true,
+              headerTransparent: true,
+              headerTintColor: Colors.black_01,
+              headerBackground: () => null,
+              headerTitle: (props: any) => (
+                <HeaderTitle
+                  {...props}
+                  interpolate={{
+                    inputRange: [0, 50],
+                    outputRange: [1, 0],
+                    extrapolate: 'clamp',
+                  }}
+                  animatedValue={animatedValue.current}
+                />
+              ),
+            };
+          }
+          break;
+
+        default:
+          options = {
+            headerTransparent: false,
+            headerShown: true,
+            headerTintColor: Colors.black_01,
+            headerBackground: (props: any) => <HeaderBackground {...props} />,
+          };
+          if (inputSearchProps) {
+            options = {
+              headerShown: true,
+              headerTransparent: true,
+              headerTintColor: Colors.black_01,
+              headerBackground: () => null,
+              headerTitle: (props: any) => (
+                <HeaderTitle
+                  {...props}
+                  interpolate={{
+                    inputRange: [0, 50],
+                    outputRange: [1, 0],
+                    extrapolate: 'clamp',
+                  }}
+                  animatedValue={animatedValue.current}
+                />
+              ),
+            };
+          }
+      }
+
+      /**
+       * override options for animated header
+       */
       if (animatedHeader) {
-        styleAnimatedHeader = {
+        options = {
           headerTransparent: true,
           headerBackground: (props: any) => (
             <HeaderBackground
@@ -157,9 +266,9 @@ const Screen = forwardRef(
             <HeaderTitle {...props} animatedValue={animatedValue.current} />
           ),
         };
-        if (animatedHeader.type == 'surface') {
-          styleAnimatedHeader = {
-            ...styleAnimatedHeader,
+        if (animatedHeader.type === 'surface') {
+          options = {
+            ...options,
             headerBackground: (props: any) => (
               <HeaderBackground
                 {...props}
@@ -171,8 +280,8 @@ const Screen = forwardRef(
           };
         }
         if (animatedHeader.headerTitle) {
-          styleAnimatedHeader = {
-            ...styleAnimatedHeader,
+          options = {
+            ...options,
             headerTitle: (props: any) =>
               animatedHeader.headerTitle?.({
                 ...props,
@@ -180,55 +289,10 @@ const Screen = forwardRef(
               }),
           };
         }
-        navigation?.setOptions(styleAnimatedHeader);
       }
-    }, [animatedHeader]);
-
-    useEffect(() => {
-      if (!animatedHeader) {
-        let headerOptions: NavigationOptions;
-        switch (headerType) {
-          case 'none':
-            headerOptions = {
-              headerTransparent: true,
-              headerBackground: () => null,
-              headerShown: false,
-            };
-            break;
 
-          case 'surface':
-            headerOptions = {
-              headerTransparent: false,
-              headerShown: true,
-              headerTintColor: theme.colors.text.default,
-              headerBackground: (props: any) => (
-                <HeaderBackground {...props} image={null} useSurface={true} />
-              ),
-              headerTitle: (props: any) => <HeaderTitle {...props} />,
-            };
-            break;
-
-          case 'extended':
-            headerOptions = {
-              headerShown: true,
-              headerTransparent: true,
-              headerTintColor: Colors.black_01,
-              headerBackground: () => null,
-              headerTitle: (props: any) => <HeaderTitle {...props} />,
-            };
-            break;
-
-          default:
-            headerOptions = {
-              headerTransparent: false,
-              headerShown: true,
-              headerTintColor: Colors.black_01,
-              headerBackground: (props: any) => <HeaderBackground {...props} />,
-            };
-        }
-        navigation?.setOptions(headerOptions);
-      }
-    }, [headerType]);
+      navigation?.setOptions(options);
+    }, [headerType, animatedHeader, inputSearchProps]);
 
     /**
      * animated when use scroll && animated value
@@ -236,7 +300,7 @@ const Screen = forwardRef(
     if (scrollable) {
       Component = Animated.ScrollView;
       handleScroll = scrollViewProps?.onScroll;
-      if (animatedHeader || floatingButtonProps?.icon) {
+      if (animatedHeader || floatingButtonProps?.icon || inputSearchProps) {
         handleScroll = Animated.event(
           [
             {
@@ -249,13 +313,13 @@ const Screen = forwardRef(
             useNativeDriver: true,
             listener: (e: NativeSyntheticEvent<NativeScrollEvent>) => {
               scrollViewProps?.onScroll?.(e);
-              if (animatedHeader?.type == 'surface') {
+              if (animatedHeader?.type === 'surface') {
                 const offsetY = e.nativeEvent.contentOffset.y;
                 let color = Colors.black_01;
                 if (offsetY > 50) {
                   color = theme.colors.text.default;
                 }
-                if (color != currentTint.current) {
+                if (color !== currentTint.current) {
                   currentTint.current = color;
                   navigation?.setOptions({
                     headerTintColor: color,
@@ -263,31 +327,52 @@ const Screen = forwardRef(
                 }
               }
             },
-          },
+          }
         );
       }
     }
 
+    /**
+     * handle scroll end
+     * @param e
+     */
+    const handleScrollEnd = (e: NativeSyntheticEvent<NativeScrollEvent>) => {
+      const offsetY = e.nativeEvent.contentOffset.y;
+      if (inputSearchProps && offsetY < 100 && offsetY > 0) {
+        Animated.timing(animatedValue.current, {
+          toValue: 0,
+          useNativeDriver: true,
+          duration: 300,
+        }).start();
+        ref?.scrollTo({y: 0, animated: true});
+      }
+      scrollViewProps?.onScrollEndDrag?.(e);
+    };
+
     /**
      * render top navigation banner
      */
-    const renderHeader = () => {
+    const renderAnimatedHeader = () => {
       if (typeof animatedHeader?.component === 'function') {
-        return animatedHeader?.component({
-          animatedValue: animatedValue.current,
-        });
+        return (
+          <View style={[styles.screenBanner, {maxHeight: 210 + layoutOffset}]}>
+            {animatedHeader?.component({
+              animatedValue: animatedValue.current,
+            })}
+          </View>
+        );
       }
     };
 
     /**
-     * build content for screen
+     * build content for screen for grid rule
      */
     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;
-          if (item?.type == Fragment) {
+          if (item?.type === Fragment) {
             return renderContent(item?.props?.children);
           }
           if (item) {
@@ -307,7 +392,7 @@ const Screen = forwardRef(
       } else {
         const item: any = children;
         const space = item?.props?.useMargin === false ? 0 : Spacing.M;
-        if (item?.type == Fragment) {
+        if (item?.type === Fragment) {
           return renderContent(item?.props?.children);
         }
         return (
@@ -326,17 +411,15 @@ const Screen = forwardRef(
 
     return (
       <View style={[Styles.flex, {backgroundColor}]}>
-        {!!headerBackground && (
-          <>
-            <Image
-              source={{
-                uri: headerBackground,
-              }}
-              style={styles.extendedHeader}
-            />
-            <View style={{height: heightHeader}} />
-          </>
-        )}
+        <HeaderExtendHeader
+          headerType={headerType}
+          heightHeader={heightHeader}
+          animatedValue={animatedValue.current}
+          inputSearchProps={inputSearchProps}
+          navigation={navigation}
+          inputSearchRef={inputSearchRef}
+        />
+
         <KeyboardAvoidingView
           style={Styles.flex}
           enabled={enableKeyboardAvoidingView}
@@ -352,11 +435,11 @@ const Screen = forwardRef(
             ref={ref}
             showsVerticalScrollIndicator={false}
             onScroll={handleScroll}
+            onScrollEndDrag={handleScrollEnd}
+            scrollEventThrottle={16}
             style={Styles.flex}>
-            <View
-              style={[styles.screenBanner, {maxHeight: 210 + layoutOffset}]}>
-              {renderHeader()}
-            </View>
+            {renderAnimatedHeader()}
+
             {useGridLayout ? renderContent(children) : children}
           </Component>
 
@@ -387,7 +470,7 @@ const Screen = forwardRef(
         </KeyboardAvoidingView>
       </View>
     );
-  },
+  }
 );
 
 export default Screen;

package/Layout/styles.ts

@@ -2,12 +2,6 @@ import {Platform, StyleSheet} from 'react-native';
 import {Colors, Radius, Spacing} from '../Consts';
 
 export default StyleSheet.create({
-  extendedHeader: {
-    aspectRatio: 1.75,
-    position: 'absolute',
-    width: '100%',
-    height: 210,
-  },
   screenBanner: {
     width: '100%',
   },

package/Layout/types.ts

@@ -1,4 +1,4 @@
-export type HeaderType = 'default' | 'surface' | 'extended' | 'none';
+export type HeaderType = 'default' | 'surface' | 'extended' | 'search' | 'none';
 
 export type GridContextProps = {
   /**

package/Pagination/PaginationScroll.tsx

@@ -42,7 +42,7 @@ const PaginationScroll: FC<ScrollIndicatorProps> = ({
               },
             },
           ],
-          {useNativeDriver: true},
+          {useNativeDriver: true}
         )}
         alwaysBounceHorizontal={false}
         showsHorizontalScrollIndicator={false}
@@ -80,7 +80,7 @@ const PaginationScroll: FC<ScrollIndicatorProps> = ({
   return (
     <View style={[style, styles.scrollContainer]}>
       {renderScrollView()}
-      {renderIndicator()}
+      {scrollContentWidth > scrollViewWidth && renderIndicator()}
     </View>
   );
 };

package/Pagination/styles.ts

@@ -29,7 +29,6 @@ export default StyleSheet.create({
     justifyContent: 'center',
   },
   scrollContainer: {
-    alignItems: 'center',
     width: '100%',
   },
   scrollView: {
@@ -42,6 +41,7 @@ export default StyleSheet.create({
     borderRadius: Radius.XS,
   },
   indicatorContainer: {
+    alignSelf: 'center',
     width: 72,
     height: 4,
     borderRadius: Radius.XS,

package/Popup/PopupNotify.tsx

@@ -5,7 +5,7 @@ import {Button} from '../Button';
 import {Radius, Spacing, Styles} from '../Consts';
 import {Icon} from '../Icon';
 import {Image} from '../Image';
-import {Text} from '../Text';
+import {scaleSize, Text} from '../Text';
 import {PopupNotifyProps} from './types';
 
 const PopupNotify: React.FC<PopupNotifyProps> = ({
@@ -27,7 +27,7 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
   let Description: any = View;
   if (scrollContent) {
     Description = ScrollView;
-    descriptionStyle = {height: 80};
+    descriptionStyle = {maxHeight: scaleSize(172)};
   }
   /**
    * tracking
@@ -195,7 +195,7 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
       ]}>
       {!!image && <Image source={{uri: image}} style={styles.image} />}
       <View style={styles.content}>
-        <Text typography={'header_default_bold'} numberOfLines={1}>
+        <Text typography={'header_default_bold'} numberOfLines={3}>
           {title}
         </Text>
         <Description style={[styles.description, descriptionStyle]}>

package/Tag/index.tsx

@@ -31,6 +31,8 @@ const Tag: FC<TagProps> = ({
   size = 'large',
   style,
   customColor,
+  accessibilityLabelContainer,
+  accessibilityLabelText,
 }) => {
   let labelColor = textColor[color];
   let tagColor = backgroundColor[color];
@@ -60,7 +62,9 @@ const Tag: FC<TagProps> = ({
   }
 
   return (
-    <View style={[style, sizeStyle, {backgroundColor: tagColor}]}>
+    <View
+      style={[style, sizeStyle, {backgroundColor: tagColor}]}
+      accessibilityLabel={accessibilityLabelContainer}>
       {!!icon && (
         <Icon
           style={styles.icon}
@@ -69,7 +73,10 @@ const Tag: FC<TagProps> = ({
           color={labelColor}
         />
       )}
-      <Text color={labelColor} typography={'label_s_medium'}>
+      <Text
+        color={labelColor}
+        typography={'label_s_medium'}
+        accessibilityLabel={accessibilityLabelText}>
         {label}
       </Text>
     </View>

package/Tag/styles.ts

@@ -1,19 +1,20 @@
 import {StyleSheet} from 'react-native';
 import {Radius, Spacing} from '../Consts';
+import {scaleSize} from '../Text';
 
 export default StyleSheet.create({
   container: {
     paddingHorizontal: Spacing.S,
     borderRadius: Radius.S,
     flexDirection: 'row',
-    height: 24,
+    height: scaleSize(24),
     alignItems: 'center',
     justifyContent: 'center',
   },
   mediumContainer: {
     paddingHorizontal: Spacing.S,
     borderRadius: Radius.S,
-    height: 18,
+    height: scaleSize(18),
     alignItems: 'center',
     flexDirection: 'row',
     justifyContent: 'center',

package/Tag/types.ts

@@ -33,4 +33,16 @@ export type TagProps = {
    * that can be applied to the Tag component.
    */
   customColor?: string;
+
+  /**
+   * Overrides the text that's read by the screen reader when the user interacts with the element. By default, the
+   * label is constructed by traversing all the children and accumulating all the Text nodes separated by space.
+   */
+  accessibilityLabelContainer?: string;
+
+  /**
+   * Overrides the text that's read by the screen reader when the user interacts with the element. By default, the
+   * label is constructed by traversing all the children and accumulating all the Text nodes separated by space.
+   */
+  accessibilityLabelText?: string;
 };

package/Title/index.tsx

@@ -1,16 +1,13 @@
 import React, {FC, useContext, useState} from 'react';
 import {Text as RNText, TouchableOpacity, View, ViewStyle} from 'react-native';
-import {
-  Typography,
-  Colors,
-  Icon,
-  Badge,
-  ApplicationContext,
-  scaleSize,
-  Text,
-} from '@momo-kits/foundation';
+import {Icon} from '../Icon';
+import {scaleSize, Text} from '../Text';
+import {ApplicationContext} from '../Application';
+import {Badge} from '../Badge';
+import {Colors} from '../Consts';
 import styles from './styles';
 import {TitleProps} from './types';
+import {Typography} from '../Text/types';
 
 const Title: FC<TitleProps> = ({
   title = 'Title',

package/Title/styles.ts

@@ -46,16 +46,16 @@ export default StyleSheet.create({
     marginRight: Spacing.S,
   },
   iconRight: {
-    width: scaleSize(22),
-    height: scaleSize(22),
+    width: 22,
+    height: 22,
     borderRadius: Radius.M,
     alignItems: 'center',
     justifyContent: 'center',
     marginLeft: Spacing.S,
   },
   iconLeft: {
-    width: scaleSize(18),
-    height: scaleSize(18),
+    width: 18,
+    height: 18,
     borderRadius: Radius.M,
     alignItems: 'center',
     justifyContent: 'center',

package/code-scanner.js

@@ -15,7 +15,7 @@ const calculateAdoptionRate = async (
   kitJsonPath,
   miniappJsonPath,
   reactNativeJsonPath,
-  fsJsonPath,
+  fsJsonPath
 ) => {
   const kitJson = require(kitJsonPath);
   const miniAppJson = require(miniappJsonPath);
@@ -98,8 +98,8 @@ const main = async () => {
 
   const allKitsReg = /@momo-kits/;
   const fsReg =
-    /^(?:@fs-mobile-platform\/(components|investment|screens)|@miniapp-platform\/(components|foundation))$/;
-  const RNReg = 'react-native';
+    /^(?:@fs-mobile-platform\/(components(\/.*)?|investment(\/.*)?|screens(\/.*)?|foundation(\/.*)?)|@miniapp-platform\/(components(\/.*)?|foundation(\/.*)?))$/;
+  const RNReg = /react-native|react-native-svg/;
 
   const config1 = {
     crawlFrom: scanPath,
@@ -148,7 +148,7 @@ const main = async () => {
       kitJsonPath,
       miniappJsonPath,
       reactNativeJsonPath,
-      fsJsonPath,
+      fsJsonPath
     );
     sendMessage(result);
     console.log(result);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.81.1-optimize.21",
+    "version": "0.81.1-rc.0",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {},
@@ -14,12 +14,12 @@
         "react-native-gesture-handler": "1.10.3",
         "react-native-modalize": "2.1.1",
         "react-native-fast-image": "8.1.5",
-        "@react-navigation/bottom-tabs": "https://oauth2:5WXQLHPMxxCyvGt_Py4D@gitlab.mservice.com.vn/momo-platform/react-native-bottom-tabs.git",
+        "@react-navigation/bottom-tabs": "https://gitlab.mservice.com.vn/momo-platform/react-native-bottom-tabs.git",
         "@react-navigation/core": "5.16.1",
         "@react-navigation/native": "5.9.8",
         "@react-navigation/routers": "5.7.4",
         "lottie-react-native": "git+https://gitlab.mservice.com.vn/momo-platform/momo-lottie-react-native.git",
-        "@react-navigation/stack": "https://oauth2:eX-jVhzQdLc343AjD3Sc@gitlab.mservice.com.vn/momo-platform/react-navigation-stack.git"
+        "@react-navigation/stack": "https://gitlab.mservice.com.vn/momo-platform/react-navigation-stack.git"
     },
     "peerDependencies": {
         "react-native": "*"
@@ -39,8 +39,9 @@
         "react-test-renderer": "17.0.1",
         "typescript": "^4.0.3",
         "@momo-platform/versions": "4.1.11",
-        "react-scanner": "^1.1.0"
+        "react-scanner": "^1.1.0",
+        "@types/color": "3.0.6"
     },
     "author": "@momo-kits/foundation",
     "license": "ISC"
-}
+}