@momo-kits/foundation 0.161.2-beta.5 → 0.161.2-beta.7

package/Application/BottomSheet.tsx

@@ -39,7 +39,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
   const heightHeader = useHeaderHeight();
   const keyboardOffset = heightHeader - Math.min(insets.bottom, 21);
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   const {
     screen: Screen,

package/Application/BottomTab/BottomTabBar.tsx

@@ -72,7 +72,7 @@ export default function BottomTabBar({
   const focusedTab = state?.routes[state.index]?.name || routes[0]?.params;
 
   const context = useContext<any>(MiniAppContext);
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   /**
    * render tab item
@@ -299,7 +299,7 @@ const styles = StyleSheet.create({
     left: 0,
     right: 0,
     top: -2,
-    bottom: Platform.OS === 'ios' ? -6 : 4,
+    bottom: Platform.OS === 'ios' ? -6 : 4
   },
   floatingContent: {
     alignItems: 'center',

package/Application/BottomTab/CustomBottomTabItem.tsx

@@ -61,7 +61,7 @@ const CustomBottomTabItem: React.FC<CustomBottomTabItemProps> = ({
   allowFontScaling,
 }) => {
   const context = useContext<any>(MiniAppContext);
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   const renderIcon = () => {
     if (icon === undefined) {

package/Application/Components/HeaderBackground.tsx

@@ -22,7 +22,7 @@ const HeaderBackground: React.FC<HeaderBackgroundProps> = ({
   const fallback = useSharedValue(0);
   const sv = animatedValue ?? fallback;
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   return (
     <View style={[Styles.flex, showBaseLineDebug && styles.debugBaseLine]}>

package/Application/Components/HeaderExtendHeader.tsx

@@ -57,7 +57,7 @@ const HeaderExtendHeader: React.FC<{
     useShadowHeader = false;
   }
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   const heightStyle = useAnimatedStyle(() => ({
     height: interpolate(

package/Application/Components/HeaderTitle.tsx

@@ -41,7 +41,7 @@ type HeaderTitleExtraProps = {
 const HeaderTitle: React.FC<HeaderTitleExtraProps & { [key: string]: any }> = props => {
   const context = useContext<any>(MiniAppContext);
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   const interpolateConfig = props.interpolate ?? {
     inputRange: [0, 200],

package/Application/Components/SearchHeader.tsx

@@ -70,7 +70,7 @@ const SearchHeader = React.forwardRef<InputRef, SearchHeaderProps>(
       return true;
     };
 
-    const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+    const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
     return (
       <View

package/Application/NavigationContainer.tsx

@@ -16,6 +16,7 @@ import { DeviceEventEmitter } from 'react-native';
 import StackScreen from './StackScreen';
 import ModalScreen from './ModalScreen';
 import Navigator from './Navigator';
+import ScaleSizeProvider from './ScaleSizeProvider';
 import { getModalOptions, getStackOptions } from './utils';
 import { NavigationContainerProps } from './types';
 import { ApplicationContext, MiniAppContext } from '../Context';
@@ -35,44 +36,39 @@ const NavigationContainer: React.FC<NavigationContainerProps> = ({
   maxApi,
   initialParams,
   localize = new Localize({ vi: {}, en: {} }),
+  features = {
+    enableBottomTabAnimation: true,
+    enableHapticDialog: true,
+    enableForceFoundationList: false,
+    enableHapticBottomTab: true,
+  },
 }) => {
   const context = useContext<any>(MiniAppContext);
   const [currentContext, setCurrentContext] = useState<any>({});
-  const [allowFontScale, setAllowFontScale] = useState<boolean>(
-    context?.designSystemConfig?.allowFontScale ?? true,
-  );
-
-  useEffect(() => {
-    const sub = maxApi?.observer?.('use_font_scale', (value: boolean) => {
-      setAllowFontScale(value ?? true);
-    });
-
-    return () => {
-      sub?.remove?.();
-    };
-  }, []);
 
   const mergedContext = {
     ...context,
     ...currentContext,
-    designSystemConfig: {
-      ...context?.designSystemConfig,
-      allowFontScale,
+    features: {
+      ...context?.features,
+      ...features,
     },
   };
 
   return (
     <SafeAreaProvider>
       <MiniAppContext.Provider value={mergedContext}>
-        <Navigation
-          screen={screen}
-          theme={theme}
-          options={options}
-          maxApi={maxApi}
-          setCurrentContext={setCurrentContext}
-          initialParams={initialParams}
-          localize={localize}
-        />
+        <ScaleSizeProvider scaleSizeMaxRate={mergedContext?.scaleSizeMaxRate}>
+          <Navigation
+            screen={screen}
+            theme={theme}
+            options={options}
+            maxApi={maxApi}
+            setCurrentContext={setCurrentContext}
+            initialParams={initialParams}
+            localize={localize}
+          />
+        </ScaleSizeProvider>
       </MiniAppContext.Provider>
     </SafeAreaProvider>
   );

package/Application/ScaleSizeProvider.tsx

@@ -0,0 +1,16 @@
+import React, { FC } from 'react';
+import { ScaleSizeContext } from '../Context';
+import { ScaleSizeProviderProps } from './types';
+
+const ScaleSizeProvider: FC<ScaleSizeProviderProps> = ({
+  scaleSizeMaxRate,
+  children,
+}) => {
+  return (
+    <ScaleSizeContext.Provider value={{ scaleSizeMaxRate }}>
+      {children}
+    </ScaleSizeContext.Provider>
+  );
+};
+
+export default ScaleSizeProvider;

package/Application/WidgetContainer.tsx

@@ -1,6 +1,7 @@
-import React, { useContext, useEffect, useRef, useState } from 'react';
+import React, { useContext, useRef, useState } from 'react';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
 import Navigator from './Navigator';
+import ScaleSizeProvider from './ScaleSizeProvider';
 import { WidgetContainerProps } from './types';
 import { ApplicationContext, MiniAppContext } from '../Context';
 import Localize from './Localize';
@@ -42,19 +43,7 @@ const WidgetContainer: React.FC<WidgetContainerProps> = ({
   const isReady = useRef(false);
   const navigator = useRef(new Navigator(navigationRef, isReady, true));
   const [currentContext, setCurrentContext] = useState({});
-  const [allowFontScale, setAllowFontScale] = useState<boolean>(
-    context?.designSystemConfig?.allowFontScale ?? true,
-  );
-
-  useEffect(() => {
-    const sub = maxApi?.observer?.('use_font_scale', (value: boolean) => {
-      setAllowFontScale(value ?? true);
-    });
 
-    return () => {
-      sub?.remove?.();
-    };
-  }, []);
   let headerBackground = context?.designConfig?.headerBar;
   let headerGradient = theme.colors?.gradient;
 
@@ -82,16 +71,15 @@ const WidgetContainer: React.FC<WidgetContainerProps> = ({
   const mergedContext = {
     ...context,
     ...currentContext,
-    designSystemConfig: {
-      ...context?.designSystemConfig,
-      allowFontScale,
-    },
   };
 
   return (
-    <View style={{ height: height ?? '100%', minHeight: 1 }}>
+    <View style={{ height: height ?? '100%', minHeight:1 }}>
       <SafeAreaProvider>
         <MiniAppContext.Provider value={mergedContext}>
+          <ScaleSizeProvider
+            scaleSizeMaxRate={mergedContext?.scaleSizeMaxRate}
+          >
           <ApplicationContext.Provider
             value={{
               navigator: navigator.current,
@@ -169,6 +157,7 @@ const WidgetContainer: React.FC<WidgetContainerProps> = ({
               </ReactNavigationContainer>
             </NavigationIndependentTree>
           </ApplicationContext.Provider>
+          </ScaleSizeProvider>
         </MiniAppContext.Provider>
       </SafeAreaProvider>
     </View>

package/Application/index.ts

@@ -16,6 +16,7 @@ export * from './Components/SearchHeader';
 import { exportHeaderTitle, setAutomationID, useComponentId } from './utils';
 import Navigation from './Navigation';
 import Navigator from './Navigator';
+import ScaleSizeProvider from './ScaleSizeProvider';
 import { useTooltipPortal } from './TooltipPortal';
 
 export {
@@ -28,5 +29,6 @@ export {
   Navigation,
   Navigator,
   exportHeaderTitle,
+  ScaleSizeProvider,
   useTooltipPortal,
 };

package/Application/types.ts

@@ -107,6 +107,11 @@ export type Theme = {
   };
 };
 
+export type ScaleSizeProviderProps = {
+  scaleSizeMaxRate?: number;
+  children: ViewProps['children'];
+};
+
 export type Context = {
   [key: string]: any;
   theme: Theme;
@@ -153,6 +158,7 @@ export type NavigationContainerProps = {
   maxApi: any;
   initialParams?: any;
   localize: LocalizeProps;
+  features?: FeatureFlags;
 };
 
 export type WidgetContainerProps = {

package/Badge/Badge.tsx

@@ -18,8 +18,8 @@ const Badge: FC<BadgeProps> = ({
   const { componentId } = useComponentId('Badge', accessibilityLabel);
   const scaledSize = useScaleSize(16);
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
-
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
+  
   const styles = StyleSheet.create({
     badge: {
       paddingHorizontal: Spacing.XS,
@@ -84,13 +84,7 @@ const Badge: FC<BadgeProps> = ({
   }
 
   return (
-    <View
-      style={[
-        style,
-        styles.badgeContainer,
-        showBaseLineDebug && styles.debugBaseLine,
-      ]}
-    >
+    <View style={[style, styles.badgeContainer, showBaseLineDebug && styles.debugBaseLine]}>
       <View
         style={[styles.badge, { backgroundColor: badgeColor }]}
         accessibilityLabel={componentId}

package/Badge/BadgeDot.tsx

@@ -9,7 +9,7 @@ const BadgeDot: FC<BadgeDotProps> = ({ size = 'large', style }) => {
   let dotStyle;
   let dotContainerStyle;
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   if (size === 'large') {
     dotStyle = styles.dot;

package/Badge/BadgeRibbon.tsx

@@ -19,7 +19,7 @@ const BadgeRibbon: FC<BadgeRibbonProps> = ({
   const isRight = position === 'top_right' || position === 'bottom_right';
   const isUpTail = position === 'bottom_left' || position === 'top_right';
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   const ribbonRotate = useMemo(() => (isRight ? '180deg' : '0deg'), [isRight]);
   const textRotate = ribbonRotate;

package/Button/index.tsx

@@ -74,7 +74,7 @@ const Button: FC<ButtonProps> = ({
   const animationRef = useRef<LottieView>(null);
   const pressAnim = useSharedValue(0);
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   const componentName = 'Button';
   const { componentId } = useComponentId(
@@ -352,7 +352,7 @@ const Button: FC<ButtonProps> = ({
         onPressOut={animateOut}
       >
         <Reanimated.View style={[buttonStyle, animatedStyle]}>
-          {renderIcon('left')}
+        {renderIcon('left')}
           {renderTitle()}
           {renderIcon('right')}
           {gradientPros && (

package/CheckBox/index.tsx

@@ -34,7 +34,7 @@ const CheckBox: FC<CheckBoxProps> = ({
     props.accessibilityLabel,
   );
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   if (haveValue) {
     borderColor = theme.colors.primary;

package/Context/index.ts

@@ -9,6 +9,9 @@ const MiniAppContext = (Platform as any).MiniAppContext ?? Context;
 const ScreenContext = (Platform as any).ScreenContext ?? Context;
 const ComponentContext = (Platform as any).ComponentContext ?? Context;
 const SkeletonContext = createContext({ loading: false });
+const ScaleSizeContext = createContext<{ scaleSizeMaxRate?: number }>({
+  scaleSizeMaxRate: undefined,
+});
 const TrackingScopeContext = createContext<{ scopeName?: string }>({
   scopeName: undefined,
 });
@@ -20,4 +23,5 @@ export {
   ComponentContext,
   SkeletonContext,
   TrackingScopeContext,
+  ScaleSizeContext,
 };

package/Icon/index.tsx

@@ -17,7 +17,7 @@ const Icon: React.FC<IconProps> = ({
   const { theme } = useContext(ApplicationContext);
   const context = useContext<any>(MiniAppContext);
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   /**
    * get icon source maps or remote http

package/IconButton/index.tsx

@@ -46,7 +46,7 @@ const IconButton: React.FC<IconButtonProps> = ({
   const { theme } = useContext(ApplicationContext);
   const context = useContext<any>(MiniAppContext);
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   /**
    * get size icon button

package/Image/index.tsx

@@ -42,7 +42,7 @@ const Image: React.FC<ImageProps> = ({
   const error = useRef(false);
   const [status, setStatus] = useState<Status>('success');
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   let accessibilityLabel: any = `img|${getImageName(source)}`;
   if (component?.componentId) {

package/Input/Input.tsx

@@ -81,7 +81,7 @@ const Input = forwardRef(
     const inputRef = useRef<TextInput | null>(null);
     const componentName = 'Input';
 
-    const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+    const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
     const { componentId } = useComponentId(
       `${componentName}/${placeholder}`,

package/Input/InputDropDown.tsx

@@ -43,7 +43,7 @@ const InputDropDown = ({
   const scaleHeight = useScaleSize(size === 'small' ? 48 : 56);
   const componentName = 'InputDropDown';
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   const { componentId } = useComponentId(
     `${componentName}/${placeholder}`,

package/Input/InputMoney.tsx

@@ -76,7 +76,7 @@ const InputMoney = forwardRef(
     const inputRef = useRef<TextInput>(null);
     const componentName = 'InputMoney';
 
-    const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+    const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
     const { componentId } = useComponentId(
       `${componentName}/${placeholder}`,

package/Input/InputOTP.tsx

@@ -114,7 +114,7 @@ const InputOTP = forwardRef(
 
     const componentName = 'InputOTP';
 
-    const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+    const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
     const { componentId } = useComponentId(
       `${componentName}/${placeholder}`,

package/Input/InputPhoneNumber.tsx

@@ -73,7 +73,7 @@ const InputPhoneNumber = forwardRef(
     const inputRef = useRef<TextInput | null>(null);
     const componentName = 'InputPhoneNumber';
 
-    const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+    const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
     const { componentId } = useComponentId(
       `${componentName}/${placeholder}`,

package/Input/InputSearch.tsx

@@ -146,7 +146,7 @@ const InputSearch: ForwardRefRenderFunction<InputRef, InputSearchProps> = (
   const context = useContext<any>(MiniAppContext);
   const scaledFontSize = useScaleSize(14);
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   const [focused, setFocused] = useState(false);
   const [internalText, setInternalText] = useState(defaultValue || '');

package/Input/InputTextArea.tsx

@@ -57,7 +57,7 @@ const InputTextArea = forwardRef(
     const context = useContext<any>(MiniAppContext);
     const DEFAULT_HEIGHT = useScaleSize(104);
 
-    const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+    const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
     const scaledFontSize = useScaleSize(14);
     const [focused, setFocused] = useState(false);
     const [inputValue, setInputValue] = useState(defaultValue ?? '');

package/Layout/Item.tsx

@@ -27,7 +27,7 @@ const Item: React.FC<ItemProps> = ({
   const context = useContext<any>(MiniAppContext);
   const grid = useContext(GridContext);
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   /**
    * render overlay view only dev mode

package/Pagination/PaginationDot.tsx

@@ -14,7 +14,7 @@ const PaginationDot: FC<ChildPaginationProps> = ({
   const { theme } = useContext(ApplicationContext);
   const context = useContext<any>(MiniAppContext);
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   const renderDots = () => {
     const dots: React.ReactElement[] = [];

package/Pagination/PaginationNumber.tsx

@@ -13,7 +13,7 @@ const PaginationNumber: FC<ChildPaginationProps> = ({
 }) => {
   const context = useContext<any>(MiniAppContext);
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   return (
     <View

package/Pagination/PaginationScroll.tsx

@@ -24,7 +24,7 @@ const PaginationScroll: FC<ScrollIndicatorProps> = ({
   const [scrollViewWidth, setScrollViewWidth] = useState(0);
   const [scrollContentWidth, setScrollContentWidth] = useState(0);
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   const onScroll = useAnimatedScrollHandler({
     onScroll: (event) => {

package/Pagination/PaginationWhiteDot.tsx

@@ -13,7 +13,7 @@ const PaginationWhiteDot: FC<ChildPaginationProps> = ({
 }) => {
   const context = useContext<any>(MiniAppContext);
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   const renderDots = () => {
     const dots: React.ReactElement[] = [];

package/Popup/PopupNotify.tsx

@@ -32,7 +32,7 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
   const { width: widthDevice } = Dimensions.get('window');
   const scaledMaxHeight = useScaleSize(172);
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
   const closeAction = useRef('touch_outside');
   let descriptionStyle = {};
   let Description: any = View;

package/Popup/PopupPromotion.tsx

@@ -17,7 +17,7 @@ const PopupPromotion: React.FC<PopupPromotionProps> = ({
   const { width: widthDevice } = Dimensions.get('window');
   const closeAction = useRef('touch_outside');
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   /**
    * on action popup

package/Radio/index.tsx

@@ -33,7 +33,7 @@ const Radio: FC<RadioProps> = ({
     accessibilityLabel,
   );
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
   let disabledStyle = {};
   let checkBoxStyle = {
     borderWidth: 2,

package/Switch/index.tsx

@@ -22,7 +22,7 @@ const Switch: FC<SwitchProps> = ({
 
   const { componentId } = useComponentId(componentName, accessibilityLabel);
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   let backgroundColor = value ? Colors.green_03 : Colors.black_07;
   if (disabled) {

package/Tag/index.tsx

@@ -38,7 +38,7 @@ const Tag: FC<TagProps> = ({
   const scaledHeight24 = useScaleSize(24);
   const scaledHeight18 = useScaleSize(18);
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   const styles = StyleSheet.create({
     container: {

package/Text/index.tsx

@@ -158,7 +158,7 @@ const Text: React.FC<TextProps> = ({
     );
   }
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   if (skeleton.loading) {
     return (

package/Text/utils.ts

@@ -1,39 +1,62 @@
 import { Dimensions, PixelRatio, useWindowDimensions } from 'react-native';
 import { useContext } from 'react';
-import { MiniAppContext } from '../Context';
+import { ScaleSizeContext } from '../Context';
 
 const deviceWidth = Dimensions.get('window').width;
 const DEFAULT_SCREEN_SIZE = 375;
-const MAX_FONT_SCALE = 1.3;
+const MAX_FONT_SCALE = 1.5;
+const MAX_DEVICE_SCALE = 5;
 
-const useScaleSize = (size: number) => {
+const useScaleSize = (size: number, scaleRate?: number) => {
+  const { scaleSizeMaxRate = MAX_FONT_SCALE } = useContext(ScaleSizeContext);
+  const fontScale = PixelRatio.getFontScale();
   const { width } = useWindowDimensions();
-  const context = useContext<any>(MiniAppContext);
-  const allowFontScale = context?.designSystemConfig?.allowFontScale ?? true;
+  const deviceScale = width / DEFAULT_SCREEN_SIZE;
+
+  const maxScaleRate = scaleRate ?? scaleSizeMaxRate;
 
-  if (allowFontScale) {
-    const deviceScale = width / DEFAULT_SCREEN_SIZE;
-    const fontScale = PixelRatio.getFontScale();
+  let fontSizeDeviceScale = size;
+  let fontSizeOSScale = size;
 
-    const maxSize = size * MAX_FONT_SCALE;
-    const fontSizeScaleDevice = deviceScale > 1 ? deviceScale * size : size;
-    const fontSizeScaleOS = fontScale > 1 ? fontScale * size : size;
+  if (deviceScale > 1) {
+    fontSizeDeviceScale = Math.min(
+      fontSizeDeviceScale * deviceScale,
+      fontSizeDeviceScale + MAX_DEVICE_SCALE,
+    );
+  }
 
-    return Math.min(Math.max(fontSizeScaleDevice, fontSizeScaleOS), maxSize);
+  if (fontScale > 1) {
+    fontSizeOSScale = Math.min(
+      fontSizeOSScale * fontScale,
+      fontSizeOSScale * maxScaleRate,
+    );
   }
 
-  return size;
+  return Math.max(fontSizeDeviceScale, fontSizeOSScale);
 };
 
 const scaleSize = (size: number) => {
-  const deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE;
   const fontScale = PixelRatio.getFontScale();
+  const deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE;
 
-  const maxSize = size * MAX_FONT_SCALE;
-  const fontSizeScaleDevice = deviceScale > 1 ? deviceScale * size : size;
-  const fontSizeScaleOS = fontScale > 1 ? fontScale * size : size;
+  let fontSizeDeviceScale = size;
+  let fontSizeOSScale = size;
+
+  if (deviceScale > 1) {
+    fontSizeDeviceScale = Math.min(
+      fontSizeDeviceScale * deviceScale,
+      fontSizeDeviceScale + MAX_DEVICE_SCALE,
+    );
+  }
+
+  if (fontScale > 1) {
+    fontSizeOSScale = Math.min(
+      fontSizeOSScale * fontScale,
+      fontSizeOSScale * MAX_FONT_SCALE,
+    );
+  }
 
-  return Math.min(Math.max(fontSizeScaleDevice, fontSizeScaleOS), maxSize);
+  return Math.max(fontSizeDeviceScale, fontSizeOSScale);
 };
 
 export { scaleSize, useScaleSize };

package/Title/index.tsx

@@ -39,7 +39,7 @@ const Title: FC<TitleProps> = ({
   const [badgeWidth, setBadgeWidth] = useState(0);
   const [contentWidth, setContentWidth] = useState(0);
 
-  const showBaseLineDebug = context?.designSystemConfig?.isBaselineEnabled;
+  const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
   const size18 = useScaleSize(18);
   const size22 = useScaleSize(22);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.161.2-beta.5",
+    "version": "0.161.2-beta.7",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {},