@momo-kits/foundation 0.159.1-beta.3 → 0.159.1-beta.4

package/Application/BottomTab/index.tsx

@@ -376,7 +376,6 @@ const BottomTab: React.FC<BottomTabProps> = ({
                 return (
                   <Text
                     numberOfLines={1}
-                    maxScaleRate={1.4}
                     typography={
                       focused ? 'label_xs_medium' : 'description_xs_regular'
                     }

package/Input/Input.tsx

@@ -75,7 +75,7 @@ const Input = forwardRef(
     const { theme } = useContext(ApplicationContext);
     const context = useContext<any>(MiniAppContext);
     const scaledFontSize = useScaleSize(14);
-    const scaleHeight = useScaleSize(size === 'small' ? 48 : 56, 1.1);
+    const scaleHeight = useScaleSize(size === 'small' ? 48 : 56);
     const [focused, setFocused] = useState(false);
     const haveValue = !!value || !!defaultValue;
     const inputRef = useRef<TextInput | null>(null);

package/Input/InputDropDown.tsx

@@ -40,7 +40,7 @@ const InputDropDown = ({
 }: InputDropDownProps) => {
   const { theme } = useContext(ApplicationContext);
   const context = useContext<any>(MiniAppContext);
-  const scaleHeight = useScaleSize(size === 'small' ? 48 : 56, 1.1);
+  const scaleHeight = useScaleSize(size === 'small' ? 48 : 56);
   const componentName = 'InputDropDown';
 
   const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;

package/Input/InputMoney.tsx

@@ -67,7 +67,7 @@ const InputMoney = forwardRef(
   ) => {
     const { theme } = useContext(ApplicationContext);
     const context = useContext<any>(MiniAppContext);
-    const scaleHeight = useScaleSize(size === 'small' ? 48 : 56, 1.1);
+    const scaleHeight = useScaleSize(size === 'small' ? 48 : 56);
     const scaledFontSize = useScaleSize(20);
     const [focused, setFocused] = useState(false);
     const [displayValue, setDisplayValue] = useState('');

package/Input/InputPhoneNumber.tsx

@@ -67,7 +67,7 @@ const InputPhoneNumber = forwardRef(
   ) => {
     const { theme } = useContext(ApplicationContext);
     const context = useContext<any>(MiniAppContext);
-    const scaleHeight = useScaleSize(size === 'small' ? 48 : 56, 1.1);
+    const scaleHeight = useScaleSize(size === 'small' ? 48 : 56);
     const [focused, setFocused] = useState(false);
     const haveValue = !!value || !!defaultValue;
     const inputRef = useRef<TextInput | null>(null);

package/Text/index.tsx

@@ -75,12 +75,6 @@ export interface TextProps extends RNTextProps {
    * Ex: MomoSignature, MomoTrustDisplay
    */
   fontFamily?: string;
-
-  /**
-   * Optional. Modified max scale rate of scaleSize function in Text component, default is 1.5.
-   * Ex: 1.5, 2
-   */
-  maxScaleRate?: number;
 }
 
 const deprecatedValues: Typography[] = [
@@ -98,11 +92,7 @@ const deprecatedValues: Typography[] = [
   'action_s',
 ];
 
-const TypoStyles = (
-  typo: Typography,
-  newFontFamily?: string,
-  maxScaleRate?: number,
-) => {
+const TypoStyles = (typo: Typography, newFontFamily?: string) => {
   const { theme } = useContext(ApplicationContext);
   const styleSheet: {
     [key: string]: any;
@@ -142,8 +132,8 @@ const TypoStyles = (
   return {
     ...typoStyle,
     fontFamily,
-    fontSize: useScaleSize(fontSize, maxScaleRate),
-    lineHeight: useScaleSize(lineHeight, maxScaleRate),
+    fontSize: useScaleSize(fontSize),
+    lineHeight: useScaleSize(lineHeight),
     fontStyle,
     fontWeight,
   };
@@ -155,13 +145,12 @@ const Text: React.FC<TextProps> = ({
   children,
   style,
   fontFamily,
-  maxScaleRate,
   ...rest
 }) => {
   const { theme } = useContext(ApplicationContext);
   const context = useContext<any>(MiniAppContext);
   const skeleton = useContext(SkeletonContext);
-  const textStyle = TypoStyles(typography, fontFamily, maxScaleRate);
+  const textStyle = TypoStyles(typography, fontFamily);
 
   if (deprecatedValues.includes(typography)) {
     console.warn(

package/Text/utils.ts

@@ -7,56 +7,12 @@ const DEFAULT_SCREEN_SIZE = 375;
 const MAX_FONT_SCALE = 1.2;
 const MAX_DEVICE_SCALE = 5;
 
-const useScaleSize = (size: number, scaleRate?: number) => {
-  const { scaleSizeMaxRate = MAX_FONT_SCALE } = useContext(ScaleSizeContext);
-  const fontScale = PixelRatio.getFontScale();
-  const { width } = useWindowDimensions();
-  const deviceScale = width / DEFAULT_SCREEN_SIZE;
-
-  const maxScaleRate = scaleRate ?? scaleSizeMaxRate;
-
-  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 * maxScaleRate,
-    );
-  }
-
-  return Math.max(fontSizeDeviceScale, fontSizeOSScale);
+const useScaleSize = (size: number) => {
+  return size;
 };
 
 const scaleSize = (size: number) => {
-  const fontScale = PixelRatio.getFontScale();
-  const deviceScale = deviceWidth / DEFAULT_SCREEN_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.max(fontSizeDeviceScale, fontSizeOSScale);
+  return size;
 };
 
 export { scaleSize, useScaleSize };

package/package.json

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