@applicaster/zapp-react-native-utils 12.0.0-alpha.5035843303 → 12.0.0-alpha.5050333009
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/actionsExecutor/ActionExecutorContext.tsx +16 -8
- package/analyticsUtils/AnalyticsEvents/index.ts +13 -0
- package/analyticsUtils/AnalyticsEvents/searchEvents.ts +21 -0
- package/analyticsUtils/AnalyticsEvents/sendShareEvent.ts +21 -0
- package/analyticsUtils/__tests__/analyticsManager.test.js +75 -73
- package/analyticsUtils/analyticsPlugins.ts +25 -0
- package/analyticsUtils/events.ts +12 -0
- package/analyticsUtils/helpers/hooks.ts +1 -1
- package/analyticsUtils/index.tsx +12 -0
- package/appUtils/HooksManager/{Hook.js → Hook.ts} +35 -23
- package/appUtils/HooksManager/{constants.js → constants.ts} +1 -1
- package/appUtils/HooksManager/{index.js → index.ts} +121 -112
- package/appUtils/HooksManager/types.ts +116 -0
- package/appUtils/RiverFocusManager/index.js +17 -12
- package/appUtils/accessibilityManager/const.ts +50 -0
- package/appUtils/accessibilityManager/hooks.ts +31 -0
- package/appUtils/accessibilityManager/index.ts +150 -0
- package/appUtils/accessibilityManager/logger.ts +5 -0
- package/appUtils/focusManager/__tests__/__snapshots__/focusManager.test.js.snap +2 -3
- package/appUtils/focusManager/__tests__/focusManager.test.js +4 -24
- package/appUtils/focusManager/__tests__/index.test.ts +2 -3
- package/appUtils/focusManager/index.ts +76 -57
- package/appUtils/focusManager/treeDataStructure/Tree/index.js +2 -3
- package/appUtils/focusManager/treeDataStructure/Utils/index.js +76 -38
- package/appUtils/focusManager/utils/index.ts +100 -0
- package/appUtils/focusManagerAux/index.ts +76 -0
- package/appUtils/focusManagerAux/utils/index.ts +100 -0
- package/appUtils/{index.js → index.ts} +2 -0
- package/appUtils/keyCodes/__tests__/__snapshots__/keyCodes.test.js.snap +1 -1
- package/appUtils/keyCodes/__tests__/keyCodes.test.js +80 -85
- package/appUtils/keyCodes/{index.js → index.ts} +2 -0
- package/appUtils/keyCodes/keys/index.ts +3 -0
- package/appUtils/keyCodes/{keys.android.js → keys/keyEventMapper.ts} +0 -19
- package/appUtils/keyCodes/keys/keys.android.ts +18 -0
- package/appUtils/keyCodes/keys/keys.ios.ts +25 -0
- package/appUtils/keyCodes/keys/keys.ts +15 -0
- package/appUtils/keyCodes/{keys.web.js → keys/keys.web.ts} +9 -0
- package/appUtils/keyCodes/{keysByPlatform.js → keys/keysByPlatform.ts} +11 -1
- package/appUtils/orientationHelper.ts +1 -1
- package/appUtils/platform/const.ts +25 -0
- package/appUtils/platform/index.ts +3 -0
- package/appUtils/platform/platformUtils.ts +171 -0
- package/appUtils/playerManager/OverlayObserver/OverlaysObserver.ts +53 -0
- package/appUtils/playerManager/conts.ts +5 -0
- package/appUtils/playerManager/index.ts +11 -5
- package/appUtils/playerManager/nativePlayerManager.ts +12 -0
- package/appUtils/playerManager/player.ts +48 -7
- package/appUtils/playerManager/playerFactory.ts +15 -1
- package/appUtils/playerManager/playerNative.ts +40 -14
- package/appUtils/playerManager/usePlayerControllerSetup.tsx +7 -1
- package/appUtils/playerManager/usePlayerState.tsx +13 -1
- package/appUtils/playerManager/usePlayerTitleSummaryOverlay.tsx +50 -0
- package/arrayUtils/__tests__/isFilledArray.test.ts +63 -0
- package/arrayUtils/index.ts +5 -0
- package/booleanUtils/index.ts +4 -4
- package/cellUtils/__tests__/cellUtils.test.ts +48 -0
- package/cellUtils/__tests__/fixtures.ts +13 -0
- package/cellUtils/index.ts +40 -2
- package/dateUtils/index.ts +11 -0
- package/domUtils/{cookieManager.js → cookieManager.ts} +1 -2
- package/focusManager/index.ts +1 -1
- package/functionUtils/__tests__/__snapshots__/functionUtils.test.js.snap +2 -2
- package/functionUtils/__tests__/functionUtils.test.js +244 -248
- package/functionUtils/index.ts +15 -11
- package/headersUtils/index.ts +1 -0
- package/inflatedUrlUtils/index.ts +4 -4
- package/keyboardState/index.ts +0 -0
- package/localizationUtils/__tests__/localizationUtils.test.ts +78 -55
- package/localizationUtils/index.ts +13 -19
- package/logger/index.ts +1 -1
- package/manifestUtils/defaultManifestConfigurations/generalContent.js +6 -0
- package/manifestUtils/defaultManifestConfigurations/player.js +10 -1
- package/manifestUtils/index.js +5 -1
- package/manifestUtils/secondaryImage/index.js +18 -15
- package/modalState/index.ts +53 -0
- package/navigationUtils/index.ts +118 -12
- package/numberUtils/__tests__/isLikeNumber.test.ts +18 -0
- package/numberUtils/index.ts +9 -18
- package/package.json +3 -2
- package/playerUtils/configurationGenerator.ts +11 -1
- package/pluginUtils/index.ts +20 -7
- package/reactHooks/autoscrolling/__tests__/useTrackCurrentAutoScrollingElement.test.ts +2 -0
- package/reactHooks/autoscrolling/__tests__/{useTrackedView.test.ts → useTrackedView.test.tsx} +18 -1
- package/reactHooks/cell-click/__tests__/index.test.js +16 -3
- package/reactHooks/cell-click/index.ts +14 -14
- package/reactHooks/device/index.ts +0 -1
- package/reactHooks/device/useIsTablet.tsx +28 -3
- package/reactHooks/device/useMemoizedIsTablet.ts +1 -1
- package/reactHooks/device/useOrientation.tsx +3 -1
- package/reactHooks/feed/__tests__/useBuildPipesUrl.test.tsx +30 -70
- package/reactHooks/feed/__tests__/useFeedRefresh.test.tsx +6 -2
- package/reactHooks/feed/__tests__/useInflatedUrl.test.ts +18 -3
- package/reactHooks/feed/useBuildPipesUrl.ts +7 -10
- package/reactHooks/feed/useFeedRefresh.tsx +9 -7
- package/reactHooks/feed/useInflatedUrl.ts +44 -15
- package/reactHooks/flatList/useLoadNextPageIfNeeded.ts +16 -9
- package/reactHooks/index.ts +2 -0
- package/reactHooks/layout/__tests__/{index.test.js → index.test.tsx} +66 -59
- package/reactHooks/layout/getDeviceInfo/index.ts +4 -2
- package/reactHooks/layout/index.ts +2 -1
- package/reactHooks/layout/types/index.ts +2 -0
- package/reactHooks/layout/useDimensions/helpers/__tests__/getInitialDimensions.native.test.js +11 -16
- package/reactHooks/layout/useDimensions/helpers/__tests__/getInitialDimensions.test.js +12 -14
- package/reactHooks/layout/useDimensions/useDimensions.ts +13 -7
- package/reactHooks/navigation/__mocks__/index.ts +15 -0
- package/reactHooks/navigation/__mocks__/useNavigation.ts +7 -0
- package/reactHooks/navigation/__tests__/index.test.tsx +240 -81
- package/reactHooks/navigation/index.ts +246 -84
- package/reactHooks/resolvers/__tests__/useCellResolver.test.tsx +3 -1
- package/reactHooks/screen/__mocks__/useScreenContext.ts +3 -1
- package/reactHooks/screen/__tests__/useCurrentScreenData.test.tsx +21 -23
- package/reactHooks/screen/index.ts +4 -0
- package/reactHooks/screen/useScreenBackgroundColor.ts +23 -0
- package/reactHooks/screen/useScreenContext.ts +4 -4
- package/reactHooks/screen/useScreenData.ts +1 -1
- package/reactHooks/screen/useTargetScreenData.ts +7 -0
- package/reactHooks/state/useRivers.ts +3 -1
- package/reactHooks/useListenEventBusEvent.ts +6 -15
- package/reactHooks/videoModal/hooks/useVideoModalScreenData.tsx +10 -9
- package/reactUtils/index.ts +91 -0
- package/riverComponetsMeasurementProvider/index.tsx +2 -2
- package/stringUtils/index.ts +5 -0
- package/testUtils/getByTestId.ts +14 -0
- package/testUtils/index.tsx +38 -23
- package/types.ts +4 -0
- package/zappFrameworkUtils/loginPluginUtils.ts +12 -2
- package/appUtils/focusManager/FocusableEvents.ts +0 -8
- package/appUtils/focusManager/treeDataStructure/Utils/__tests__/Utils_android.test.js +0 -1094
- package/appUtils/focusManager/treeDataStructure/Utils/index.android.js +0 -261
- package/appUtils/keyCodes/keys.ios.js +0 -46
- package/reactHooks/device/useIsTablet.android.tsx +0 -14
- package/reactHooks/device/useIsTablet.ios.tsx +0 -7
- package/reactHooks/device/useIsTablet.web.tsx +0 -3
- /package/appUtils/HooksManager/{logger.js → logger.ts} +0 -0
- /package/appUtils/{directionHelper.js → directionHelper.ts} +0 -0
- /package/appUtils/keyCodes/{androidTVKeys.js → androidTVKeys.ts} +0 -0
- /package/appUtils/{localizationsHelper.js → localizationsHelper.ts} +0 -0
- /package/domUtils/{logger.js → logger.ts} +0 -0
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-use-before-define */
|
|
2
2
|
/* eslint max-len: off */
|
|
3
3
|
|
|
4
|
-
import React, { useEffect, useMemo } from "react";
|
|
4
|
+
import React, { useContext, useEffect, useMemo } from "react";
|
|
5
5
|
import { BackHandler, InteractionManager, NativeModules } from "react-native";
|
|
6
6
|
import { useSafeAreaInsets } from "react-native-safe-area-context";
|
|
7
7
|
|
|
@@ -12,23 +12,117 @@ import {
|
|
|
12
12
|
import { HooksManager } from "@applicaster/zapp-react-native-utils/appUtils/HooksManager";
|
|
13
13
|
|
|
14
14
|
import { legacyScreenData } from "@applicaster/quick-brick-core/App/NavigationProvider/utils";
|
|
15
|
-
import {
|
|
15
|
+
import {
|
|
16
|
+
LONG_KEY_PRESS_TIMEOUT,
|
|
17
|
+
QUICK_BRICK_NAVBAR,
|
|
18
|
+
QUICK_BRICK_CONTENT,
|
|
19
|
+
} from "@applicaster/quick-brick-core/const";
|
|
16
20
|
import { useZappHooksModalState } from "@applicaster/zapp-react-dom-ui-components/Components/ZappHooksModal/ZappHooksModal";
|
|
17
21
|
import { ZappHookModalContext } from "@applicaster/zapp-react-native-ui-components/Contexts";
|
|
18
22
|
import { PathnameContext } from "@applicaster/zapp-react-native-ui-components/Contexts/PathnameContext";
|
|
19
23
|
import { HookModalContextT } from "@applicaster/zapp-react-native-ui-components/Contexts/ZappHookModalContext";
|
|
20
|
-
import { getNavigationProps } from "@applicaster/zapp-react-native-utils/navigationUtils";
|
|
21
24
|
import { HOOKS_EVENTS } from "../../appUtils/HooksManager/constants";
|
|
22
|
-
import {
|
|
25
|
+
import {
|
|
26
|
+
getNavigationProps,
|
|
27
|
+
getRiverFromRoute,
|
|
28
|
+
getTargetRoute,
|
|
29
|
+
} from "../../navigationUtils";
|
|
23
30
|
import { platformSelect } from "../../reactUtils";
|
|
24
31
|
import { useConnectionInfo } from "../connection";
|
|
25
32
|
import { getTargetScreenData } from "../screen/useTargetScreenData";
|
|
26
|
-
import { useNavbarState } from "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenContext";
|
|
27
33
|
|
|
34
|
+
import { isTV, isWeb } from "@applicaster/zapp-react-native-utils/reactUtils";
|
|
35
|
+
import { useNavbarState } from "../screen";
|
|
28
36
|
import { useNavigation } from "./useNavigation";
|
|
37
|
+
import { useModalStore } from "../../modalState";
|
|
38
|
+
import { ScreenDataContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenDataContext";
|
|
29
39
|
|
|
30
40
|
export { useNavigation } from "./useNavigation";
|
|
31
41
|
|
|
42
|
+
/**
|
|
43
|
+
* This function helps to decide wether the navbar should be presented on the screen
|
|
44
|
+
* based on route and / or screen Data
|
|
45
|
+
*
|
|
46
|
+
* Currently the scenarios include
|
|
47
|
+
* - players => false
|
|
48
|
+
* - search screen plugin => false
|
|
49
|
+
* - hooks with `showNavBar: true` or `presentFullScreen` not set to true, defaults to no navbar for hook screens
|
|
50
|
+
* - screens with `allow_screen_plugin_presentation` in general property => false
|
|
51
|
+
*
|
|
52
|
+
* @param {String} route current route of the screen
|
|
53
|
+
* @param {Object} screenData payload associated with the currently presented screen
|
|
54
|
+
* @returns {Boolean}
|
|
55
|
+
*/
|
|
56
|
+
export function isNavBarVisible(
|
|
57
|
+
route: string,
|
|
58
|
+
screenData: ZappRiver = {} as ZappRiver,
|
|
59
|
+
showNavBar: boolean,
|
|
60
|
+
canGoBack: boolean,
|
|
61
|
+
videoModalState: QuickBrickVideoModalState | null = null
|
|
62
|
+
) {
|
|
63
|
+
/* screenData is not actual navigator.data
|
|
64
|
+
* or navigator.screenData,
|
|
65
|
+
* but navigator.data.screen */
|
|
66
|
+
if (route.includes("playable")) {
|
|
67
|
+
return false;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
if (
|
|
71
|
+
videoModalState?.mode === "FULLSCREEN" &&
|
|
72
|
+
videoModalState?.visible === true
|
|
73
|
+
) {
|
|
74
|
+
return false;
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
if (screenData?.type === "qb_search_screen" && !isTV()) {
|
|
78
|
+
return false;
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
if (screenData?.plugin_type === "login" && isTV()) {
|
|
82
|
+
return false;
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
/* Match if screen is Hook */
|
|
86
|
+
if (route.startsWith("/hooks/")) {
|
|
87
|
+
const module = screenData?.module;
|
|
88
|
+
|
|
89
|
+
if (module?.presentFullScreen) {
|
|
90
|
+
return false;
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
return module?.showNavBar ?? false;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
if (screenData?.hookPlugin) {
|
|
97
|
+
const hookPlugin = screenData?.hookPlugin?.module;
|
|
98
|
+
|
|
99
|
+
return (
|
|
100
|
+
hookPlugin?.showNavBar || hookPlugin?.presentFullScreen !== true || false
|
|
101
|
+
);
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
if (
|
|
105
|
+
screenData?.general?.allow_screen_plugin_presentation ||
|
|
106
|
+
screenData?.general?.hide_app_nav_bar
|
|
107
|
+
) {
|
|
108
|
+
return false;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
const hideSecondaryLevel = screenData?.navigations?.some(
|
|
112
|
+
(navigation) => navigation.styles?.hide_secondary_level_menu
|
|
113
|
+
);
|
|
114
|
+
|
|
115
|
+
if (canGoBack && hideSecondaryLevel) {
|
|
116
|
+
return false;
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
if (typeof showNavBar === "boolean" && !showNavBar) {
|
|
120
|
+
return false;
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
return true;
|
|
124
|
+
}
|
|
125
|
+
|
|
32
126
|
const { ProfilerBridge } = NativeModules;
|
|
33
127
|
|
|
34
128
|
export const usePathname = () => React.useContext(PathnameContext);
|
|
@@ -43,6 +137,88 @@ export const useBackHandler = (cb: () => boolean) => {
|
|
|
43
137
|
}, [cb]);
|
|
44
138
|
};
|
|
45
139
|
|
|
140
|
+
// starts with modal/
|
|
141
|
+
const isModalPathname = (pathname: string) => /^modal\//.test(pathname);
|
|
142
|
+
|
|
143
|
+
const isVideoModalPathname = (pathname: string) =>
|
|
144
|
+
/^video-modal\//.test(pathname);
|
|
145
|
+
|
|
146
|
+
const isHookModalPathname = (pathname: string) =>
|
|
147
|
+
/^hooks-modal\//.test(pathname);
|
|
148
|
+
|
|
149
|
+
const isHookPathname = (pathname: string) => /^\/hooks\//.test(pathname);
|
|
150
|
+
|
|
151
|
+
type VariousScreenData = LegacyNavigationScreenData | ZappRiver | ZappEntry;
|
|
152
|
+
|
|
153
|
+
export const useRoute = (): {
|
|
154
|
+
screenData: VariousScreenData;
|
|
155
|
+
pathname: string;
|
|
156
|
+
} => {
|
|
157
|
+
const pathname = usePathname() || "";
|
|
158
|
+
const navigator = useNavigation();
|
|
159
|
+
const screenDataContext = legacyScreenData(useContext(ScreenDataContext));
|
|
160
|
+
|
|
161
|
+
const { plugins, contentTypes, rivers } = usePickFromState([
|
|
162
|
+
"plugins",
|
|
163
|
+
"rivers",
|
|
164
|
+
"contentTypes",
|
|
165
|
+
]);
|
|
166
|
+
|
|
167
|
+
const { modalState } = useModalStore();
|
|
168
|
+
const hookModalState = useZappHooksModalState();
|
|
169
|
+
|
|
170
|
+
const modalScreenData = modalState.screen;
|
|
171
|
+
|
|
172
|
+
const hookModalScreenData = hookModalState.state.screenData?.payload;
|
|
173
|
+
|
|
174
|
+
const videoModalScreenData =
|
|
175
|
+
navigator.videoModalState?.item &&
|
|
176
|
+
legacyScreenData(
|
|
177
|
+
{
|
|
178
|
+
entry: navigator.videoModalState?.item as ZappEntry,
|
|
179
|
+
screen: getTargetScreenData(
|
|
180
|
+
navigator.videoModalState?.item as ZappEntry,
|
|
181
|
+
rivers,
|
|
182
|
+
contentTypes
|
|
183
|
+
),
|
|
184
|
+
},
|
|
185
|
+
plugins
|
|
186
|
+
);
|
|
187
|
+
|
|
188
|
+
// There are 4 route scenarios
|
|
189
|
+
// For regular screens take date from navigator stack.
|
|
190
|
+
// is path is model grab screenData from modal state
|
|
191
|
+
// if path is video modal grab screenData from video state
|
|
192
|
+
// if path is hook modal grab screenData from hook state
|
|
193
|
+
// if path is hook grab screenData from screenData
|
|
194
|
+
|
|
195
|
+
if (isModalPathname(pathname)) {
|
|
196
|
+
const screenData = modalScreenData ?? ({} as ZappEntry);
|
|
197
|
+
|
|
198
|
+
return { screenData, pathname };
|
|
199
|
+
}
|
|
200
|
+
|
|
201
|
+
if (isVideoModalPathname(pathname)) {
|
|
202
|
+
const screenData = videoModalScreenData as LegacyNavigationScreenData;
|
|
203
|
+
|
|
204
|
+
return { screenData, pathname };
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
if (isHookModalPathname(pathname)) {
|
|
208
|
+
const screenData = hookModalScreenData;
|
|
209
|
+
|
|
210
|
+
return { screenData, pathname };
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
if (isHookPathname(pathname)) {
|
|
214
|
+
return { screenData: screenDataContext, pathname };
|
|
215
|
+
}
|
|
216
|
+
|
|
217
|
+
const screenData = screenDataContext;
|
|
218
|
+
|
|
219
|
+
return { screenData, pathname };
|
|
220
|
+
};
|
|
221
|
+
|
|
46
222
|
type Callbacks = Partial<{
|
|
47
223
|
handleHookPresent: ({
|
|
48
224
|
route,
|
|
@@ -144,16 +320,19 @@ export const useZappHooksForEntry = (
|
|
|
144
320
|
callbacks?.handleHookComplete?.(props);
|
|
145
321
|
};
|
|
146
322
|
|
|
147
|
-
const hookManager = HooksManager(hooksOptions)
|
|
323
|
+
const hookManager = HooksManager(hooksOptions);
|
|
324
|
+
|
|
325
|
+
hookManager.subscriber
|
|
148
326
|
.on(HOOKS_EVENTS.PRESENT_SCREEN_HOOK, handleHookPresent)
|
|
149
327
|
.on(HOOKS_EVENTS.ERROR, handleHookError)
|
|
150
328
|
.on(HOOKS_EVENTS.CANCEL, handleHookCancel)
|
|
151
329
|
.on(HOOKS_EVENTS.START_BACKGROUND_HOOK, handleBackgroundHook)
|
|
152
|
-
.on(HOOKS_EVENTS.COMPLETE, handleHookComplete)
|
|
153
|
-
|
|
330
|
+
.on(HOOKS_EVENTS.COMPLETE, handleHookComplete);
|
|
331
|
+
|
|
332
|
+
hookManager.handleHooks(entry);
|
|
154
333
|
|
|
155
334
|
return () => {
|
|
156
|
-
hookManager
|
|
335
|
+
hookManager.subscriber
|
|
157
336
|
.removeHandler(HOOKS_EVENTS.PRESENT_SCREEN_HOOK, handleHookPresent)
|
|
158
337
|
.removeHandler(HOOKS_EVENTS.ERROR, handleHookError)
|
|
159
338
|
.removeHandler(HOOKS_EVENTS.CANCEL, handleHookCancel)
|
|
@@ -209,7 +388,7 @@ export const useRunIfLongPress = (
|
|
|
209
388
|
React.useRef<Nullable<ReturnType<typeof setTimeout>>>(null);
|
|
210
389
|
|
|
211
390
|
const resetTimeout = () => {
|
|
212
|
-
clearTimeout(pressTimeout.current);
|
|
391
|
+
clearTimeout(pressTimeout.current as ReturnType<typeof setTimeout>);
|
|
213
392
|
};
|
|
214
393
|
|
|
215
394
|
const startTimeout = (cb: () => void) => {
|
|
@@ -231,102 +410,85 @@ export const useRunIfLongPress = (
|
|
|
231
410
|
* @returns boolean - navbar visiblity status
|
|
232
411
|
*/
|
|
233
412
|
export const useIsNavBarVisible = (): boolean => {
|
|
234
|
-
const visible = useNavbarState()
|
|
413
|
+
const { visible } = useNavbarState();
|
|
235
414
|
|
|
236
415
|
return useMemo(() => visible, [visible]);
|
|
237
416
|
};
|
|
238
417
|
|
|
239
|
-
const
|
|
418
|
+
const useGetNavBarTopBorderWidth = (): number => {
|
|
419
|
+
const navigator = useNavigation();
|
|
240
420
|
|
|
241
|
-
const
|
|
242
|
-
|
|
421
|
+
const navProps = getNavigationProps({
|
|
422
|
+
navigator,
|
|
423
|
+
title: "",
|
|
424
|
+
category: "menu",
|
|
425
|
+
});
|
|
243
426
|
|
|
244
|
-
|
|
245
|
-
|
|
427
|
+
return Number(((navProps?.styles as any)?.top_border_width as number) ?? 0);
|
|
428
|
+
};
|
|
246
429
|
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
const navigator = useNavigation();
|
|
430
|
+
const TAB_BAR_HEIGHT_IOS = 49;
|
|
431
|
+
const TAB_BAR_HEIGHT_ANDROID = 56;
|
|
250
432
|
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
433
|
+
const useGetTabBarHeight = () =>
|
|
434
|
+
platformSelect({
|
|
435
|
+
ios: TAB_BAR_HEIGHT_IOS + (useSafeAreaInsets().bottom ?? 0),
|
|
436
|
+
android: TAB_BAR_HEIGHT_ANDROID,
|
|
437
|
+
}) as number;
|
|
256
438
|
|
|
257
|
-
|
|
258
|
-
const
|
|
259
|
-
const
|
|
439
|
+
export const useGetBottomTabBarHeight = (): number => {
|
|
440
|
+
const topBorderWidth = useGetNavBarTopBorderWidth();
|
|
441
|
+
const tabBarHeight = useGetTabBarHeight();
|
|
260
442
|
|
|
261
|
-
const
|
|
443
|
+
const isBottomBarNavigation = useNavigationType() === MenuTypes.bottomTabBar;
|
|
262
444
|
|
|
263
|
-
|
|
445
|
+
return !isBottomBarNavigation ? 0 : tabBarHeight + topBorderWidth;
|
|
446
|
+
};
|
|
264
447
|
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
entry: navigator.videoModalState?.item,
|
|
270
|
-
screen: getTargetScreenData(
|
|
271
|
-
navigator.videoModalState?.item,
|
|
272
|
-
rivers,
|
|
273
|
-
contentTypes
|
|
274
|
-
),
|
|
275
|
-
},
|
|
276
|
-
plugins
|
|
277
|
-
);
|
|
448
|
+
// If current screen is active/focused (visible to the user)
|
|
449
|
+
export const useIsScreenActive = () => {
|
|
450
|
+
const pathname = usePathname();
|
|
451
|
+
const { currentRoute, videoModalState } = useNavigation();
|
|
278
452
|
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
entry: currentStack?.state?.entry ?? ({} as ZappEntry),
|
|
286
|
-
},
|
|
453
|
+
if (
|
|
454
|
+
videoModalState.visible &&
|
|
455
|
+
["FULLSCREEN", "MAXIMIZED", "PIP"].includes(videoModalState.mode)
|
|
456
|
+
) {
|
|
457
|
+
return false;
|
|
458
|
+
}
|
|
287
459
|
|
|
288
|
-
|
|
289
|
-
|
|
460
|
+
return pathname === currentRoute;
|
|
461
|
+
};
|
|
290
462
|
|
|
291
|
-
|
|
292
|
-
// For regular screens take date from navigator stack.
|
|
293
|
-
// is path is model grab screenData from modal state
|
|
294
|
-
// if path is video modal grab screenData from video state
|
|
295
|
-
// if path is hook modal grab screenData from hook state
|
|
463
|
+
type Return = (prefix: string) => string;
|
|
296
464
|
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
? videoModalScreenData
|
|
301
|
-
: isHookModalPathname(pathname)
|
|
302
|
-
? hookModalScreenData
|
|
303
|
-
: currentRouteScreenData;
|
|
465
|
+
export const useUniqueRouteSuffix = (): Return => {
|
|
466
|
+
const pathname = usePathname();
|
|
467
|
+
const { currentRoute } = useNavigation();
|
|
304
468
|
|
|
305
|
-
|
|
306
|
-
};
|
|
469
|
+
const suffix = `currentRoute:${currentRoute}_pathname:${pathname}`;
|
|
307
470
|
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
471
|
+
const withUniqueRouteSuffix = React.useCallback((prefix: string) => {
|
|
472
|
+
if (isWeb()) {
|
|
473
|
+
// we should use extended route prefix only on Web, where we have stack-navigator
|
|
474
|
+
return `${prefix}___${suffix}`;
|
|
475
|
+
}
|
|
311
476
|
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
category: "menu",
|
|
316
|
-
});
|
|
477
|
+
// for other platforms use previous version
|
|
478
|
+
return prefix;
|
|
479
|
+
}, []);
|
|
317
480
|
|
|
318
|
-
|
|
319
|
-
|
|
481
|
+
return withUniqueRouteSuffix;
|
|
482
|
+
};
|
|
320
483
|
|
|
321
|
-
|
|
322
|
-
const
|
|
484
|
+
export const useNavbarId = () => {
|
|
485
|
+
const withUniqueRouteSuffix = useUniqueRouteSuffix();
|
|
323
486
|
|
|
324
|
-
|
|
487
|
+
return withUniqueRouteSuffix(QUICK_BRICK_NAVBAR);
|
|
488
|
+
};
|
|
325
489
|
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
android: TAB_BAR_HEIGHT_ANDROID,
|
|
329
|
-
}) as number;
|
|
490
|
+
export const useContentId = () => {
|
|
491
|
+
const withUniqueRouteSuffix = useUniqueRouteSuffix();
|
|
330
492
|
|
|
331
|
-
return
|
|
493
|
+
return withUniqueRouteSuffix(QUICK_BRICK_CONTENT);
|
|
332
494
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as React from "react";
|
|
2
2
|
import { View } from "react-native";
|
|
3
|
-
import {
|
|
3
|
+
import { cleanup, renderHook } from "@testing-library/react-hooks";
|
|
4
4
|
import configureStore from "redux-mock-store";
|
|
5
5
|
import { Provider } from "react-redux";
|
|
6
6
|
|
|
@@ -12,6 +12,8 @@ jest.mock("@applicaster/zapp-react-native-utils/localizationUtils", () => ({
|
|
|
12
12
|
useIsRTL: jest.fn(() => mock_rtl_flag),
|
|
13
13
|
}));
|
|
14
14
|
|
|
15
|
+
jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation");
|
|
16
|
+
|
|
15
17
|
const { useCellResolver } = require("../useCellResolver");
|
|
16
18
|
|
|
17
19
|
describe("cellResolver", () => {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// @ts-ignore
|
|
2
2
|
import { View } from "react-native";
|
|
3
3
|
|
|
4
|
-
const mockData
|
|
4
|
+
const mockData = {
|
|
5
5
|
screen: {
|
|
6
6
|
id: "screen-id",
|
|
7
7
|
name: "screen",
|
|
@@ -40,3 +40,5 @@ const mockData: NavigationScreenData = {
|
|
|
40
40
|
};
|
|
41
41
|
|
|
42
42
|
export const useScreenContext = jest.fn().mockReturnValue(mockData);
|
|
43
|
+
|
|
44
|
+
export const useNavbarState = () => ({ visible: true });
|
|
@@ -3,23 +3,28 @@ import { Provider } from "react-redux";
|
|
|
3
3
|
import { renderHook } from "@testing-library/react-hooks";
|
|
4
4
|
import configureStore from "redux-mock-store";
|
|
5
5
|
import thunk from "redux-thunk";
|
|
6
|
-
import { NavigationContext } from "@applicaster/zapp-react-native-ui-components/Contexts/NavigationContext";
|
|
7
6
|
|
|
8
7
|
const mockStore = configureStore([thunk]);
|
|
9
8
|
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
9
|
+
const river_id_2: ZappRiver = {
|
|
10
|
+
name: "River 2",
|
|
11
|
+
id: "A1234",
|
|
12
|
+
home: false,
|
|
13
|
+
home_offline: false,
|
|
14
|
+
supports_offline: false,
|
|
15
|
+
navigations: [],
|
|
16
|
+
hooks: { preload_plugins: [] },
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
jest.mock("../useScreenContext", () => ({
|
|
20
|
+
useScreenContext: () => ({
|
|
21
|
+
screen: river_id_2,
|
|
22
|
+
}),
|
|
23
|
+
}));
|
|
24
|
+
|
|
25
|
+
const { useCurrentScreenData } = require("../useCurrentScreenData");
|
|
26
|
+
|
|
27
|
+
describe("useScreenData", () => {
|
|
23
28
|
const river_id_1 = { id: "B5678" };
|
|
24
29
|
|
|
25
30
|
const store = mockStore({
|
|
@@ -27,17 +32,10 @@ describe("useScreenData", function () {
|
|
|
27
32
|
});
|
|
28
33
|
|
|
29
34
|
const wrapper: React.FC<any> = ({ children }) => (
|
|
30
|
-
<
|
|
31
|
-
value={{
|
|
32
|
-
currentRoute: "/river/river_id_1/river/river_id_2",
|
|
33
|
-
data: { screen: river_id_2 },
|
|
34
|
-
}}
|
|
35
|
-
>
|
|
36
|
-
<Provider store={store}>{children}</Provider>
|
|
37
|
-
</NavigationContext.Provider>
|
|
35
|
+
<Provider store={store}>{children}</Provider>
|
|
38
36
|
);
|
|
39
37
|
|
|
40
|
-
it("should return river data for the current screen/route",
|
|
38
|
+
it("should return river data for the current screen/route", () => {
|
|
41
39
|
const { result } = renderHook(() => useCurrentScreenData(), { wrapper });
|
|
42
40
|
|
|
43
41
|
expect(result.current).toBe(river_id_2);
|
|
@@ -2,9 +2,13 @@ export { useCurrentScreenData } from "./useCurrentScreenData";
|
|
|
2
2
|
|
|
3
3
|
export { useTargetScreenData } from "./useTargetScreenData";
|
|
4
4
|
|
|
5
|
+
export { useScreenData } from "./useScreenData";
|
|
6
|
+
|
|
5
7
|
export {
|
|
6
8
|
useScreenContext,
|
|
7
9
|
useLegacyScreenData,
|
|
8
10
|
useNavbarState,
|
|
9
11
|
useSetNavbarState,
|
|
10
12
|
} from "./useScreenContext";
|
|
13
|
+
|
|
14
|
+
export { useScreenBackgroundColor } from "./useScreenBackgroundColor";
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import * as React from "react";
|
|
2
|
+
import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
|
|
3
|
+
import { useScreenConfiguration } from "@applicaster/zapp-react-native-ui-components/Components/River/useScreenConfiguration";
|
|
4
|
+
import { ifEmptyUseFallback } from "@applicaster/zapp-react-native-utils/cellUtils";
|
|
5
|
+
|
|
6
|
+
export const useScreenBackgroundColor = (screenId: string): string => {
|
|
7
|
+
const { backgroundColor: screenBackgroundColor } =
|
|
8
|
+
useScreenConfiguration(screenId);
|
|
9
|
+
|
|
10
|
+
const theme = useTheme();
|
|
11
|
+
|
|
12
|
+
const themeBackgroundColor = React.useMemo(
|
|
13
|
+
() => theme.app_background_color,
|
|
14
|
+
[theme.app_background_color]
|
|
15
|
+
);
|
|
16
|
+
|
|
17
|
+
const backgroundColor = ifEmptyUseFallback(
|
|
18
|
+
screenBackgroundColor,
|
|
19
|
+
themeBackgroundColor
|
|
20
|
+
);
|
|
21
|
+
|
|
22
|
+
return backgroundColor;
|
|
23
|
+
};
|
|
@@ -2,11 +2,12 @@ import { useContext, useMemo } from "react";
|
|
|
2
2
|
|
|
3
3
|
import { useModalNavigationContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ModalNavigationContext";
|
|
4
4
|
import { useNestedNavigationContext } from "@applicaster/zapp-react-native-ui-components/Contexts/NestedNavigationContext";
|
|
5
|
-
import { useNavigation } from "../navigation";
|
|
5
|
+
import { useNavigation } from "../navigation/useNavigation";
|
|
6
6
|
|
|
7
7
|
import { ScreenContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenContext";
|
|
8
|
+
import { ScreenDataContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenDataContext";
|
|
8
9
|
|
|
9
|
-
function useScreenContextV2() {
|
|
10
|
+
export function useScreenContextV2() {
|
|
10
11
|
return useContext(ScreenContext);
|
|
11
12
|
}
|
|
12
13
|
|
|
@@ -44,9 +45,8 @@ export function useSetNavbarState() {
|
|
|
44
45
|
|
|
45
46
|
export function useScreenContext(): NavigationScreenData {
|
|
46
47
|
const navigator = useNavigation();
|
|
48
|
+
const screenData = useContext(ScreenDataContext);
|
|
47
49
|
|
|
48
|
-
const screenKey = useMemo(() => navigator?.key, [navigator]);
|
|
49
|
-
const screenData = useMemo(() => navigator?.data, [screenKey]);
|
|
50
50
|
const modalScreenData = navigator?.modalData;
|
|
51
51
|
|
|
52
52
|
const isModal = useModalNavigationContext();
|
|
@@ -4,7 +4,7 @@ import { useRivers } from "../state";
|
|
|
4
4
|
|
|
5
5
|
const logger = utilsLogger.addSubsystem("useScreenData");
|
|
6
6
|
|
|
7
|
-
export const useScreenData = (screenId
|
|
7
|
+
export const useScreenData = (screenId: string): ZappRiver => {
|
|
8
8
|
const rivers = useRivers();
|
|
9
9
|
|
|
10
10
|
React.useEffect(() => {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
|
|
3
3
|
import * as R from "ramda";
|
|
4
|
+
import { appStore } from "@applicaster/zapp-react-native-redux/AppStore";
|
|
4
5
|
|
|
5
6
|
export function getTargetScreenData(
|
|
6
7
|
entry: ZappEntry,
|
|
@@ -35,6 +36,12 @@ export function getTargetScreenData(
|
|
|
35
36
|
return rivers?.[screenId];
|
|
36
37
|
}
|
|
37
38
|
|
|
39
|
+
export function getTargetScreenDataFromEntry(entry: ZappEntry): ZappRiver {
|
|
40
|
+
const { rivers, contentTypes } = appStore.get(["rivers", "contentTypes"]);
|
|
41
|
+
|
|
42
|
+
return getTargetScreenData(entry, rivers, contentTypes);
|
|
43
|
+
}
|
|
44
|
+
|
|
38
45
|
export const useTargetScreenData = (entry: ZappEntry) => {
|
|
39
46
|
const { rivers, contentTypes } = usePickFromState(["rivers", "contentTypes"]);
|
|
40
47
|
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
|
|
2
2
|
|
|
3
|
+
const riversSelector = ["rivers"];
|
|
4
|
+
|
|
3
5
|
export const useRivers = () => {
|
|
4
|
-
const { rivers } = usePickFromState(
|
|
6
|
+
const { rivers } = usePickFromState(riversSelector as any);
|
|
5
7
|
|
|
6
8
|
return rivers;
|
|
7
9
|
};
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import { DeviceEventEmitter, NativeModules, Platform } from "react-native";
|
|
3
|
-
import { PushTopicManager } from "@applicaster/zapp-react-native-bridge/PushNotifications/PushTopicManager";
|
|
4
3
|
|
|
5
4
|
const { ReactNativeEventBusBridge } = NativeModules;
|
|
6
5
|
|
|
@@ -11,26 +10,18 @@ export const useListenEventBusEvent = (
|
|
|
11
10
|
handler: (event) => void
|
|
12
11
|
) => {
|
|
13
12
|
React.useEffect(() => {
|
|
14
|
-
let sub;
|
|
15
|
-
|
|
16
13
|
// TODO: remove after implementing ReactNativeEventBusBridge on iOS
|
|
17
14
|
if (Platform.OS === "android") {
|
|
18
15
|
// subscribe to DeviceEventEmitter using subsciption ID
|
|
19
|
-
sub = DeviceEventEmitter.addListener(
|
|
20
|
-
subscriptionID,
|
|
21
|
-
handler
|
|
22
|
-
);
|
|
16
|
+
const sub = DeviceEventEmitter.addListener(subscriptionID, handler);
|
|
23
17
|
|
|
24
18
|
// ask native to start routing these events to RN
|
|
25
19
|
ReactNativeEventBusBridge.subscribe(subscriptionID, { [source]: events });
|
|
26
|
-
}
|
|
27
20
|
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
sub?.remove?.(); // stop listening to DeviceEventEmitter
|
|
34
|
-
};
|
|
21
|
+
return () => {
|
|
22
|
+
ReactNativeEventBusBridge.unsubscribe(subscriptionID); // ask EventBus to stop routing these events to RN
|
|
23
|
+
sub.remove(); // stop listening to DeviceEventEmitter
|
|
24
|
+
};
|
|
25
|
+
}
|
|
35
26
|
}, []);
|
|
36
27
|
};
|