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

package/Popup/PopupPromotion.tsx

@@ -92,7 +92,7 @@ const PopupPromotion: React.FC<PopupPromotionProps> = ({
 
 const styles = StyleSheet.create({
   container: {
-    aspectRatio: 0.5625, // 9:16
+    aspectRatio: 0.72,
     width: '100%',
   },
   debugBaseLine: { borderWidth: 1, borderColor: Colors.green_06 },

package/Text/utils.ts

@@ -7,12 +7,56 @@ const DEFAULT_SCREEN_SIZE = 375;
 const MAX_FONT_SCALE = 1.2;
 const MAX_DEVICE_SCALE = 5;
 
-const useScaleSize = (size: number) => {
-  return size;
+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 scaleSize = (size: number) => {
-  return size;
+  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);
 };
 
 export { scaleSize, useScaleSize };

package/package.json

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