@momo-kits/foundation 0.169.6-beta.1 → 0.169.7-beta.1
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.hooks.ts +8 -8
- package/Application/BottomSheet.parts.tsx +44 -34
- package/Application/BottomSheet.tsx +35 -26
- package/Application/BottomTab/ActiveIndicator.tsx +15 -14
- package/Application/BottomTab/BottomTabBar.tsx +48 -49
- package/Application/BottomTab/BottomTabInset.tsx +8 -4
- package/Application/BottomTab/CurvedContainer.tsx +14 -12
- package/Application/BottomTab/CustomBottomTabItem.tsx +12 -13
- package/Application/BottomTab/DuoBarCompression.tsx +13 -19
- package/Application/BottomTab/DuoRailTabBar.tsx +20 -20
- package/Application/BottomTab/DuoTabBar.tsx +8 -9
- package/Application/BottomTab/TabBarIcon.tsx +15 -29
- package/Application/BottomTab/TabScreen.tsx +1 -5
- package/Application/BottomTab/index.tsx +33 -30
- package/Application/BottomTab/metrics.ts +22 -25
- package/Application/BottomTab/tabItems.ts +1 -1
- package/Application/BottomTab/usePressLift.ts +2 -2
- package/Application/Components/BackgroundImageView.tsx +4 -0
- package/Application/Components/DuoGlassBackground.tsx +5 -4
- package/Application/Components/HeaderAnimated.tsx +4 -0
- package/Application/Components/HeaderBackground.tsx +4 -0
- package/Application/Components/HeaderExtendHeader.tsx +11 -10
- package/Application/Components/HeaderLeft.tsx +2 -1
- package/Application/Components/HeaderRight.tsx +2 -1
- package/Application/Components/HeaderTitle.shared.ts +11 -9
- package/Application/Components/HeaderTitle.tsx +4 -3
- package/Application/Components/HeaderToolkitAction.tsx +17 -20
- package/Application/Components/NavigationButton.tsx +2 -1
- package/Application/Components/SearchHeader.tsx +17 -10
- package/Application/Components/TitleJourney.tsx +2 -2
- package/Application/Components/TitleLocation.tsx +2 -2
- package/Application/Components/TitleUser.tsx +2 -2
- package/Application/Components/useToolkitActions.tsx +17 -32
- package/Application/Localize.ts +7 -0
- package/Application/ModalScreen.tsx +9 -3
- package/Application/Navigation.ts +14 -16
- package/Application/NavigationContainer.tsx +19 -16
- package/Application/Navigator.ts +20 -48
- package/Application/ScaleSizeProvider.tsx +13 -6
- package/Application/StackScreen.tracking.ts +11 -26
- package/Application/StackScreen.tsx +8 -35
- package/Application/TooltipPortal.tsx +12 -5
- package/Application/WidgetContainer.tsx +10 -4
- package/Application/modalLayout.ts +13 -14
- package/Application/navigationOptions.tsx +21 -17
- package/Badge/Badge.tsx +5 -0
- package/Badge/BadgeDot.tsx +1 -0
- package/Badge/BadgeDotAnimation.tsx +15 -7
- package/Badge/BadgeRibbon.tsx +46 -38
- package/Badge/Shape.tsx +2 -0
- package/Badge/types.ts +2 -2
- package/Button/index.tsx +5 -16
- package/Button/utils.ts +9 -15
- package/CheckBox/index.tsx +4 -0
- package/Consts/theme.ts +10 -10
- package/Context/index.ts +5 -1
- package/Divider/DashDivider.tsx +1 -0
- package/Divider/index.tsx +4 -0
- package/FoundationList/index.tsx +4 -0
- package/Icon/index.tsx +6 -6
- package/Icon/types.ts +1 -1
- package/IconButton/index.tsx +4 -12
- package/Image/index.tsx +9 -7
- package/Input/Input.tsx +8 -9
- package/Input/InputDropDown.tsx +10 -12
- package/Input/InputMoney.tsx +12 -8
- package/Input/InputMoneyView.tsx +14 -7
- package/Input/InputOTP.tsx +35 -33
- package/Input/InputPhoneNumber.tsx +8 -9
- package/Input/InputSearch.tsx +4 -6
- package/Input/InputTextArea.tsx +4 -0
- package/Input/SearchTextTyping.tsx +4 -0
- package/Input/SystemTextInput.tsx +7 -2
- package/Input/TextTyping.tsx +4 -0
- package/Input/common.tsx +26 -12
- package/Input/index.tsx +17 -20
- package/Input/moneyUtils.ts +10 -4
- package/Input/styles.ts +0 -5
- package/Input/utils.ts +14 -12
- package/Layout/Card.tsx +7 -4
- package/Layout/FloatingButton.tsx +4 -0
- package/Layout/Item.tsx +6 -2
- package/Layout/ItemList.tsx +9 -7
- package/Layout/ItemSectionList.tsx +2 -1
- package/Layout/ReservedRegions.tsx +25 -25
- package/Layout/Screen.tsx +56 -58
- package/Layout/Section.tsx +8 -5
- package/Layout/TrackingScope.tsx +1 -0
- package/Layout/screenContent.tsx +4 -2
- package/Layout/screenFooter.tsx +28 -18
- package/Layout/screenHeader.tsx +34 -31
- package/Layout/screenQuickReturn.tsx +17 -20
- package/Layout/screenScroll.ts +4 -7
- package/Layout/screenTypes.ts +3 -2
- package/Layout/types.ts +2 -4
- package/Layout/utils.ts +31 -37
- package/Loader/DotLoader.tsx +4 -0
- package/Loader/Loader.tsx +4 -0
- package/Loader/ProgressBar.tsx +1 -0
- package/Loader/Spinner.tsx +4 -0
- package/Loader/utils.ts +11 -7
- package/Pagination/Dot.tsx +4 -0
- package/Pagination/PaginationDot.tsx +1 -0
- package/Pagination/PaginationNumber.tsx +5 -3
- package/Pagination/PaginationScroll.tsx +5 -0
- package/Pagination/PaginationWhiteDot.tsx +1 -0
- package/Pagination/index.tsx +4 -0
- package/Pagination/types.ts +2 -2
- package/Popup/PopupNotify.tsx +44 -48
- package/Popup/PopupPromotion.tsx +4 -7
- package/Popup/types.ts +4 -4
- package/Popup/utils.ts +4 -0
- package/Radio/index.tsx +4 -0
- package/Skeleton/index.tsx +8 -0
- package/Switch/index.tsx +1 -0
- package/Tag/index.tsx +5 -1
- package/Tag/types.ts +3 -3
- package/Text/index.tsx +14 -3
- package/Text/styles.ts +1 -1
- package/Text/types.ts +1 -6
- package/Text/utils.ts +20 -4
- package/Title/index.tsx +41 -32
- package/ViewBoundary/index.tsx +4 -2
- package/index.ts +0 -6
- package/package.json +1 -1
- package/Application/__tests__/modalLayout.test.ts +0 -128
package/Application/Navigator.ts
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import {CommonActions, StackActions} from '@react-navigation/native';
|
|
2
2
|
import {BottomSheetParams, ModalParams, ScreenParams} from './types';
|
|
3
3
|
|
|
4
|
+
/**
|
|
5
|
+
* Imperative navigation API exposed to features through `ApplicationContext`.
|
|
6
|
+
* Every action is a no-op until the container reports ready.
|
|
7
|
+
*/
|
|
4
8
|
class Navigator {
|
|
5
9
|
ref?: any;
|
|
6
10
|
isReady?: any;
|
|
@@ -14,40 +18,28 @@ class Navigator {
|
|
|
14
18
|
this.isWidget = isWidget;
|
|
15
19
|
}
|
|
16
20
|
|
|
17
|
-
/**
|
|
18
|
-
* push new stack screen
|
|
19
|
-
* @param params
|
|
20
|
-
*/
|
|
21
|
+
/** Pushes a new stack screen. */
|
|
21
22
|
push = (params: ScreenParams) => {
|
|
22
23
|
if (this.isReady.current) {
|
|
23
24
|
this.ref.current?.dispatch?.(StackActions.push('Stack', params));
|
|
24
25
|
}
|
|
25
26
|
};
|
|
26
27
|
|
|
27
|
-
/**
|
|
28
|
-
* replace current screen with new screen
|
|
29
|
-
* @param params
|
|
30
|
-
*/
|
|
28
|
+
/** Replaces the current screen with a new stack screen. */
|
|
31
29
|
replace = (params: ScreenParams) => {
|
|
32
30
|
if (this.isReady.current) {
|
|
33
31
|
this.ref.current?.dispatch?.(StackActions.replace('Stack', params));
|
|
34
32
|
}
|
|
35
33
|
};
|
|
36
34
|
|
|
37
|
-
/**
|
|
38
|
-
* pop to dismiss a screen
|
|
39
|
-
* @param count
|
|
40
|
-
*/
|
|
35
|
+
/** Pops `count` screens, 1 by default. */
|
|
41
36
|
pop = (count?: number) => {
|
|
42
37
|
if (this.isReady.current) {
|
|
43
38
|
this.ref.current?.dispatch?.(StackActions.pop(count ?? 1));
|
|
44
39
|
}
|
|
45
40
|
};
|
|
46
41
|
|
|
47
|
-
/**
|
|
48
|
-
* present a new screen, show from bottom iOS
|
|
49
|
-
* @param params
|
|
50
|
-
*/
|
|
42
|
+
/** Presents a screen as a dialog (slides up from the bottom on iOS). */
|
|
51
43
|
present = (params: ScreenParams) => {
|
|
52
44
|
if (this.isReady.current) {
|
|
53
45
|
this.ref.current?.dispatch?.(StackActions.push('Dialog', params));
|
|
@@ -55,9 +47,8 @@ class Navigator {
|
|
|
55
47
|
};
|
|
56
48
|
|
|
57
49
|
/**
|
|
58
|
-
*
|
|
59
|
-
*
|
|
60
|
-
* @param onError
|
|
50
|
+
* Shows a modal popup; inside a widget it always uses the native modal.
|
|
51
|
+
* Failures are reported through `onError` instead of throwing.
|
|
61
52
|
*/
|
|
62
53
|
showModal = (params: ModalParams, onError?: (error: string) => void) => {
|
|
63
54
|
try {
|
|
@@ -76,11 +67,7 @@ class Navigator {
|
|
|
76
67
|
}
|
|
77
68
|
};
|
|
78
69
|
|
|
79
|
-
/**
|
|
80
|
-
* show a bottom sheet
|
|
81
|
-
* @param params
|
|
82
|
-
* @param onError
|
|
83
|
-
*/
|
|
70
|
+
/** Shows a bottom sheet through the modal route; failures go to `onError`. */
|
|
84
71
|
showBottomSheet = (
|
|
85
72
|
params: BottomSheetParams,
|
|
86
73
|
onError?: (error: string) => void
|
|
@@ -102,31 +89,21 @@ class Navigator {
|
|
|
102
89
|
}
|
|
103
90
|
};
|
|
104
91
|
|
|
105
|
-
/**
|
|
106
|
-
* pop all screen route
|
|
107
|
-
*/
|
|
92
|
+
/** Pops back to the first screen of the stack. */
|
|
108
93
|
popToTop = () => {
|
|
109
94
|
if (this.isReady.current) {
|
|
110
95
|
this.ref.current?.dispatch?.(StackActions.popToTop());
|
|
111
96
|
}
|
|
112
97
|
};
|
|
113
98
|
|
|
114
|
-
/**
|
|
115
|
-
* navigate route name bottom tab only
|
|
116
|
-
* @param name
|
|
117
|
-
*/
|
|
99
|
+
/** Navigates to a route by name; meant for bottom tab routes only. */
|
|
118
100
|
navigate = (name: string) => {
|
|
119
101
|
if (this.isReady.current) {
|
|
120
|
-
this.ref.current?.dispatch?.(
|
|
121
|
-
CommonActions.navigate(name)
|
|
122
|
-
);
|
|
102
|
+
this.ref.current?.dispatch?.(CommonActions.navigate(name));
|
|
123
103
|
}
|
|
124
104
|
};
|
|
125
105
|
|
|
126
|
-
/**
|
|
127
|
-
* reset a navigation flow with new screen
|
|
128
|
-
* @param params
|
|
129
|
-
*/
|
|
106
|
+
/** Resets the flow to a single new stack screen. */
|
|
130
107
|
reset = (params: ScreenParams) => {
|
|
131
108
|
if (this.isReady.current) {
|
|
132
109
|
this.ref.current?.dispatch?.(
|
|
@@ -144,26 +121,21 @@ class Navigator {
|
|
|
144
121
|
}
|
|
145
122
|
};
|
|
146
123
|
|
|
147
|
-
/**
|
|
148
|
-
* dismiss a feature data
|
|
149
|
-
* @param data
|
|
150
|
-
*/
|
|
124
|
+
/** Sets the payload the header passes to `maxApi.dismiss` on close. */
|
|
151
125
|
setDismissData = (data: any) => {
|
|
152
126
|
this.dismissData = data;
|
|
153
127
|
};
|
|
154
128
|
|
|
155
129
|
/**
|
|
156
|
-
*
|
|
157
|
-
*
|
|
130
|
+
* No-op placeholder; `NavigationContainer` and `WidgetContainer` replace it
|
|
131
|
+
* with their context state setter.
|
|
158
132
|
*/
|
|
159
|
-
setCurrentContext = (
|
|
133
|
+
setCurrentContext = (_context: {
|
|
160
134
|
code?: string;
|
|
161
135
|
name?: {vi: string; en: string};
|
|
162
136
|
description?: {vi: string; en: string};
|
|
163
137
|
icon?: string;
|
|
164
|
-
}) => {
|
|
165
|
-
console.log(context);
|
|
166
|
-
};
|
|
138
|
+
}) => {};
|
|
167
139
|
}
|
|
168
140
|
|
|
169
141
|
export default Navigator;
|
|
@@ -1,16 +1,23 @@
|
|
|
1
|
-
import React, { FC } from 'react';
|
|
2
|
-
import {
|
|
1
|
+
import React, { FC, useContext, useMemo } from 'react';
|
|
2
|
+
import { MiniAppContext } from '../Context';
|
|
3
3
|
import { ScaleSizeProviderProps } from './types';
|
|
4
4
|
|
|
5
|
-
/**
|
|
5
|
+
/**
|
|
6
|
+
* Caps the font scale of its subtree at `scaleSizeMaxRate` × the design size
|
|
7
|
+
* (`useScaleSize`), passed down in MiniAppContext. The nearest provider wins;
|
|
8
|
+
* an undefined rate lifts an outer cap.
|
|
9
|
+
*/
|
|
6
10
|
const ScaleSizeProvider: FC<ScaleSizeProviderProps> = ({
|
|
7
11
|
scaleSizeMaxRate,
|
|
8
12
|
children,
|
|
9
13
|
}) => {
|
|
14
|
+
const context = useContext<object | undefined>(MiniAppContext);
|
|
15
|
+
const value = useMemo(() => {
|
|
16
|
+
return { ...context, scaleSizeMaxRate };
|
|
17
|
+
}, [context, scaleSizeMaxRate]);
|
|
18
|
+
|
|
10
19
|
return (
|
|
11
|
-
<
|
|
12
|
-
{children}
|
|
13
|
-
</ScaleSizeContext.Provider>
|
|
20
|
+
<MiniAppContext.Provider value={value}>{children}</MiniAppContext.Provider>
|
|
14
21
|
);
|
|
15
22
|
};
|
|
16
23
|
|
|
@@ -8,15 +8,17 @@ type ScreenTrackingDeps = {
|
|
|
8
8
|
screenName: string;
|
|
9
9
|
};
|
|
10
10
|
|
|
11
|
+
/**
|
|
12
|
+
* Auto-tracking reporters of a stack screen. Each event fires at most once per
|
|
13
|
+
* screen, guarded by the `release*` flags on `tracking.current`.
|
|
14
|
+
*/
|
|
11
15
|
export const createScreenTracking = ({
|
|
12
16
|
tracking,
|
|
13
17
|
context,
|
|
14
18
|
navigator,
|
|
15
19
|
screenName,
|
|
16
20
|
}: ScreenTrackingDeps) => {
|
|
17
|
-
/**
|
|
18
|
-
* tracking for screen load
|
|
19
|
-
*/
|
|
21
|
+
/** Reports the screen load time. */
|
|
20
22
|
const onScreenLoad = () => {
|
|
21
23
|
if (!tracking.current?.releaseLoad) {
|
|
22
24
|
let timeLoad = tracking.current.timeLoad;
|
|
@@ -42,29 +44,22 @@ export const createScreenTracking = ({
|
|
|
42
44
|
);
|
|
43
45
|
tracking.current.releaseLoad = true;
|
|
44
46
|
|
|
45
|
-
/**
|
|
46
|
-
* debug
|
|
47
|
-
*/
|
|
48
47
|
navigator?.maxApi?.showToastDebug?.({
|
|
49
48
|
appId: context.appId,
|
|
50
49
|
message: `${screenName} screen_load_time ${timeLoad}`,
|
|
51
50
|
type: 'ERROR',
|
|
52
51
|
});
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
tracking.current.lastElement?.children?.current?.length > 0
|
|
56
|
-
) {
|
|
52
|
+
const lastChildren = tracking.current.lastElement?.children?.current;
|
|
53
|
+
if (__DEV__ && lastChildren?.length > 0) {
|
|
57
54
|
Alert.alert(
|
|
58
55
|
`${screenName}- load ${timeLoad}ms`,
|
|
59
|
-
JSON.stringify(
|
|
56
|
+
JSON.stringify(lastChildren),
|
|
60
57
|
);
|
|
61
58
|
}
|
|
62
59
|
}
|
|
63
60
|
};
|
|
64
61
|
|
|
65
|
-
/**
|
|
66
|
-
* tracking for screen load
|
|
67
|
-
*/
|
|
62
|
+
/** Reports the time until the screen became interactive. */
|
|
68
63
|
const onScreenInteraction = () => {
|
|
69
64
|
if (!tracking.current?.releaseInteraction) {
|
|
70
65
|
let timeLoad = tracking.current.timeLoad;
|
|
@@ -92,9 +87,6 @@ export const createScreenTracking = ({
|
|
|
92
87
|
);
|
|
93
88
|
tracking.current.releaseInteraction = true;
|
|
94
89
|
|
|
95
|
-
/**
|
|
96
|
-
* debug toast
|
|
97
|
-
*/
|
|
98
90
|
navigator?.maxApi?.showToastDebug?.({
|
|
99
91
|
appId: context.appId,
|
|
100
92
|
message: `${screenName} screen_interaction_time ${tracking.current.timeInteraction}`,
|
|
@@ -103,9 +95,7 @@ export const createScreenTracking = ({
|
|
|
103
95
|
}
|
|
104
96
|
};
|
|
105
97
|
|
|
106
|
-
/**
|
|
107
|
-
* tracking for first interaction by user
|
|
108
|
-
*/
|
|
98
|
+
/** Reports the user's first interaction with the screen. */
|
|
109
99
|
const onFirstInteraction = (action: string) => {
|
|
110
100
|
if (!tracking.current?.releaseUserInteraction) {
|
|
111
101
|
const timeLoad = tracking.current.endTime - tracking.current.startTime;
|
|
@@ -119,9 +109,6 @@ export const createScreenTracking = ({
|
|
|
119
109
|
});
|
|
120
110
|
tracking.current.releaseUserInteraction = true;
|
|
121
111
|
|
|
122
|
-
/**
|
|
123
|
-
* debug
|
|
124
|
-
*/
|
|
125
112
|
navigator?.maxApi?.showToastDebug?.({
|
|
126
113
|
appId: context.appId,
|
|
127
114
|
message: `${screenName} user_interaction ${timeLoad}`,
|
|
@@ -130,9 +117,7 @@ export const createScreenTracking = ({
|
|
|
130
117
|
}
|
|
131
118
|
};
|
|
132
119
|
|
|
133
|
-
/**
|
|
134
|
-
* tracking for loading screen
|
|
135
|
-
*/
|
|
120
|
+
/** Reports how long the skeleton loading state lasted. */
|
|
136
121
|
const onScreenLoading = () => {
|
|
137
122
|
const start = tracking.current.timeStartLoading;
|
|
138
123
|
const end = tracking.current.timeEndLoading;
|
|
@@ -12,9 +12,8 @@ import { TooltipPortalHost, TooltipPortalProvider } from './TooltipPortal';
|
|
|
12
12
|
const runAfterInteractions = InteractionManager.runAfterInteractions;
|
|
13
13
|
|
|
14
14
|
/**
|
|
15
|
-
*
|
|
16
|
-
*
|
|
17
|
-
* @constructor
|
|
15
|
+
* Hosts a feature screen in the stack: applies its header options, provides
|
|
16
|
+
* `ScreenContext` and reports navigation, load and interaction tracking.
|
|
18
17
|
*/
|
|
19
18
|
const StackScreen: React.FC<any> = props => {
|
|
20
19
|
const { navigator } = useContext(ApplicationContext);
|
|
@@ -64,18 +63,12 @@ const StackScreen: React.FC<any> = props => {
|
|
|
64
63
|
|
|
65
64
|
const screenName = Component?.name || Component?.type?.name || 'Invalid';
|
|
66
65
|
|
|
67
|
-
/**
|
|
68
|
-
* set options for screen
|
|
69
|
-
*/
|
|
70
66
|
useLayoutEffect(() => {
|
|
71
67
|
if (options) {
|
|
72
68
|
navigation.setOptions(options);
|
|
73
69
|
}
|
|
74
70
|
}, [navigation, options]);
|
|
75
71
|
|
|
76
|
-
/**
|
|
77
|
-
* tracking for screen
|
|
78
|
-
*/
|
|
79
72
|
useEffect(() => {
|
|
80
73
|
let focusScreen: any;
|
|
81
74
|
let onFocusApp: any;
|
|
@@ -149,6 +142,7 @@ const StackScreen: React.FC<any> = props => {
|
|
|
149
142
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
150
143
|
}, []);
|
|
151
144
|
|
|
145
|
+
/** Reports a navigation to this screen: `back` if it was shown before. */
|
|
152
146
|
const onScreenNavigated = (pre: string, current: string) => {
|
|
153
147
|
if (!isBackgroundToForeground) {
|
|
154
148
|
const item: any = {
|
|
@@ -166,9 +160,6 @@ const StackScreen: React.FC<any> = props => {
|
|
|
166
160
|
|
|
167
161
|
tracking.current.mounted = true;
|
|
168
162
|
|
|
169
|
-
/**
|
|
170
|
-
* debug toast
|
|
171
|
-
*/
|
|
172
163
|
navigator?.maxApi?.showToastDebug?.({
|
|
173
164
|
appId: context.appId,
|
|
174
165
|
message: `${screenName} screen_navigated`,
|
|
@@ -190,9 +181,7 @@ const StackScreen: React.FC<any> = props => {
|
|
|
190
181
|
screenName,
|
|
191
182
|
bottomTab: !!bottomTab,
|
|
192
183
|
onElementLoad: (item: any) => {
|
|
193
|
-
|
|
194
|
-
* widget handle
|
|
195
|
-
*/
|
|
184
|
+
// Widgets record their own load span and don't end the screen load.
|
|
196
185
|
if (item?.componentName === 'Widget') {
|
|
197
186
|
const index = widgets.current.findIndex(
|
|
198
187
|
(element: any) => element.componentId === item.componentId,
|
|
@@ -216,35 +205,25 @@ const StackScreen: React.FC<any> = props => {
|
|
|
216
205
|
return;
|
|
217
206
|
}
|
|
218
207
|
|
|
219
|
-
/**
|
|
220
|
-
* tracking for element screen load
|
|
221
|
-
*/
|
|
222
208
|
clearTimeout(tracking.current.timeoutLoad);
|
|
223
209
|
tracking.current.endTime = Date.now();
|
|
224
210
|
tracking.current.timeoutInteraction?.cancel?.();
|
|
225
211
|
tracking.current.timeoutInteraction = runAfterInteractions(() => {
|
|
226
|
-
tracking.current.
|
|
227
|
-
|
|
212
|
+
const elapsed = Date.now() - tracking.current.startTime;
|
|
213
|
+
tracking.current.timeInteraction = elapsed;
|
|
228
214
|
});
|
|
229
215
|
|
|
230
|
-
/**
|
|
231
|
-
* support for debug last element
|
|
232
|
-
*/
|
|
233
216
|
if (item?.componentName) {
|
|
234
217
|
tracking.current.lastElement = item;
|
|
235
218
|
}
|
|
236
219
|
|
|
237
|
-
|
|
238
|
-
* for stop tracking when user interaction
|
|
239
|
-
*/
|
|
220
|
+
// A user interaction settles load and interaction tracking at once.
|
|
240
221
|
if (item?.interaction) {
|
|
241
222
|
onScreenLoad();
|
|
242
223
|
onScreenInteraction();
|
|
243
224
|
onFirstInteraction(item?.action);
|
|
244
225
|
}
|
|
245
|
-
|
|
246
|
-
* timeout for handle tracking screen
|
|
247
|
-
*/
|
|
226
|
+
// Reports once no element has loaded for 2s.
|
|
248
227
|
tracking.current.timeoutLoad = setTimeout(() => {
|
|
249
228
|
const time = tracking.current.endTime - tracking.current.startTime;
|
|
250
229
|
tracking.current.widgets = widgets.current;
|
|
@@ -262,16 +241,10 @@ const StackScreen: React.FC<any> = props => {
|
|
|
262
241
|
tracking.current.timeStartLoading = Date.now();
|
|
263
242
|
}
|
|
264
243
|
|
|
265
|
-
/**
|
|
266
|
-
* tracking for loading screen
|
|
267
|
-
*/
|
|
268
244
|
if (!loading) {
|
|
269
245
|
tracking.current.timeEndLoading = Date.now();
|
|
270
246
|
}
|
|
271
247
|
|
|
272
|
-
/**
|
|
273
|
-
* timeout for handle tracking screen
|
|
274
|
-
*/
|
|
275
248
|
clearTimeout(tracking.current.timeoutLoading);
|
|
276
249
|
tracking.current.timeoutLoading = setTimeout(() => {
|
|
277
250
|
onScreenLoading();
|
|
@@ -21,10 +21,14 @@ const TooltipPortalContext = createContext<TooltipPortalContextValue | null>(
|
|
|
21
21
|
null,
|
|
22
22
|
);
|
|
23
23
|
|
|
24
|
+
/**
|
|
25
|
+
* Registry of tooltip contents that `TooltipPortalHost` renders in one layer
|
|
26
|
+
* above the screen, so tooltips aren't clipped by their anchor's parents.
|
|
27
|
+
*/
|
|
24
28
|
export const TooltipPortalProvider: React.FC<{ children: ReactNode }> = ({
|
|
25
29
|
children,
|
|
26
30
|
}) => {
|
|
27
|
-
//
|
|
31
|
+
// The ref map updates synchronously; the reducer only triggers re-renders.
|
|
28
32
|
const portalsRef = useRef<Map<string, ReactNode>>(new Map());
|
|
29
33
|
const hostRef = useRef<View>(null);
|
|
30
34
|
const [updateCounter, forceUpdate] = useReducer((x: number) => x + 1, 0);
|
|
@@ -32,16 +36,15 @@ export const TooltipPortalProvider: React.FC<{ children: ReactNode }> = ({
|
|
|
32
36
|
|
|
33
37
|
const register = useCallback((id: string, content: ReactNode) => {
|
|
34
38
|
portalsRef.current.set(id, content);
|
|
35
|
-
forceUpdate();
|
|
39
|
+
forceUpdate();
|
|
36
40
|
}, []);
|
|
37
41
|
|
|
38
42
|
const unregister = useCallback((id: string, immediate = false) => {
|
|
39
43
|
const hasItem = portalsRef.current.has(id);
|
|
40
|
-
if (!hasItem) return;
|
|
44
|
+
if (!hasItem) return;
|
|
41
45
|
|
|
42
46
|
portalsRef.current.delete(id);
|
|
43
47
|
|
|
44
|
-
// Clear any pending updates
|
|
45
48
|
if (pendingUpdateRef.current) {
|
|
46
49
|
clearTimeout(pendingUpdateRef.current);
|
|
47
50
|
pendingUpdateRef.current = null;
|
|
@@ -72,6 +75,7 @@ export const TooltipPortalProvider: React.FC<{ children: ReactNode }> = ({
|
|
|
72
75
|
);
|
|
73
76
|
};
|
|
74
77
|
|
|
78
|
+
/** Full-screen, touch-through layer that renders every registered tooltip. */
|
|
75
79
|
export const TooltipPortalHost: React.FC = () => {
|
|
76
80
|
const context = useContext(TooltipPortalContext);
|
|
77
81
|
|
|
@@ -95,6 +99,10 @@ export const TooltipPortalHost: React.FC = () => {
|
|
|
95
99
|
);
|
|
96
100
|
};
|
|
97
101
|
|
|
102
|
+
/**
|
|
103
|
+
* Tooltip portal API. Outside a provider it returns no-ops (and warns in dev)
|
|
104
|
+
* so a tooltip degrades instead of crashing.
|
|
105
|
+
*/
|
|
98
106
|
export const useTooltipPortal = () => {
|
|
99
107
|
const context = useContext(TooltipPortalContext);
|
|
100
108
|
|
|
@@ -104,7 +112,6 @@ export const useTooltipPortal = () => {
|
|
|
104
112
|
'useTooltipPortal must be used within TooltipPortalProvider. Tooltips may not appear correctly.',
|
|
105
113
|
);
|
|
106
114
|
}
|
|
107
|
-
// Return no-op functions if context is missing
|
|
108
115
|
return {
|
|
109
116
|
register: () => { },
|
|
110
117
|
unregister: () => { },
|
|
@@ -18,6 +18,7 @@ import { StyleSheet, View } from 'react-native';
|
|
|
18
18
|
|
|
19
19
|
const Stack = createStackNavigator();
|
|
20
20
|
|
|
21
|
+
/** Widget screen that reports its laid-out height to size the container. */
|
|
21
22
|
const WidgetContent: React.FC = ({ route }: any) => {
|
|
22
23
|
const Component = route?.params?.screen;
|
|
23
24
|
return (
|
|
@@ -31,6 +32,10 @@ const WidgetContent: React.FC = ({ route }: any) => {
|
|
|
31
32
|
);
|
|
32
33
|
};
|
|
33
34
|
|
|
35
|
+
/**
|
|
36
|
+
* Root of an embedded widget: its own navigator with the widget screen and the
|
|
37
|
+
* `Modal` route, sized to the widget's content height.
|
|
38
|
+
*/
|
|
34
39
|
const WidgetContainer: React.FC<WidgetContainerProps> = ({
|
|
35
40
|
widget,
|
|
36
41
|
theme = defaultTheme,
|
|
@@ -61,11 +66,9 @@ const WidgetContainer: React.FC<WidgetContainerProps> = ({
|
|
|
61
66
|
headerGradient = context?.designConfig?.headerGradient;
|
|
62
67
|
}
|
|
63
68
|
|
|
64
|
-
/**
|
|
65
|
-
* inject data for navigator
|
|
66
|
-
*/
|
|
67
69
|
navigator.current.maxApi = maxApi;
|
|
68
70
|
|
|
71
|
+
/** Text for a localization key, or the current-language side of `{ vi, en }`. */
|
|
69
72
|
const translate = (data?: string | { vi: string; en: string }) => {
|
|
70
73
|
if (data && typeof data !== 'string') {
|
|
71
74
|
return localize?.translateData(data);
|
|
@@ -81,7 +84,10 @@ const WidgetContainer: React.FC<WidgetContainerProps> = ({
|
|
|
81
84
|
};
|
|
82
85
|
const isWhiteList = isWhiteListDesignSystem(mergedContext);
|
|
83
86
|
const fontFamily = isWhiteList ? 'MomoTrustSans' : 'SFProText';
|
|
84
|
-
|
|
87
|
+
let navigationFontFamily = 'SFProText';
|
|
88
|
+
if (isWhiteList) {
|
|
89
|
+
navigationFontFamily = 'MomoTrustSans-Regular';
|
|
90
|
+
}
|
|
85
91
|
|
|
86
92
|
return (
|
|
87
93
|
<View style={[styles.container, { height: height ?? '100%' }]}>
|
|
@@ -73,11 +73,12 @@ type ModalLayoutInput = {
|
|
|
73
73
|
hinge?: ReservedRegion;
|
|
74
74
|
};
|
|
75
75
|
|
|
76
|
-
const clamp = (value: number, min: number, max: number) =>
|
|
77
|
-
Math.min(Math.max(value, min), max);
|
|
76
|
+
const clamp = (value: number, min: number, max: number) => {
|
|
77
|
+
return Math.min(Math.max(value, min), max);
|
|
78
|
+
};
|
|
78
79
|
|
|
79
80
|
/**
|
|
80
|
-
* Modal geometry for a window, pure so it can be tested without a device
|
|
81
|
+
* Modal geometry for a window, pure so it can be tested without a device.
|
|
81
82
|
*/
|
|
82
83
|
const getModalLayout = ({
|
|
83
84
|
width,
|
|
@@ -91,8 +92,9 @@ const getModalLayout = ({
|
|
|
91
92
|
const isFoldable = isDuo || shortSide >= FOLDABLE_MIN_WIDTH;
|
|
92
93
|
const isDuoOuter = isDuo && shortSide < FOLDABLE_MIN_WIDTH;
|
|
93
94
|
const hingeRight = hinge ? hinge.x + hinge.width : 0;
|
|
94
|
-
const
|
|
95
|
-
|
|
95
|
+
const hasHinge = !!hinge && hinge.x > 0;
|
|
96
|
+
const isHingeInWindow = hingeRight < width - insets.right;
|
|
97
|
+
const isHalfFolded = isDuo && hasHinge && isHingeInWindow;
|
|
96
98
|
|
|
97
99
|
const safeLeft = isHalfFolded ? hingeRight : insets.left;
|
|
98
100
|
const placement = {
|
|
@@ -112,9 +114,9 @@ const getModalLayout = ({
|
|
|
112
114
|
minWidth: popupWidth,
|
|
113
115
|
maxWidth: popupWidth,
|
|
114
116
|
margin: Spacing.XL,
|
|
115
|
-
radius: Radius.
|
|
117
|
+
radius: Radius.XL,
|
|
116
118
|
},
|
|
117
|
-
sheet: { margin: 0, radius: Radius.
|
|
119
|
+
sheet: { margin: 0, radius: Radius.XL },
|
|
118
120
|
scrimOpacity: SCRIM_OPACITY,
|
|
119
121
|
};
|
|
120
122
|
}
|
|
@@ -125,6 +127,7 @@ const getModalLayout = ({
|
|
|
125
127
|
|
|
126
128
|
const sheetMargin = Spacing.M;
|
|
127
129
|
const sheetSpace = placement.width - sheetMargin * 2;
|
|
130
|
+
const sheetMinWidth = Math.min(SHEET_MIN_WIDTH, sheetSpace);
|
|
128
131
|
const sheetMaxHeight = height - insets.top - Spacing.M;
|
|
129
132
|
|
|
130
133
|
return {
|
|
@@ -139,11 +142,7 @@ const getModalLayout = ({
|
|
|
139
142
|
radius: Radius.XL,
|
|
140
143
|
},
|
|
141
144
|
sheet: {
|
|
142
|
-
width: clamp(
|
|
143
|
-
sheetSpace,
|
|
144
|
-
Math.min(SHEET_MIN_WIDTH, sheetSpace),
|
|
145
|
-
SHEET_MAX_WIDTH,
|
|
146
|
-
),
|
|
145
|
+
width: clamp(sheetSpace, sheetMinWidth, SHEET_MAX_WIDTH),
|
|
147
146
|
maxHeight: sheetMaxHeight,
|
|
148
147
|
minHeight: Math.min(SHEET_MIN_HEIGHT, sheetMaxHeight),
|
|
149
148
|
margin: sheetMargin,
|
|
@@ -154,8 +153,8 @@ const getModalLayout = ({
|
|
|
154
153
|
};
|
|
155
154
|
|
|
156
155
|
/**
|
|
157
|
-
* Modal geometry for the current window
|
|
158
|
-
* iPhone Duo hinge
|
|
156
|
+
* Modal geometry for the current window; follows fold, unfold, rotation and
|
|
157
|
+
* the iPhone Duo hinge.
|
|
159
158
|
*/
|
|
160
159
|
const useModalLayout = (): ModalLayout => {
|
|
161
160
|
const { width, height } = useWindowDimensions();
|
|
@@ -133,13 +133,15 @@ const exportHeaderTitle = (
|
|
|
133
133
|
};
|
|
134
134
|
} else if (typeof params.headerTitle === 'string') {
|
|
135
135
|
return {
|
|
136
|
-
headerTitle: (props: any) =>
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
136
|
+
headerTitle: (props: any) => {
|
|
137
|
+
return (
|
|
138
|
+
<HeaderTitle
|
|
139
|
+
{...props}
|
|
140
|
+
children={params.headerTitle}
|
|
141
|
+
animatedValue={animatedValue}
|
|
142
|
+
/>
|
|
143
|
+
);
|
|
144
|
+
},
|
|
143
145
|
};
|
|
144
146
|
}
|
|
145
147
|
return {};
|
|
@@ -156,15 +158,17 @@ const getOptions = (
|
|
|
156
158
|
let options: StackNavigationOptions = {};
|
|
157
159
|
|
|
158
160
|
if (hasCustomHeaderLeft(params)) {
|
|
159
|
-
let headerLeft: any = (props: any) =>
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
161
|
+
let headerLeft: any = (props: any) => {
|
|
162
|
+
return (
|
|
163
|
+
<HeaderLeft
|
|
164
|
+
{...props}
|
|
165
|
+
preventBack={params.preventBack}
|
|
166
|
+
onPressLeftHeader={params.onPressLeftHeader}
|
|
167
|
+
onBackHandler={params.onBackHandler}
|
|
168
|
+
floating
|
|
169
|
+
/>
|
|
170
|
+
);
|
|
171
|
+
};
|
|
168
172
|
if (params.hiddenBack) {
|
|
169
173
|
headerLeft = null;
|
|
170
174
|
options.headerTitleContainerStyle = {
|
|
@@ -203,7 +207,7 @@ const getOptions = (
|
|
|
203
207
|
};
|
|
204
208
|
}
|
|
205
209
|
|
|
206
|
-
//
|
|
210
|
+
// Only ever turns swipe back off; screens opt in via gestureEnabled.
|
|
207
211
|
if (params.gestureEnabled === undefined && hasCustomBackHandling(params)) {
|
|
208
212
|
options.gestureEnabled = false;
|
|
209
213
|
}
|
package/Badge/Badge.tsx
CHANGED
|
@@ -7,6 +7,11 @@ import { BadgeProps } from './types';
|
|
|
7
7
|
import { Colors, Radius, Spacing } from '../Consts';
|
|
8
8
|
import { Text, useScaleSize } from '../Text';
|
|
9
9
|
|
|
10
|
+
/**
|
|
11
|
+
* Label or count badge; counts over 99 show "99+". Counts use the error color,
|
|
12
|
+
* labels the warning color, and `backgroundColor` applies only if it's a
|
|
13
|
+
* `Colors.*_03` token.
|
|
14
|
+
*/
|
|
10
15
|
const Badge: FC<BadgeProps> = ({
|
|
11
16
|
label = '',
|
|
12
17
|
style,
|
package/Badge/BadgeDot.tsx
CHANGED
|
@@ -4,6 +4,7 @@ import { BadgeDotProps } from './types';
|
|
|
4
4
|
import styles from './styles';
|
|
5
5
|
import { MiniAppContext } from '../Context';
|
|
6
6
|
|
|
7
|
+
/** Static red notification dot with a white ring, `large` or `small`. */
|
|
7
8
|
const BadgeDot: FC<BadgeDotProps> = ({ size = 'large', style }) => {
|
|
8
9
|
const context = useContext<any>(MiniAppContext);
|
|
9
10
|
let dotStyle;
|
|
@@ -14,6 +14,10 @@ import styles from './styles';
|
|
|
14
14
|
|
|
15
15
|
const DURATION = 500;
|
|
16
16
|
|
|
17
|
+
/**
|
|
18
|
+
* Red notification dot that pulses with a spring and emits an expanding,
|
|
19
|
+
* fading wave ring, looping until unmounted.
|
|
20
|
+
*/
|
|
17
21
|
const BadgeDotAnimation = ({ size, style }: BadgeDotProps) => {
|
|
18
22
|
const scaleAnim = useSharedValue(1);
|
|
19
23
|
const waveScaleAnim = useSharedValue(1);
|
|
@@ -57,14 +61,18 @@ const BadgeDotAnimation = ({ size, style }: BadgeDotProps) => {
|
|
|
57
61
|
};
|
|
58
62
|
}, [scaleAnim, waveOpacityAnim, waveScaleAnim]);
|
|
59
63
|
|
|
60
|
-
const waveAnimatedStyle = useAnimatedStyle(() =>
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
+
const waveAnimatedStyle = useAnimatedStyle(() => {
|
|
65
|
+
return {
|
|
66
|
+
transform: [{ scale: waveScaleAnim.value }],
|
|
67
|
+
opacity: waveOpacityAnim.value,
|
|
68
|
+
};
|
|
69
|
+
});
|
|
64
70
|
|
|
65
|
-
const dotAnimatedStyle = useAnimatedStyle(() =>
|
|
66
|
-
|
|
67
|
-
|
|
71
|
+
const dotAnimatedStyle = useAnimatedStyle(() => {
|
|
72
|
+
return {
|
|
73
|
+
transform: [{ scale: scaleAnim.value }],
|
|
74
|
+
};
|
|
75
|
+
});
|
|
68
76
|
|
|
69
77
|
return (
|
|
70
78
|
<View style={[styles.dotAnimationContainer, style]}>
|