@applicaster/zapp-react-native-utils 13.0.0-alpha.4515349201 → 13.0.0-alpha.4700935119
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/ActionExecutor.ts +16 -9
- package/actionsExecutor/ActionExecutorContext.tsx +74 -9
- package/alertUtils/alert.ts +148 -0
- package/alertUtils/index.ts +1 -148
- package/analyticsUtils/AnalyticPlayerListener.ts +18 -1
- package/analyticsUtils/__tests__/__snapshots__/analyticsManagerNoModule.test.js.snap +9 -9
- package/analyticsUtils/helpers/hooks.ts +1 -1
- package/appUtils/HooksManager/{Hook.js → Hook.ts} +35 -23
- package/appUtils/HooksManager/__tests__/__snapshots__/hook.test.js.snap +10 -8
- package/appUtils/HooksManager/__tests__/__snapshots__/hooksManager.test.js.snap +693 -0
- package/appUtils/HooksManager/__tests__/hook.test.js +196 -184
- package/appUtils/HooksManager/__tests__/hooksManager.test.js +96 -99
- package/appUtils/HooksManager/{constants.js → constants.ts} +1 -1
- package/appUtils/HooksManager/{index.js → index.ts} +121 -112
- package/appUtils/HooksManager/types.ts +119 -0
- package/appUtils/RiverFocusManager/index.js +17 -12
- package/appUtils/accessibilityManager/index.ts +42 -1
- package/appUtils/contextKeysManager/contextResolver.ts +73 -0
- package/appUtils/focusManager/__tests__/__snapshots__/focusManager.test.js.snap +6 -6
- package/appUtils/focusManager/index.ts +90 -63
- package/appUtils/focusManager/treeDataStructure/Tree/index.js +25 -3
- package/appUtils/focusManager/treeDataStructure/Utils/index.js +1 -3
- package/appUtils/focusManager/utils/enums.ts +4 -0
- package/appUtils/focusManagerAux/utils/index.ts +4 -3
- package/appUtils/{index.js → index.ts} +1 -1
- package/appUtils/keyCodes/__tests__/__snapshots__/keyCodes.test.js.snap +2 -2
- package/appUtils/keyCodes/__tests__/keyCodes.test.js +4 -4
- 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/{keysByPlatform.js → keys/keysByPlatform.ts} +3 -3
- package/appUtils/keyCodes/keysByPlatform.ts +8 -0
- package/appUtils/orientationHelper.ts +1 -1
- package/appUtils/platform/const.ts +14 -0
- package/appUtils/platform/platformUtils.ts +17 -15
- package/appUtils/playerManager/playerNative.ts +1 -1
- package/arrayUtils/__tests__/__snapshots__/arrayUtils.test.ts.snap +4 -4
- package/domUtils/{cookieManager.js → cookieManager.ts} +1 -2
- package/functionUtils/__tests__/__snapshots__/functionUtils.test.js.snap +4 -4
- package/functionUtils/index.ts +15 -11
- package/logger/const.ts +9 -67
- package/manifestUtils/__tests__/createConfig.test.js +18 -16
- package/modalState/index.ts +1 -5
- package/navigationUtils/__tests__/__snapshots__/navigationUtils.test.js.snap +6 -6
- package/navigationUtils/__tests__/itemTypes.test.js +2 -2
- package/navigationUtils/__tests__/navigationUtils.test.js +2 -2
- package/navigationUtils/index.ts +14 -5
- package/package.json +3 -2
- package/reactHooks/autoscrolling/__tests__/useTrackCurrentAutoScrollingElement.test.ts +1 -1
- package/reactHooks/autoscrolling/__tests__/useTrackedView.test.tsx +1 -1
- package/reactHooks/cell-click/__tests__/index.test.js +10 -2
- package/reactHooks/cell-click/index.ts +7 -1
- package/reactHooks/feed/__tests__/useBuildPipesUrl.test.tsx +4 -4
- package/reactHooks/feed/__tests__/useFeedLoader.test.tsx +10 -11
- package/reactHooks/feed/useFeedLoader.tsx +1 -1
- package/reactHooks/feed/usePipesCacheReset.ts +5 -5
- package/reactHooks/flatList/__tests__/index.test.tsx +30 -21
- package/reactHooks/layout/__tests__/index.test.tsx +10 -10
- package/reactHooks/layout/useDimensions/helpers/__tests__/getInitialDimensions.native.test.js +14 -28
- package/reactHooks/navigation/__tests__/index.test.tsx +0 -4
- package/reactHooks/navigation/index.ts +29 -218
- package/reactHooks/navigation/useGetBottomTabBarHeight.ts +12 -0
- package/reactHooks/navigation/useGetNavBarTopBorderWidth.ts +14 -0
- package/reactHooks/navigation/useGetTabBarHeight.ts +12 -0
- package/reactHooks/navigation/useIsScreenActive.ts +17 -0
- package/reactHooks/navigation/useNavigationPluginData.ts +15 -0
- package/reactHooks/navigation/useNavigationType.ts +15 -0
- package/reactHooks/navigation/usePathname.ts +4 -0
- package/reactHooks/navigation/useRoute.ts +100 -0
- package/reactHooks/navigation/useUniqueRouteSuffix.ts +41 -0
- package/reactHooks/player/TVSeekControlller/ISeekController.ts +19 -2
- package/reactHooks/player/TVSeekControlller/LongPressSeekController.ts +20 -41
- package/reactHooks/player/TVSeekControlller/TVSeekController.ts +80 -31
- package/reactHooks/player/TVSeekControlller/TapSeekController.ts +18 -40
- package/reactHooks/player/__tests__/useAutoSeek._test.tsx +115 -0
- package/reactHooks/player/__tests__/useTapSeek._test.ts +94 -0
- package/reactHooks/player/const.ts +1 -1
- package/reactUtils/__tests__/reactUtils.test.js +10 -28
- package/reactUtils/createContext/__tests__/__snapshots__/helpers.test.js.snap +19 -19
- package/reactUtils/createContext/__tests__/__snapshots__/index.test.js.snap +2 -2
- package/reactUtils/createContext/__tests__/__snapshots__/provider.test.js.snap +3 -3
- package/reactUtils/createContext/__tests__/helpers.test.js +8 -8
- package/reactUtils/index.ts +0 -14
- package/theme/__mocks__/index.ts +4 -0
- package/time/Timer.ts +1 -1
- package/appUtils/keyCodes/keys.ios.js +0 -46
- /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/keyCodes/{keys.web.js → keys/keys.web.ts} +0 -0
- /package/appUtils/{localizationsHelper.js → localizationsHelper.ts} +0 -0
- /package/domUtils/{logger.js → logger.ts} +0 -0
|
@@ -1,9 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
/* eslint max-len: off */
|
|
3
|
-
|
|
4
|
-
import React, { useContext, useEffect, useMemo } from "react";
|
|
1
|
+
import React, { useEffect, useMemo } from "react";
|
|
5
2
|
import { BackHandler, InteractionManager, NativeModules } from "react-native";
|
|
6
|
-
import { useSafeAreaInsets } from "react-native-safe-area-context";
|
|
7
3
|
|
|
8
4
|
import {
|
|
9
5
|
useContentTypes,
|
|
@@ -11,34 +7,36 @@ import {
|
|
|
11
7
|
} from "@applicaster/zapp-react-native-redux/hooks";
|
|
12
8
|
import { HooksManager } from "@applicaster/zapp-react-native-utils/appUtils/HooksManager";
|
|
13
9
|
|
|
14
|
-
import {
|
|
15
|
-
import {
|
|
16
|
-
LONG_KEY_PRESS_TIMEOUT,
|
|
17
|
-
QUICK_BRICK_NAVBAR,
|
|
18
|
-
QUICK_BRICK_CONTENT,
|
|
19
|
-
} from "@applicaster/quick-brick-core/const";
|
|
20
|
-
import { useZappHooksModalState } from "@applicaster/zapp-react-dom-ui-components/Components/ZappHooksModal/hooks/useZappHooksModalState";
|
|
10
|
+
import { LONG_KEY_PRESS_TIMEOUT } from "@applicaster/quick-brick-core/const";
|
|
21
11
|
import { ZappHookModalContext } from "@applicaster/zapp-react-native-ui-components/Contexts";
|
|
22
|
-
import { PathnameContext } from "@applicaster/zapp-react-native-ui-components/Contexts/PathnameContext";
|
|
23
12
|
import { HookModalContextT } from "@applicaster/zapp-react-native-ui-components/Contexts/ZappHookModalContext";
|
|
24
13
|
import { HOOKS_EVENTS } from "../../appUtils/HooksManager/constants";
|
|
25
|
-
import {
|
|
26
|
-
getNavigationProps,
|
|
27
|
-
getRiverFromRoute,
|
|
28
|
-
getTargetRoute,
|
|
29
|
-
} from "../../navigationUtils";
|
|
30
|
-
import { platformSelect } from "../../reactUtils";
|
|
14
|
+
import { getRiverFromRoute, getTargetRoute } from "../../navigationUtils";
|
|
31
15
|
import { useConnectionInfo } from "../connection";
|
|
32
|
-
import { getTargetScreenData } from "../screen/useTargetScreenData";
|
|
33
16
|
|
|
34
|
-
import { isTV
|
|
17
|
+
import { isTV } from "@applicaster/zapp-react-native-utils/reactUtils";
|
|
35
18
|
import { useNavbarState } from "../screen";
|
|
36
|
-
import { useNavigation } from "./useNavigation";
|
|
37
|
-
import { useModalStore } from "../../modalState";
|
|
38
|
-
import { ScreenDataContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenDataContext";
|
|
39
19
|
|
|
40
20
|
export { useNavigation } from "./useNavigation";
|
|
41
21
|
|
|
22
|
+
export { useRoute } from "./useRoute";
|
|
23
|
+
|
|
24
|
+
export { usePathname } from "./usePathname";
|
|
25
|
+
|
|
26
|
+
export { useNavigationPluginData } from "./useNavigationPluginData";
|
|
27
|
+
|
|
28
|
+
export { useNavigationType } from "./useNavigationType";
|
|
29
|
+
|
|
30
|
+
export { useGetBottomTabBarHeight } from "./useGetBottomTabBarHeight";
|
|
31
|
+
|
|
32
|
+
export { useIsScreenActive } from "./useIsScreenActive";
|
|
33
|
+
|
|
34
|
+
export {
|
|
35
|
+
useUniqueRouteSuffix,
|
|
36
|
+
useNavbarId,
|
|
37
|
+
useContentId,
|
|
38
|
+
} from "./useUniqueRouteSuffix";
|
|
39
|
+
|
|
42
40
|
/**
|
|
43
41
|
* This function helps to decide wether the navbar should be presented on the screen
|
|
44
42
|
* based on route and / or screen Data
|
|
@@ -125,8 +123,6 @@ export function isNavBarVisible(
|
|
|
125
123
|
|
|
126
124
|
const { ProfilerBridge } = NativeModules;
|
|
127
125
|
|
|
128
|
-
export const usePathname = () => React.useContext(PathnameContext);
|
|
129
|
-
|
|
130
126
|
export const useBackHandler = (cb: () => boolean) => {
|
|
131
127
|
React.useEffect(() => {
|
|
132
128
|
BackHandler.addEventListener("hardwareBackPress", cb);
|
|
@@ -137,88 +133,6 @@ export const useBackHandler = (cb: () => boolean) => {
|
|
|
137
133
|
}, [cb]);
|
|
138
134
|
};
|
|
139
135
|
|
|
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
|
-
|
|
222
136
|
type Callbacks = Partial<{
|
|
223
137
|
handleHookPresent: ({
|
|
224
138
|
route,
|
|
@@ -320,16 +234,19 @@ export const useZappHooksForEntry = (
|
|
|
320
234
|
callbacks?.handleHookComplete?.(props);
|
|
321
235
|
};
|
|
322
236
|
|
|
323
|
-
const hookManager = HooksManager(hooksOptions)
|
|
237
|
+
const hookManager = HooksManager(hooksOptions);
|
|
238
|
+
|
|
239
|
+
hookManager.subscriber
|
|
324
240
|
.on(HOOKS_EVENTS.PRESENT_SCREEN_HOOK, handleHookPresent)
|
|
325
241
|
.on(HOOKS_EVENTS.ERROR, handleHookError)
|
|
326
242
|
.on(HOOKS_EVENTS.CANCEL, handleHookCancel)
|
|
327
243
|
.on(HOOKS_EVENTS.START_BACKGROUND_HOOK, handleBackgroundHook)
|
|
328
|
-
.on(HOOKS_EVENTS.COMPLETE, handleHookComplete)
|
|
329
|
-
|
|
244
|
+
.on(HOOKS_EVENTS.COMPLETE, handleHookComplete);
|
|
245
|
+
|
|
246
|
+
hookManager.handleHooks(entry);
|
|
330
247
|
|
|
331
248
|
return () => {
|
|
332
|
-
hookManager
|
|
249
|
+
hookManager.subscriber
|
|
333
250
|
.removeHandler(HOOKS_EVENTS.PRESENT_SCREEN_HOOK, handleHookPresent)
|
|
334
251
|
.removeHandler(HOOKS_EVENTS.ERROR, handleHookError)
|
|
335
252
|
.removeHandler(HOOKS_EVENTS.CANCEL, handleHookCancel)
|
|
@@ -339,34 +256,6 @@ export const useZappHooksForEntry = (
|
|
|
339
256
|
}, [entry.id]);
|
|
340
257
|
};
|
|
341
258
|
|
|
342
|
-
export enum MenuTypes {
|
|
343
|
-
drawer = "DRAWER",
|
|
344
|
-
bottomTabBar = "BOTTOM_TAB_BAR",
|
|
345
|
-
}
|
|
346
|
-
|
|
347
|
-
export const useNavigationPluginData = (): ZappNavigation | undefined => {
|
|
348
|
-
const {
|
|
349
|
-
screenData: useRouteScreenData,
|
|
350
|
-
}: { screenData: QuickBrickNavigationData | null } = useRoute();
|
|
351
|
-
|
|
352
|
-
const navigations = useRouteScreenData?.targetScreen
|
|
353
|
-
? (useRouteScreenData.targetScreen as ZappRiver).navigations
|
|
354
|
-
: (useRouteScreenData as ZappRiver).navigations;
|
|
355
|
-
|
|
356
|
-
const navigationMenu = navigations?.find((nav) => nav.category === "menu");
|
|
357
|
-
|
|
358
|
-
return navigationMenu;
|
|
359
|
-
};
|
|
360
|
-
|
|
361
|
-
export const useNavigationType = (): MenuTypes => {
|
|
362
|
-
const navigationMenu = useNavigationPluginData();
|
|
363
|
-
|
|
364
|
-
return !navigationMenu ||
|
|
365
|
-
navigationMenu.navigation_type === "quick_brick_side_menu"
|
|
366
|
-
? MenuTypes.drawer
|
|
367
|
-
: MenuTypes.bottomTabBar;
|
|
368
|
-
};
|
|
369
|
-
|
|
370
259
|
export const useProfilerLogging = () => {
|
|
371
260
|
const logTimestamp = (data: string) =>
|
|
372
261
|
InteractionManager.runAfterInteractions(() => {
|
|
@@ -411,81 +300,3 @@ export const useIsNavBarVisible = (): boolean => {
|
|
|
411
300
|
|
|
412
301
|
return useMemo(() => visible, [visible]);
|
|
413
302
|
};
|
|
414
|
-
|
|
415
|
-
const useGetNavBarTopBorderWidth = (): number => {
|
|
416
|
-
const navigator = useNavigation();
|
|
417
|
-
|
|
418
|
-
const navProps = getNavigationProps({
|
|
419
|
-
navigator,
|
|
420
|
-
title: "",
|
|
421
|
-
category: "menu",
|
|
422
|
-
});
|
|
423
|
-
|
|
424
|
-
return Number(((navProps?.styles as any)?.top_border_width as number) ?? 0);
|
|
425
|
-
};
|
|
426
|
-
|
|
427
|
-
const TAB_BAR_HEIGHT_IOS = 49;
|
|
428
|
-
const TAB_BAR_HEIGHT_ANDROID = 56;
|
|
429
|
-
|
|
430
|
-
const useGetTabBarHeight = () =>
|
|
431
|
-
platformSelect({
|
|
432
|
-
ios: TAB_BAR_HEIGHT_IOS + (useSafeAreaInsets().bottom ?? 0),
|
|
433
|
-
android: TAB_BAR_HEIGHT_ANDROID,
|
|
434
|
-
}) as number;
|
|
435
|
-
|
|
436
|
-
export const useGetBottomTabBarHeight = (): number => {
|
|
437
|
-
const topBorderWidth = useGetNavBarTopBorderWidth();
|
|
438
|
-
const tabBarHeight = useGetTabBarHeight();
|
|
439
|
-
|
|
440
|
-
const isBottomBarNavigation = useNavigationType() === MenuTypes.bottomTabBar;
|
|
441
|
-
|
|
442
|
-
return !isBottomBarNavigation ? 0 : tabBarHeight + topBorderWidth;
|
|
443
|
-
};
|
|
444
|
-
|
|
445
|
-
// If current screen is active/focused (visible to the user)
|
|
446
|
-
export const useIsScreenActive = () => {
|
|
447
|
-
const pathname = usePathname();
|
|
448
|
-
const { currentRoute, videoModalState } = useNavigation();
|
|
449
|
-
|
|
450
|
-
if (
|
|
451
|
-
videoModalState.visible &&
|
|
452
|
-
["FULLSCREEN", "MAXIMIZED", "PIP"].includes(videoModalState.mode)
|
|
453
|
-
) {
|
|
454
|
-
return false;
|
|
455
|
-
}
|
|
456
|
-
|
|
457
|
-
return pathname === currentRoute;
|
|
458
|
-
};
|
|
459
|
-
|
|
460
|
-
type Return = (prefix: string) => string;
|
|
461
|
-
|
|
462
|
-
export const useUniqueRouteSuffix = (): Return => {
|
|
463
|
-
const pathname = usePathname();
|
|
464
|
-
const { currentRoute } = useNavigation();
|
|
465
|
-
|
|
466
|
-
const suffix = `currentRoute:${currentRoute}_pathname:${pathname}`;
|
|
467
|
-
|
|
468
|
-
const withUniqueRouteSuffix = React.useCallback((prefix: string) => {
|
|
469
|
-
if (isWeb()) {
|
|
470
|
-
// we should use extended route prefix only on Web, where we have stack-navigator
|
|
471
|
-
return `${prefix}___${suffix}`;
|
|
472
|
-
}
|
|
473
|
-
|
|
474
|
-
// for other platforms use previous version
|
|
475
|
-
return prefix;
|
|
476
|
-
}, []);
|
|
477
|
-
|
|
478
|
-
return withUniqueRouteSuffix;
|
|
479
|
-
};
|
|
480
|
-
|
|
481
|
-
export const useNavbarId = () => {
|
|
482
|
-
const withUniqueRouteSuffix = useUniqueRouteSuffix();
|
|
483
|
-
|
|
484
|
-
return withUniqueRouteSuffix(QUICK_BRICK_NAVBAR);
|
|
485
|
-
};
|
|
486
|
-
|
|
487
|
-
export const useContentId = () => {
|
|
488
|
-
const withUniqueRouteSuffix = useUniqueRouteSuffix();
|
|
489
|
-
|
|
490
|
-
return withUniqueRouteSuffix(QUICK_BRICK_CONTENT);
|
|
491
|
-
};
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { useGetNavBarTopBorderWidth } from "./useGetNavBarTopBorderWidth";
|
|
2
|
+
import { useGetTabBarHeight } from "./useGetTabBarHeight";
|
|
3
|
+
import { MenuTypes, useNavigationType } from "./useNavigationType";
|
|
4
|
+
|
|
5
|
+
export const useGetBottomTabBarHeight = (): number => {
|
|
6
|
+
const topBorderWidth = useGetNavBarTopBorderWidth();
|
|
7
|
+
const tabBarHeight = useGetTabBarHeight();
|
|
8
|
+
|
|
9
|
+
const isBottomBarNavigation = useNavigationType() === MenuTypes.bottomTabBar;
|
|
10
|
+
|
|
11
|
+
return !isBottomBarNavigation ? 0 : tabBarHeight + topBorderWidth;
|
|
12
|
+
};
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { getNavigationProps } from "../../navigationUtils";
|
|
2
|
+
import { useNavigation } from "./useNavigation";
|
|
3
|
+
|
|
4
|
+
export const useGetNavBarTopBorderWidth = (): number => {
|
|
5
|
+
const navigator = useNavigation();
|
|
6
|
+
|
|
7
|
+
const navProps = getNavigationProps({
|
|
8
|
+
navigator,
|
|
9
|
+
title: "",
|
|
10
|
+
category: "menu",
|
|
11
|
+
});
|
|
12
|
+
|
|
13
|
+
return Number(((navProps?.styles as any)?.top_border_width as number) ?? 0);
|
|
14
|
+
};
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { useSafeAreaInsets } from "react-native-safe-area-context";
|
|
2
|
+
|
|
3
|
+
import { platformSelect } from "../../reactUtils";
|
|
4
|
+
|
|
5
|
+
const TAB_BAR_HEIGHT_IOS = 49;
|
|
6
|
+
const TAB_BAR_HEIGHT_ANDROID = 56;
|
|
7
|
+
|
|
8
|
+
export const useGetTabBarHeight = () =>
|
|
9
|
+
platformSelect({
|
|
10
|
+
ios: TAB_BAR_HEIGHT_IOS + (useSafeAreaInsets().bottom ?? 0),
|
|
11
|
+
android: TAB_BAR_HEIGHT_ANDROID,
|
|
12
|
+
}) as number;
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { useNavigation } from "./useNavigation";
|
|
2
|
+
import { usePathname } from "./usePathname";
|
|
3
|
+
|
|
4
|
+
// If current screen is active/focused (visible to the user)
|
|
5
|
+
export const useIsScreenActive = () => {
|
|
6
|
+
const pathname = usePathname();
|
|
7
|
+
const { currentRoute, videoModalState } = useNavigation();
|
|
8
|
+
|
|
9
|
+
if (
|
|
10
|
+
videoModalState.visible &&
|
|
11
|
+
["FULLSCREEN", "MAXIMIZED", "PIP"].includes(videoModalState.mode)
|
|
12
|
+
) {
|
|
13
|
+
return false;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
return pathname === currentRoute;
|
|
17
|
+
};
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { useRoute } from "./useRoute";
|
|
2
|
+
|
|
3
|
+
export const useNavigationPluginData = (): ZappNavigation | undefined => {
|
|
4
|
+
const {
|
|
5
|
+
screenData: useRouteScreenData,
|
|
6
|
+
}: { screenData: QuickBrickNavigationData | null } = useRoute();
|
|
7
|
+
|
|
8
|
+
const navigations = useRouteScreenData?.targetScreen
|
|
9
|
+
? (useRouteScreenData.targetScreen as ZappRiver).navigations
|
|
10
|
+
: (useRouteScreenData as ZappRiver).navigations;
|
|
11
|
+
|
|
12
|
+
const navigationMenu = navigations?.find((nav) => nav.category === "menu");
|
|
13
|
+
|
|
14
|
+
return navigationMenu;
|
|
15
|
+
};
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { useNavigationPluginData } from "./useNavigationPluginData";
|
|
2
|
+
|
|
3
|
+
export enum MenuTypes {
|
|
4
|
+
drawer = "DRAWER",
|
|
5
|
+
bottomTabBar = "BOTTOM_TAB_BAR",
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
export const useNavigationType = (): MenuTypes => {
|
|
9
|
+
const navigationMenu = useNavigationPluginData();
|
|
10
|
+
|
|
11
|
+
return !navigationMenu ||
|
|
12
|
+
navigationMenu.navigation_type === "quick_brick_side_menu"
|
|
13
|
+
? MenuTypes.drawer
|
|
14
|
+
: MenuTypes.bottomTabBar;
|
|
15
|
+
};
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
/* eslint-disable @typescript-eslint/no-use-before-define */
|
|
2
|
+
/* eslint max-len: off */
|
|
3
|
+
|
|
4
|
+
import { useContext } from "react";
|
|
5
|
+
|
|
6
|
+
import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
|
|
7
|
+
|
|
8
|
+
import { legacyScreenData } from "@applicaster/quick-brick-core/App/NavigationProvider/utils";
|
|
9
|
+
|
|
10
|
+
import { useZappHooksModalState } from "@applicaster/zapp-react-dom-ui-components/Components/ZappHooksModal/hooks/useZappHooksModalState";
|
|
11
|
+
|
|
12
|
+
import { getTargetScreenData } from "../screen/useTargetScreenData";
|
|
13
|
+
|
|
14
|
+
import { useNavigation } from "./useNavigation";
|
|
15
|
+
import { useModalStore } from "../../modalState";
|
|
16
|
+
import { ScreenDataContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenDataContext";
|
|
17
|
+
import { usePathname } from "./usePathname";
|
|
18
|
+
|
|
19
|
+
// starts with modal/
|
|
20
|
+
const isModalPathname = (pathname: string) => /^modal\//.test(pathname);
|
|
21
|
+
|
|
22
|
+
const isVideoModalPathname = (pathname: string) =>
|
|
23
|
+
/^video-modal\//.test(pathname);
|
|
24
|
+
|
|
25
|
+
const isHookModalPathname = (pathname: string) =>
|
|
26
|
+
/^hooks-modal\//.test(pathname);
|
|
27
|
+
|
|
28
|
+
const isHookPathname = (pathname: string) => /^\/hooks\//.test(pathname);
|
|
29
|
+
|
|
30
|
+
type VariousScreenData = LegacyNavigationScreenData | ZappRiver | ZappEntry;
|
|
31
|
+
|
|
32
|
+
export const useRoute = (): {
|
|
33
|
+
screenData: VariousScreenData;
|
|
34
|
+
pathname: string;
|
|
35
|
+
} => {
|
|
36
|
+
const pathname = usePathname() || "";
|
|
37
|
+
const navigator = useNavigation();
|
|
38
|
+
|
|
39
|
+
const screenDataContext = legacyScreenData(useContext(ScreenDataContext));
|
|
40
|
+
|
|
41
|
+
const { plugins, contentTypes, rivers } = usePickFromState([
|
|
42
|
+
"plugins",
|
|
43
|
+
"rivers",
|
|
44
|
+
"contentTypes",
|
|
45
|
+
]);
|
|
46
|
+
|
|
47
|
+
const { modalState } = useModalStore();
|
|
48
|
+
const hookModalState = useZappHooksModalState();
|
|
49
|
+
|
|
50
|
+
const modalScreenData = modalState.screen;
|
|
51
|
+
|
|
52
|
+
const hookModalScreenData = hookModalState.state.screenData?.payload;
|
|
53
|
+
|
|
54
|
+
const videoModalScreenData =
|
|
55
|
+
navigator?.videoModalState?.item &&
|
|
56
|
+
legacyScreenData(
|
|
57
|
+
{
|
|
58
|
+
entry: navigator.videoModalState?.item as ZappEntry,
|
|
59
|
+
screen: getTargetScreenData(
|
|
60
|
+
navigator.videoModalState?.item as ZappEntry,
|
|
61
|
+
rivers,
|
|
62
|
+
contentTypes
|
|
63
|
+
),
|
|
64
|
+
},
|
|
65
|
+
plugins
|
|
66
|
+
);
|
|
67
|
+
|
|
68
|
+
// There are 4 route scenarios
|
|
69
|
+
// For regular screens take date from navigator stack.
|
|
70
|
+
// is path is model grab screenData from modal state
|
|
71
|
+
// if path is video modal grab screenData from video state
|
|
72
|
+
// if path is hook modal grab screenData from hook state
|
|
73
|
+
// if path is hook grab screenData from screenData
|
|
74
|
+
|
|
75
|
+
if (isModalPathname(pathname)) {
|
|
76
|
+
const screenData = modalScreenData ?? ({} as ZappEntry);
|
|
77
|
+
|
|
78
|
+
return { screenData, pathname };
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
if (isVideoModalPathname(pathname)) {
|
|
82
|
+
const screenData = videoModalScreenData as LegacyNavigationScreenData;
|
|
83
|
+
|
|
84
|
+
return { screenData, pathname };
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
if (isHookModalPathname(pathname)) {
|
|
88
|
+
const screenData = hookModalScreenData;
|
|
89
|
+
|
|
90
|
+
return { screenData, pathname };
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
if (isHookPathname(pathname)) {
|
|
94
|
+
return { screenData: screenDataContext, pathname };
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
const screenData = screenDataContext;
|
|
98
|
+
|
|
99
|
+
return { screenData, pathname };
|
|
100
|
+
};
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import React from "react";
|
|
2
|
+
import { isWeb } from "../../reactUtils";
|
|
3
|
+
import { useNavigation } from "./useNavigation";
|
|
4
|
+
import { usePathname } from "./usePathname";
|
|
5
|
+
import {
|
|
6
|
+
QUICK_BRICK_CONTENT,
|
|
7
|
+
QUICK_BRICK_NAVBAR,
|
|
8
|
+
} from "@applicaster/quick-brick-core/const";
|
|
9
|
+
|
|
10
|
+
type Return = (prefix: string) => string;
|
|
11
|
+
|
|
12
|
+
export const useUniqueRouteSuffix = (): Return => {
|
|
13
|
+
const pathname = usePathname();
|
|
14
|
+
const { currentRoute } = useNavigation();
|
|
15
|
+
|
|
16
|
+
const suffix = `currentRoute:${currentRoute}_pathname:${pathname}`;
|
|
17
|
+
|
|
18
|
+
const withUniqueRouteSuffix = React.useCallback((prefix: string) => {
|
|
19
|
+
if (isWeb()) {
|
|
20
|
+
// we should use extended route prefix only on Web, where we have stack-navigator
|
|
21
|
+
return `${prefix}___${suffix}`;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
// for other platforms use previous version
|
|
25
|
+
return prefix;
|
|
26
|
+
}, []);
|
|
27
|
+
|
|
28
|
+
return withUniqueRouteSuffix;
|
|
29
|
+
};
|
|
30
|
+
|
|
31
|
+
export const useNavbarId = () => {
|
|
32
|
+
const withUniqueRouteSuffix = useUniqueRouteSuffix();
|
|
33
|
+
|
|
34
|
+
return withUniqueRouteSuffix(QUICK_BRICK_NAVBAR);
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
export const useContentId = () => {
|
|
38
|
+
const withUniqueRouteSuffix = useUniqueRouteSuffix();
|
|
39
|
+
|
|
40
|
+
return withUniqueRouteSuffix(QUICK_BRICK_CONTENT);
|
|
41
|
+
};
|
|
@@ -1,15 +1,32 @@
|
|
|
1
|
-
import { SEEK_TYPE } from "../const";
|
|
1
|
+
import { MAX_SEEK_TIME, SEEK_TYPE, SKIP_TIME_BASE } from "../const";
|
|
2
2
|
|
|
3
3
|
export interface ISeekControllerDelegate {
|
|
4
4
|
handleDelayedSeek(offset: number): void;
|
|
5
5
|
handleSeek(offset: number): void;
|
|
6
6
|
handleSeekComplete(): void;
|
|
7
7
|
handlePlayerPause(): void;
|
|
8
|
-
delayedSeekOffset: number | null;
|
|
9
8
|
}
|
|
10
9
|
|
|
11
10
|
export interface ISeekController {
|
|
11
|
+
title: string;
|
|
12
12
|
onStartSeek(seekType: SEEK_TYPE): void;
|
|
13
13
|
onSeekEnd(): void;
|
|
14
14
|
reset(): void;
|
|
15
15
|
}
|
|
16
|
+
|
|
17
|
+
export class SeekIncrementalBaseStrategy {
|
|
18
|
+
private skipMultiplier = 1;
|
|
19
|
+
|
|
20
|
+
getSkipTime = () =>
|
|
21
|
+
Math.min(MAX_SEEK_TIME, SKIP_TIME_BASE * this.skipMultiplier);
|
|
22
|
+
|
|
23
|
+
increment = () => {
|
|
24
|
+
this.skipMultiplier++;
|
|
25
|
+
};
|
|
26
|
+
|
|
27
|
+
getSkipMultiplier = () => this.skipMultiplier;
|
|
28
|
+
|
|
29
|
+
reset = () => {
|
|
30
|
+
this.skipMultiplier = 1;
|
|
31
|
+
};
|
|
32
|
+
}
|
|
@@ -1,85 +1,64 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
ISeekController,
|
|
3
|
+
ISeekControllerDelegate,
|
|
4
|
+
SeekIncrementalBaseStrategy,
|
|
5
|
+
} from "./ISeekController";
|
|
2
6
|
import { SEEK_TYPE } from "../const";
|
|
3
7
|
import { log_debug, log_error, log_verbose } from "./TVSeekController";
|
|
4
8
|
import { interval, Subscription } from "rxjs";
|
|
5
9
|
import { tap } from "rxjs/operators";
|
|
6
10
|
|
|
7
11
|
interface LongPressConfig {
|
|
8
|
-
TIMER_INTERVAL_MS: number;
|
|
9
|
-
SKIP_INCREMENT_STEP: number; // seconds
|
|
10
|
-
MAX_SKIP_PER_TICK: number; // seconds
|
|
11
|
-
INITIAL_SKIP_AMOUNT: number; // e.g., 10s to start
|
|
12
|
+
TIMER_INTERVAL_MS: number;
|
|
12
13
|
}
|
|
13
14
|
|
|
14
15
|
export class LongPressSeekController implements ISeekController {
|
|
15
|
-
isLongPressActive = false;
|
|
16
|
-
private currentSkipAmount = 0;
|
|
17
16
|
private subscription: Subscription | null = null;
|
|
18
|
-
|
|
17
|
+
readonly title = "LongPressSeek";
|
|
19
18
|
constructor(
|
|
20
19
|
private seekControllerDelegate: ISeekControllerDelegate,
|
|
20
|
+
private seekIncrementalStrategy: SeekIncrementalBaseStrategy,
|
|
21
21
|
private config: LongPressConfig
|
|
22
22
|
) {}
|
|
23
23
|
|
|
24
24
|
onStartSeek(seekType: SEEK_TYPE) {
|
|
25
25
|
this.cleanUpSubscription();
|
|
26
26
|
|
|
27
|
-
log_debug(
|
|
28
|
-
`LongPressSeekController: start long press seek type:${seekType}.`
|
|
29
|
-
);
|
|
27
|
+
log_debug(`${this.title}: start long press seek type: ${seekType}.`);
|
|
30
28
|
|
|
31
29
|
this.seekControllerDelegate.handlePlayerPause();
|
|
32
30
|
|
|
33
|
-
this.isLongPressActive = true;
|
|
34
|
-
this.currentSkipAmount = this.config.INITIAL_SKIP_AMOUNT;
|
|
35
|
-
|
|
36
31
|
this.subscription = interval(this.config.TIMER_INTERVAL_MS)
|
|
37
32
|
.pipe(
|
|
38
33
|
tap(() => {
|
|
39
|
-
this.seekControllerDelegate.handleDelayedSeek(
|
|
34
|
+
this.seekControllerDelegate.handleDelayedSeek(
|
|
35
|
+
this.seekIncrementalStrategy.getSkipTime()
|
|
36
|
+
);
|
|
40
37
|
|
|
41
38
|
log_debug(
|
|
42
|
-
|
|
39
|
+
`${
|
|
40
|
+
this.title
|
|
41
|
+
}: handle delayed seek type: ${seekType} - multiplier: ${this.seekIncrementalStrategy.getSkipMultiplier()}, currentSkipAmount: ${this.seekIncrementalStrategy.getSkipTime()}.`
|
|
43
42
|
);
|
|
44
43
|
|
|
45
|
-
this.
|
|
46
|
-
this.currentSkipAmount + this.config.SKIP_INCREMENT_STEP,
|
|
47
|
-
this.config.MAX_SKIP_PER_TICK
|
|
48
|
-
);
|
|
44
|
+
this.seekIncrementalStrategy.increment();
|
|
49
45
|
})
|
|
50
46
|
)
|
|
51
47
|
.subscribe({
|
|
52
48
|
complete: () =>
|
|
53
|
-
log_verbose(
|
|
54
|
-
"LongPressSeekController: Long press subscription complete"
|
|
55
|
-
),
|
|
49
|
+
log_verbose(`${this.title}: Long press subscription complete`),
|
|
56
50
|
error: (err) =>
|
|
57
|
-
log_error(
|
|
58
|
-
"LongPressSeekController: Long press subscription error",
|
|
59
|
-
err
|
|
60
|
-
),
|
|
51
|
+
log_error(`${this.title}: Long press subscription error`, err),
|
|
61
52
|
});
|
|
62
53
|
}
|
|
63
54
|
|
|
64
55
|
onSeekEnd() {
|
|
65
|
-
|
|
66
|
-
const offset = this.seekControllerDelegate.delayedSeekOffset;
|
|
67
|
-
|
|
68
|
-
if (offset !== null) {
|
|
69
|
-
log_debug(
|
|
70
|
-
`LongPressSeekController: onPressEnd for LongPressSeekController, seek offset: ${offset}`
|
|
71
|
-
);
|
|
72
|
-
|
|
73
|
-
this.seekControllerDelegate.handleSeek(offset);
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
|
-
|
|
56
|
+
this.cleanUpSubscription();
|
|
77
57
|
this.seekControllerDelegate.handleSeekComplete();
|
|
78
58
|
}
|
|
79
59
|
|
|
80
60
|
reset() {
|
|
81
|
-
this.
|
|
82
|
-
this.currentSkipAmount = 0;
|
|
61
|
+
this.seekIncrementalStrategy.reset();
|
|
83
62
|
this.cleanUpSubscription();
|
|
84
63
|
}
|
|
85
64
|
|