@momo-kits/foundation 0.81.41-beta.3 → 0.81.41-beta.8

package/Application/Components.tsx

@@ -343,7 +343,7 @@ const HeaderRightAction: React.FC<any> = ({children, ...restProps}) => {
   return <View style={styles.headerRightButton}>{renderAction()}</View>;
 };
 
-const HeaderToolkitAction: React.FC<any> = ({tintColor}) => {
+const HeaderToolkitAction: React.FC<any> = ({tintColor, pinnedTool}) => {
   const {theme, navigator} = useContext(ApplicationContext);
   const [toolConfig, setToolConfig] = useState<any>();
   const {appCode, onAction} = toolConfig ?? {};
@@ -357,29 +357,21 @@ const HeaderToolkitAction: React.FC<any> = ({tintColor}) => {
     if (navigator?.toolkitConfig) {
       setToolConfig(navigator?.toolkitConfig);
     } else {
-      navigator?.requestApi('getToolkit', [undefined], (result: boolean) => {
-        if (result) {
-          navigator?.requestApi(
-            'getToolkitConfig',
-            [undefined],
-            (config: any) => {
-              navigator.toolkitConfig = {
-                configs: [
-                  ...config?.toolkitConfig?.customTools,
-                  ...config?.toolkitFeatureConfig,
-                ],
-                appCode: config?.appCode,
-              };
-              setToolConfig({
-                configs: [
-                  ...config?.toolkitConfig?.customTools,
-                  ...config?.toolkitFeatureConfig,
-                ],
-                appCode: config?.appCode,
-              });
-            },
-          );
-        }
+      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,
+        });
       });
     }
   }, []);
@@ -440,18 +432,16 @@ const HeaderToolkitAction: React.FC<any> = ({tintColor}) => {
   };
 
   const renderPinnedTool = () => {
-    const pinTool = toolConfig?.configs?.find(
-      (i: any) => i.key === navigator?.pinnedTool,
-    );
+    const pinTool = toolConfig?.configs?.find((i: any) => i.key === pinnedTool);
     const {icon} = pinTool || '';
-    if (pinTool && navigator?.pinnedTool)
+    if (pinTool && pinnedTool)
       return (
         <NavigationButton
           accessibilityLabel={'UtilityTool'}
           icon={icon as string}
           tintColor={tintColor}
           onPress={() => {
-            navigator?.toolkitCallback?.(navigator?.pinnedTool);
+            navigator?.toolkitCallback?.(pinnedTool);
           }}
         />
       );

package/Application/Navigator.ts

@@ -13,7 +13,6 @@ class Navigator {
   maxApi?: any;
   trackingInfo?: TrackingInfo;
   dismissData?: any;
-  pinnedTool?: string;
   toolkitCallback?: (item: any) => void;
 
   constructor(navigation: any) {
@@ -110,10 +109,6 @@ class Navigator {
     }
   };
 
-  setPinnedTool = (key: string) => {
-    this.pinnedTool = key;
-  };
-
   setToolkitCallback = (
     callback: (item: {key: string; action: string}) => void,
   ) => {

package/Application/types.ts

@@ -138,6 +138,7 @@ export interface NavigationOptions extends StackNavigationOptions {
   surface?: boolean;
   hiddenBack?: boolean;
   customTitle?: TitleCustomProps;
+  pinnedTool?: string;
 }
 
 export interface HeaderBackProps extends NavigationButtonProps {

package/Application/utils.tsx

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

package/package.json

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