@momo-kits/foundation 0.162.2-sp.2 → 0.162.2-test.10

package/Loader/ProgressBar.tsx

@@ -1,10 +1,5 @@
-import React, { FC, useContext, useEffect } from 'react';
-import { View } from 'react-native';
-import Animated, {
-  useAnimatedStyle,
-  useSharedValue,
-  withTiming,
-} from 'react-native-reanimated';
+import React, { FC, useContext, useEffect, useRef } from 'react';
+import { Animated, View } from 'react-native';
 import styles from './styles';
 import { ProgressBarProps } from './types';
 import { ApplicationContext } from '../Context';
@@ -12,15 +7,20 @@ import { Radius } from '../Consts';
 
 const ProgressBar: FC<ProgressBarProps> = ({ percent = 0, style }) => {
   const { theme } = useContext(ApplicationContext);
-  const animation = useSharedValue(0);
+  const animation = useRef(new Animated.Value(0)).current;
 
   useEffect(() => {
-    animation.value = withTiming(percent, { duration: 200 });
+    Animated.timing(animation, {
+      toValue: percent,
+      duration: 200,
+      useNativeDriver: false,
+    }).start();
   }, [percent, animation]);
 
-  const animatedStyle = useAnimatedStyle(() => ({
-    width: `${Math.min(Math.max(animation.value, 0), 100)}%`,
-  }));
+  const width = animation.interpolate({
+    inputRange: [0, 100],
+    outputRange: ['0%', '100%'],
+  });
 
   return (
     <View
@@ -31,14 +31,12 @@ const ProgressBar: FC<ProgressBarProps> = ({ percent = 0, style }) => {
       ]}
     >
       <Animated.View
-        style={[
-          {
-            height: 4,
-            borderRadius: Radius.XXS,
-            backgroundColor: theme.colors.primary,
-          },
-          animatedStyle,
-        ]}
+        style={{
+          height: 4,
+          borderRadius: Radius.XXS,
+          width,
+          backgroundColor: theme.colors.primary,
+        }}
       />
     </View>
   );

package/Pagination/Dot.tsx

@@ -1,5 +1,5 @@
 import React, { FC, useContext } from 'react';
-import { View } from 'react-native';
+import { Animated } from 'react-native';
 import styles from './styles';
 import { DotProps } from './types';
 import { ApplicationContext } from '../Context';
@@ -13,7 +13,7 @@ const Dot: FC<DotProps> = ({ active, style }) => {
         { backgroundColor: theme.colors.background.pressed },
       ];
 
-  return <View style={[style, dotStyle]} />;
+  return <Animated.View style={[style, dotStyle]} />;
 };
 
 export default Dot;

package/Pagination/PaginationScroll.tsx

@@ -1,12 +1,5 @@
-import React, { FC, useContext, useState } from 'react';
-import { View } from 'react-native';
-import Animated, {
-  Extrapolation,
-  interpolate,
-  useAnimatedScrollHandler,
-  useAnimatedStyle,
-  useSharedValue,
-} from 'react-native-reanimated';
+import React, { FC, useContext, useRef, useState } from 'react';
+import { Animated, View } from 'react-native';
 import { ScrollIndicatorProps } from './types';
 import styles from './styles';
 import { ApplicationContext, MiniAppContext } from '../Context';
