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

package/Application/NavigationContainer.tsx

@@ -48,10 +48,11 @@ const NavigationContainer: React.FC<NavigationContainerProps> = ({
 }) => {
   const context = useContext<any>(MiniAppContext);
   const [currentContext, setCurrentContext] = useState<any>({});
-  // FontScaleConfig the host writes to observer storage (single source of truth when present).
+  // Default = the host-seeded fontScaleConfig from MiniAppContext, so the first frame is already
+  // scaled (no flash). The observer below overwrites it on later host writes (live rate changes).
   const [observerFontScaleConfig, setObserverFontScaleConfig] = useState<
     FontScaleConfig | undefined
-  >(undefined);
+  >(context?.fontScaleConfig);
 
   const mergedContext = {
     ...context,
@@ -63,11 +64,10 @@ const NavigationContainer: React.FC<NavigationContainerProps> = ({
   };
 
   useEffect(() => {
-    if (!maxApi) return;
-    // The initial value is seeded by the host into MiniAppContext (mergedContext.fontScaleConfig)
-    // before the miniapp mounts, so the first frame is already scaled (no flash). Here we only
-    // subscribe to later host writes so a rate change applies live while the miniapp is open.
-    const sub = maxApi.observer?.(
+    // The initial value is seeded by the host into MiniAppContext and used as this state's default
+    // above, so the first frame is already scaled (no flash). Here we only subscribe to later host
+    // writes so a rate change applies live while the miniapp is open.
+    const sub = maxApi?.observer?.(
       FONT_SCALE_OBSERVER_KEY,
       (data: FontScaleConfig) => {
         setObserverFontScaleConfig(data ?? undefined);
@@ -82,7 +82,7 @@ const NavigationContainer: React.FC<NavigationContainerProps> = ({
     <SafeAreaProvider>
       <MiniAppContext.Provider value={mergedContext}>
         <ScaleSizeProvider
-          fontScaleConfig={observerFontScaleConfig ?? mergedContext?.fontScaleConfig}
+          fontScaleConfig={observerFontScaleConfig}
         >
           <Navigation
             screen={screen}

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.7",
+    "version": "0.162.2-test.9",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {},