@momo-kits/foundation 0.169.4-beta.5 → 0.169.4-beta.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Application/BottomSheet.tsx +11 -5
- package/Application/BottomTab/BottomTabBar.tsx +12 -9
- package/Application/BottomTab/CustomBottomTabItem.tsx +2 -7
- package/Application/BottomTab/DuoRailTabBar.tsx +3 -3
- package/Application/BottomTab/TabBarIcon.tsx +0 -24
- package/Application/BottomTab/metrics.ts +0 -3
- package/Application/KitAdoption/AdoptionBadge.tsx +123 -0
- package/Application/KitAdoption/AdoptionProbe.tsx +147 -0
- package/Application/KitAdoption/AdoptionStore.ts +80 -0
- package/Application/KitAdoption/constants.ts +104 -0
- package/Application/KitAdoption/index.ts +5 -0
- package/Application/KitAdoption/styles.ts +55 -0
- package/Application/KitAdoption/types.ts +48 -0
- package/Application/KitAdoption/utils.ts +400 -0
- package/Application/ModalScreen.tsx +7 -1
- package/Application/NavigationContainer.tsx +2 -0
- package/Application/StackScreen.tsx +4 -1
- package/Application/__tests__/KitAdoption.integration.test.tsx +235 -0
- package/Application/__tests__/KitAdoption.test.ts +260 -0
- package/Application/__tests__/KitAdoptionStore.test.ts +110 -0
- package/Application/__tests__/modalLayout.test.ts +3 -3
- package/Application/modalLayout.ts +2 -2
- package/Application/types.tabs.ts +1 -0
- package/Popup/PopupNotify.tsx +9 -5
- package/Text/utils.ts +3 -8
- package/package.json +1 -1
package/Text/utils.ts
CHANGED
|
@@ -9,18 +9,13 @@ const MAX_DEVICE_SCALE = 5;
|
|
|
9
9
|
const useScaleSize = (size: number, scaleRate?: number) => {
|
|
10
10
|
const { width } = useWindowDimensions();
|
|
11
11
|
const context = useContext<any>(MiniAppContext);
|
|
12
|
-
// opt-in ceiling: when set (arg or context), the final size never exceeds size × capRate,
|
|
13
|
-
// in both the mini-app userScaleRate path and the OS path. Undefined keeps the old behavior.
|
|
14
|
-
const capRate = scaleRate ?? context?.fontScale?.maxScaleRate;
|
|
15
|
-
const cap = (scaled: number) =>
|
|
16
|
-
capRate != null ? Math.min(scaled, size * capRate) : scaled;
|
|
17
12
|
if (context?.fontScale?.useOSScaleRate === false) {
|
|
18
|
-
return
|
|
13
|
+
return size * (context.fontScale.userScaleRate ?? 1);
|
|
19
14
|
}
|
|
20
15
|
const fontScale = PixelRatio.getFontScale();
|
|
21
16
|
const deviceScale = width / DEFAULT_SCREEN_SIZE;
|
|
22
17
|
|
|
23
|
-
const maxScaleRate =
|
|
18
|
+
const maxScaleRate = scaleRate ?? MAX_FONT_SCALE;
|
|
24
19
|
|
|
25
20
|
let fontSizeDeviceScale = size;
|
|
26
21
|
let fontSizeOSScale = size;
|
|
@@ -39,7 +34,7 @@ const useScaleSize = (size: number, scaleRate?: number) => {
|
|
|
39
34
|
);
|
|
40
35
|
}
|
|
41
36
|
|
|
42
|
-
return
|
|
37
|
+
return Math.max(fontSizeDeviceScale, fontSizeOSScale);
|
|
43
38
|
};
|
|
44
39
|
|
|
45
40
|
const scaleSize = (size: number) => {
|