@applicaster/quick-brick-core 16.0.0-alpha.4416921324 → 16.0.0-alpha.4548770949

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.
Files changed (64) hide show
  1. package/App/ActionsProvider/LegacyActionsRegistryAdapter.tsx +16 -0
  2. package/App/ActionsProvider/__tests__/LegacyActionsRegistryAdapter.test.tsx +64 -0
  3. package/App/DeepLinking/URLSchemeHandler/SchemeHandlerHooks/__tests__/useOpenSchemeHandler.test.tsx +25 -15
  4. package/App/DeepLinking/URLSchemeHandler/SchemeHandlerHooks/usePresentSchemeHandler.ts +3 -0
  5. package/App/ModalProvider/ModalBottomSheet/ModalBottomSheetFrame.tsx +9 -2
  6. package/App/ModalProvider/ModalBottomSheet/hooks/__tests__/useKeyboardHeight.android.test.ts +105 -0
  7. package/App/ModalProvider/ModalBottomSheet/hooks/__tests__/useKeyboardHeight.test.ts +102 -0
  8. package/App/ModalProvider/ModalBottomSheet/hooks/index.ts +1 -0
  9. package/App/ModalProvider/ModalBottomSheet/hooks/useKeyboardHeight.ts +30 -0
  10. package/App/ModalProvider/ModalBottomSheet/index.tsx +5 -2
  11. package/App/ModalProvider/ModalContent.tsx +3 -0
  12. package/App/ModalProvider/__tests__/ModalContent.test.tsx +39 -0
  13. package/App/ModalProvider/__tests__/index.test.tsx +99 -0
  14. package/App/ModalProvider/index.tsx +39 -14
  15. package/App/NavigationProvider/NavigationProvider.tsx +71 -10
  16. package/App/NavigationProvider/__tests__/navToolbox.test.ts +227 -0
  17. package/App/NavigationProvider/__tests__/navigationProvider.test.tsx +56 -0
  18. package/App/NavigationProvider/__tests__/utils.test.ts +31 -1
  19. package/App/NavigationProvider/navToolbox.ts +224 -0
  20. package/App/NavigationProvider/utils.ts +35 -0
  21. package/App/NetworkStatusProvider/NetworkStatusProvider.tsx +32 -4
  22. package/App/NetworkStatusProvider/ResumeVerificationController.ts +282 -0
  23. package/App/NetworkStatusProvider/__tests__/NetworkStatusProvider.test.tsx +152 -1
  24. package/App/NetworkStatusProvider/__tests__/ResumeVerificationController.test.ts +471 -0
  25. package/App/NetworkStatusProvider/__tests__/resumeVerification.test.ts +126 -0
  26. package/App/NetworkStatusProvider/__tests__/useResumeVerifiedNetInfo.test.ts +189 -0
  27. package/App/NetworkStatusProvider/resumeVerification.ts +54 -0
  28. package/App/NetworkStatusProvider/useResumeVerifiedNetInfo.ts +33 -0
  29. package/App/NotificationToastRenderer/NotificationToastManager.ts +13 -2
  30. package/App/NotificationToastRenderer/NotificationToastRenderer.tsx +56 -24
  31. package/App/NotificationToastRenderer/NotificationToastRenderer.tv.tsx +10 -0
  32. package/App/NotificationToastRenderer/__tests__/NotificationToastManager.test.ts +24 -0
  33. package/App/NotificationToastRenderer/__tests__/NotificationToastRenderer.test.tsx +151 -3
  34. package/App/NotificationToastRenderer/__tests__/resolveConfirmationToastStyle.test.ts +118 -0
  35. package/App/NotificationToastRenderer/__tests__/useNotificationHeight.test.tsx +16 -11
  36. package/App/NotificationToastRenderer/index.tsx +5 -1
  37. package/App/NotificationToastRenderer/resolveConfirmationToastStyle.ts +33 -0
  38. package/App/NotificationToastRenderer/useNotificationHeight.tsx +3 -3
  39. package/App/index.tsx +8 -2
  40. package/App/layoutPreview/LayoutPreviewReminder.tsx +136 -0
  41. package/App/layoutPreview/__tests__/persistence.test.ts +63 -0
  42. package/App/layoutPreview/persistence.ts +228 -0
  43. package/App/remoteContextReloader/getRemoteContextData/getNativeRemoteContextData.ts +64 -19
  44. package/App/uiActions/index.ts +13 -0
  45. package/App/uiActions/muteUnmute/__tests__/assetResolver.test.ts +226 -0
  46. package/App/uiActions/muteUnmute/__tests__/binding.test.ts +51 -0
  47. package/App/uiActions/muteUnmute/__tests__/defaultAssets.test.ts +73 -0
  48. package/App/uiActions/muteUnmute/__tests__/entryState.test.ts +57 -0
  49. package/App/uiActions/muteUnmute/__tests__/labelResolver.test.ts +35 -0
  50. package/App/uiActions/muteUnmute/assetResolver.ts +87 -0
  51. package/App/uiActions/muteUnmute/assets/action/flavour_1/mute.png +0 -0
  52. package/App/uiActions/muteUnmute/assets/action/flavour_1/unmute.png +0 -0
  53. package/App/uiActions/muteUnmute/assets/action/flavour_2/mute.png +0 -0
  54. package/App/uiActions/muteUnmute/assets/action/flavour_2/unmute.png +0 -0
  55. package/App/uiActions/muteUnmute/assets/button/flavour_1/mute.png +0 -0
  56. package/App/uiActions/muteUnmute/assets/button/flavour_1/unmute.png +0 -0
  57. package/App/uiActions/muteUnmute/assets/button/flavour_2/mute.png +0 -0
  58. package/App/uiActions/muteUnmute/assets/button/flavour_2/unmute.png +0 -0
  59. package/App/uiActions/muteUnmute/defaultAssets.ts +33 -0
  60. package/App/uiActions/muteUnmute/entryState.ts +28 -0
  61. package/App/uiActions/muteUnmute/index.ts +79 -0
  62. package/App/uiActions/muteUnmute/labelResolver.ts +15 -0
  63. package/App/uiActions/muteUnmute/types.ts +18 -0
  64. package/package.json +8 -8
