@momo-kits/foundation 0.81.41-beta.9 → 0.81.42

package/Application/Components.tsx

@@ -347,14 +347,10 @@ const HeaderRightAction: React.FC<any> = ({children, ...restProps}) => {
   return <View style={styles.headerRightButton}>{renderAction()}</View>;
 };
 
-const HeaderToolkitAction: React.FC<any> = ({
-  tintColor,
-  pinnedTool,
-  preventBack,
-}) => {
+const HeaderToolkitAction: React.FC<any> = ({tintColor}) => {
   const {theme, navigator} = useContext(ApplicationContext);
-  const [toolConfig, setToolConfig] = useState<any>();
-  const {appCode, onAction} = toolConfig ?? {};
+  const [toolConfig, setToolConfig] = useState<HeaderToolkitProps>();
+  const {appCode, hidden, type, onAction} = toolConfig ?? {};
 
   let backgroundColor;
   if (tintColor != Colors.black_01) {
@@ -365,21 +361,20 @@ const HeaderToolkitAction: React.FC<any> = ({
     if (navigator?.toolkitConfig) {
       setToolConfig(navigator?.toolkitConfig);
     } else {
-      navigator?.requestApi('getToolkitConfig', [undefined], (config: any) => {
-        navigator.toolkitConfig = {
-          configs: [
-            ...config?.miniappTools?.customTools,
-            ...config?.defaultTools,
-          ],
-          appCode: config?.appCode,
-        };
-        setToolConfig({
-          configs: [
-            ...config?.miniappTools?.customTools,
-            ...config?.defaultTools,
-          ],
-          appCode: config?.appCode,
-        });
+      navigator?.requestApi('getToolkit', [undefined], (result: boolean) => {
+        if (result) {
+          navigator?.requestApi(
+            'getToolkitConfig',
+            [undefined],
+            (config: any) => {
+              navigator.toolkitConfig = {
+                ...config?.utilityToolConfig,
+                appCode: config?.appCode,
+              };
+              setToolConfig(navigator?.toolkitConfig);
+            },
+          );
+        }
       });
     }
   }, []);
@@ -422,59 +417,39 @@ const HeaderToolkitAction: React.FC<any> = ({
     };
   }, [appCode]);
 
+  const onUtilityTool = () => {
+    onAction?.('onUtilityTool');
+    navigator?.requestApi(type, undefined, undefined);
+  };
+
   const onMore = () => {
     onAction?.('onMore');
-    navigator?.requestApi(
-      'showTools',
-      [toolConfig],
-      (res: {item: {action?: string; key: string}}) => {
-        const {item} = res;
-        navigator?.toolkitCallback?.(item);
-      },
-    );
+    navigator?.requestApi('showToolkit', [toolConfig], undefined);
   };
 
   const onClose = () => {
-    if (preventBack) {
-      navigator?.showModal({
-        screen: () => (
-          <PopupNotify
-            {...preventBack}
-            primary={{
-              title: preventBack.primary.title,
-              onPress: () => {
-                preventBack?.primary.onPress();
-                navigator?.requestApi('dismiss', undefined, undefined);
-              },
-            }}
-          />
-        ),
-      });
-    } else {
-      navigator?.requestApi('dismiss', undefined, undefined);
-    }
+    onAction?.('onClose');
+    navigator?.requestApi('dismiss', undefined, undefined);
   };
 
-  const renderPinnedTool = () => {
-    const pinTool = toolConfig?.configs?.find((i: any) => i.key === pinnedTool);
-    const {icon} = pinTool || '';
-    if (pinTool && pinnedTool)
+  const renderUtilityTool = () => {
+    if (hidden === false) {
       return (
         <NavigationButton
           accessibilityLabel={'UtilityTool'}
-          icon={icon as string}
+          icon={type as string}
           tintColor={tintColor}
-          onPress={() => {
-            navigator?.toolkitCallback?.(pinnedTool);
-          }}
+          onPress={onUtilityTool}
         />
       );
+    }
+    return null;
   };
 
   if (toolConfig) {
     return (
       <View style={styles.headerRightButton}>
-        {renderPinnedTool()}
+        {renderUtilityTool()}
         <View
           style={[
             styles.toolkitContainer,

package/Application/Navigator.ts

@@ -13,7 +13,6 @@ class Navigator {
   maxApi?: any;
   trackingInfo?: TrackingInfo;
   dismissData?: any;
-  toolkitCallback?: (item: any) => void;
 
   constructor(navigation: any) {
     this.ref = navigation;
@@ -122,12 +121,6 @@ class Navigator {
       this.maxApi[func]?.(...args, callback);
     }
   };
-
-  setToolkitCallback = (
-    callback: (item: {key: string; action: string}) => void,
-  ) => {
-    this.toolkitCallback = callback;
-  };
 }
 
 export default Navigator;

package/Application/types.ts

@@ -138,7 +138,6 @@ export interface NavigationOptions extends StackNavigationOptions {
   surface?: boolean;
   hiddenBack?: boolean;
   customTitle?: TitleCustomProps;
-  pinnedTool?: string;
 }
 
 export interface HeaderBackProps extends NavigationButtonProps {
@@ -167,7 +166,9 @@ export type TitleCustomProps = {
 export type HeaderToolkitProps = {
   [key: string]: any;
   appCode: string;
-  configs: any[];
+  hidden: boolean;
+  type: string;
+  onAction?: (action: string) => void;
 };
 
 export type HeaderAnimatedProps = {

package/Application/utils.tsx

@@ -126,21 +126,6 @@ const getOptions = (params: NavigationOptions, theme: Theme) => {
     };
   }
 
-  if (params.pinnedTool) {
-    options = {
-      ...options,
-      headerRight: (props: any) => {
-        return (
-          <HeaderToolkitAction
-            preventBack={params.preventBack}
-            pinnedTool={params.pinnedTool}
-            {...props}
-          />
-        );
-      },
-    };
-  }
-
   return {
     ...params,
     ...options,

package/package.json

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