@momo-kits/foundation 0.81.1-beta.6 → 0.81.1-optimize.1

package/Input/InputTextArea.tsx

@@ -29,12 +29,12 @@ const InputTextArea = forwardRef(
       floatingValue,
       onFocus,
       onBlur,
-      disabled,
+      disabled = false,
       value,
       defaultValue,
       height,
       placeholder,
-      maxLength,
+      maxLength = MAX_LENGTH,
       required,
       errorSpacing,
       style,
@@ -46,7 +46,6 @@ const InputTextArea = forwardRef(
     const [focused, setFocused] = useState(false);
     const [inputValue, setInputValue] = useState(defaultValue ?? '');
     const inputRef = (ref as React.RefObject<TextInput>) ?? useRef<TextInput>();
-    const accessibilityLabel = `InputTextArea/${floatingValue ?? placeholder}`;
 
     const onClearText = () => {
       inputRef?.current?.clear();
@@ -71,7 +70,9 @@ const InputTextArea = forwardRef(
     const renderCountingView = () => {
       return (
         <View style={styles.countingView}>
-          <Text color={theme.colors.text.hint} typography={'description_xs'}>
+          <Text
+            color={theme.colors.text.hint}
+            typography={'description_xs_regular'}>
             {`${inputValue.length}/${maxLength}`}
           </Text>
         </View>
@@ -108,7 +109,6 @@ const InputTextArea = forwardRef(
             <View style={styles.textAreaView}>
               <TextInput
                 {...props}
-                accessibilityLabel={accessibilityLabel}
                 ref={inputRef}
                 editable={!disabled}
                 textAlignVertical="top"
@@ -148,9 +148,7 @@ const InputTextArea = forwardRef(
     };
 
     return (
-      <View
-        style={[style, styles.wrapper]}
-        accessibilityLabel={accessibilityLabel}>
+      <View style={[style, styles.wrapper]}>
         {renderInputView()}
         <ErrorView errorMessage={errorMessage} errorSpacing={errorSpacing} />
       </View>
@@ -158,8 +156,4 @@ const InputTextArea = forwardRef(
   },
 );
 
-InputTextArea.defaultProps = {
-  maxLength: MAX_LENGTH,
-};
-
 export default InputTextArea;

package/Input/common.tsx

@@ -64,7 +64,7 @@ export const ErrorView: FC<{errorMessage?: string; errorSpacing?: boolean}> = ({
           style={Styles.flex}
           color={errorColor}
           numberOfLines={2}
-          typography={'description_s'}>
+          typography={'description_default_regular'}>
           {errorMessage}
         </Text>
       </View>
@@ -104,10 +104,12 @@ export const FloatingView: FC<FloatingViewProps> = ({
           },
           style,
         ]}>
-        <Text color={floatingTextColor} typography={'label_s'}>
+        <Text color={floatingTextColor} typography={'label_s_medium'}>
           {floatingValue}
           {required && (
-            <Text typography={'label_s'} color={theme.colors.error.primary}>
+            <Text
+              typography={'label_s_medium'}
+              color={theme.colors.error.primary}>
               *
             </Text>
           )}

package/Input/index.tsx

@@ -76,6 +76,10 @@ export interface InputProps extends TextInputProps {
    * Optional. Represents the color of the leading icon in the Input component.
    */
   leadingIconColor?: string;
+
+  fontWeight?: 'Regular' | 'Bold';
+
+  onPressIcon?: () => void;
 }
 
 type InputPropsWithoutSizeAndIcon = Omit<
@@ -83,10 +87,6 @@ type InputPropsWithoutSizeAndIcon = Omit<
   'size' | 'icon' | 'iconColor'
 >;
 
-type InputPropsOmitForSearch = Omit<
-  InputProps,
-  'required' | 'size' | 'errorMessage' | 'disabled'
->;
 type InputPropsWithoutPlaceholder = Omit<InputProps, 'placeholder'>;
 
 export interface InputTextAreaProps extends InputPropsWithoutSizeAndIcon {
@@ -97,7 +97,7 @@ export interface InputTextAreaProps extends InputPropsWithoutSizeAndIcon {
   height?: number;
 }
 
-export interface InputSearchProps extends InputPropsOmitForSearch {
+export interface InputSearchProps extends TextInputProps {
   /**
    * Optional. Represents the text to be displayed on the search button within the InputSearch component.
    */
@@ -109,13 +109,19 @@ export interface InputSearchProps extends InputPropsOmitForSearch {
    */
   showButtonText?: boolean;
 
+  onPressButtonText?: () => void;
+
+  /**
+   * Optional. Represents the color of the icon in the Input component.
+   */
+  iconColor?: string;
+
   /**
-   * Optional. If `true`, a border will be displayed around the InputSearch component.
-   * Defaults to `true` if not provided.
+   * Optional. Represents the name or key of the icon to be displayed in the Input component.
    */
-  showBorder?: boolean;
+  icon?: string;
 
-  onPressButtonText?: () => void;
+  hasColorBG?: boolean
 }
 
 export interface InputMoneyProps extends InputPropsWithoutPlaceholder {}

package/Input/styles.ts

@@ -7,7 +7,6 @@ export default StyleSheet.create({
   input: {
     flex: 1,
     paddingLeft: Spacing.M,
-    height: '100%',
     fontSize: scaleSize(15),
   },
   wrapper: {
@@ -54,8 +53,7 @@ export default StyleSheet.create({
     marginRight: Spacing.M,
   },
   icon: {
-    width: 24,
-    height: 24,
+    marginLeft: Spacing.S
   },
   iconWrapper: {
     width: 24,
@@ -102,7 +100,6 @@ export default StyleSheet.create({
   searchInputWrapper: {
     flexDirection: 'row',
     borderRadius: Radius.XL,
-    borderWidth: 1,
     paddingHorizontal: Spacing.S,
     alignItems: 'center',
     flex: 1,

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, Shadow, Spacing} from '../Consts';
+import {Colors, Radius, Shadow, Spacing} from '../Consts';
 import ItemList from './ItemList';
 
 export interface CardProps extends ViewProps {
@@ -27,8 +27,9 @@ const Card: React.FC<CardProps> = ({
   style,
   backgroundImage,
   useShadow = false,
+  ...props
 }) => {
-  const {showGrid} = useContext(ApplicationContext);
+  const {showGrid, theme} = useContext(ApplicationContext);
   const {numberOfColumns} = useGridSystem();
 
   const gutterSize = 8;
@@ -41,12 +42,12 @@ const Card: React.FC<CardProps> = ({
   const gridContext: GridContextProps = {
     numberOfColumns,
     gutterSize,
-    margin,
     sizePerSpan,
     getSizeSpan: span => {
       return span * sizePerSpan + (span - 1) * gutterSize;
     },
   };
+
   /**
    * render overlay only dev mode
    */
@@ -107,8 +108,9 @@ const Card: React.FC<CardProps> = ({
     if (Array.isArray(children)) {
       let cursor = 0;
       let rows: any[] = [];
-      for (let i = 0; i < children.length; ++i) {
-        const item = children[i];
+      const arrayChild = children.filter(item => !!item);
+      for (let i = 0; i < arrayChild.length; ++i) {
+        const item = arrayChild[i];
         const totalSpan = rows
           .concat([item])
           .map(i => i.props?.widthSpan)
@@ -124,7 +126,7 @@ const Card: React.FC<CardProps> = ({
           rows = [item];
         }
 
-        if (i == children.length - 1) {
+        if (i == arrayChild.length - 1) {
           cursor += 1;
           element.push(addRowView(rows, cursor, true));
         }
@@ -138,25 +140,32 @@ const Card: React.FC<CardProps> = ({
     return element;
   };
 
-  const {theme} = useContext(ApplicationContext);
   return (
     <GridContext.Provider value={gridContext}>
       <View
-        accessibilityLabel={`Card`}
+        {...props}
         style={[
+          {backgroundColor: theme.colors.background.surface},
           style,
+          styles.protectedStyle,
           styles.card,
           {
             width: widthSection,
-            marginHorizontal: gridContext.margin,
-            backgroundColor: theme.colors.background.surface,
+            marginHorizontal: margin,
           },
+          !!backgroundImage && {backgroundColor: undefined},
           useShadow && Shadow.Light,
         ]}>
         {!!backgroundImage && (
           <Image
             source={{uri: backgroundImage}}
-            style={styles.imageBackground}
+            style={[
+              styles.imageBackground,
+              {
+                width: widthSection,
+                borderRadius: Radius.M,
+              },
+            ]}
           />
         )}
         {renderView(validateChildren(children, [Item, ItemList]))}

package/Layout/GridSystem.tsx

@@ -24,7 +24,6 @@ const GridSystem: React.FC<any> = ({
   const grid: GridContextProps = {
     numberOfColumns,
     gutterSize,
-    margin,
     sizePerSpan,
     getSizeSpan: span => {
       return span * sizePerSpan + (span - 1) * gutterSize;
@@ -46,7 +45,7 @@ const GridSystem: React.FC<any> = ({
           screenGrid && insets,
           {
             borderColor: theme.colors.error.primary,
-            marginHorizontal: grid.margin,
+            marginHorizontal: margin,
             top: Spacing.M,
             bottom: Spacing.M,
           },

package/Layout/Item.tsx

@@ -37,7 +37,6 @@ const Item: React.FC<ItemProps> = ({
 
   return (
     <View
-      accessibilityLabel={`Item`}
       style={[
         style,
         styles.item,

package/Layout/ItemList.tsx

@@ -1,56 +1,55 @@
-import React, {FC, useContext} from 'react';
+import React, {forwardRef, useContext} from 'react';
 import {FlatList, FlatListProps, View} from 'react-native';
 import Item, {SpanNumber} from './Item';
 import {GridContext} from './index';
 import styles from './styles';
 
 export interface ItemListProps extends FlatListProps<any> {
-  /**
-   * Require key support number columns change grid system
-   */
-
-  key: string;
   /**
    * Represents the width of the Card component in terms of span numbers (1-12).
    */
   widthSpan?: SpanNumber;
 }
 
-const ItemList: FC<ItemListProps> = ({
-  key,
-  renderItem,
-  widthSpan,
-  style,
-  contentContainerStyle,
-  ...props
-}) => {
-  const {gutterSize, numberOfColumns} = useContext(GridContext);
-  const widthItem = (widthSpan ?? numberOfColumns) as SpanNumber;
-  const numColumns = Math.floor(numberOfColumns / widthItem);
-  const indexBegin = props?.data?.map((_i, index) => index * numColumns);
-  const _renderItem = (item: any) => {
-    if (indexBegin?.includes(item?.index)) {
-      return <Item widthSpan={widthItem}>{renderItem?.(item)}</Item>;
-    }
+const ItemList = forwardRef(
+  (
+    {
+      renderItem,
+      widthSpan,
+      style,
+      contentContainerStyle,
+      ...props
+    }: ItemListProps,
+    ref,
+  ) => {
+    const {gutterSize, numberOfColumns} = useContext(GridContext);
+    const widthItem = (widthSpan ?? numberOfColumns) as SpanNumber;
+    const numColumns = Math.floor(numberOfColumns / widthItem);
+    const indexBegin = props?.data?.map((_i, index) => index * numColumns);
+    const _renderItem = (item: any) => {
+      if (indexBegin?.includes(item?.index)) {
+        return <Item widthSpan={widthItem}>{renderItem?.(item)}</Item>;
+      }
+      return (
+        <View style={{paddingLeft: gutterSize}}>
+          <Item widthSpan={widthItem}>{renderItem?.(item)}</Item>
+        </View>
+      );
+    };
+
     return (
-      <View style={{paddingLeft: gutterSize}}>
-        <Item widthSpan={widthItem}>{renderItem?.(item)}</Item>
-      </View>
+      <FlatList
+        ref={ref as React.RefObject<FlatList>}
+        {...props}
+        numColumns={numColumns}
+        renderItem={_renderItem}
+        horizontal={false}
+        ItemSeparatorComponent={() => <View style={{height: gutterSize}} />}
+        style={[style, styles.protectedStyle]}
+        contentContainerStyle={[contentContainerStyle, styles.protectedStyle]}
+      />
     );
-  };
-
-  return (
-    <FlatList
-      {...props}
-      key={`${key ?? 'ItemList'}${numColumns}}`}
-      numColumns={numColumns}
-      renderItem={_renderItem}
-      horizontal={false}
-      ItemSeparatorComponent={() => <View style={{height: gutterSize}} />}
-      style={[style, styles.protectedStyle]}
-      contentContainerStyle={[contentContainerStyle, styles.protectedStyle]}
-    />
-  );
-};
+  },
+);
 
 export default ItemList;

package/Layout/ItemSectionList.tsx

@@ -0,0 +1,39 @@
+import React, {FC, useContext} from 'react';
+import {SectionList, SectionListProps, View} from 'react-native';
+import Item, {SpanNumber} from './Item';
+import {GridContext} from './index';
+import styles from './styles';
+
+export interface ItemSectionListProps extends SectionListProps<any> {
+  /**
+   * Represents the width of the Card component in terms of span numbers (1-12).
+   */
+  widthSpan?: SpanNumber;
+}
+
+const ItemSectionList: FC<ItemSectionListProps> = ({
+  renderItem,
+  widthSpan,
+  style,
+  contentContainerStyle,
+  ...props
+}) => {
+  const {gutterSize, numberOfColumns} = useContext(GridContext);
+  const widthItem = (widthSpan ?? numberOfColumns) as SpanNumber;
+  const _renderItem = (item: any) => {
+    return <Item widthSpan={widthItem}>{renderItem?.(item)}</Item>;
+  };
+
+  return (
+    <SectionList
+      {...props}
+      renderItem={_renderItem}
+      horizontal={false}
+      ItemSeparatorComponent={() => <View style={{height: gutterSize}} />}
+      style={[style, styles.protectedStyle]}
+      contentContainerStyle={[contentContainerStyle, styles.protectedStyle]}
+    />
+  );
+};
+
+export default ItemSectionList;

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,
@@ -28,6 +29,7 @@ import Navigation from '../Application/Navigation';
 import styles from './styles';
 import {AnimatedHeader, NavigationOptions} from '../Application/types';
 import {Image} from '../Image';
+import {HeaderType} from './types';
 
 export interface ScreenProps extends ViewProps {
   children: React.ReactNode;
@@ -47,9 +49,9 @@ export interface ScreenProps extends ViewProps {
   scrollable?: boolean;
 
   /**
-   * Optional. If `true`, use an extended header for the screen.
+   * Optional. Set type of header.
    */
-  useExtendedHeader?: boolean;
+  headerType?: HeaderType;
 
   /**
    * Optional. Props for the animated component or bool used top navigation animated.
@@ -89,13 +91,13 @@ const Screen = forwardRef(
       enableKeyboardAvoidingView = false,
       scrollable = false,
       navigation,
-      useExtendedHeader,
       animatedHeader,
       scrollViewProps,
       headerComponent: Header,
       footerComponent: Footer,
       layoutOffset = -56,
       backgroundColor,
+      headerType = 'default',
     }: ScreenProps,
     ref,
   ) => {
@@ -108,20 +110,16 @@ const Screen = forwardRef(
     let handleScroll;
     let headerBackground: string | undefined = undefined;
     let Component: any = View;
+    let keyboardVerticalOffset = heightHeader - 20;
     animatedValue.current = undefined;
 
-    if (useExtendedHeader) {
-      headerBackground = theme.assets?.headerBackground;
+    if (headerType == 'extended' || animatedHeader) {
+      keyboardVerticalOffset = -20;
     }
 
-    useEffect(() => {
-      if (useExtendedHeader) {
-        navigation?.setOptions({
-          headerTransparent: true,
-          headerBackground: () => null,
-        });
-      }
-    }, [useExtendedHeader]);
+    if (headerType == 'extended') {
+      headerBackground = theme.assets?.headerBackground;
+    }
 
     useEffect(() => {
       if (animatedHeader) {
@@ -152,17 +150,63 @@ const Screen = forwardRef(
           };
         }
         navigation?.setOptions(styleAnimatedHeader);
-        const current: any = navigation;
-        const parent = current?.getParent?.();
-        if (parent) {
-          return current?.addListener?.('focus', () => {
-            const stackNavigation = new Navigation(parent, theme);
-            stackNavigation?.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}
+                  backgroundColor={theme.colors.background.surface}
+                  useBorder={true}
+                  animatedValue={animatedValue.current}
+                />
+              ),
+              headerTitle: (props: any) => (
+                <HeaderTitle {...props} animatedValue={animatedValue.current} />
+              ),
+            };
+            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]);
+
     /**
      * animated when use scroll && animated value
      */
@@ -216,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`}
@@ -249,9 +301,7 @@ const Screen = forwardRef(
     };
 
     return (
-      <View
-        style={[Styles.flex, {backgroundColor}]}
-        accessibilityLabel={`ScreenContainer`}>
+      <View style={[Styles.flex, {backgroundColor}]}>
         {!!headerBackground && (
           <>
             <Image
@@ -259,7 +309,6 @@ const Screen = forwardRef(
                 uri: headerBackground,
               }}
               style={styles.extendedHeader}
-              loading={false}
             />
             <View style={{height: heightHeader}} />
           </>
@@ -267,6 +316,7 @@ const Screen = forwardRef(
         <KeyboardAvoidingView
           style={Styles.flex}
           enabled={enableKeyboardAvoidingView}
+          keyboardVerticalOffset={keyboardVerticalOffset}
           behavior={Platform.select({
             ios: 'padding',
             android: undefined,
@@ -275,7 +325,6 @@ const Screen = forwardRef(
           <Component
             {...scrollViewProps}
             ref={ref}
-            heightHeader={heightHeader}
             showsVerticalScrollIndicator={false}
             onScroll={handleScroll}
             style={Styles.flex}>
@@ -283,15 +332,17 @@ const Screen = forwardRef(
               style={[styles.screenBanner, {maxHeight: 210 + layoutOffset}]}>
               {renderHeader()}
             </View>
-            {renderContent()}
+            {renderContent(children)}
           </Component>
           {Footer && (
             <View
-              style={{
-                paddingTop: Spacing.S,
-                paddingBottom: Math.min(insets.bottom, 20) + Spacing.S,
-                backgroundColor: theme.colors.background.surface,
-              }}>
+              style={[
+                styles.footerContainer,
+                {
+                  paddingBottom: Math.min(insets.bottom, 21) + Spacing.S,
+                  backgroundColor: theme.colors.background.surface,
+                },
+              ]}>
               <Section>{Footer}</Section>
             </View>
           )}