@momo-kits/foundation 0.120.0-beta.21 → 0.120.0-beta.22

package/Application/Components/HeaderRight.tsx

@@ -12,10 +12,10 @@ import {PopupNotify} from '../../Popup';
 import {Tool, ToolGroup} from '../types';
 import {Icon} from '../../Icon';
 import {scaleSize, Text} from '../../Text';
-import {DesignSystemWhiteList} from '../NavigationContainer';
 
 const DID_SYNC_NEW_HOME = 'did_sync_new_home';
-const isWhiteList = DesignSystemWhiteList;
+const context = useContext<any>(MiniAppContext);
+const isWhiteList = context?.designSystemConfig?.isWhiteList || false;
 
 /**
  * main component for header right
@@ -261,10 +261,6 @@ const HeaderToolkitAction: React.FC<any> = ({
     group?.items?.some?.(tool => tool?.showBadge)
   );
 
-  const iconClose = isWhiteList
-    ? '16_basic_home'
-    : '16_navigation_close_circle';
-
   return (
     <View style={Styles.row}>
       {useShortcut && (
@@ -301,7 +297,13 @@ const HeaderToolkitAction: React.FC<any> = ({
           onPress={onClose}
           style={styles.toolkitButton}
           hitSlop={{top: 7, bottom: 7, left: 0, right: 7}}>
-          <Icon color={tintColor} source={iconClose} size={20} />
+          <Icon
+            color={tintColor}
+            source={
+              isWhiteList ? '16_basic_home' : '16_navigation_close_circle'
+            }
+            size={20}
+          />
         </TouchableOpacity>
       </View>
     </View>

package/Application/NavigationContainer.tsx

@@ -8,7 +8,7 @@ import {
   createStackNavigator,
   StackNavigationOptions,
 } from '@react-navigation/stack';
-import {DeviceEventEmitter, Text} from 'react-native';
+import {DeviceEventEmitter} from 'react-native';
 import StackScreen from './StackScreen';
 import ModalScreen from './ModalScreen';
 import Navigator from './Navigator';
@@ -19,9 +19,6 @@ import Localize from './Localize';
 import {defaultTheme} from '../Consts';
 
 const Stack = createStackNavigator();
-export let DesignSystemWhiteList: boolean | undefined = undefined;
-let setDesignSystemWhiteList = (value: boolean) =>
-  (DesignSystemWhiteList = value);
 
 const NavigationContainer: React.FC<NavigationContainerProps> = ({
   screen,
@@ -39,21 +36,14 @@ const NavigationContainer: React.FC<NavigationContainerProps> = ({
   const [showGrid, setShowGrid] = useState(false);
   const [currentContext, setCurrentContext] = useState({});
 
-  setDesignSystemWhiteList(context?.designSystemConfig?.isWhiteList);
-
-  (Text as any).defaultProps = {
-    ...(Text as any).defaultProps,
-    allowFontScaling: false,
-  };
-
-  let headerBackground = context?.designSystemConfig?.config?.headerBar;
+  let headerBackground = context?.designConfig?.headerBar;
   let headerGradient = theme.colors?.gradient;
 
   if (theme.assets?.headerBackground) {
     headerBackground = theme.assets?.headerBackground;
   }
-  if (context?.designSystemConfig?.config?.headerGradient) {
-    headerGradient = context?.designSystemConfig?.config?.headerGradient;
+  if (context?.designConfig?.headerGradient) {
+    headerGradient = context?.designConfig?.headerGradient;
   }
 
   /**
@@ -252,4 +242,4 @@ const NavigationContainer: React.FC<NavigationContainerProps> = ({
   );
 };
 
-export {ApplicationContext, NavigationContainer, setDesignSystemWhiteList};
+export {ApplicationContext, NavigationContainer};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/foundation",
-  "version": "0.120.0-beta.21",
+  "version": "0.120.0-beta.22",
   "minimumDeployTarget": 32,
   "deploymentTarget": 120,
   "description": "React Native Component Kits",