@momo-kits/foundation 0.165.2-beta.3 → 0.167.1-beta.10

package/Application/Components/HeaderTitle.tsx

@@ -16,7 +16,16 @@ import {
 import { Image } from '../../Image';
 import { Icon } from '../../Icon';
 import { Skeleton } from '../../Skeleton';
-import { AnimatedCompatValue, useNormalizedSharedValue } from '../utils';
+import {
+  AnimatedCompatValue,
+  isWhiteListDesignSystem,
+  useNormalizedSharedValue,
+} from '../utils';
+
+const useHeaderFontFamily = (): string => {
+  const context = useContext<any>(MiniAppContext);
+  return isWhiteListDesignSystem(context) ? 'MoMoTrustDisplay' : 'SFProText';
+};
 
 type HeaderTitleInterpolate = {
   inputRange: number[];
@@ -37,6 +46,7 @@ const HeaderTitle: React.FC<
   HeaderTitleExtraProps & { [key: string]: any }
 > = props => {
   const context = useContext<any>(MiniAppContext);
+  const headerFontFamily = useHeaderFontFamily();
 
   const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
@@ -85,7 +95,7 @@ const HeaderTitle: React.FC<
             fontFamily: exportFontFamily(
               'bold',
               'action_xs_bold',
-              'MoMoTrustDisplay',
+              headerFontFamily,
             ),
             color: props.tintColor,
           },
@@ -130,6 +140,7 @@ const TitleUser: React.FC<TitleUserProps> = ({
   isLoading,
 }) => {
   const { theme } = useContext(ApplicationContext);
+  const headerFontFamily = useHeaderFontFamily();
   const maxWidth = Dimensions.get('window').width - 172;
   const getShortName = (name: string) => {
     const words = name.split(' ');
@@ -378,7 +389,7 @@ const TitleUser: React.FC<TitleUserProps> = ({
           <View style={Styles.row}>
             <Text
               typography="action_xs_bold"
-              fontFamily='MoMoTrustDisplay'
+              fontFamily={headerFontFamily}
               color={tintColor}
               numberOfLines={1}
             >
@@ -412,6 +423,7 @@ const TitleLocation: React.FC<TitleLocationProps> = ({
   onPress,
   isLoading,
 }) => {
+  const headerFontFamily = useHeaderFontFamily();
   const maxWidth = Dimensions.get('window').width - 172;
   const renderShimmer = () => {
     return (
@@ -448,9 +460,12 @@ const TitleLocation: React.FC<TitleLocationProps> = ({
         </Text>
       )}
       <View style={Styles.row}>
-        <Text typography="action_xs_bold" 
-          fontFamily='MoMoTrustDisplay'
-         color={tintColor} numberOfLines={1}>
+        <Text
+          typography="action_xs_bold"
+          fontFamily={headerFontFamily}
+          color={tintColor}
+          numberOfLines={1}
+        >
           {location}
         </Text>
         <Icon
@@ -477,6 +492,7 @@ const TitleJourney: React.FC<TitleJourneyProps> = ({
   onPress,
   isLoading,
 }) => {
+  const headerFontFamily = useHeaderFontFamily();
   const { width } = Dimensions.get('screen');
   const maxWidth = Dimensions.get('window').width - 172;
   const startWidth = width * 0.25;
@@ -512,8 +528,7 @@ const TitleJourney: React.FC<TitleJourneyProps> = ({
             style={{ maxWidth: startWidth }}
             color={tintColor}
             numberOfLines={1}
-          fontFamily='MoMoTrustDisplay'
-
+            fontFamily={headerFontFamily}
           >
             {start}
           </Text>
@@ -529,8 +544,7 @@ const TitleJourney: React.FC<TitleJourneyProps> = ({
               typography="action_xs_bold"
               color={tintColor}
               numberOfLines={1}
-          fontFamily='MoMoTrustDisplay'
-
+              fontFamily={headerFontFamily}
             >
               {end}
             </Text>

package/Application/NavigationContainer.tsx

@@ -17,10 +17,14 @@ import { DeviceEventEmitter } from 'react-native';
 import StackScreen from './StackScreen';
 import ModalScreen from './ModalScreen';
 import Navigator from './Navigator';
-import { getModalOptions, getStackOptions, useNativeCanGoBack } from './utils';
+import {
+  getModalOptions,
+  getStackOptions,
+  isWhiteListDesignSystem,
+  useNativeCanGoBack,
+} from './utils';
 import { NavigationContainerProps } from './types';
 import { ApplicationContext, MiniAppContext } from '../Context';
-import { useDefaultRegularFontFamily } from '../Consts/designSystemFont';
 import Localize from './Localize';
 import { Colors, defaultTheme } from '../Consts';
 import { HeaderLeft } from './Components/HeaderLeft';
@@ -103,8 +107,10 @@ const Navigation: React.FC<any> = ({
   const navigator = useRef(new Navigator(navigationRef, isReady));
   const [showGrid, setShowGrid] = useState(false);
   const insets = useSafeAreaInsets();
-  const defaultRegularFontFamily = useDefaultRegularFontFamily();
   const syncCanGoBack = useNativeCanGoBack();
+  const isWhiteList = isWhiteListDesignSystem(context);
+  const fontFamily = isWhiteList ? 'MomoTrustSans' : 'SFProText';
+  const navigationFontFamily = isWhiteList ? 'MomoTrustSans-Regular' : 'SFProText';
   let headerBackground = context?.designSystemConfig?.config?.headerBar;
   let headerGradient = theme.colors?.gradient;
 
@@ -156,6 +162,7 @@ const Navigation: React.FC<any> = ({
         navigator: navigator.current,
         theme: {
           ...theme,
+          font: fontFamily,
           colors: {
             ...theme.colors,
             gradient: headerGradient,
@@ -183,19 +190,19 @@ const Navigation: React.FC<any> = ({
             },
             fonts: {
               regular: {
-                fontFamily: defaultRegularFontFamily,
+                fontFamily: navigationFontFamily,
                 fontWeight: '400',
               },
               medium: {
-                fontFamily: defaultRegularFontFamily,
+                fontFamily: navigationFontFamily,
                 fontWeight: '400',
               },
               bold: {
-                fontFamily: defaultRegularFontFamily,
+                fontFamily: navigationFontFamily,
                 fontWeight: '400',
               },
               heavy: {
-                fontFamily: defaultRegularFontFamily,
+                fontFamily: navigationFontFamily,
                 fontWeight: '400',
               },
             },

package/Application/WidgetContainer.tsx

@@ -3,7 +3,6 @@ import { SafeAreaProvider } from 'react-native-safe-area-context';
 import Navigator from './Navigator';
 import { WidgetContainerProps } from './types';
 import { ApplicationContext, MiniAppContext } from '../Context';
-import { useDefaultRegularFontFamily } from '../Consts/designSystemFont';
 import Localize from './Localize';
 import { defaultTheme } from '../Consts';
 import {
@@ -11,7 +10,7 @@ import {
   NavigationContainerRef,
   NavigationIndependentTree,
 } from '@react-navigation/native';
-import { getModalOptions } from './utils';
+import { getModalOptions, isWhiteListDesignSystem } from './utils';
 import { createStackNavigator } from '@react-navigation/stack';
 import ModalScreen from './ModalScreen';
 import { View } from 'react-native';
@@ -43,7 +42,6 @@ const WidgetContainer: React.FC<WidgetContainerProps> = ({
   const isReady = useRef(false);
   const navigator = useRef(new Navigator(navigationRef, isReady, true));
   const [currentContext, setCurrentContext] = useState({});
-  const defaultRegularFontFamily = useDefaultRegularFontFamily();
 
   useEffect(() => {
     const sub = maxApi?.observer?.('font_scale_config', (data: any) => {
@@ -80,6 +78,9 @@ const WidgetContainer: React.FC<WidgetContainerProps> = ({
     ...context,
     ...currentContext,
   };
+  const isWhiteList = isWhiteListDesignSystem(mergedContext);
+  const fontFamily = isWhiteList ? 'MomoTrustSans' : 'SFProText';
+  const navigationFontFamily = isWhiteList ? 'MomoTrustSans-Regular' : 'SFProText';
 
   return (
     <View style={{ height: height ?? '100%', minHeight: 1 }}>
@@ -90,6 +91,7 @@ const WidgetContainer: React.FC<WidgetContainerProps> = ({
               navigator: navigator.current,
               theme: {
                 ...theme,
+                font: fontFamily,
                 colors: {
                   ...theme.colors,
                   gradient: headerGradient,
@@ -116,19 +118,19 @@ const WidgetContainer: React.FC<WidgetContainerProps> = ({
                   },
                   fonts: {
                     regular: {
-                      fontFamily: defaultRegularFontFamily,
+                      fontFamily: navigationFontFamily,
                       fontWeight: '400',
                     },
                     medium: {
-                      fontFamily: defaultRegularFontFamily,
+                      fontFamily: navigationFontFamily,
                       fontWeight: '400',
                     },
                     bold: {
-                      fontFamily: defaultRegularFontFamily,
+                      fontFamily: navigationFontFamily,
                       fontWeight: '400',
                     },
                     heavy: {
-                      fontFamily: defaultRegularFontFamily,
+                      fontFamily: navigationFontFamily,
                       fontWeight: '400',
                     },
                   },

package/Application/utils.tsx

@@ -475,6 +475,9 @@ const SwipeBackHaptic = () => {
   return null;
 };
 
+const isWhiteListDesignSystem = (context: any): boolean =>
+  context?.designSystemConfig?.isWhiteListDesignSystem === true;
+
 export {
   getStackOptions,
   getModalOptions,
@@ -487,4 +490,5 @@ export {
   useNativeCanGoBack,
   useNormalizedSharedValue,
   SwipeBackHaptic,
+  isWhiteListDesignSystem,
 };

package/Consts/index.ts

@@ -2,4 +2,3 @@ export * from './colors+spacing+radius';
 export * from './theme';
 export * from './styles';
 export const GRIDVIEW = false;
-export * from './designSystemFont';

package/Consts/theme.ts

@@ -51,7 +51,7 @@ const defaultTheme: Theme = {
       container: Colors.blue_08,
     },
   },
-  font: 'MomoTrustSans',
+  font: 'SFProText',
   assets: {},
 };
 
@@ -105,7 +105,7 @@ const defaultDarkTheme: Theme = {
       container: Colors.blue_08,
     },
   },
-  font: 'MomoTrustSans',
+  font: 'SFProText',
   assets: {},
 };
 

package/Text/index.tsx

@@ -7,10 +7,6 @@ import {
   MiniAppContext,
   SkeletonContext,
 } from '../Context';
-import {
-  NEW_DEFAULT_FONT_FAMILY,
-  useResolvedFontFamily,
-} from '../Consts/designSystemFont';
 import { scaleSize, useScaleSize } from './utils';
 import { Skeleton } from '../Skeleton';
 
@@ -118,8 +114,7 @@ const TypoStyles = (typo: Typography, newFontFamily?: string) => {
   const typoStyle = styleSheet[typo] ?? styleSheet.paragraph_default;
   const { fontWeight, fontSize, fontStyle, lineHeight } = typoStyle;
   const style = FontStyle[fontStyle ?? 'normal'];
-  const font = useResolvedFontFamily(newFontFamily ?? theme.font);
-  const resolvedDefaultFamily = useResolvedFontFamily(NEW_DEFAULT_FONT_FAMILY);
+  const font = newFontFamily ?? theme.font;
   let fontFamily: string;
 
   switch (font) {
@@ -148,11 +143,7 @@ const TypoStyles = (typo: Typography, newFontFamily?: string) => {
       break;
     }
     default: {
-      fontFamily = `${resolvedDefaultFamily}-${
-        resolvedDefaultFamily === NEW_DEFAULT_FONT_FAMILY
-          ? MomoTrustSans[fontWeight]
-          : SFProText[fontWeight]
-      }`;
+      fontFamily = `${font}-${SFProText[fontWeight]}${style}`;
     }
   }
 

package/package.json

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

package/Consts/designSystemFont.ts

@@ -1,38 +0,0 @@
-import { useContext } from 'react';
-import { MiniAppContext } from '../Context';
-
-export const NEW_DEFAULT_FONT_FAMILY = 'MomoTrustSans';
-export const LEGACY_DEFAULT_FONT_FAMILY = 'SFProText';
-
-/**
- * Font thuoc bo design system moi. Ngoai whitelist thi ha het ve font cu:
- * MoMoTrustDisplay chi duoc dung tu commit header title 5bfde6251 (DS-791),
- * truoc do header lay font theo theme.
- */
-const NEW_FONT_FAMILIES = [NEW_DEFAULT_FONT_FAMILY, 'MoMoTrustDisplay'];
-
-/**
- * Cờ whitelist design system, host đẩy xuống qua `decorateProps`
- * (`designSystemConfig.isWhiteListDesignSystem`). Ngoài whitelist thì kit giữ
- * nguyên font cũ.
- */
-export const useIsDesignSystemWhiteList = (): boolean => {
-  const context = useContext<any>(MiniAppContext);
-  return context?.designSystemConfig?.isWhiteListDesignSystem === true;
-};
-
-/**
- * Hạ font mặc định mới về font cũ khi user không nằm trong whitelist.
- * Font do caller chỉ định tường minh (MoMoSignature, AlegreyaSans...) giữ nguyên.
- */
-export const useResolvedFontFamily = (font: string): string => {
-  const isWhiteList = useIsDesignSystemWhiteList();
-  if (NEW_FONT_FAMILIES.includes(font) && !isWhiteList) {
-    return LEGACY_DEFAULT_FONT_FAMILY;
-  }
-  return font;
-};
-
-/** Tên file font Regular tương ứng với nhánh whitelist đang áp dụng. */
-export const useDefaultRegularFontFamily = (): string =>
-  `${useResolvedFontFamily(NEW_DEFAULT_FONT_FAMILY)}-Regular`;