@@ -1,9 +1,15 @@
1
1
  import * as React from "react";
2
2
 
3
+ import {
4
+ initialWindowMetrics,
5
+ SafeAreaProvider,
6
+ } from "react-native-safe-area-context";
7
+
3
8
  import { ModalPresenter } from "./ModalPresenter";
4
9
  import { ModalContent } from "./ModalContent";
5
10
  import { ModalChildrenWrapper } from "./ModalChildrenWrapper";
6
11
  import { PathnameContext } from "@applicaster/zapp-react-native-ui-components/Contexts/PathnameContext";
12
+ import { ScreenDataContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenDataContext";
7
13
  import { ScreenContextProvider } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenContext";
8
14
  import { ROUTE_TYPES } from "@applicaster/zapp-react-native-utils/navigationUtils/routeTypes";
9
15
  import { useModalStoreState } from "@applicaster/zapp-react-native-utils/modalState";
@@ -14,6 +20,9 @@ export function ModalProvider() {
14
20
  const [modalVisible, setModalVisible] = React.useState(false);
15
21
  const [modalShown, setModalShown] = React.useState(false);
16
22
 
23
+ const screen = modalState?.screen;
24
+ const entry = modalState?.props?.entry as ZappEntry | undefined;
25
+
17
26
  React.useEffect(() => {
18
27
  setModalVisible(!!modalState);
19
28
 
@@ -22,13 +31,25 @@ export function ModalProvider() {
22
31
  }
23
32
  }, [modalState]);
24
33
 
25
- if (!modalState?.screen) {
34
+ /**
35
+ * The modal renders as a sibling of the stack navigator, so nothing upstream
36
+ * provides ScreenDataContext and the presented screen would otherwise see
37
+ * `null` from useScreenContext()/useCurrentScreenData(). Provide it here so a
38
+ * presented screen resolves its own screen and entry, the same way a pushed
39
+ * screen does through the navigator's scene.
40
+ */
41
+ const screenDataContextValue = React.useMemo(
42
+ () => ({ screen, entry }),
43
+ [screen, entry]
44
+ );
45
+
46
+ if (!screen) {
26
47
  return null;
27
48
  }
28
49
 
29
50
  const modalScreenProps = {
30
- screenData: modalState?.screen,
31
- screenId: modalState?.screen?.id,
51
+ screenData: entry ? { ...entry, targetScreen: screen } : screen,
52
+ screenId: screen?.id,
32
53
  screenType: "river",
33
54
  ...modalState.props,
34
55
  };
@@ -39,17 +60,21 @@ export function ModalProvider() {
39
60
 
40
61
  return (
41
62
  <PathnameContext.Provider value={pathname}>
42
- <ScreenContextProvider pathname={pathname}>
43
- <ModalPresenter
44
- visible={shouldShowModal}
45
- {...modalState?.options}
46
- statusBarTranslucent
47
- >
48
- <ModalChildrenWrapper>
49
- <ModalContent modalScreenProps={modalScreenProps} />
50
- </ModalChildrenWrapper>
51
- </ModalPresenter>
52
- </ScreenContextProvider>
63
+ <ScreenDataContext.Provider value={screenDataContextValue}>
64
+ <ScreenContextProvider pathname={pathname}>
65
+ <ModalPresenter
66
+ visible={shouldShowModal}
67
+ {...modalState?.options}
68
+ statusBarTranslucent
69
+ >
70
+ <SafeAreaProvider initialMetrics={initialWindowMetrics}>
71
+ <ModalChildrenWrapper>
72
+ <ModalContent modalScreenProps={modalScreenProps} />
73
+ </ModalChildrenWrapper>
74
+ </SafeAreaProvider>
75
+ </ModalPresenter>
76
+ </ScreenContextProvider>
77
+ </ScreenDataContext.Provider>
53
78
  </PathnameContext.Provider>
54
79
  );
55
80
  }
@@ -13,6 +13,8 @@ import {
13
13
  useGetScreenOrientation,
14
14
  } from "@applicaster/zapp-react-native-utils/appUtils/orientationHelper";
15
15
  import { focusManager } from "@applicaster/zapp-react-native-utils/focusManager/FocusManager";
16
+ import { setXrayNavigator } from "@applicaster/zapp-react-native-utils/navigationUtils/xrayNavigator";
17
+ import { registerNavToolbox } from "./navToolbox";
16
18
 
17
19
  import reducer, {
18
20
  ACTIONS,
@@ -55,6 +57,7 @@ import {
55
57
  getTargetScreen,
56
58
  legacyScreenData,
57
59
  openExternalUrl,
60
+ stripHookPrefix,
58
61
  } from "./utils";
59
62
  import {
60
63
  debounce,
@@ -242,6 +245,10 @@ export function NavigationProvider({ children }: Props) {
242
245
  playNextOverlayState.current = state;
243
246
  };
244
247
 
248
+ // The play-next overlay owns remote focus while it is visible, so key
249
+ // handling (InteractionManager) needs to be able to ask for it.
250
+ const getPlayNextOverlay = () => playNextOverlayState.current ?? null;
251
+
245
252
  const setNestedScreenContent = (entry: ZappEntry, screenId: string) => {
246
253
  const screen = rivers[screenId];
247
254
  const parent = findParent(context, navigator.currentRoute);
@@ -348,10 +355,7 @@ export function NavigationProvider({ children }: Props) {
348
355
  state: firstRoute.state,
349
356
  };
350
357
 
351
- if (
352
- stateForBack?.state?.entry &&
353
- "home" in stateForBack?.state?.entry
354
- ) {
358
+ if (stateForBack?.state?.entry?.home) {
355
359
  goHome();
356
360
  } else {
357
361
  dispatch(back(stateForBack));
@@ -414,6 +418,19 @@ export function NavigationProvider({ children }: Props) {
414
418
  },
415
419
  dispose
416
420
  ) => {
421
+ logger.debug({
422
+ message: `Hook screen presented: ${
423
+ hookPlugin.isModalHook() ? `(modal) ${route}` : route
424
+ }`,
425
+ data: {
426
+ route,
427
+ hookIdentifier: hookPlugin?.identifier,
428
+ hookScreenId: hookPlugin?.screen_id,
429
+ isModal: hookPlugin.isModalHook(),
430
+ lastHook: hookPlugin?.lastHook,
431
+ },
432
+ });
433
+
417
434
  if (hookPlugin?.lastHook) {
418
435
  dispose();
419
436
  }
@@ -536,6 +553,17 @@ export function NavigationProvider({ children }: Props) {
536
553
  currentStartUpHooks.current && setStartUpHooks(false);
537
554
  }
538
555
 
556
+ logger.debug({
557
+ message: `Hooks complete, navigating to: ${targetRoute}`,
558
+ data: {
559
+ targetRoute,
560
+ hookIdentifier: hookPlugin?.identifier,
561
+ screenId: screen?.id,
562
+ screenName: screen?.name,
563
+ options,
564
+ },
565
+ });
566
+
539
567
  dispatch(
540
568
  navigationAction(targetRoute, { screen, entry: payload, options })
541
569
  );
@@ -574,12 +602,28 @@ export function NavigationProvider({ children }: Props) {
574
602
  ) => {
575
603
  const { entry, screen, targetRoute, externalUrl } = getNavigationTarget(
576
604
  item,
577
- action === ACTIONS.REPLACE ? "" : pathnameRef.current,
605
+ action === ACTIONS.REPLACE ? "" : stripHookPrefix(pathnameRef.current),
578
606
  contentTypes,
579
607
  layoutVersion,
580
608
  rivers
581
609
  );
582
610
 
611
+ logger.debug({
612
+ message: `Navigating: ${pathnameRef.current || "(none)"} -> ${
613
+ targetRoute || externalUrl || "(unresolved)"
614
+ }`,
615
+ data: {
616
+ action,
617
+ from: pathnameRef.current,
618
+ to: targetRoute,
619
+ externalUrl,
620
+ screenId: screen?.id,
621
+ screenName: screen?.name,
622
+ entryType: entry?.type?.value,
623
+ options,
624
+ },
625
+ });
626
+
583
627
  if (externalUrl) {
584
628
  const openURL = async (url) => {
585
629
  const inflatedURL = await inflateUrl(url);
@@ -668,6 +712,15 @@ export function NavigationProvider({ children }: Props) {
668
712
 
669
713
  hooksManager.handleHooks(legacyScreenData({ entry, screen }));
670
714
  } else {
715
+ logger.debug({
716
+ message: `Navigating offline (hooks skipped) to: ${targetRoute}`,
717
+ data: {
718
+ targetRoute,
719
+ screenId: screen?.id,
720
+ screenName: screen?.name,
721
+ },
722
+ });
723
+
671
724
  dispatch(navigationAction(targetRoute, { screen, entry, options }));
672
725
  }
673
726
  },
@@ -709,11 +762,11 @@ export function NavigationProvider({ children }: Props) {
709
762
  const getStackForPathname = (
710
763
  pathname: string
711
764
  ): NavigationScreenState | undefined => {
712
- const stack = [...state?.stack?.mainStack];
713
-
714
- const currentStack = stack.find(({ route }) => route === pathname);
715
-
716
- return currentStack;
765
+ // Topmost match: the active screen if a route is on the stack twice.
766
+ return R.findLast(
767
+ ({ route }) => route === pathname,
768
+ state?.stack?.mainStack ?? []
769
+ );
717
770
  };
718
771
 
719
772
  const navigator: QuickBrickAppNavigator = React.useMemo(
@@ -727,6 +780,7 @@ export function NavigationProvider({ children }: Props) {
727
780
  replace: replaceItem,
728
781
  setNestedScreenContent,
729
782
  setPlayNextOverlay,
783
+ getPlayNextOverlay,
730
784
  goHome,
731
785
  canGoBack,
732
786
  goBack,
@@ -777,6 +831,13 @@ export function NavigationProvider({ children }: Props) {
777
831
  navigator.state = state;
778
832
  }
779
833
 
834
+ React.useLayoutEffect(() => {
835
+ setXrayNavigator(navigator);
836
+ registerNavToolbox();
837
+
838
+ return () => setXrayNavigator(undefined);
839
+ }, [navigator]);
840
+
780
841
  React.useLayoutEffect(() => {
781
842
  if (pathname === "/" && appLaunched) {
782
843
  goHome(true);
@@ -0,0 +1,227 @@
1
+ const mockRegister = jest.fn().mockResolvedValue(undefined);
2
+
3
+ // The X-Ray mock (__mocks__/@applicaster/quick-brick-xray) has no toolbox API: give it one.
4
+ require("@applicaster/quick-brick-xray").registerReactToolbox = mockRegister;
5
+
6
+ // Required after the toolbox API is in place: loading them can register the player toolbox.
7
+ const {
8
+ modalStore,
9
+ } = require("@applicaster/zapp-react-native-utils/modalState");
10
+
11
+ const {
12
+ setXrayNavigator,
13
+ } = require("@applicaster/zapp-react-native-utils/navigationUtils/xrayNavigator");
14
+
15
+ const {
16
+ playerManager,
17
+ } = require("@applicaster/zapp-react-native-utils/appUtils/playerManager");
18
+
19
+ const { registerNavToolbox } = require("../navToolbox");
20
+
21
+ const navigator = (overrides = {}) => {
22
+ const nav = {
23
+ getPathname: () => "/river/a/river/b",
24
+ getStack: () => [{ route: "/river/a" }, { route: "/river/a/river/b" }],
25
+ canGoBack: () => true,
26
+ goBack: jest.fn(),
27
+ goHome: jest.fn(),
28
+ getPlayNextOverlay: () => null,
29
+ getModalState: () => modalStore.getState().modalState,
30
+ dismissModal: jest.fn(),
31
+ videoModalState: { visible: false },
32
+ minimiseVideoModal: jest.fn(),
33
+ maximiseVideoModal: jest.fn(),
34
+ closeVideoModal: jest.fn(),
35
+ ...overrides,
36
+ };
37
+
38
+ setXrayNavigator(nav as unknown as QuickBrickAppNavigator);
39
+
40
+ return nav;
41
+ };
42
+
43
+ const videoModal = (mode: string) => ({
44
+ videoModalState: { visible: true, mode, item: { id: "v1", title: "V" } },
45
+ });
46
+
47
+ const call = (name: string) => {
48
+ // Other toolboxes (player) may register first.
49
+ const { tools } = mockRegister.mock.calls.find(
50
+ ([toolbox]) => toolbox.name === "nav"
51
+ )[0];
52
+
53
+ return tools.find((tool) => tool.name === name).handler({});
54
+ };
55
+
56
+ describe("navToolbox", () => {
57
+ beforeAll(() => registerNavToolbox());
58
+
59
+ afterEach(() => {
60
+ modalStore.getState().setModalState({ visible: false, screen: null });
61
+ jest.restoreAllMocks();
62
+ });
63
+
64
+ it("throws until the NavigationProvider sets the navigator", () => {
65
+ setXrayNavigator(undefined);
66
+
67
+ expect(() => call("stack")).toThrow("Navigation is not available yet");
68
+ });
69
+
70
+ it("goes back one screen", () => {
71
+ const nav = navigator();
72
+
73
+ expect(call("back")).toEqual({ from: "/river/a/river/b", wentBack: true });
74
+ expect(nav.goBack).toHaveBeenCalledWith(false);
75
+ });
76
+
77
+ it("does not go back from the root", () => {
78
+ const nav = navigator({ canGoBack: () => false });
79
+
80
+ expect(call("back")).toMatchObject({ wentBack: false });
81
+ expect(nav.goBack).not.toHaveBeenCalled();
82
+ });
83
+
84
+ it("does not pop the screen under a modal or the video modal", () => {
85
+ const nav = navigator(videoModal("MAXIMIZED"));
86
+
87
+ expect(call("back")).toEqual({
88
+ from: "video-modal/v1",
89
+ wentBack: false,
90
+ blockedBy: "video-modal",
91
+ });
92
+
93
+ modalStore.getState().openModal({ item: { id: "m" } });
94
+
95
+ expect(call("back")).toMatchObject({ blockedBy: "modal" });
96
+ expect(nav.goBack).not.toHaveBeenCalled();
97
+ });
98
+
99
+ it("only dismisses Play Next when it shows", () => {
100
+ const nav = navigator({ getPlayNextOverlay: () => ({}) });
101
+
102
+ expect(call("back")).toMatchObject({
103
+ wentBack: false,
104
+ dismissed: "playNext",
105
+ });
106
+
107
+ expect(nav.goBack).toHaveBeenCalledWith(false);
108
+ });
109
+
110
+ it("leaves a hook screen to cancel itself", () => {
111
+ const nav = navigator({ getPathname: () => "/river/a/hooks/login" });
112
+
113
+ expect(call("back")).toMatchObject({ wentBack: false, blockedBy: "hook" });
114
+ expect(nav.goBack).not.toHaveBeenCalled();
115
+ });
116
+
117
+ it("goes home", () => {
118
+ const nav = navigator();
119
+
120
+ expect(call("home")).toEqual({ from: "/river/a/river/b", wentHome: true });
121
+ expect(nav.goHome).toHaveBeenCalled();
122
+ });
123
+
124
+ it("does not go home under a modal or the video modal", () => {
125
+ const nav = navigator(videoModal("MAXIMIZED"));
126
+
127
+ expect(call("home")).toEqual({
128
+ from: "video-modal/v1",
129
+ wentHome: false,
130
+ blockedBy: "video-modal",
131
+ });
132
+
133
+ modalStore.getState().openModal({ item: { id: "m" } });
134
+
135
+ expect(call("home")).toMatchObject({ blockedBy: "modal" });
136
+ expect(nav.goHome).not.toHaveBeenCalled();
137
+ });
138
+
139
+ it("goes home with the mini player docked", () => {
140
+ const nav = navigator(videoModal("MINIMIZED"));
141
+
142
+ expect(call("home")).toMatchObject({ wentHome: true });
143
+ expect(nav.goHome).toHaveBeenCalled();
144
+ });
145
+
146
+ it("dismisses the modal store's modal, not the video modal", () => {
147
+ const nav = navigator(videoModal("MAXIMIZED"));
148
+
149
+ expect(() => call("dismissModal")).toThrow("No modal is open");
150
+
151
+ modalStore.getState().openModal({ item: { id: "m" } });
152
+
153
+ expect(call("dismissModal")).toBe("OK");
154
+ expect(nav.dismissModal).toHaveBeenCalled();
155
+ });
156
+
157
+ it("minimises only a maximised video modal", () => {
158
+ const fullscreen = navigator(videoModal("FULLSCREEN"));
159
+
160
+ expect(() => call("minimizeVideoModal")).toThrow("mode is FULLSCREEN");
161
+ expect(fullscreen.minimiseVideoModal).not.toHaveBeenCalled();
162
+
163
+ const maximized = navigator(videoModal("MAXIMIZED"));
164
+
165
+ call("minimizeVideoModal");
166
+
167
+ expect(maximized.minimiseVideoModal).toHaveBeenCalled();
168
+ });
169
+
170
+ it("enters and leaves fullscreen through the player, which also rotates the phone", () => {
171
+ const invoke = jest.spyOn(playerManager, "invokeHandler");
172
+ const playerContainer = jest.fn();
173
+
174
+ playerManager.on("toggleFullscreen", playerContainer);
175
+
176
+ navigator(videoModal("MAXIMIZED"));
177
+ call("fullscreenVideoModal");
178
+
179
+ expect(invoke).toHaveBeenCalledWith("toggleFullscreen", {
180
+ fullscreen: true,
181
+ });
182
+
183
+ const fullscreen = navigator(videoModal("FULLSCREEN"));
184
+
185
+ call("maximizeVideoModal");
186
+
187
+ expect(invoke).toHaveBeenCalledWith("toggleFullscreen", {
188
+ fullscreen: false,
189
+ });
190
+
191
+ expect(fullscreen.maximiseVideoModal).not.toHaveBeenCalled();
192
+
193
+ playerManager.removeHandler("toggleFullscreen", playerContainer);
194
+ });
195
+
196
+ it("does not claim fullscreen without a player, or from the mini player", () => {
197
+ navigator(videoModal("MAXIMIZED"));
198
+
199
+ expect(() => call("fullscreenVideoModal")).toThrow("shows no player");
200
+
201
+ navigator(videoModal("MINIMIZED"));
202
+
203
+ expect(() => call("fullscreenVideoModal")).toThrow("mode is MINIMIZED");
204
+ });
205
+
206
+ it("expands the mini player", () => {
207
+ const nav = navigator(videoModal("MINIMIZED"));
208
+
209
+ call("maximizeVideoModal");
210
+
211
+ expect(nav.maximiseVideoModal).toHaveBeenCalled();
212
+ });
213
+
214
+ it("reports the video modal", () => {
215
+ navigator(videoModal("MINIMIZED"));
216
+
217
+ expect(call("videoModal")).toMatchObject({
218
+ visible: true,
219
+ mode: "MINIMIZED",
220
+ entry: { id: "v1", title: "V" },
221
+ });
222
+
223
+ navigator();
224
+
225
+ expect(call("videoModal")).toMatchObject({ visible: false });
226
+ });
227
+ });
@@ -410,6 +410,62 @@ describe("<NavigationProvider />", () => {
410
410
  });
411
411
  });
412
412
 
413
+ describe("when backToTop is requested from a non-home tab", () => {
414
+ const listenRiver = {
415
+ id: "LISTEN",
416
+ home: false,
417
+ navigations: [],
418
+ ui_components: [],
419
+ };
420
+
421
+ beforeEach(() => {
422
+ wrapper = renderContextConsumer({
423
+ ...store,
424
+ rivers: { ...rivers, LISTEN: listenRiver },
425
+ });
426
+
427
+ act(() => {
428
+ getNavigatorValues(wrapper).navigator.replace(listenRiver);
429
+ });
430
+ });
431
+
432
+ it("returns to the tab root from the second level", () => {
433
+ act(() => {
434
+ getNavigatorValues(wrapper).navigator.push(rivers.A1234);
435
+ });
436
+
437
+ act(() => {
438
+ getNavigatorValues(wrapper).navigator.goBack(false, false, true);
439
+ });
440
+
441
+ const { navigator, state } = getNavigatorValues(wrapper);
442
+
443
+ expect(navigator.currentRoute).toEqual("/river/LISTEN");
444
+ expect(navigator.activeRiver).toEqual(listenRiver);
445
+ expect(state.stack.mainStack).toHaveLength(1);
446
+ });
447
+
448
+ it("returns to the tab root from the third level", () => {
449
+ act(() => {
450
+ getNavigatorValues(wrapper).navigator.push(rivers.A1234);
451
+ });
452
+
453
+ act(() => {
454
+ getNavigatorValues(wrapper).navigator.push(rivers.C0987);
455
+ });
456
+
457
+ act(() => {
458
+ getNavigatorValues(wrapper).navigator.goBack(false, false, true);
459
+ });
460
+
461
+ const { navigator, state } = getNavigatorValues(wrapper);
462
+
463
+ expect(navigator.currentRoute).toEqual("/river/LISTEN");
464
+ expect(navigator.activeRiver).toEqual(listenRiver);
465
+ expect(state.stack.mainStack).toHaveLength(1);
466
+ });
467
+ });
468
+
413
469
  describe("when there is a previous route and there are hooks", () => {
414
470
  beforeEach(() => {
415
471
  wrapper = renderContextConsumer();
@@ -1,4 +1,4 @@
1
- const { targetShouldOpenExternally } = require("../utils");
1
+ const { targetShouldOpenExternally, stripHookPrefix } = require("../utils");
2
2
 
3
3
  const mockedOpenUrl = jest.fn();
4
4
 
@@ -116,3 +116,33 @@ describe("targetShouldOpenExternally", () => {
116
116
  });
117
117
  });
118
118
  });
119
+
120
+ describe("stripHookPrefix", () => {
121
+ const HOOK = "203d96a9-f4af-49d1-9890-435e683b9274";
122
+ const MANAGE = "9f8e1e06-abd6-48b9-b73a-4caf4601f870";
123
+
124
+ it("drops the hook segment so a hook screen navigates from the root", () => {
125
+ expect(stripHookPrefix(`/hooks/${HOOK}`)).toBe("");
126
+ });
127
+
128
+ it("keeps the screens opened from a hook, without their hook prefix", () => {
129
+ expect(stripHookPrefix(`/hooks/${HOOK}/river/${MANAGE}`)).toBe(
130
+ `/river/${MANAGE}`
131
+ );
132
+ });
133
+
134
+ it("leaves a regular route untouched", () => {
135
+ expect(stripHookPrefix(`/river/${MANAGE}`)).toBe(`/river/${MANAGE}`);
136
+ });
137
+
138
+ it("only strips a hook segment at the start of the path", () => {
139
+ expect(stripHookPrefix(`/river/${MANAGE}/hooks/${HOOK}`)).toBe(
140
+ `/river/${MANAGE}/hooks/${HOOK}`
141
+ );
142
+ });
143
+
144
+ it("returns an empty prefix for an empty or missing path", () => {
145
+ expect(stripHookPrefix("")).toBe("");
146
+ expect(stripHookPrefix(undefined)).toBe("");
147
+ });
148
+ });