@momo-kits/foundation 0.92.26-beta.0 → 0.92.26-beta.10

package/Application/BottomSheet.tsx

@@ -19,7 +19,6 @@ import {Icon} from '../Icon';
 
 const BottomSheet: React.FC<BottomSheetParams> = props => {
   const {theme, navigator} = useContext(ApplicationContext);
-  const closed = useRef(false);
   const heightDevice = Dimensions.get('screen').height;
   const insets = useSafeAreaInsets();
   const {
@@ -75,12 +74,9 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
     Animated.timing(pan, {
       toValue: {x: 0, y: 0},
       useNativeDriver: false,
-      duration: 200,
+      duration: 150,
     }).start();
     return () => {
-      if (!closed.current) {
-        navigator?.pop();
-      }
       props.route.params?.onDismiss?.();
     };
   }, []);
@@ -92,16 +88,17 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
     if (barrierDismissible && !force) {
       return;
     }
-    closed.current = true;
     setTimeout(() => {
-      navigator?.pop();
       callback?.();
-    }, 300);
+    }, 350);
+
     Animated.timing(pan, {
       toValue: {x: 0, y: heightDevice},
       useNativeDriver: false,
-      duration: 200,
-    }).start();
+      duration: 100,
+    }).start(() => {
+      navigator?.pop();
+    });
   };
 
   /**
@@ -168,7 +165,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
             <Screen
               {...props}
               {...props.route.params}
-              // requestClose={requestClose}
+              requestClose={requestClose}
             />
             {useBottomInset && (
               <View style={{height: Math.min(insets.bottom, 21)}} />

package/Application/BottomTab/index.tsx

@@ -17,10 +17,9 @@ const Tab = createBottomTabNavigator();
 const Stack = createStackNavigator();
 
 const TabScreen: React.FC<NavigationScreenProps> = ({route}) => {
-  const {theme} = useContext(ApplicationContext);
   let options = {};
   if (route.params?.options) {
-    options = getOptions(route.params?.options, theme);
+    options = getOptions(route.params?.options);
   }
 
   if (route.params?.nested) {

package/Application/Components.tsx

@@ -1,8 +1,8 @@
 import React, {
-  Fragment,
   useCallback,
   useContext,
   useEffect,
+  useRef,
   useState,
 } from 'react';
 import {
@@ -29,7 +29,14 @@ import {scaleSize, Text} from '../Text';
 import {Icon} from '../Icon';
 import {PopupNotify} from '../Popup';
 import {Badge, BadgeDot} from '../Badge';
+import {HeaderType} from '../Layout/types';
+import Navigation from './Navigation';
+import {InputSearchProps} from '../Input';
+import AnimatedInputSearch from '../Layout/AnimatedInputSearch';
 
+/**
+ * default navigation button used header nav
+ */
 const NavigationButton: React.FC<NavigationButtonProps> = ({
   icon,
   tintColor,
@@ -81,13 +88,18 @@ const NavigationButton: React.FC<NavigationButtonProps> = ({
   );
 };
 
+/**
+ * default header title used for nav
+ */
 const HeaderTitle: React.FC<any> = props => {
   const {theme} = useContext(ApplicationContext);
-  const opacity = props.animatedValue?.interpolate({
-    inputRange: [0, 200],
-    outputRange: [0, 1],
-    extrapolate: 'clamp',
-  });
+  const opacity = props.animatedValue?.interpolate(
+    props.interpolate ?? {
+      inputRange: [0, 200],
+      outputRange: [0, 1],
+      extrapolate: 'clamp',
+    }
+  );
 
   return (
     <Animated.Text
@@ -101,6 +113,9 @@ const HeaderTitle: React.FC<any> = props => {
   );
 };
 
+/**
+ * default header left used for nav
+ */
 const HeaderLeft: React.FC<HeaderBackProps> = ({
   tintColor,
   preventBack,
@@ -113,7 +128,7 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
   useEffect(() => {
     const backHandler = BackHandler.addEventListener(
       'hardwareBackPress',
-      goBackSafe,
+      goBackSafe
     );
 
     return () => backHandler.remove();
@@ -168,6 +183,7 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
     }
     return true;
   };
+
   return (
     <View style={styles.headerLeft}>
       <NavigationButton
@@ -181,6 +197,9 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
   );
 };
 
+/**
+ * header background for default
+ */
 const HeaderBackground: React.FC<HeaderBackgroundProps> = ({
   image,
   animatedValue,
@@ -229,6 +248,10 @@ const HeaderBackground: React.FC<HeaderBackgroundProps> = ({
   );
 };
 
+/**
+ * Header custom with image, title, subtitle
+ * @constructor
+ */
 const HeaderCustom: React.FC<TitleCustomProps> = ({
   title,
   subTitle,
@@ -263,37 +286,42 @@ const HeaderCustom: React.FC<TitleCustomProps> = ({
   return <View style={styles.headerTitleContainer}>{content ?? header}</View>;
 };
 
-const HeaderRightAction: React.FC<any> = ({children, ...restProps}) => {
-  const validateType = (child: React.ReactElement) => {
-    const valid = child?.type === NavigationButton || child?.type === Fragment;
-    if (__DEV__ && !valid) {
-      console.warn(
-        'HeaderRightAction contains element type of NavigationButton, Please check again.',
-      );
+/**
+ * main component for header right
+ */
+const HeaderRight: React.FC<any> = ({type, children, onLayout, ...props}) => {
+  if (type === 'icon') {
+    let buttons = props?.buttons || [];
+    if (buttons?.length > 3) {
+      buttons = buttons.slice(0, 3);
     }
-    return child;
-  };
-
-  const renderAction = () => {
-    if (Array.isArray(children)) {
-      return children.map((child, index) => {
-        return (
-          <View key={`HeaderRightAction ${index}`} style={styles.headerButton}>
-            {React.cloneElement(validateType(child), {...restProps})}
-          </View>
-        );
-      });
-    }
-
     return (
-      <View style={styles.headerButton}>
-        {React.cloneElement(validateType(children), {...restProps})}
+      <View style={styles.headerRightButton} onLayout={onLayout}>
+        {buttons?.map?.((item: NavigationButtonProps, index: number) => {
+          return (
+            <View
+              key={`HeaderRightAction ${index}`}
+              style={{
+                marginLeft: index !== 0 ? Spacing.S : 0,
+              }}>
+              <NavigationButton {...item} tintColor={props?.tintColor} />
+            </View>
+          );
+        })}
       </View>
     );
-  };
-  return <View style={styles.headerRightButton}>{renderAction()}</View>;
+  }
+
+  return (
+    <View style={styles.headerRightButton} onLayout={onLayout}>
+      <HeaderToolkitAction {...props} />
+    </View>
+  );
 };
 
+/**
+ * Header toolkit action
+ */
 const HeaderToolkitAction: React.FC<any> = ({
   tintColor,
   pinnedTool,
@@ -305,6 +333,7 @@ const HeaderToolkitAction: React.FC<any> = ({
   const [toolConfig, setToolConfig] = useState<any>();
   const {onAction} = toolConfig ?? {};
 
+  console.log('Toolconfig--------', toolConfig);
   let backgroundColor;
   if (tintColor !== Colors.black_01) {
     backgroundColor = 'transparent';
@@ -327,7 +356,7 @@ const HeaderToolkitAction: React.FC<any> = ({
       (config: any) => {
         navigator.toolkitConfig = config;
         setToolConfig(navigator?.toolkitConfig);
-      },
+      }
     );
   };
 
@@ -340,7 +369,7 @@ const HeaderToolkitAction: React.FC<any> = ({
         const {item} = res;
         navigator?.toolkitCallback?.(item);
         getToolkitConfig();
-      },
+      }
     );
   };
 
@@ -357,7 +386,7 @@ const HeaderToolkitAction: React.FC<any> = ({
                 navigator?.maxApi?.dispatchFunction?.(
                   'dismiss',
                   undefined,
-                  undefined,
+                  undefined
                 );
               },
             }}
@@ -388,7 +417,7 @@ const HeaderToolkitAction: React.FC<any> = ({
               [pinTool?.key],
               () => {
                 getToolkitConfig();
-              },
+              }
             );
             navigator?.toolkitCallback?.(pinTool.key);
           }}
@@ -397,7 +426,7 @@ const HeaderToolkitAction: React.FC<any> = ({
   };
   if (toolConfig) {
     return (
-      <View style={styles.headerRightButton}>
+      <View style={Styles.row}>
         {renderPinnedTool()}
         <View
           style={[
@@ -405,6 +434,7 @@ const HeaderToolkitAction: React.FC<any> = ({
             {
               backgroundColor: backgroundColor ?? '#00000066',
               borderWidth: backgroundColor ? 0.5 : 0,
+              marginLeft: renderPinnedTool() ? Spacing.S : 0,
             },
           ]}>
           <TouchableOpacity
@@ -430,6 +460,9 @@ const HeaderToolkitAction: React.FC<any> = ({
   return <View />;
 };
 
+/**
+ * default header banner for header animated
+ */
 const HeaderAnimated: React.FC<HeaderAnimatedProps> = ({
   animatedValue,
   image,
@@ -470,6 +503,152 @@ const HeaderAnimated: React.FC<HeaderAnimatedProps> = ({
   );
 };
 
+/**
+ * Header extended with background image
+ * @constructor
+ */
+const HeaderExtendHeader: React.FC<{
+  headerType?: HeaderType;
+  animatedValue: Animated.Value;
+  heightHeader: number;
+  inputSearchProps?: InputSearchProps;
+  navigation?: Navigation;
+}> = ({
+  headerType = 'default',
+  animatedValue,
+  heightHeader,
+  inputSearchProps,
+  navigation,
+}) => {
+  const {theme} = useContext(ApplicationContext);
+
+  const heightAnimated = useRef(new Animated.Value(0));
+
+  useEffect(() => {
+    const listener = animatedValue.addListener(({value}) => {
+      heightAnimated.current.setValue(value);
+    });
+    return () => {
+      animatedValue?.removeListener(listener);
+    };
+  }, []);
+
+  if (inputSearchProps) {
+    if (headerType === 'surface') {
+      return (
+        <View
+          style={{
+            backgroundColor: theme.colors.background.surface,
+            borderBottomWidth: 1,
+            borderColor: theme.colors.border.default,
+          }}>
+          <Animated.View
+            style={{
+              justifyContent: 'flex-end',
+              height: heightAnimated.current.interpolate({
+                inputRange: [0, 100],
+                outputRange: [heightHeader + 52, heightHeader],
+                extrapolate: 'clamp',
+              }),
+            }}>
+            <AnimatedInputSearch
+              animatedValue={animatedValue}
+              navigation={navigation}
+              {...inputSearchProps}
+              hasColorBG={true}
+            />
+          </Animated.View>
+        </View>
+      );
+    }
+
+    if (headerType === 'extended') {
+      return (
+        <>
+          <Animated.View
+            style={[
+              styles.headerBox,
+              {
+                height: heightAnimated.current.interpolate({
+                  inputRange: [0, 100],
+                  outputRange: [heightHeader + 52, heightHeader],
+                  extrapolate: 'clamp',
+                }),
+              },
+            ]}>
+            <Image
+              source={{
+                uri: theme.assets?.headerBackground,
+              }}
+              style={styles.headerBackground}
+            />
+          </Animated.View>
+
+          <Animated.View
+            style={{
+              justifyContent: 'flex-end',
+              height: heightAnimated.current.interpolate({
+                inputRange: [0, 100],
+                outputRange: [heightHeader + 52, heightHeader],
+                extrapolate: 'clamp',
+              }),
+            }}>
+            <AnimatedInputSearch
+              animatedValue={animatedValue}
+              navigation={navigation}
+              {...inputSearchProps}
+            />
+          </Animated.View>
+        </>
+      );
+    }
+
+    return (
+      <>
+        <View style={[styles.headerBox, {height: heightHeader}]}>
+          <Image
+            source={{
+              uri: theme.assets?.headerBackground,
+            }}
+            style={styles.headerBackground}
+          />
+        </View>
+
+        <Animated.View
+          style={{
+            justifyContent: 'flex-end',
+            height: heightAnimated.current.interpolate({
+              inputRange: [0, 100],
+              outputRange: [heightHeader + 52, heightHeader],
+              extrapolate: 'clamp',
+            }),
+          }}>
+          <AnimatedInputSearch
+            animatedValue={animatedValue}
+            navigation={navigation}
+            {...inputSearchProps}
+          />
+        </Animated.View>
+      </>
+    );
+  }
+
+  if (headerType === 'extended') {
+    return (
+      <View style={{minHeight: heightHeader}}>
+        <Image
+          source={{
+            uri: theme.assets?.headerBackground,
+          }}
+          style={styles.extendedHeader}
+        />
+      </View>
+    );
+  }
+
+  return <View />;
+};
+
 const styles = StyleSheet.create({
   navigationButton: {
     height: 28,
@@ -509,7 +688,6 @@ const styles = StyleSheet.create({
     paddingRight: Spacing.M,
   },
   toolkitContainer: {
-    marginLeft: Spacing.S,
     padding: Spacing.XS,
     height: 28,
     borderRadius: 14,
@@ -541,6 +719,17 @@ const styles = StyleSheet.create({
     top: -Spacing.XS,
     right: -Spacing.XS,
   },
+  extendedHeader: {
+    aspectRatio: 1.75,
+    position: 'absolute',
+    width: '100%',
+    height: 210,
+  },
+  headerBox: {
+    width: '100%',
+    position: 'absolute',
+    overflow: 'hidden',
+  },
 });
 
 export {
@@ -548,8 +737,9 @@ export {
   HeaderTitle,
   HeaderLeft,
   HeaderBackground,
-  HeaderRightAction,
   HeaderToolkitAction,
   HeaderCustom,
   HeaderAnimated,
+  HeaderRight,
+  HeaderExtendHeader,
 };

package/Application/ModalScreen.tsx

@@ -21,10 +21,10 @@ const ModalScreen: React.FC<any> = props => {
 };
 
 const Modal: React.FC<ModalParams> = props => {
-  const {theme, navigator} = useContext(ApplicationContext);
+  const {navigator} = useContext(ApplicationContext);
   const {screen, barrierDismissible} = props.route.params;
   const Component = useRef(screen).current;
-  const navigation = new Navigation(props.navigation, theme);
+  const navigation = new Navigation(props.navigation);
   const params = {
     ...props.route.params,
     navigation,

package/Application/Navigation.ts

@@ -1,17 +1,13 @@
-import React from 'react';
 import {NavigationProp} from '@react-navigation/native';
-import {NavigationOptions, Theme} from './types';
-import {HeaderRightAction} from './index';
+import {NavigationOptions} from './types';
 import {getOptions} from './utils';
-import {HeaderToolkitAction} from './Components';
 
 class Navigation {
   instance: NavigationProp<any>;
-  readonly theme: Theme;
+  rightHeaderWidth?: number;
 
-  constructor(instance: any, theme: Theme) {
+  constructor(instance: any) {
     this.instance = instance;
-    this.theme = theme;
   }
 
   /**
@@ -19,16 +15,6 @@ class Navigation {
    * @param params
    */
   private filterParams = (params: NavigationOptions) => {
-    if (params.headerRight) {
-      const headerRight = params.headerRight?.({}) as React.ReactElement;
-      const type = headerRight?.type;
-      if (type !== HeaderRightAction && type !== HeaderToolkitAction) {
-        console.warn(
-          'headerRight contains element type of HeaderRightAction | HeaderToolkitAction, Please check again.',
-        );
-      }
-    }
-
     if (params.headerLeft) {
       console.warn('headerLeft not allow override render by design system!');
       delete params.headerLeft;
@@ -42,7 +28,7 @@ class Navigation {
    * @param params
    */
   setOptions = (params: NavigationOptions) => {
-    params = getOptions(this.filterParams(params), this.theme);
+    params = getOptions(this.filterParams(params), this);
     this.instance.setOptions(params);
   };
 }

package/Application/StackScreen.tsx

@@ -88,7 +88,7 @@ const EmptyScreen: React.FC = () => {
  * @constructor
  */
 const StackScreen: React.FC<ScreenParams> = props => {
-  const {theme, showGrid, navigator} = useContext(ApplicationContext);
+  const {showGrid, navigator} = useContext(ApplicationContext);
   const startTime = useRef(Date.now());
   const endTime = useRef(Date.now());
   const timeLoad = useRef(0);
@@ -104,7 +104,7 @@ const StackScreen: React.FC<ScreenParams> = props => {
   const context = useContext<any>(MiniAppContext);
 
   const {screen: Component, options, initialParams} = props.route.params;
-  const navigation = new Navigation(props.navigation, theme);
+  const navigation = new Navigation(props.navigation);
   const heightHeader = useHeaderHeight();
 
   const data = {

package/Application/index.ts

@@ -5,7 +5,6 @@ import {
   HeaderAnimated,
   HeaderBackground,
   HeaderCustom,
-  HeaderRightAction,
   HeaderTitle,
   NavigationButton,
 } from './Components';
@@ -31,7 +30,6 @@ export {
   NavigationButton,
   HeaderTitle,
   HeaderBackground,
-  HeaderRightAction,
   HeaderCustom,
   HeaderAnimated,
 };

package/Application/types.ts

@@ -145,19 +145,29 @@ export type RuntimeToolType = {
   key: string;
 };
 
-export interface NavigationOptions extends StackNavigationOptions {
+export interface NavigationOptions
+  extends Omit<StackNavigationOptions, 'headerRight'> {
   preventBack?: PopupNotifyProps;
   onPressLeftHeader?: () => void;
   surface?: boolean;
   hiddenBack?: boolean;
   customTitle?: TitleCustomProps;
-  toolkitParams?: {
-    pinnedTool?: PinnedToolType;
-    runtimeTools?: RuntimeToolType[];
-    preventClose?: PopupNotifyProps;
-  };
+  headerRight?: HeaderRightToolkit | HeaderRightActions | any;
 }
 
+export type HeaderRightToolkit = {
+  type?: 'toolkit';
+  pinnedTool?: PinnedToolType;
+  runtimeTools?: RuntimeToolType[];
+  preventClose?: PopupNotifyProps;
+  useMore?: boolean;
+};
+
+export type HeaderRightActions = {
+  type?: 'icon';
+  buttons: NavigationButtonProps[];
+};
+
 export interface HeaderBackProps extends NavigationButtonProps {
   preventBack?: PopupNotifyProps;
   onPressLeftHeader?: () => void;