@@ -20,37 +13,40 @@ const PaginationScroll: FC<ScrollIndicatorProps> = ({
 }) => {
   const { theme } = useContext(ApplicationContext);
   const context = useContext<any>(MiniAppContext);
-  const left = useSharedValue(0);
+  const left = useRef(new Animated.Value(0)).current;
   const [scrollViewWidth, setScrollViewWidth] = useState(0);
   const [scrollContentWidth, setScrollContentWidth] = useState(0);
 
   const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
-  const onScroll = useAnimatedScrollHandler({
-    onScroll: (event) => {
-      left.value = event.contentOffset.x;
-    },
-  });
-
-  const indicatorStyle = useAnimatedStyle(() => {
-    if (!scrollViewWidth || !scrollContentWidth) {
-      return {};
+  const translateX = () => {
+    if (scrollViewWidth && scrollContentWidth) {
+      const value = left.interpolate({
+        inputRange: [0, scrollContentWidth - scrollViewWidth],
+        outputRange: [0, INDICATOR_CONTAINER_WIDTH - INDICATOR_WIDTH],
+        extrapolate: 'clamp',
+      });
+      return { transform: [{ translateX: value }] };
     }
-    const value = interpolate(
-      left.value,
-      [0, scrollContentWidth - scrollViewWidth],
-      [0, INDICATOR_CONTAINER_WIDTH - INDICATOR_WIDTH],
-      Extrapolation.CLAMP,
-    );
-    return { transform: [{ translateX: value }] };
-  });
+    return {};
+  };
 
   const renderScrollView = () => {
     return (
       <Animated.ScrollView
-        ref={scrollViewRef as any}
-        onScroll={onScroll}
-        scrollEventThrottle={16}
+        ref={scrollViewRef}
+        onScroll={Animated.event(
+          [
+            {
+              nativeEvent: {
+                contentOffset: {
+                  x: left,
+                },
+              },
+            },
+          ],
+          { useNativeDriver: true },
+        )}
         alwaysBounceHorizontal={false}
         showsHorizontalScrollIndicator={false}
         horizontal
@@ -80,7 +76,7 @@ const PaginationScroll: FC<ScrollIndicatorProps> = ({
             {
               backgroundColor: theme.colors.primary,
             },
-            indicatorStyle,
+            translateX(),
           ]}
         />
       </View>

package/Skeleton/index.tsx

@@ -1,20 +1,13 @@
-import React, { useContext, useEffect, useState } from 'react';
+import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import {
+  Animated,
+  Easing,
   LayoutAnimation,
   Platform,
   StyleSheet,
   UIManager,
   View,
 } from 'react-native';
-import Animated, {
-  cancelAnimation,
-  Easing,
-  interpolate,
-  useAnimatedStyle,
-  useSharedValue,
-  withRepeat,
-  withTiming,
-} from 'react-native-reanimated';
 import LinearGradient from 'react-native-linear-gradient';
 import { SkeletonTypes } from './types';
 import { Colors, Styles } from '../Consts';
@@ -27,31 +20,32 @@ const Skeleton: React.FC<SkeletonTypes> = ({ style }) => {
   const PRIMARY_COLOR = Colors.black_05;
   const HIGHLIGHT_COLOR1 = Colors.black_05;
   const HIGHLIGHT_COLOR2 = Colors.black_03;
-  const progress = useSharedValue(0);
+  const beginShimmerPosition = useRef(new Animated.Value(0)).current;
 
   const shimmerColors = [HIGHLIGHT_COLOR1, HIGHLIGHT_COLOR2, HIGHLIGHT_COLOR1];
-
-  useEffect(() => {
-    progress.value = 0;
-    progress.value = withRepeat(
-      withTiming(1, {
+  const linearTranslate = beginShimmerPosition.interpolate({
+    inputRange: [0, 1],
+    outputRange: [-width, width],
+  });
+  const animatedValue = useMemo(() => {
+    return Animated.loop(
+      Animated.timing(beginShimmerPosition, {
+        toValue: 1,
         duration: 1000,
         easing: Easing.linear,
+        useNativeDriver: Platform.OS !== 'web',
       }),
-      -1,
-      false,
     );
+  }, [beginShimmerPosition]);
+
+  useEffect(() => {
+    animatedValue.start();
     screen?.onLoading?.(true);
     return () => {
-      cancelAnimation(progress);
+      animatedValue.stop();
       screen?.onLoading?.(false);
     };
-  }, [progress, screen]);
-
-  const shimmerStyle = useAnimatedStyle(() => {
-    const translateX = interpolate(progress.value, [0, 1], [-width, width]);
-    return { transform: [{ translateX }] };
-  });
+  }, [animatedValue, screen]);
 
   const onLayout = (newWidth: number) => {
     if (newWidth !== width) {
@@ -66,13 +60,11 @@ const Skeleton: React.FC<SkeletonTypes> = ({ style }) => {
         style={[Styles.flex, { backgroundColor: PRIMARY_COLOR }]}
       >
         <Animated.View
-          style={[
-            {
-              width: '60%',
-              height: '100%',
-            },
-            shimmerStyle,
-          ]}
+          style={{
+            transform: [{ translateX: linearTranslate }],
+            width: '60%',
+            height: '100%',
+          }}
         >
           <LinearGradient
             style={[StyleSheet.absoluteFill]}

package/Text/utils.ts

@@ -7,14 +7,24 @@ const DEFAULT_SCREEN_SIZE = 375;
 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 useScaleSize = (size: number, userScaleRate?: number) => {
+  const { useOSFontScale = true, userScaleRate: ctxRate } =
+    useContext(ScaleSizeContext);
   const fontScale = PixelRatio.getFontScale();
   const { width } = useWindowDimensions();
   const deviceScale = width / DEFAULT_SCREEN_SIZE;
 
-  const maxScaleRate = scaleRate ?? scaleSizeMaxRate;
+  // rate precedence: per-call param override > host config (ctxRate) > 1 (no scaling)
+  const customRate = userScaleRate ?? ctxRate ?? 1;
 
+  // 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) {
+    // custom rate is uncapped (full user control); only the OS-follow path below caps at MAX_FONT_SCALE.
+    return customRate > 1 ? customRate * size : size;
+  }
+
+  // useOSFontScale on -> device-width scale + OS font scale, take the larger.
   let fontSizeDeviceScale = size;
   let fontSizeOSScale = size;
 
@@ -27,8 +37,8 @@ const useScaleSize = (size: number, scaleRate?: number) => {
 
   if (fontScale > 1) {
     fontSizeOSScale = Math.min(
-      fontSizeOSScale * fontScale,
-      fontSizeOSScale * maxScaleRate,
+      fontScale * fontSizeOSScale,
+      fontSizeOSScale * MAX_FONT_SCALE,
     );
   }
 

package/package.json

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