@momo-kits/foundation 0.92.1-tracking.2 → 0.92.1-tracking.4

package/Application/Components.tsx

@@ -29,7 +29,7 @@ import {scaleSize, Text} from '../Text';
 import {Icon} from '../Icon';
 import {PopupNotify} from '../Popup';
 import {Badge, BadgeDot} from '../Badge';
-import {getAccessibilityID} from "./utils";
+import {getAccessibilityID} from './utils';
 
 const NavigationButton: React.FC<NavigationButtonProps> = ({
   icon,
@@ -38,7 +38,7 @@ const NavigationButton: React.FC<NavigationButtonProps> = ({
   useBorder = true,
   badgeType,
   badgeValue,
-    accessibilityID = ''
+  accessibilityID = '',
 }) => {
   const {theme} = useContext(ApplicationContext);
   let buttonStyle: ViewStyle = {backgroundColor: '#00000066'};
@@ -65,7 +65,7 @@ const NavigationButton: React.FC<NavigationButtonProps> = ({
     }
   }, [badgeType, badgeValue]);
 
-  const ID = getAccessibilityID(accessibilityID)
+  const ID = getAccessibilityID(accessibilityID);
   return (
     <View {...ID} style={{width: scaleSize(28)}}>
       <TouchableOpacity
@@ -170,9 +170,9 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
     return true;
   };
   return (
-    <View  style={styles.headerLeft}>
+    <View style={styles.headerLeft}>
       <NavigationButton
-          accessibilityID = "btn_navigation_back"
+        accessibilityID="btn_navigation_back"
         icon="ic_back"
         tintColor={tintColor}
         onPress={goBackSafe}
@@ -293,7 +293,7 @@ const HeaderToolkitAction: React.FC<any> = ({
   tintColor,
   pinnedTool,
   runtimeTools = [],
-  preventBack,
+  preventClose,
 }) => {
   const {theme, navigator} = useContext(ApplicationContext);
   const miniContext = useContext(MiniAppContext);
@@ -340,15 +340,15 @@ const HeaderToolkitAction: React.FC<any> = ({
   };
 
   const onClose = () => {
-    if (preventBack) {
+    if (preventClose) {
       navigator?.showModal({
         screen: () => (
           <PopupNotify
-            {...preventBack}
+            {...preventClose}
             primary={{
-              title: preventBack.primary.title,
+              title: preventClose.primary.title,
               onPress: () => {
-                preventBack?.primary.onPress();
+                preventClose?.primary.onPress();
                 navigator?.maxApi?.dispatchFunction?.(
                   'dismiss',
                   undefined,
@@ -372,7 +372,7 @@ const HeaderToolkitAction: React.FC<any> = ({
     if (pinTool)
       return (
         <NavigationButton
-            accessibilityID  = "btn_navigation_pin"
+          accessibilityID="btn_navigation_pin"
           icon={pinTool.icon as string}
           tintColor={tintColor}
           badgeValue={badgeValue}
@@ -403,14 +403,14 @@ const HeaderToolkitAction: React.FC<any> = ({
             },
           ]}>
           <TouchableOpacity
-              {...getAccessibilityID("btn_navigation_more")}
-              onPress={onMore}>
+            {...getAccessibilityID('btn_navigation_more')}
+            onPress={onMore}>
             <Icon color={tintColor} source="navigation_more_horiz" size={20} />
           </TouchableOpacity>
           <View style={[styles.divider, {backgroundColor: tintColor}]} />
           <TouchableOpacity
-              {...getAccessibilityID("btn_navigation_close")}
-              onPress={onClose}>
+            {...getAccessibilityID('btn_navigation_close')}
+            onPress={onClose}>
             <Icon
               color={tintColor}
               source="16_navigation_close_circle"
@@ -429,6 +429,7 @@ const HeaderAnimated: React.FC<HeaderAnimatedProps> = ({
   animatedValue,
   image,
   onPress,
+  children,
 }) => {
   const scale = animatedValue.interpolate({
     inputRange: [-300, 0, 300],
@@ -447,19 +448,21 @@ const HeaderAnimated: React.FC<HeaderAnimatedProps> = ({
   });
 
   return (
-    <TouchableOpacity onPress={onPress}>
+    <TouchableOpacity onPress={onPress} disabled={!onPress}>
       <Animated.View
         style={{
           height: 210,
           opacity: opacity,
           transform: [{scale}, {translateY}],
         }}>
-        <Image
-          source={{
-            uri: image,
-          }}
-          style={{width: '100%', height: '100%'}}
-        />
+        {children ?? (
+          <Image
+            source={{
+              uri: image,
+            }}
+            style={{width: '100%', height: '100%'}}
+          />
+        )}
       </Animated.View>
     </TouchableOpacity>
   );

package/Application/index.ts

@@ -4,10 +4,8 @@ import {
   HeaderAnimated,
   HeaderBackground,
   HeaderCustom,
-  HeaderLeft,
   HeaderRightAction,
   HeaderTitle,
-  HeaderToolkitAction,
   NavigationButton,
 } from './Components';
 import BottomTab from './BottomTab';
@@ -32,10 +30,8 @@ export {
   BottomTab,
   NavigationButton,
   HeaderTitle,
-  HeaderLeft,
   HeaderBackground,
   HeaderRightAction,
-  HeaderToolkitAction,
   HeaderCustom,
   HeaderAnimated,
 };

package/Application/types.ts

@@ -1,4 +1,4 @@
-import {Animated} from 'react-native';
+import {Animated, ViewProps} from 'react-native';
 import {StackNavigationOptions} from '@react-navigation/stack';
 import React from 'react';
 import Navigator from './Navigator';
@@ -154,6 +154,7 @@ export interface NavigationOptions extends StackNavigationOptions {
   toolkitParams?: {
     pinnedTool?: PinnedToolType;
     runtimeTools?: RuntimeToolType[];
+    preventClose?: PopupNotifyProps;
   };
 }
 
@@ -185,11 +186,11 @@ export type HeaderToolkitProps = {
   configs: any[];
 };
 
-export type HeaderAnimatedProps = {
+export interface HeaderAnimatedProps extends ViewProps {
   animatedValue: Animated.Value;
   image: string;
   onPress?: () => void;
-};
+}
 
 export type BottomTabItemProps = {
   name: string;

package/Application/utils.tsx

@@ -131,14 +131,7 @@ const getOptions = (params: NavigationOptions, theme: Theme) => {
     options = {
       ...options,
       headerRight: (props: any) => {
-        return (
-          <HeaderToolkitAction
-            preventBack={params.preventBack}
-            pinnedTool={params.toolkitParams?.pinnedTool}
-            runtimeTools={params.toolkitParams?.runtimeTools}
-            {...props}
-          />
-        );
+        return <HeaderToolkitAction {...params.toolkitParams} {...props} />;
       },
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.92.1-tracking.2",
+    "version": "0.92.1-tracking.4",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {

package/verify.js

@@ -2,21 +2,24 @@ const fs = require('fs');
 const path = require('path');
 
 try {
-  const package = path.join(`${__dirname}`, 'package.json');
-  const packageInfo = JSON.parse(fs.readFileSync(package, 'utf8'));
+  const packageInfo = JSON.parse(
+    fs.readFileSync(path.join(`${__dirname}`, 'package.json'), 'utf8'),
+  );
   const packageVersion = parseInt(packageInfo?.version.split('.')?.[1]);
 
   const app = path.join(`${__dirname}/../../../`, 'app.json');
   const miniJson = path.join(`${__dirname}/../../../`, 'package.json');
+
+  if (!fs.existsSync(app) || fs.existsSync(miniJson)) {
+    return;
+  }
+
   const appInfo = JSON.parse(fs.readFileSync(app, 'utf8'));
   const miniInfo = JSON.parse(fs.readFileSync(miniJson, 'utf8'));
+
   const iOSAppTarget = appInfo?.client?.ios.deploymentTarget;
   const androidAppTarget = appInfo?.client?.android.deploymentTarget;
 
-  if (Object.values(appInfo).length < 1) {
-    return;
-  }
-
   if (packageVersion > iOSAppTarget || packageVersion > androidAppTarget) {
     console.error(
       `Package ${packageInfo.name} version: ${packageInfo.version} require deploymentTarget ${packageVersion}`,