@momo-kits/foundation 0.169.10-beta.1 → 0.169.10
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 +27 -17
- package/Application/BottomSheet.tsx +35 -27
- package/Application/BottomTab/BottomTabBar.tsx +6 -6
- package/Application/BottomTab/DuoRailTabBar.tsx +5 -5
- package/Application/BottomTab/TabScreen.tsx +11 -10
- package/Application/BottomTab/index.tsx +5 -5
- package/Application/BottomTab/usePressLift.ts +3 -3
- package/Application/Components/HeaderToolkitAction.tsx +16 -13
- package/Application/Components/useToolkitActions.tsx +22 -21
- package/Application/ModalScreen.tsx +19 -15
- package/Application/StackScreen.tsx +13 -9
- package/Application/modalLayout.ts +1 -0
- package/Context/index.ts +3 -1
- package/Image/index.tsx +6 -6
- package/Input/ErrorView.tsx +59 -0
- package/Input/FloatingView.tsx +101 -0
- package/Input/Input.tsx +40 -37
- package/Input/InputDropDown.tsx +13 -10
- package/Input/InputMoney.tsx +17 -17
- package/Input/InputMoneyView.tsx +12 -12
- package/Input/InputOTP.tsx +46 -34
- package/Input/InputPhoneNumber.tsx +48 -43
- package/Input/InputSearch.tsx +24 -23
- package/Input/InputTextArea.tsx +29 -23
- package/Input/RenderTrailing.tsx +79 -0
- package/Input/constants.ts +8 -0
- package/Input/utils.ts +126 -7
- package/Layout/FloatingButton.tsx +38 -24
- package/Layout/layoutMetrics.ts +43 -34
- package/Layout/screenTypes.ts +2 -3
- package/Pagination/PaginationScroll.tsx +5 -3
- package/Pagination/types.ts +3 -5
- package/Popup/PopupNotify.tsx +17 -14
- package/Popup/PopupPromotion.tsx +5 -4
- package/Popup/types.ts +2 -4
- package/Popup/utils.ts +7 -4
- package/Skeleton/index.tsx +15 -12
- package/package.json +1 -1
- package/Input/common.tsx +0 -257
- package/Input/moneyUtils.ts +0 -23
|
@@ -21,6 +21,8 @@ import { BottomSheetParams, NavigatorProps } from './types';
|
|
|
21
21
|
import { isIPhoneDuo } from './utils';
|
|
22
22
|
import { useModalLayout } from './modalLayout';
|
|
23
23
|
|
|
24
|
+
const MAX_IOS_BOTTOM_INSET = 21;
|
|
25
|
+
|
|
24
26
|
/**
|
|
25
27
|
* Sheet geometry for the current window: foldable placement and size from
|
|
26
28
|
* `useModalLayout`, plus the insets and offsets the keyboard handling needs.
|
|
@@ -35,7 +37,10 @@ export const useBottomSheetLayout = () => {
|
|
|
35
37
|
const insets = useSafeAreaInsets();
|
|
36
38
|
const heightHeader = useHeaderHeight();
|
|
37
39
|
const isIOS = Platform.OS === 'ios';
|
|
38
|
-
|
|
40
|
+
let bottomInset = insets.bottom;
|
|
41
|
+
if (isIOS) {
|
|
42
|
+
bottomInset = Math.min(insets.bottom, MAX_IOS_BOTTOM_INSET);
|
|
43
|
+
}
|
|
39
44
|
const keyboardOffset = heightHeader - bottomInset;
|
|
40
45
|
|
|
41
46
|
return {
|
|
@@ -68,7 +73,7 @@ export const useDuoKeyboardLift = (
|
|
|
68
73
|
if (!isDuo || !useKeyboardAvoidingView) {
|
|
69
74
|
return;
|
|
70
75
|
}
|
|
71
|
-
const
|
|
76
|
+
const handleKeyboardChange = (e: KeyboardEvent) => {
|
|
72
77
|
const overlap = windowHeight - e.endCoordinates.screenY;
|
|
73
78
|
const lift = Math.max(
|
|
74
79
|
overlap - bottomInset - (keyboardVerticalOffset ?? 0),
|
|
@@ -86,8 +91,8 @@ export const useDuoKeyboardLift = (
|
|
|
86
91
|
setKeyboardLift(lift);
|
|
87
92
|
};
|
|
88
93
|
const subscriptions = [
|
|
89
|
-
Keyboard.addListener('keyboardWillChangeFrame',
|
|
90
|
-
Keyboard.addListener('keyboardWillHide',
|
|
94
|
+
Keyboard.addListener('keyboardWillChangeFrame', handleKeyboardChange),
|
|
95
|
+
Keyboard.addListener('keyboardWillHide', handleKeyboardChange),
|
|
91
96
|
];
|
|
92
97
|
return () => subscriptions.forEach(sub => sub.remove());
|
|
93
98
|
}, [
|
|
@@ -149,7 +154,7 @@ export const useSheetDismiss = ({
|
|
|
149
154
|
leftOptions,
|
|
150
155
|
action,
|
|
151
156
|
}: SheetDismissParams) => {
|
|
152
|
-
const
|
|
157
|
+
const handleDismiss = useCallback(
|
|
153
158
|
(force = false, callback?: () => void) => {
|
|
154
159
|
if (barrierDismissible && !force) {
|
|
155
160
|
return;
|
|
@@ -164,32 +169,37 @@ export const useSheetDismiss = ({
|
|
|
164
169
|
[barrierDismissible, closeAnimation, navigator],
|
|
165
170
|
);
|
|
166
171
|
|
|
167
|
-
const
|
|
172
|
+
const handleRequestClose = useCallback(
|
|
168
173
|
(callback?: () => void) => {
|
|
169
|
-
|
|
174
|
+
handleDismiss(true, callback);
|
|
170
175
|
},
|
|
171
|
-
[
|
|
176
|
+
[handleDismiss],
|
|
172
177
|
);
|
|
173
178
|
|
|
174
179
|
useEffect(() => {
|
|
175
180
|
const backHandler = BackHandler.addEventListener(
|
|
176
181
|
'hardwareBackPress',
|
|
177
182
|
() => {
|
|
178
|
-
|
|
183
|
+
handleDismiss();
|
|
179
184
|
return true;
|
|
180
185
|
},
|
|
181
186
|
);
|
|
182
187
|
return () => backHandler.remove();
|
|
183
|
-
}, [barrierDismissible,
|
|
188
|
+
}, [barrierDismissible, handleDismiss]);
|
|
184
189
|
|
|
185
|
-
const
|
|
186
|
-
|
|
187
|
-
}, [leftOptions,
|
|
190
|
+
const handlePressBack = useCallback(() => {
|
|
191
|
+
handleDismiss(true, leftOptions?.onPressIconLeft);
|
|
192
|
+
}, [leftOptions, handleDismiss]);
|
|
188
193
|
|
|
189
|
-
const
|
|
194
|
+
const handlePressClose = useCallback(() => {
|
|
190
195
|
action.current = 'icon_close';
|
|
191
|
-
|
|
192
|
-
}, [action,
|
|
196
|
+
handleDismiss(true);
|
|
197
|
+
}, [action, handleDismiss]);
|
|
193
198
|
|
|
194
|
-
return {
|
|
199
|
+
return {
|
|
200
|
+
handleDismiss,
|
|
201
|
+
handleRequestClose,
|
|
202
|
+
handlePressBack,
|
|
203
|
+
handlePressClose,
|
|
204
|
+
};
|
|
195
205
|
};
|
|
@@ -30,6 +30,23 @@ import {
|
|
|
30
30
|
renderSheetHeader,
|
|
31
31
|
} from './BottomSheet.parts';
|
|
32
32
|
|
|
33
|
+
const OPEN_TIMING = {
|
|
34
|
+
duration: 350,
|
|
35
|
+
easing: Easing.bezier(0.05, 0.7, 0.1, 1),
|
|
36
|
+
};
|
|
37
|
+
const CLOSE_TIMING = {
|
|
38
|
+
duration: 200,
|
|
39
|
+
easing: Easing.bezier(0.3, 0.0, 0.8, 0.15),
|
|
40
|
+
};
|
|
41
|
+
const SETTLE_SPRING = {
|
|
42
|
+
damping: 20,
|
|
43
|
+
mass: 1,
|
|
44
|
+
stiffness: 100,
|
|
45
|
+
overshootClamping: false,
|
|
46
|
+
energyThreshold: 1e-10,
|
|
47
|
+
};
|
|
48
|
+
const DISMISS_DRAG_DISTANCE = 100;
|
|
49
|
+
|
|
33
50
|
/**
|
|
34
51
|
* Bottom sheet route of the modal stack: slides the given screen up under a
|
|
35
52
|
* drag handle and header, and reports how it was closed through `onDismiss`.
|
|
@@ -79,22 +96,14 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
|
|
|
79
96
|
);
|
|
80
97
|
|
|
81
98
|
const openAnimation = useCallback(() => {
|
|
82
|
-
translateY.value = withTiming(0,
|
|
83
|
-
duration: 350,
|
|
84
|
-
easing: Easing.bezier(0.05, 0.7, 0.1, 1),
|
|
85
|
-
});
|
|
99
|
+
translateY.value = withTiming(0, OPEN_TIMING);
|
|
86
100
|
}, [translateY]);
|
|
87
101
|
|
|
88
102
|
const closeAnimation = useCallback(
|
|
89
103
|
(callback = () => {}) => {
|
|
90
|
-
translateY.value = withTiming(
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
duration: 200,
|
|
94
|
-
easing: Easing.bezier(0.3, 0.0, 0.8, 0.15),
|
|
95
|
-
},
|
|
96
|
-
() => scheduleOnRN(callback),
|
|
97
|
-
);
|
|
104
|
+
translateY.value = withTiming(heightDevice, CLOSE_TIMING, () => {
|
|
105
|
+
return scheduleOnRN(callback);
|
|
106
|
+
});
|
|
98
107
|
},
|
|
99
108
|
[heightDevice, translateY],
|
|
100
109
|
);
|
|
@@ -111,17 +120,11 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
|
|
|
111
120
|
}
|
|
112
121
|
},
|
|
113
122
|
onPanResponderRelease: (_, gestureState) => {
|
|
114
|
-
if (gestureState.dy >
|
|
123
|
+
if (gestureState.dy > DISMISS_DRAG_DISTANCE) {
|
|
115
124
|
action.current = 'gesture';
|
|
116
|
-
|
|
125
|
+
handleDismiss(true);
|
|
117
126
|
} else {
|
|
118
|
-
translateY.value = withSpring(0,
|
|
119
|
-
damping: 20,
|
|
120
|
-
mass: 1,
|
|
121
|
-
stiffness: 100,
|
|
122
|
-
overshootClamping: false,
|
|
123
|
-
energyThreshold: 1e-10,
|
|
124
|
-
});
|
|
127
|
+
translateY.value = withSpring(0, SETTLE_SPRING);
|
|
125
128
|
}
|
|
126
129
|
},
|
|
127
130
|
}),
|
|
@@ -151,7 +154,12 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
|
|
|
151
154
|
leftOptions,
|
|
152
155
|
action,
|
|
153
156
|
});
|
|
154
|
-
const {
|
|
157
|
+
const {
|
|
158
|
+
handleDismiss,
|
|
159
|
+
handleRequestClose,
|
|
160
|
+
handlePressBack,
|
|
161
|
+
handlePressClose,
|
|
162
|
+
} = handlers;
|
|
155
163
|
|
|
156
164
|
const showBack = !!leftOptions?.onPressIconLeft;
|
|
157
165
|
const iconBack = leftOptions?.iconLeft ?? 'ic_back';
|
|
@@ -161,8 +169,8 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
|
|
|
161
169
|
useDivider,
|
|
162
170
|
theme,
|
|
163
171
|
showBack,
|
|
164
|
-
onPressBack,
|
|
165
|
-
onPressClose,
|
|
172
|
+
onPressBack: handlePressBack,
|
|
173
|
+
onPressClose: handlePressClose,
|
|
166
174
|
iconBack,
|
|
167
175
|
options,
|
|
168
176
|
leftOptions,
|
|
@@ -178,7 +186,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
|
|
|
178
186
|
<Screen
|
|
179
187
|
{...props}
|
|
180
188
|
{...props.route.params}
|
|
181
|
-
onRequestClose={
|
|
189
|
+
onRequestClose={handleRequestClose}
|
|
182
190
|
/>
|
|
183
191
|
);
|
|
184
192
|
|
|
@@ -205,7 +213,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
|
|
|
205
213
|
transparent
|
|
206
214
|
visible={true}
|
|
207
215
|
onRequestClose={() => {
|
|
208
|
-
|
|
216
|
+
handleDismiss();
|
|
209
217
|
}}
|
|
210
218
|
style={StyleSheet.absoluteFillObject}
|
|
211
219
|
isModalKit={true}
|
|
@@ -225,7 +233,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
|
|
|
225
233
|
style={StyleSheet.absoluteFillObject}
|
|
226
234
|
onPress={() => {
|
|
227
235
|
action.current = 'touch';
|
|
228
|
-
|
|
236
|
+
handleDismiss();
|
|
229
237
|
}}
|
|
230
238
|
>
|
|
231
239
|
<Animated.View style={[styles.overlay, animatedOverlayStyle]} />
|
|
@@ -54,16 +54,16 @@ const useCenterActionPress = () => {
|
|
|
54
54
|
const buttonStyle = useAnimatedStyle(() => ({
|
|
55
55
|
transform: [{ scale: scale.value }],
|
|
56
56
|
}));
|
|
57
|
-
const
|
|
57
|
+
const handlePressIn = () => {
|
|
58
58
|
scale.value = withTiming(
|
|
59
59
|
TabBarMotion.ctaPressedScale,
|
|
60
60
|
TabBarMotion.ctaPress,
|
|
61
61
|
);
|
|
62
62
|
};
|
|
63
|
-
const
|
|
63
|
+
const handlePressOut = () => {
|
|
64
64
|
scale.value = withTiming(1, TabBarMotion.ctaPress);
|
|
65
65
|
};
|
|
66
|
-
return { buttonStyle,
|
|
66
|
+
return { buttonStyle, handlePressIn, handlePressOut };
|
|
67
67
|
};
|
|
68
68
|
|
|
69
69
|
/**
|
|
@@ -77,7 +77,7 @@ const CenterAction: React.FC<{ floatingButton: FloatingButtonProps }> = ({
|
|
|
77
77
|
const context = useContext<any>(MiniAppContext);
|
|
78
78
|
const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
|
|
79
79
|
const { icon, label, onPress, labelContent } = floatingButton;
|
|
80
|
-
const { buttonStyle,
|
|
80
|
+
const { buttonStyle, handlePressIn, handlePressOut } = useCenterActionPress();
|
|
81
81
|
let iconNode = icon;
|
|
82
82
|
if (typeof icon === 'string') {
|
|
83
83
|
iconNode = (
|
|
@@ -95,8 +95,8 @@ const CenterAction: React.FC<{ floatingButton: FloatingButtonProps }> = ({
|
|
|
95
95
|
accessibilityRole={'button'}
|
|
96
96
|
accessibilityLabel={label}
|
|
97
97
|
onPress={onPress}
|
|
98
|
-
onPressIn={
|
|
99
|
-
onPressOut={
|
|
98
|
+
onPressIn={handlePressIn}
|
|
99
|
+
onPressOut={handlePressOut}
|
|
100
100
|
style={styles.cta}
|
|
101
101
|
>
|
|
102
102
|
<Animated.View
|
|
@@ -94,14 +94,14 @@ const RailCenterAction: React.FC<{ floatingButton: FloatingButtonProps }> = ({
|
|
|
94
94
|
floatingButton,
|
|
95
95
|
}) => {
|
|
96
96
|
const { theme } = useContext(ApplicationContext);
|
|
97
|
-
const { buttonStyle,
|
|
97
|
+
const { buttonStyle, handlePressIn, handlePressOut } = useCenterActionPress();
|
|
98
98
|
return (
|
|
99
99
|
<Pressable
|
|
100
100
|
accessibilityRole={'button'}
|
|
101
101
|
accessibilityLabel={floatingButton.label}
|
|
102
102
|
onPress={floatingButton.onPress}
|
|
103
|
-
onPressIn={
|
|
104
|
-
onPressOut={
|
|
103
|
+
onPressIn={handlePressIn}
|
|
104
|
+
onPressOut={handlePressOut}
|
|
105
105
|
style={styles.railCta}
|
|
106
106
|
>
|
|
107
107
|
<Animated.View
|
|
@@ -190,8 +190,8 @@ const DuoRailTabBar: React.FC<DuoTabBarProps> = props => {
|
|
|
190
190
|
accessibilityLabel={current?.label}
|
|
191
191
|
accessibilityHint={'bottom_tab_bar'}
|
|
192
192
|
activeOpacity={1}
|
|
193
|
-
onPressIn={compactLift.
|
|
194
|
-
onPressOut={compactLift.
|
|
193
|
+
onPressIn={compactLift.handlePressIn}
|
|
194
|
+
onPressOut={compactLift.handlePressOut}
|
|
195
195
|
onPress={expandTabBar}
|
|
196
196
|
style={styles.railCompact}
|
|
197
197
|
>
|
|
@@ -15,6 +15,8 @@ import { useScreenLayout } from '../../Layout';
|
|
|
15
15
|
import { getHeaderRowOptions } from '../../Layout/utils';
|
|
16
16
|
import { BottomTabInsetContext } from './BottomTabInset';
|
|
17
17
|
|
|
18
|
+
const NAVIGATED_REPORT_DELAY = 100;
|
|
19
|
+
|
|
18
20
|
const Stack = createStackNavigator();
|
|
19
21
|
|
|
20
22
|
/**
|
|
@@ -29,16 +31,15 @@ const TabScreen: React.FC<any> = ({ route, navigation }) => {
|
|
|
29
31
|
|
|
30
32
|
const screenName = screen?.name || screen?.type?.name || 'Invalid';
|
|
31
33
|
const { isBackgroundToForeground } = useAppState();
|
|
32
|
-
// Pad clear of the floating bar unless a Screen inside claims the inset to scroll under it.
|
|
33
34
|
const { inset: tabBarInset } = useContext(BottomTabInsetContext);
|
|
34
|
-
const [
|
|
35
|
+
const [isInsetClaimed, setIsInsetClaimed] = useState(false);
|
|
35
36
|
const tabInsetValue = useMemo(
|
|
36
|
-
() => ({ inset: tabBarInset, claim: () =>
|
|
37
|
+
() => ({ inset: tabBarInset, claim: () => setIsInsetClaimed(true) }),
|
|
37
38
|
[tabBarInset],
|
|
38
39
|
);
|
|
39
|
-
const tabInsetStyle = { paddingBottom:
|
|
40
|
+
const tabInsetStyle = { paddingBottom: isInsetClaimed ? 0 : tabBarInset };
|
|
40
41
|
|
|
41
|
-
const
|
|
42
|
+
const handleScreenNavigated = (pre: string, current: string) => {
|
|
42
43
|
if (!isBackgroundToForeground) {
|
|
43
44
|
const data: any = {
|
|
44
45
|
preScreenName: pre,
|
|
@@ -68,13 +69,13 @@ const TabScreen: React.FC<any> = ({ route, navigation }) => {
|
|
|
68
69
|
navigator?.maxApi?.getDataObserver?.(
|
|
69
70
|
'current_screen',
|
|
70
71
|
(data: any) => {
|
|
71
|
-
|
|
72
|
+
handleScreenNavigated(data?.screenName, screenName);
|
|
72
73
|
navigator?.maxApi?.setObserver?.('current_screen', {
|
|
73
74
|
screenName,
|
|
74
75
|
});
|
|
75
76
|
},
|
|
76
77
|
);
|
|
77
|
-
},
|
|
78
|
+
}, NAVIGATED_REPORT_DELAY);
|
|
78
79
|
},
|
|
79
80
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
80
81
|
[],
|
|
@@ -83,12 +84,12 @@ const TabScreen: React.FC<any> = ({ route, navigation }) => {
|
|
|
83
84
|
|
|
84
85
|
useEffect(
|
|
85
86
|
() => {
|
|
86
|
-
const
|
|
87
|
+
const focusAppListener = navigator?.maxApi?.listen?.('onFocusApp', () => {
|
|
87
88
|
if (navigation.isFocused()) {
|
|
88
89
|
navigator?.maxApi?.getDataObserver?.(
|
|
89
90
|
'current_screen',
|
|
90
91
|
(data: any) => {
|
|
91
|
-
|
|
92
|
+
handleScreenNavigated(data?.screenName, screenName);
|
|
92
93
|
navigator?.maxApi?.setObserver?.('current_screen', {
|
|
93
94
|
screenName,
|
|
94
95
|
});
|
|
@@ -98,7 +99,7 @@ const TabScreen: React.FC<any> = ({ route, navigation }) => {
|
|
|
98
99
|
});
|
|
99
100
|
|
|
100
101
|
return () => {
|
|
101
|
-
|
|
102
|
+
focusAppListener?.remove?.();
|
|
102
103
|
};
|
|
103
104
|
},
|
|
104
105
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
@@ -99,16 +99,16 @@ const BottomTab: React.FC<BottomTabProps> = ({
|
|
|
99
99
|
}, []),
|
|
100
100
|
);
|
|
101
101
|
|
|
102
|
-
const
|
|
102
|
+
const handleFocus = (e: any) => {
|
|
103
103
|
activeIndex.current = tabs.findIndex(i => e.target.includes(i.name));
|
|
104
104
|
|
|
105
105
|
const isFirstTab = activeIndex.current === 0;
|
|
106
|
-
const
|
|
106
|
+
const isGestureEnabled = Platform.OS === 'ios' && isFirstTab;
|
|
107
107
|
navigation?.setOptions({
|
|
108
|
-
gestureEnabled:
|
|
108
|
+
gestureEnabled: isGestureEnabled,
|
|
109
109
|
});
|
|
110
110
|
NativeModules?.MiniAppModule?.setShouldUseFloatingArrowBack?.(
|
|
111
|
-
!
|
|
111
|
+
!isGestureEnabled,
|
|
112
112
|
);
|
|
113
113
|
};
|
|
114
114
|
|
|
@@ -123,7 +123,7 @@ const BottomTab: React.FC<BottomTabProps> = ({
|
|
|
123
123
|
listeners?.tabPress?.(e);
|
|
124
124
|
},
|
|
125
125
|
focus: e => {
|
|
126
|
-
|
|
126
|
+
handleFocus(e);
|
|
127
127
|
StatusBar.setBarStyle('dark-content', true);
|
|
128
128
|
listeners?.focus?.(e);
|
|
129
129
|
},
|
|
@@ -18,15 +18,15 @@ const usePressLift = () => {
|
|
|
18
18
|
const style = useAnimatedStyle(() => ({
|
|
19
19
|
transform: [{ scale: 1 + lift.value * (PRESSED_SCALE - 1) }],
|
|
20
20
|
}));
|
|
21
|
-
const
|
|
21
|
+
const handlePressIn = () => {
|
|
22
22
|
if (!reduceMotion) {
|
|
23
23
|
lift.value = withSpring(1, SPRING);
|
|
24
24
|
}
|
|
25
25
|
};
|
|
26
|
-
const
|
|
26
|
+
const handlePressOut = () => {
|
|
27
27
|
lift.value = withSpring(0, SPRING);
|
|
28
28
|
};
|
|
29
|
-
return { style,
|
|
29
|
+
return { style, handlePressIn, handlePressOut };
|
|
30
30
|
};
|
|
31
31
|
|
|
32
32
|
export { usePressLift };
|
|
@@ -13,6 +13,9 @@ import { HeaderBarMetrics } from '../headerLayout';
|
|
|
13
13
|
|
|
14
14
|
const CLOSE_ICON = '16_navigation_close_circle';
|
|
15
15
|
const HOME_ICON = '16_basic_home';
|
|
16
|
+
// the capsule's two buttons extend their touch area outward only
|
|
17
|
+
const HELP_CENTER_HIT_SLOP = { top: 7, bottom: 7, left: 7, right: 0 };
|
|
18
|
+
const CLOSE_HIT_SLOP = { top: 7, bottom: 7, left: 0, right: 7 };
|
|
16
19
|
|
|
17
20
|
/**
|
|
18
21
|
* Header toolkit: optional shortcut plus the help center / close capsule. When
|
|
@@ -37,8 +40,8 @@ const HeaderToolkitAction: React.FC<any> = ({
|
|
|
37
40
|
iconShortcut,
|
|
38
41
|
shortcutOnPress,
|
|
39
42
|
showBadge,
|
|
40
|
-
|
|
41
|
-
|
|
43
|
+
handlePressHelpCenter,
|
|
44
|
+
handleClose,
|
|
42
45
|
} = useToolkitActions({
|
|
43
46
|
preventClose,
|
|
44
47
|
useSystemTools,
|
|
@@ -56,14 +59,14 @@ const HeaderToolkitAction: React.FC<any> = ({
|
|
|
56
59
|
};
|
|
57
60
|
}
|
|
58
61
|
|
|
59
|
-
const
|
|
62
|
+
const hasHelpCenter = context.appId !== 'vn.momo.helpcenter';
|
|
60
63
|
const closeIcon = useCloseIcon ? CLOSE_ICON : HOME_ICON;
|
|
61
64
|
let toolkitWidthStyle: ViewStyle = styles.toolkitNarrow;
|
|
62
|
-
if (
|
|
65
|
+
if (hasHelpCenter) {
|
|
63
66
|
toolkitWidthStyle = styles.toolkitWide;
|
|
64
67
|
}
|
|
65
68
|
|
|
66
|
-
const groupCount =
|
|
69
|
+
const groupCount = hasHelpCenter ? 2 : 1;
|
|
67
70
|
let capsuleHeight = DuoMetrics.controlSize;
|
|
68
71
|
if (groupCount > 1) {
|
|
69
72
|
capsuleHeight = groupCount * DuoMetrics.itemPitch;
|
|
@@ -112,19 +115,19 @@ const HeaderToolkitAction: React.FC<any> = ({
|
|
|
112
115
|
/>
|
|
113
116
|
)}
|
|
114
117
|
<SideBarGroup tintColor={tintColor}>
|
|
115
|
-
{
|
|
118
|
+
{hasHelpCenter && (
|
|
116
119
|
<SideBarGroupItem
|
|
117
120
|
accessibilityLabel={'btn_navigation_help_center'}
|
|
118
121
|
icon={'help_center'}
|
|
119
122
|
tintColor={tintColor}
|
|
120
|
-
onPress={
|
|
123
|
+
onPress={handlePressHelpCenter}
|
|
121
124
|
/>
|
|
122
125
|
)}
|
|
123
126
|
<SideBarGroupItem
|
|
124
127
|
accessibilityLabel={'btn_navigation_close'}
|
|
125
128
|
icon={closeIcon}
|
|
126
129
|
tintColor={tintColor}
|
|
127
|
-
onPress={
|
|
130
|
+
onPress={handleClose}
|
|
128
131
|
/>
|
|
129
132
|
</SideBarGroup>
|
|
130
133
|
</View>
|
|
@@ -143,13 +146,13 @@ const HeaderToolkitAction: React.FC<any> = ({
|
|
|
143
146
|
/>
|
|
144
147
|
)}
|
|
145
148
|
<View style={[styles.toolkitContainer, buttonStyle, toolkitWidthStyle]}>
|
|
146
|
-
{
|
|
149
|
+
{hasHelpCenter && (
|
|
147
150
|
<>
|
|
148
151
|
<TouchableOpacity
|
|
149
152
|
accessibilityLabel={'btn_navigation_help_center'}
|
|
150
153
|
style={styles.toolkitButton}
|
|
151
|
-
onPress={
|
|
152
|
-
hitSlop={
|
|
154
|
+
onPress={handlePressHelpCenter}
|
|
155
|
+
hitSlop={HELP_CENTER_HIT_SLOP}
|
|
153
156
|
>
|
|
154
157
|
<Icon
|
|
155
158
|
color={tintColor}
|
|
@@ -162,9 +165,9 @@ const HeaderToolkitAction: React.FC<any> = ({
|
|
|
162
165
|
)}
|
|
163
166
|
<TouchableOpacity
|
|
164
167
|
accessibilityLabel={'btn_navigation_close'}
|
|
165
|
-
onPress={
|
|
168
|
+
onPress={handleClose}
|
|
166
169
|
style={styles.toolkitButton}
|
|
167
|
-
hitSlop={
|
|
170
|
+
hitSlop={CLOSE_HIT_SLOP}
|
|
168
171
|
>
|
|
169
172
|
<Icon
|
|
170
173
|
color={tintColor}
|
|
@@ -4,6 +4,7 @@ import { PopupNotify } from '../../Popup';
|
|
|
4
4
|
import { Tool, ToolGroup } from '../types';
|
|
5
5
|
|
|
6
6
|
const DID_SYNC_NEW_HOME = 'did_sync_new_home';
|
|
7
|
+
const LOADING_RESET_DELAY = 1000;
|
|
7
8
|
|
|
8
9
|
type ToolkitActionsParams = {
|
|
9
10
|
preventClose?: any;
|
|
@@ -49,8 +50,8 @@ const useToolkitActions = ({
|
|
|
49
50
|
const favoriteObserver = navigator?.maxApi?.observer?.(
|
|
50
51
|
DID_SYNC_NEW_HOME,
|
|
51
52
|
(updatedData: any) => {
|
|
52
|
-
const
|
|
53
|
-
setIsFavorite(
|
|
53
|
+
const isInFavorites = updatedData?.items?.includes(context?.code);
|
|
54
|
+
setIsFavorite(isInFavorites);
|
|
54
55
|
},
|
|
55
56
|
);
|
|
56
57
|
return () => {
|
|
@@ -59,7 +60,7 @@ const useToolkitActions = ({
|
|
|
59
60
|
}
|
|
60
61
|
}, [useShortcut, context, checkAppIsFavorite, navigator?.maxApi]);
|
|
61
62
|
|
|
62
|
-
const
|
|
63
|
+
const handleDismiss = () => {
|
|
63
64
|
if (useCloseIcon) {
|
|
64
65
|
navigator?.maxApi?.dispatchFunction?.(
|
|
65
66
|
'dismiss',
|
|
@@ -71,7 +72,7 @@ const useToolkitActions = ({
|
|
|
71
72
|
}
|
|
72
73
|
};
|
|
73
74
|
|
|
74
|
-
const
|
|
75
|
+
const handleClose = () => {
|
|
75
76
|
const currentRoute = navigator?.ref?.current?.getCurrentRoute?.();
|
|
76
77
|
context?.autoTracking?.({
|
|
77
78
|
...context,
|
|
@@ -89,24 +90,24 @@ const useToolkitActions = ({
|
|
|
89
90
|
title: preventClose.primary.title,
|
|
90
91
|
onPress: () => {
|
|
91
92
|
preventClose?.primary.onPress();
|
|
92
|
-
|
|
93
|
+
handleDismiss();
|
|
93
94
|
},
|
|
94
95
|
}}
|
|
95
96
|
/>
|
|
96
97
|
),
|
|
97
98
|
});
|
|
98
99
|
} else {
|
|
99
|
-
|
|
100
|
+
handleDismiss();
|
|
100
101
|
}
|
|
101
102
|
};
|
|
102
103
|
|
|
103
|
-
const
|
|
104
|
+
const handlePressShortcut = () => {
|
|
104
105
|
const currentRoute = navigator?.ref?.current?.getCurrentRoute?.();
|
|
105
|
-
const
|
|
106
|
+
const shouldBeFavorite = !isFavorite;
|
|
106
107
|
context?.autoTracking?.({
|
|
107
108
|
...context,
|
|
108
109
|
componentName: 'IconButton',
|
|
109
|
-
componentId: `${
|
|
110
|
+
componentId: `${shouldBeFavorite ? 'pin' : 'unpin'}_shortcut`,
|
|
110
111
|
screenName: currentRoute?.params?.screen?.name ?? currentRoute?.name,
|
|
111
112
|
});
|
|
112
113
|
setIsLoading(true);
|
|
@@ -120,16 +121,16 @@ const useToolkitActions = ({
|
|
|
120
121
|
},
|
|
121
122
|
({ success }: { success: boolean }) => {
|
|
122
123
|
if (success) {
|
|
123
|
-
setIsFavorite(
|
|
124
|
+
setIsFavorite(shouldBeFavorite);
|
|
124
125
|
}
|
|
125
126
|
},
|
|
126
127
|
);
|
|
127
128
|
setTimeout(() => {
|
|
128
129
|
setIsLoading(false);
|
|
129
|
-
},
|
|
130
|
+
}, LOADING_RESET_DELAY);
|
|
130
131
|
};
|
|
131
132
|
|
|
132
|
-
const
|
|
133
|
+
const handlePressHelpCenter = () => {
|
|
133
134
|
const currentRoute = navigator?.ref?.current?.getCurrentRoute?.();
|
|
134
135
|
context?.autoTracking?.({
|
|
135
136
|
...context,
|
|
@@ -141,7 +142,7 @@ const useToolkitActions = ({
|
|
|
141
142
|
navigator?.maxApi?.dispatchFunction?.('showHelpCenter', context);
|
|
142
143
|
};
|
|
143
144
|
|
|
144
|
-
const
|
|
145
|
+
const handlePressIconMore = () => {
|
|
145
146
|
const currentRoute = navigator?.ref?.current?.getCurrentRoute?.();
|
|
146
147
|
context?.autoTracking?.({
|
|
147
148
|
...context,
|
|
@@ -172,18 +173,18 @@ const useToolkitActions = ({
|
|
|
172
173
|
};
|
|
173
174
|
|
|
174
175
|
let iconShortcut = isFavorite ? 'pin_star_checked' : 'pin_star';
|
|
175
|
-
let shortcutOnPress =
|
|
176
|
+
let shortcutOnPress = handlePressShortcut;
|
|
176
177
|
const totalTools = tools.reduce(
|
|
177
178
|
(count: number, group: ToolGroup) => count + group?.items?.length,
|
|
178
179
|
0,
|
|
179
180
|
);
|
|
180
|
-
const
|
|
181
|
-
const
|
|
181
|
+
const hasManyTools = tools && totalTools > 1;
|
|
182
|
+
const hasOneTool = tools && totalTools === 1;
|
|
182
183
|
|
|
183
|
-
if (
|
|
184
|
+
if (hasManyTools || useMore) {
|
|
184
185
|
iconShortcut = 'navigation_more_icon';
|
|
185
|
-
shortcutOnPress =
|
|
186
|
-
} else if (
|
|
186
|
+
shortcutOnPress = handlePressIconMore;
|
|
187
|
+
} else if (hasOneTool) {
|
|
187
188
|
const singleToolGroup = tools.find(
|
|
188
189
|
(group: ToolGroup) => group?.items?.length === 1,
|
|
189
190
|
);
|
|
@@ -210,8 +211,8 @@ const useToolkitActions = ({
|
|
|
210
211
|
iconShortcut,
|
|
211
212
|
shortcutOnPress,
|
|
212
213
|
showBadge,
|
|
213
|
-
|
|
214
|
-
|
|
214
|
+
handlePressHelpCenter,
|
|
215
|
+
handleClose,
|
|
215
216
|
};
|
|
216
217
|
};
|
|
217
218
|
|