@momo-kits/foundation 0.162.2-test.8 → 0.162.2-test.9

package/Text/utils.ts

@@ -16,10 +16,16 @@ const useScaleSize = (size: number, userScaleRate?: number) => {
 
   // user-adjusted rate: param override > config > 1 (no scaling)
   const customRate = userScaleRate ?? ctxRate ?? 1;
-  // useOSFontScale on -> apply the OS scale, ignore the custom rate;
-  // off -> use the custom rate. Both hard-capped at MAX_FONT_SCALE (150%).
-  const appliedRate = useOSFontScale ? fontScale : customRate;
 
+  // useOSFontScale off -> the user has full control via customRate; skip device-width scaling
+  // entirely and apply only the custom rate (capped at MAX_FONT_SCALE).
+  if (!useOSFontScale) {
+    return customRate > 1
+      ? Math.min(customRate * size, size * MAX_FONT_SCALE)
+      : size;
+  }
+
+  // useOSFontScale on -> device-width scale + OS font scale, take the larger.
   let fontSizeDeviceScale = size;
   let fontSizeOSScale = size;
 
@@ -30,9 +36,9 @@ const useScaleSize = (size: number, userScaleRate?: number) => {
     );
   }
 
-  if (appliedRate > 1) {
+  if (fontScale > 1) {
     fontSizeOSScale = Math.min(
-      appliedRate * fontSizeOSScale,
+      fontScale * fontSizeOSScale,
       fontSizeOSScale * MAX_FONT_SCALE,
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.162.2-test.8",
+    "version": "0.162.2-test.9",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {},