@momo-kits/foundation 0.163.1-beta.2 → 0.163.1-beta.4

package/Application/NavigationContainer.tsx

@@ -16,7 +16,6 @@ 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';
@@ -46,6 +45,13 @@ const NavigationContainer: React.FC<NavigationContainerProps> = ({
   const context = useContext<any>(MiniAppContext);
   const [currentContext, setCurrentContext] = useState<any>({});
 
+  useEffect(() => {
+    const sub = maxApi?.observer?.('font_scale_config', (data: any) => {
+      setCurrentContext((prev: any) => ({ ...prev, fontScale: data }));
+    });
+    return () => sub?.remove?.();
+  }, [maxApi]);
+
   const mergedContext = {
     ...context,
     ...currentContext,
@@ -58,17 +64,15 @@ const NavigationContainer: React.FC<NavigationContainerProps> = ({
   return (
     <SafeAreaProvider>
       <MiniAppContext.Provider value={mergedContext}>
-        <ScaleSizeProvider scaleSizeMaxRate={mergedContext?.scaleSizeMaxRate}>
-          <Navigation
-            screen={screen}
-            theme={theme}
-            options={options}
-            maxApi={maxApi}
-            setCurrentContext={setCurrentContext}
-            initialParams={initialParams}
-            localize={localize}
-          />
-        </ScaleSizeProvider>
+        <Navigation
+          screen={screen}
+          theme={theme}
+          options={options}
+          maxApi={maxApi}
+          setCurrentContext={setCurrentContext}
+          initialParams={initialParams}
+          localize={localize}
+        />
       </MiniAppContext.Provider>
     </SafeAreaProvider>
   );

package/Application/ScaleSizeProvider.tsx

@@ -2,6 +2,7 @@ import React, { FC } from 'react';
 import { ScaleSizeContext } from '../Context';
 import { ScaleSizeProviderProps } from './types';
 
+/** @deprecated Max font scale is fixed at 1.5; this provider no longer affects scaling. */
 const ScaleSizeProvider: FC<ScaleSizeProviderProps> = ({
   scaleSizeMaxRate,
   children,

package/Application/StackScreen.tsx

@@ -315,6 +315,7 @@ const StackScreen: React.FC<any> = props => {
     <ScreenContext.Provider
       value={{
         screenName,
+        bottomTab: !!bottomTab,
         onElementLoad: (item: any) => {
           /**
            * widget handle

package/Application/WidgetContainer.tsx

@@ -1,4 +1,4 @@
-import React, { useContext, useRef, useState } from 'react';
+import React, { useContext, useEffect, useRef, useState } from 'react';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
 import Navigator from './Navigator';
 import ScaleSizeProvider from './ScaleSizeProvider';
@@ -44,6 +44,13 @@ const WidgetContainer: React.FC<WidgetContainerProps> = ({
   const navigator = useRef(new Navigator(navigationRef, isReady, true));
   const [currentContext, setCurrentContext] = useState({});
 
+  useEffect(() => {
+    const sub = maxApi?.observer?.('font_scale_config', (data: any) => {
+      setCurrentContext((prev: any) => ({ ...prev, fontScale: data }));
+    });
+    return () => sub?.remove?.();
+  }, [maxApi]);
+
   let headerBackground = context?.designConfig?.headerBar;
   let headerGradient = theme.colors?.gradient;
 
@@ -74,12 +81,9 @@ const WidgetContainer: React.FC<WidgetContainerProps> = ({
   };
 
   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,
@@ -157,7 +161,6 @@ const WidgetContainer: React.FC<WidgetContainerProps> = ({
               </ReactNavigationContainer>
             </NavigationIndependentTree>
           </ApplicationContext.Provider>
-          </ScaleSizeProvider>
         </MiniAppContext.Provider>
       </SafeAreaProvider>
     </View>

package/Context/index.ts

@@ -9,6 +9,7 @@ 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 });
+/** @deprecated Max font scale is fixed at 1.5; this context is no longer read. */
 const ScaleSizeContext = createContext<{ scaleSizeMaxRate?: number }>({
   scaleSizeMaxRate: undefined,
 });

package/IconButton/index.tsx

@@ -28,7 +28,12 @@ export interface IconButtonProps extends TouchableOpacityProps {
   /**
    * Optional. Defines the size of the IconButton.
    */
-  size?: 'large' | 'small';
+  size?: 'large' | 'medium' | 'small';
+
+  /**
+   * Optional. Defines the shape of the IconButton.
+   */
+  shape?: 'circle' | 'square';
 
   /**
    * Optional. Params auto tracking component.
@@ -40,6 +45,7 @@ const IconButton: React.FC<IconButtonProps> = ({
   type = 'primary',
   icon,
   size,
+  shape = 'circle',
   params,
   ...rest
 }) => {
@@ -52,10 +58,21 @@ const IconButton: React.FC<IconButtonProps> = ({
    * get size icon button
    */
   const getSizeStyle = () => {
-    if (size === 'small') {
-      return styles.small;
+    switch (size) {
+      case 'small':
+        return styles.small;
+      case 'medium':
+        return styles.medium;
+      default:
+        return styles.large;
     }
-    return styles.large;
+  };
+
+  /**
+   * get shape icon button
+   */
+  const getShapeStyle = () => {
+    return shape === 'square' ? styles.square : styles.circle;
   };
 
   /**
@@ -117,8 +134,13 @@ const IconButton: React.FC<IconButtonProps> = ({
   };
 
   const activeOpacity = type === 'disabled' ? 0.75 : 0.5;
-  const buttonStyle = StyleSheet.flatten([getTypeStyle(), getSizeStyle()]);
-  const iconSize = size === 'small' ? 16 : 24;
+  const buttonStyle = StyleSheet.flatten([
+    getTypeStyle(),
+    styles.base,
+    getSizeStyle(),
+    getShapeStyle(),
+  ]);
+  const iconSize = size === 'small' || size === 'medium' ? 16 : 24;
 
   return (
     <ComponentContext.Provider

package/IconButton/styles.ts

@@ -2,19 +2,27 @@ import { StyleSheet } from 'react-native';
 import { Radius, Colors } from '../Consts';
 
 export default StyleSheet.create({
+  base: {
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
   large: {
     width: 48,
     height: 48,
-    borderRadius: Radius.XL,
-    justifyContent: 'center',
-    alignItems: 'center',
+  },
+  medium: {
+    width: 36,
+    height: 36,
   },
   small: {
-    width: 40,
-    height: 40,
+    width: 28,
+    height: 28,
+  },
+  circle: {
     borderRadius: Radius.XL,
-    justifyContent: 'center',
-    alignItems: 'center',
+  },
+  square: {
+    borderRadius: Radius.S,
   },
   debugBaseLine: { borderWidth: 1, borderColor: Colors.green_06 },
 });

package/Layout/Screen.tsx

@@ -25,10 +25,7 @@ import {
   View,
   ViewProps,
 } from 'react-native';
-import {
-  useSharedValue,
-  withTiming,
-} from 'react-native-reanimated';
+import { useSharedValue, withTiming } from 'react-native-reanimated';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { ApplicationContext, ScreenContext } from '../Context';
 import Navigation from '../Application/Navigation';
@@ -196,7 +193,7 @@ const Screen = forwardRef(
   ) => {
     const screenRef = useRef<View | ScrollView>(null);
     const { width: widthDevice } = useWindowDimensions();
-    const { theme } = useContext(ApplicationContext);
+    const { theme, navigator } = useContext(ApplicationContext);
     const screen: any = useContext(ScreenContext);
     const insets = useSafeAreaInsets();
     const heightHeader = useHeaderHeight();
@@ -235,7 +232,8 @@ const Screen = forwardRef(
     }, [customAnimatedValue, internalShared]);
 
     const currentTint = useRef<string | undefined>(undefined);
-    const isTab = navigation?.instance?.getState?.()?.type === 'tab';
+    
+    const isTab = !!screen?.bottomTab;
 
     let handleScroll;
     let Component: any = View;
@@ -650,10 +648,7 @@ const Screen = forwardRef(
             onScroll={handleScroll}
             onScrollEndDrag={handleScrollEnd}
             scrollEventThrottle={16}
-            style={[
-              Styles.flex,
-              !scrollable && !Footer && !isTab && { paddingBottom: bottomInset },
-            ]}
+            style={[Styles.flex]}
             contentContainerStyle={[
               scrollable && !Footer && !isTab && { paddingBottom: bottomInset },
               scrollViewProps?.contentContainerStyle,
@@ -669,9 +664,7 @@ const Screen = forwardRef(
               <FloatingButton
                 {...floatingButtonProps}
                 animatedValue={sharedValue}
-                bottom={
-                  Footer || isTab ? 12 : bottomInset + Spacing.S
-                }
+                bottom={Footer || isTab ? 12 : bottomInset + Spacing.S}
               />
             </View>
           )}

package/Text/utils.ts

@@ -1,6 +1,6 @@
 import { Dimensions, PixelRatio, useWindowDimensions } from 'react-native';
 import { useContext } from 'react';
-import { ScaleSizeContext } from '../Context';
+import { MiniAppContext } from '../Context';
 
 const deviceWidth = Dimensions.get('window').width;
 const DEFAULT_SCREEN_SIZE = 375;
@@ -8,12 +8,15 @@ const MAX_FONT_SCALE = 1.5;
 const MAX_DEVICE_SCALE = 5;
 
 const useScaleSize = (size: number, scaleRate?: number) => {
-  const { scaleSizeMaxRate = MAX_FONT_SCALE } = useContext(ScaleSizeContext);
+  const context = useContext<any>(MiniAppContext);
+  if (context?.fontScale?.useOSScaleRate === false) {
+    return size * (context.fontScale.userScaleRate ?? 1);
+  }
   const fontScale = PixelRatio.getFontScale();
   const { width } = useWindowDimensions();
   const deviceScale = width / DEFAULT_SCREEN_SIZE;
 
-  const maxScaleRate = scaleRate ?? scaleSizeMaxRate;
+  const maxScaleRate = scaleRate ?? MAX_FONT_SCALE;
 
   let fontSizeDeviceScale = size;
   let fontSizeOSScale = size;

package/package.json

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