@applicaster/zapp-react-native-ui-components 12.0.0-alpha.5882013252 → 12.0.0-alpha.5923342081

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 (168) hide show
  1. package/Components/AnimatedInOut/index.tsx +18 -10
  2. package/Components/AudioPlayer/AudioPlayer.tsx +9 -1
  3. package/Components/AudioPlayer/__tests__/__snapshots__/audioPlayer.test.js.snap +5 -0
  4. package/Components/AudioPlayer/helpers.tsx +1 -0
  5. package/Components/BaseFocusable/index.tsx +3 -3
  6. package/Components/Cell/Cell.tsx +32 -11
  7. package/Components/Cell/CellWithFocusable.tsx +40 -19
  8. package/Components/Cell/TvOSCellComponent.tsx +5 -9
  9. package/Components/ErrorScreen/index.tsx +1 -1
  10. package/Components/Focusable/Focusable.tsx +6 -1
  11. package/Components/FocusableCell/index.tsx +7 -7
  12. package/Components/FocusableGroup/index.tsx +11 -2
  13. package/Components/FocusableList/FocusableChild.ts +24 -14
  14. package/Components/FocusableList/FocusableItem.tsx +1 -1
  15. package/Components/FocusableList/FocusableListItemWrapper.tsx +76 -0
  16. package/Components/FocusableList/hooks/useCellState.android.ts +3 -1
  17. package/Components/FocusableList/index.tsx +26 -25
  18. package/Components/FreezeWithCallback/Freeze.tsx +31 -0
  19. package/Components/FreezeWithCallback/LICENSE +21 -0
  20. package/Components/FreezeWithCallback/Suspender.tsx +17 -0
  21. package/Components/FreezeWithCallback/__tests__/index.test.tsx +170 -0
  22. package/Components/FreezeWithCallback/index.tsx +3 -0
  23. package/Components/GeneralContentScreen/GeneralContentScreen.tsx +11 -8
  24. package/Components/GeneralContentScreen/utils/__tests__/useCurationAPI.test.js +13 -6
  25. package/Components/GeneralContentScreen/utils/useCurationAPI.ts +1 -1
  26. package/Components/HandlePlayable/HandlePlayable.tsx +4 -1
  27. package/Components/HookRenderer/index.tsx +1 -6
  28. package/Components/Image/Image.android.tsx +3 -22
  29. package/Components/Image/Image.tsx +18 -2
  30. package/Components/Image/utils/index.ts +39 -0
  31. package/Components/Layout/TV/ScreenContainer.tsx +79 -5
  32. package/Components/Layout/TV/ScreenLayoutContextProvider.tsx +2 -2
  33. package/Components/Layout/TV/__tests__/ScreenContainer.test.tsx +38 -28
  34. package/Components/Layout/TV/__tests__/__snapshots__/ScreenContainer.test.tsx.snap +25 -13
  35. package/Components/Layout/TV/__tests__/__snapshots__/index.test.tsx.snap +10 -50
  36. package/Components/Layout/TV/__tests__/index.test.tsx +20 -108
  37. package/Components/Layout/TV/index.tsx +15 -84
  38. package/Components/Layout/TV/index.web.tsx +33 -0
  39. package/Components/Layout/index.tsx +15 -11
  40. package/Components/MasterCell/DefaultComponents/ActionButton.tsx +4 -1
  41. package/Components/MasterCell/DefaultComponents/BorderContainerView/index.tsx +86 -117
  42. package/Components/MasterCell/DefaultComponents/CellBadge/index.tsx +21 -8
  43. package/Components/MasterCell/DefaultComponents/DynamicBadge.tsx +4 -2
  44. package/Components/MasterCell/DefaultComponents/FocusableView/index.tsx +17 -1
  45. package/Components/MasterCell/DefaultComponents/Image/Image.android.tsx +9 -26
  46. package/Components/MasterCell/DefaultComponents/Image/Image.ios.tsx +5 -3
  47. package/Components/MasterCell/DefaultComponents/Image/hooks/useImageSize.ts +65 -0
  48. package/Components/MasterCell/DefaultComponents/ImageBorderContainer/index.ts +71 -0
  49. package/Components/MasterCell/DefaultComponents/ImageContainer/index.tsx +5 -1
  50. package/Components/MasterCell/DefaultComponents/LiveImage/index.tsx +37 -2
  51. package/Components/MasterCell/DefaultComponents/SecondaryImage/Image.tsx +3 -2
  52. package/Components/MasterCell/DefaultComponents/Text/index.tsx +14 -2
  53. package/Components/MasterCell/DefaultComponents/Toggle.tsx +5 -1
  54. package/Components/MasterCell/DefaultComponents/__tests__/image.test.js +1 -1
  55. package/Components/MasterCell/DefaultComponents/__tests__/text.test.tsx +24 -9
  56. package/Components/MasterCell/DefaultComponents/index.ts +2 -0
  57. package/Components/MasterCell/DefaultComponents/tv/ButtonContainerView/index.android.tsx +4 -1
  58. package/Components/MasterCell/DefaultComponents/tv/ButtonContainerView/index.tsx +10 -2
  59. package/Components/MasterCell/SharedUI/CollapsibleTextContainer/index.ts +6 -10
  60. package/Components/MasterCell/SharedUI/ProgressBar/hooks/useFillInPercent.ts +7 -1
  61. package/Components/MasterCell/dataAdapter.ts +21 -7
  62. package/Components/MasterCell/hooks/useAsyncRendering/index.ts +1 -1
  63. package/Components/MasterCell/index.tsx +5 -3
  64. package/Components/MasterCell/utils/__tests__/insertBetween.test.js +9 -0
  65. package/Components/MasterCell/utils/index.ts +33 -35
  66. package/Components/MeasurmentsPortal/BasicMeasurementsPortal.tsx +11 -7
  67. package/Components/MeasurmentsPortal/MeasurementsPortal.tsx +10 -1
  68. package/Components/ModalComponent/BottomSheetModalContent.tsx +121 -0
  69. package/Components/ModalComponent/Button/Item.tsx +82 -0
  70. package/Components/ModalComponent/Button/ItemIcon.tsx +60 -0
  71. package/Components/ModalComponent/Button/ItemLabel.tsx +101 -0
  72. package/Components/ModalComponent/Button/assets.ts +4 -0
  73. package/Components/ModalComponent/Button/index.tsx +111 -0
  74. package/Components/ModalComponent/Header/CloseButton.tsx +59 -0
  75. package/Components/ModalComponent/Header/Title.tsx +70 -0
  76. package/Components/ModalComponent/Header/assets.ts +4 -0
  77. package/Components/ModalComponent/Header/index.tsx +71 -0
  78. package/Components/ModalComponent/Header/utils.ts +79 -0
  79. package/Components/ModalComponent/index.tsx +38 -0
  80. package/Components/ModalComponent/utils.ts +126 -0
  81. package/Components/Navigator/StackNavigator.tsx +57 -0
  82. package/Components/Navigator/index.ts +1 -0
  83. package/Components/PlayerContainer/ErrorDisplay/ErrorDisplay.tsx +4 -7
  84. package/Components/PlayerContainer/PlayerContainer.tsx +77 -34
  85. package/Components/PlayerContainer/ProgramInfo/index.tsx +3 -1
  86. package/Components/PlayerImageBackground/index.tsx +34 -8
  87. package/Components/River/ComponentsMap/ComponentsMap.tsx +97 -2
  88. package/Components/River/RefreshControl.tsx +55 -1
  89. package/Components/River/River.tsx +8 -5
  90. package/Components/River/TV/River.tsx +2 -25
  91. package/Components/River/__tests__/__snapshots__/componentsMap.test.js.snap +1 -1
  92. package/Components/River/__tests__/componentsMap.test.js +7 -0
  93. package/Components/River/useScreenConfiguration.ts +5 -6
  94. package/Components/RouteManager/__tests__/__snapshots__/routeManager.test.js.snap +1 -0
  95. package/Components/RouteManager/__tests__/routeManager.test.js +9 -2
  96. package/Components/RouteManager/index.tsx +4 -2
  97. package/Components/Screen/TV/hooks/index.ts +1 -0
  98. package/Components/Screen/TV/hooks/useInitialFocus.ts +70 -0
  99. package/Components/Screen/TV/index.web.tsx +178 -0
  100. package/Components/Screen/__tests__/Screen.test.tsx +43 -77
  101. package/Components/Screen/__tests__/__snapshots__/Screen.test.tsx.snap +24 -6
  102. package/Components/Screen/__tests__/navigationHandler.test.ts +1 -178
  103. package/Components/Screen/index.tsx +104 -66
  104. package/Components/Screen/navigationHandler.ts +6 -85
  105. package/Components/Screen/orientationHandler.ts +19 -8
  106. package/Components/Screen/utils.ts +16 -0
  107. package/Components/ScreenResolver/index.tsx +10 -13
  108. package/Components/Tabs/TV/styles.ts +1 -1
  109. package/Components/TrackedView/index.tsx +6 -3
  110. package/Components/Transitioner/Scene.tsx +39 -26
  111. package/Components/Transitioner/Transitioner.tsx +56 -48
  112. package/Components/Transitioner/__tests__/Scene.test.js +7 -0
  113. package/Components/Transitioner/__tests__/__snapshots__/Scene.test.js.snap +12 -4
  114. package/Components/Transitioner/__tests__/__snapshots__/transitioner.test.js.snap +2 -0
  115. package/Components/VideoLive/LiveImageManager.ts +70 -14
  116. package/Components/VideoLive/PlayerLiveImageComponent.tsx +132 -95
  117. package/Components/VideoLive/__tests__/PlayerLiveImageComponent.test.tsx +45 -3
  118. package/Components/VideoLive/__tests__/__snapshots__/PlayerLiveImageComponent.test.tsx.snap +21 -29
  119. package/Components/VideoModal/ModalAnimation/AnimatedPlayerModalWrapper.tsx +66 -0
  120. package/Components/VideoModal/ModalAnimation/AnimatedScrollModal.tsx +376 -0
  121. package/Components/VideoModal/ModalAnimation/AnimatedVideoPlayerComponent.tsx +165 -0
  122. package/Components/VideoModal/ModalAnimation/AnimationComponent.tsx +473 -0
  123. package/Components/VideoModal/ModalAnimation/ModalAnimationContext.tsx +182 -0
  124. package/Components/VideoModal/ModalAnimation/index.ts +15 -0
  125. package/Components/VideoModal/ModalAnimation/utils.ts +302 -0
  126. package/Components/VideoModal/PlayerDetails.tsx +21 -4
  127. package/Components/VideoModal/PlayerWrapper.tsx +156 -95
  128. package/Components/VideoModal/VideoModal.tsx +32 -43
  129. package/Components/VideoModal/__tests__/PlayerDetails.test.tsx +6 -1
  130. package/Components/VideoModal/__tests__/PlayerWrapper.test.tsx +15 -3
  131. package/Components/VideoModal/__tests__/__snapshots__/PlayerDetails.test.tsx.snap +2 -0
  132. package/Components/VideoModal/__tests__/__snapshots__/PlayerWrapper.test.tsx.snap +358 -170
  133. package/Components/VideoModal/hooks/useModalSize.ts +23 -16
  134. package/Components/VideoModal/utils.ts +8 -5
  135. package/Components/Viewport/ViewportAware/__tests__/viewportAware.test.js +26 -21
  136. package/Components/Viewport/ViewportTracker/ViewportTracker.tsx +31 -40
  137. package/Components/Viewport/ViewportTracker/__tests__/viewportTracker.test.js +4 -5
  138. package/Components/Viewport/ViewportTracker/index.tsx +1 -0
  139. package/Components/Viewport/utils.js +1 -1
  140. package/Components/ZappFrameworkComponents/BarView/BarView.tsx +4 -3
  141. package/Components/ZappUIComponent/index.tsx +22 -12
  142. package/Components/default-cell-renderer/__tests__/__snapshots__/defaultCellRenderer.test.tsx.snap +4 -4
  143. package/Components/index.js +2 -0
  144. package/Contexts/ConfirmDialogState/index.ts +1 -1
  145. package/Contexts/FocusableGroupContext/FocusableGroupContext.ts +3 -0
  146. package/Contexts/FocusableGroupContext/FocusableGroupContextProvider.tsx +16 -0
  147. package/Contexts/FocusableGroupContext/__tests__/FocusableGroupContextProvider.test.tsx +22 -0
  148. package/Contexts/FocusableGroupContext/__tests__/withFocusableContext.test.tsx +26 -0
  149. package/Contexts/FocusableGroupContext/index.ts +7 -0
  150. package/Contexts/FocusableGroupContext/withFocusableContext.tsx +17 -0
  151. package/Contexts/MenuToggleContext/{index.js → index.ts} +16 -0
  152. package/Contexts/ScreenContext/__tests__/__snapshots__/index.test.tsx.snap +3 -0
  153. package/Contexts/ScreenContext/__tests__/index.test.tsx +27 -0
  154. package/Contexts/ScreenContext/index.tsx +95 -29
  155. package/Contexts/ScreenDataContext/index.tsx +20 -0
  156. package/Contexts/ZappPipesContext/ZappPipesEntryContext.ts +1 -1
  157. package/Decorators/ComponentsMapWrapper/withComponentsMapProvider.tsx +7 -2
  158. package/Decorators/RiverResolver/index.tsx +0 -4
  159. package/Decorators/index.tsx +0 -4
  160. package/const.ts +6 -0
  161. package/events/index.ts +1 -0
  162. package/index.js +3 -0
  163. package/package.json +5 -6
  164. package/Components/Layout/TV/TransitionOverlay.tsx +0 -64
  165. package/Components/VideoModal/hooks/usePosition.ts +0 -50
  166. /package/Components/FocusableGroup/{index.android.js → index.android.ts} +0 -0
  167. /package/Components/FocusableGroup/{index.ios.js → index.ios.ts} +0 -0
  168. /package/Contexts/{index.js → index.ts} +0 -0
@@ -0,0 +1,178 @@
1
+ import React from "react";
2
+ import { last } from "ramda";
3
+ import { StyleSheet, View } from "react-native";
4
+ import {
5
+ findMenuPlugin,
6
+ getNavigationProps,
7
+ getPathAttributes,
8
+ } from "@applicaster/zapp-react-native-utils/navigationUtils";
9
+ import {
10
+ useIsScreenActive,
11
+ useNavigation,
12
+ } from "@applicaster/zapp-react-native-utils/reactHooks";
13
+ import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
14
+ import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
15
+ import {
16
+ useNavbarState,
17
+ useScreenBackgroundColor,
18
+ } from "@applicaster/zapp-react-native-utils/reactHooks/screen";
19
+ import { isNilOrEmpty } from "@applicaster/zapp-react-native-utils/reactUtils/helpers";
20
+
21
+ import { NavBarContainer } from "../../Layout/TV/NavBarContainer";
22
+ import { ScreenResolver } from "../../ScreenResolver";
23
+ import { useInitialFocus } from "./hooks";
24
+ import { isPlayerPlugin } from "@applicaster/zapp-react-native-utils/pluginUtils";
25
+ import { focusManager } from "@applicaster/zapp-react-native-utils/appUtils";
26
+ import { FreezeWithCallback } from "../../FreezeWithCallback";
27
+
28
+ const styles = StyleSheet.create({
29
+ container: {
30
+ position: "absolute",
31
+ top: 0,
32
+ left: 0,
33
+ right: 0,
34
+ bottom: 0,
35
+ },
36
+ });
37
+
38
+ type Components = {
39
+ NavBar: React.ComponentType<any>;
40
+ Background: React.ComponentType<any>;
41
+ };
42
+
43
+ type Props = {
44
+ route: string;
45
+ Components: Components;
46
+ };
47
+
48
+ const getActiveRiver = ({
49
+ screenId,
50
+ screenType,
51
+ routeState,
52
+ rivers,
53
+ fallbackActiveRiver,
54
+ }) => {
55
+ if (rivers[screenId]) {
56
+ if (screenType === "hooks") {
57
+ const navigations = routeState?.state?.entry?.payload?.navigations;
58
+
59
+ if (navigations) {
60
+ return routeState.state.entry.payload;
61
+ }
62
+ }
63
+
64
+ return routeState?.state?.screen;
65
+ }
66
+
67
+ // screenId is not presented into rivers, use fallback instead
68
+ return fallbackActiveRiver;
69
+ };
70
+
71
+ const getNavigations = ({
72
+ screenId,
73
+ screenType,
74
+ routeState,
75
+ rivers,
76
+ fallbackNavigations,
77
+ }) => {
78
+ if (rivers[screenId]) {
79
+ // river presents
80
+ if (screenType === "hooks") {
81
+ const navigations = routeState?.state?.entry?.payload?.navigations;
82
+
83
+ if (navigations) {
84
+ return navigations;
85
+ }
86
+ }
87
+
88
+ return routeState?.state?.screen?.navigations;
89
+ }
90
+
91
+ // screenId is not presented into rivers, use fallback instead
92
+ return fallbackNavigations;
93
+ };
94
+
95
+ export const Screen = ({ route, Components }: Props) => {
96
+ if (isNilOrEmpty(route)) {
97
+ throw Error("Required props: route is missing");
98
+ }
99
+
100
+ const navigator = useNavigation();
101
+ const { plugins = [], rivers = [] } = usePickFromState(["plugins", "rivers"]);
102
+
103
+ const pathAttributes = getPathAttributes({ pathname: route });
104
+ const routeState = navigator.getStackForPathname(route);
105
+
106
+ const { screenType, screenId } = last(pathAttributes);
107
+
108
+ const backgroundColor = useScreenBackgroundColor(screenId);
109
+
110
+ useInitialFocus();
111
+
112
+ const activeRiver = getActiveRiver({
113
+ screenId,
114
+ screenType,
115
+ routeState,
116
+ rivers,
117
+ fallbackActiveRiver: navigator.activeRiver,
118
+ });
119
+
120
+ const navigationProps = getNavigationProps({
121
+ navigator: {
122
+ // @ts-ignore
123
+ activeRiver,
124
+ // @ts-ignore
125
+ screenTitle: routeState.state.entry?.title || routeState.screen?.name,
126
+ },
127
+ category: "menu",
128
+ });
129
+
130
+ const navigations = getNavigations({
131
+ screenId,
132
+ screenType,
133
+ routeState,
134
+ rivers,
135
+ fallbackNavigations: navigator.activeRiver.navigations,
136
+ });
137
+
138
+ const menuPlugin = findMenuPlugin(navigations, plugins);
139
+
140
+ const NavBar = (Components.NavBar ||
141
+ menuPlugin.module) as React.ComponentType<any>;
142
+
143
+ const isPlayer = isPlayerPlugin(routeState);
144
+
145
+ const { visible: isNavBarVisible } = useNavbarState();
146
+
147
+ const screenData =
148
+ screenType === "hooks" || isPlayer
149
+ ? routeState?.state?.entry
150
+ : routeState?.state?.screen;
151
+
152
+ const isScreenActive = useIsScreenActive();
153
+
154
+ return (
155
+ <FreezeWithCallback
156
+ freeze={!isScreenActive}
157
+ onRelease={() => {
158
+ focusManager.setInitialFocus();
159
+ }}
160
+ >
161
+ <View style={[styles.container, { backgroundColor }]}>
162
+ <NavBarContainer isVisible={isNavBarVisible} onReady={noop}>
163
+ <NavBar
164
+ isVisible={isNavBarVisible}
165
+ menuPlugin={menuPlugin}
166
+ navigationProps={navigationProps}
167
+ />
168
+ </NavBarContainer>
169
+ <ScreenResolver
170
+ screenType={screenType}
171
+ screenId={screenId}
172
+ screenData={screenData}
173
+ groupId={route}
174
+ />
175
+ </View>
176
+ </FreezeWithCallback>
177
+ );
178
+ };
@@ -1,13 +1,21 @@
1
1
  import * as React from "react";
2
2
  import { View } from "react-native";
3
- import { create, act } from "react-test-renderer";
4
-
5
- import { ORIENTATIONS } from "@applicaster/zapp-react-native-utils/appUtils/orientationHelper";
3
+ import { act, create } from "react-test-renderer";
6
4
 
7
5
  const Mocked_RouteManager = jest.fn((props) => (
8
6
  <View testID="routeManager" {...props} />
9
7
  ));
10
8
 
9
+ const mock_navBarVisibleFlag = true;
10
+
11
+ const mockIsNavBarVisible = jest.fn(() => mock_navBarVisibleFlag);
12
+
13
+ const mockIsOrientationCompatible = jest.fn(() => true);
14
+
15
+ jest.mock("react-native-safe-area-context", () => ({
16
+ useSafeAreaInsets: () => ({ top: 44 }),
17
+ }));
18
+
11
19
  jest.mock("../../RouteManager", () => ({
12
20
  RouteManager: Mocked_RouteManager,
13
21
  }));
@@ -15,6 +23,7 @@ jest.mock("../../RouteManager", () => ({
15
23
  jest.mock(
16
24
  "@applicaster/zapp-react-native-utils/appUtils/orientationHelper",
17
25
  () => ({
26
+ isOrientationCompatible: mockIsOrientationCompatible,
18
27
  allowedOrientationsForScreen: jest.fn(),
19
28
  getOrientation: jest.fn(),
20
29
  getScreenOrientation: jest.fn(),
@@ -25,59 +34,54 @@ jest.mock(
25
34
  })
26
35
  );
27
36
 
28
- let mock_navBarVisibleFlag = true;
29
-
30
- jest.mock("../navigationHandler.ts", () => ({
31
- isNavBarVisible: jest.fn(() => mock_navBarVisibleFlag),
32
- }));
33
-
34
37
  jest.mock("@applicaster/zapp-react-native-utils/analyticsUtils", () => ({
35
38
  useAnalytics: jest.fn(() => ({
36
39
  sendScreenEvent: jest.fn(),
37
40
  })),
38
41
  }));
39
42
 
40
- const {
41
- allowedOrientationsForScreen,
42
- getOrientation,
43
- useGetScreenOrientation,
44
- } = require("@applicaster/zapp-react-native-utils/appUtils/orientationHelper");
45
-
46
43
  jest.mock("@applicaster/zapp-react-native-utils/theme", () => ({
47
44
  useTheme: jest.fn(() => ({
48
45
  app_background_color: "blue",
49
46
  })),
50
47
  }));
51
48
 
49
+ const NavBar = jest.fn((props) => <View testID="navBar" {...props} />);
50
+
51
+ jest.mock(
52
+ "@applicaster/zapp-react-native-app/App/Layout/layoutHelpers",
53
+ () => ({
54
+ getNavigationPluginModule: () => NavBar,
55
+ })
56
+ );
57
+
52
58
  jest.mock("@applicaster/zapp-react-native-utils/reactHooks/screen", () => ({
53
- useCurrentScreenData: jest.fn(() => ({
59
+ ...(jest.requireActual(
60
+ "@applicaster/zapp-react-native-utils/reactHooks/screen"
61
+ ) as any),
62
+ useScreenData: jest.fn(() => ({
54
63
  id: "testId",
64
+ navigations: [{ id: "testId", category: "nav_bar" }],
55
65
  })),
56
- useNavbarState: jest.fn(() => ({
57
- visible: jest.fn(() => mock_navBarVisibleFlag),
66
+ useCurrentScreenData: jest.fn(() => ({
67
+ id: "testId",
58
68
  })),
59
69
  }));
60
70
 
61
- const {
62
- useCurrentScreenData,
63
- } = require("@applicaster/zapp-react-native-utils/reactHooks/screen");
64
-
65
- const { isNavBarVisible } = require("../navigationHandler");
66
-
67
- const NavBar = jest.fn((props) => <View testID="navBar" {...props} />);
68
- const navigator = {};
69
- const navBarProps = { nav_items: [] };
70
- const screenData = {};
71
-
72
71
  jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation", () => ({
72
+ isNavBarVisible: mockIsNavBarVisible,
73
73
  useRoute: jest.fn(() => ({
74
74
  pathname: "/river/testId",
75
+ screenData: { id: "testId" },
75
76
  })),
76
77
  useNavigation: jest.fn(() => ({
77
78
  canGoBack: () => false,
78
79
  currentRoute: "/river/testId",
80
+ activeRiver: { id: "testId" },
81
+ screenData: { id: "testId" },
79
82
  data: { screen: { id: "testId" } },
80
83
  })),
84
+ useIsScreenActive: jest.fn().mockReturnValue(true),
81
85
  }));
82
86
 
83
87
  jest.mock("@applicaster/zapp-react-native-redux/hooks", () => ({
@@ -95,9 +99,18 @@ jest.mock("@applicaster/zapp-react-native-redux/hooks", () => ({
95
99
  }),
96
100
  }));
97
101
 
102
+ const {
103
+ allowedOrientationsForScreen,
104
+ getOrientation,
105
+ useGetScreenOrientation,
106
+ } = require("@applicaster/zapp-react-native-utils/appUtils/orientationHelper");
107
+
108
+ const navigator = {};
109
+ const navBarProps = { nav_items: [] };
110
+ const screenData = {};
111
+
98
112
  const screenProps = {
99
113
  pathname: "/foo/path",
100
- NavBar,
101
114
  navigator,
102
115
  navBarProps,
103
116
  screenData,
@@ -111,7 +124,6 @@ describe("<Screen Component />", () => {
111
124
  beforeEach(() => {
112
125
  allowedOrientationsForScreen.mockClear();
113
126
  getOrientation.mockClear();
114
- isNavBarVisible.mockClear();
115
127
  useGetScreenOrientation.mockClear();
116
128
  });
117
129
 
@@ -127,14 +139,9 @@ describe("<Screen Component />", () => {
127
139
 
128
140
  describe("when the navbar should be hidden", () => {
129
141
  beforeEach(() => {
130
- mock_navBarVisibleFlag = false;
131
142
  wrapper = create(<Screen {...screenProps} />);
132
143
  });
133
144
 
134
- afterEach(() => {
135
- mock_navBarVisibleFlag = true;
136
- });
137
-
138
145
  it("renders correctly", () => {
139
146
  act(() => {
140
147
  wrapper = create(<Screen {...screenProps} />);
@@ -143,45 +150,4 @@ describe("<Screen Component />", () => {
143
150
  expect(wrapper.toJSON()).toMatchSnapshot();
144
151
  });
145
152
  });
146
-
147
- it("invokes the orientation hook when the route changes", () => {
148
- act(() => {
149
- wrapper = create(<Screen {...screenProps} />);
150
- });
151
-
152
- // @ts-ignore
153
- useCurrentScreenData.mockReturnValue({
154
- id: "player-testId",
155
- general: { screen_orientation: ORIENTATIONS.landscapeSensor },
156
- plugin_type: "player",
157
- });
158
-
159
- act(() => {
160
- wrapper.update(
161
- <Screen
162
- {...screenProps}
163
- pathname="/playable"
164
- screenData={{
165
- id: "player-testId",
166
- general: { screen_orientation: ORIENTATIONS.landscapeSensor },
167
- plugin_type: "player",
168
- }}
169
- />
170
- );
171
- });
172
-
173
- useCurrentScreenData.mockReturnValue({
174
- id: "player-testId",
175
- general: { screen_orientation: ORIENTATIONS.landscapeSensor },
176
- });
177
-
178
- act(() => {
179
- wrapper.update(<Screen {...screenProps} />);
180
- });
181
-
182
- expect(allowedOrientationsForScreen).toHaveBeenNthCalledWith(
183
- 1,
184
- ORIENTATIONS.landscapeSensor
185
- );
186
- });
187
153
  });
@@ -6,17 +6,26 @@ exports[`<Screen Component /> when the navbar should be hidden renders correctly
6
6
  Object {
7
7
  "backgroundColor": "blue",
8
8
  "flex": 1,
9
+ "paddingTop": 0,
9
10
  }
10
11
  }
11
12
  >
12
13
  <View
13
- nav_items={Array []}
14
+ hasMenu={false}
15
+ id="/river/testId"
16
+ pathname="/river/testId"
17
+ selected="testId"
14
18
  testID="navBar"
19
+ title=""
15
20
  />
16
21
  <View>
17
22
  <View
18
- pathname="/foo/path"
19
- screenData={Object {}}
23
+ pathname="/river/testId"
24
+ screenData={
25
+ Object {
26
+ "id": "testId",
27
+ }
28
+ }
20
29
  testID="routeManager"
21
30
  />
22
31
  </View>
@@ -29,17 +38,26 @@ exports[`<Screen Component /> when the navbar should show renders correctly 1`]
29
38
  Object {
30
39
  "backgroundColor": "blue",
31
40
  "flex": 1,
41
+ "paddingTop": 0,
32
42
  }
33
43
  }
34
44
  >
35
45
  <View
36
- nav_items={Array []}
46
+ hasMenu={false}
47
+ id="/river/testId"
48
+ pathname="/river/testId"
49
+ selected="testId"
37
50
  testID="navBar"
51
+ title=""
38
52
  />
39
53
  <View>
40
54
  <View
41
- pathname="/foo/path"
42
- screenData={Object {}}
55
+ pathname="/river/testId"
56
+ screenData={
57
+ Object {
58
+ "id": "testId",
59
+ }
60
+ }
43
61
  testID="routeManager"
44
62
  />
45
63
  </View>
@@ -1,183 +1,6 @@
1
- import { isNavBarVisible, isMenuVisible } from "../navigationHandler";
1
+ import { isMenuVisible } from "../navigationHandler";
2
2
 
3
3
  describe("NavigationHandler", () => {
4
- describe("isNavBarVisible", () => {
5
- it("returns false when the route is a player route", () => {
6
- const navBarVisible = isNavBarVisible(
7
- "/playable/some_vod_item",
8
- {},
9
- undefined,
10
- false
11
- );
12
-
13
- expect(navBarVisible).toBe(false);
14
- });
15
-
16
- it("returns false when the next screen is the QB search screen", () => {
17
- const navBarVisible = isNavBarVisible(
18
- "/river/A1234",
19
- {
20
- type: "qb_search_screen",
21
- },
22
- undefined,
23
- false
24
- );
25
-
26
- expect(navBarVisible).toBe(false);
27
- });
28
-
29
- describe("when screen is a hook", () => {
30
- it("returns true if the `showNavBar` flag is set to true", () => {
31
- const navBarVisible = isNavBarVisible(
32
- "",
33
- {
34
- hookPlugin: {
35
- module: {
36
- showNavBar: true,
37
- },
38
- },
39
- },
40
- undefined,
41
- false
42
- );
43
-
44
- expect(navBarVisible).toBe(true);
45
- });
46
-
47
- it("returns true if presentFullScreen flag is set to false", () => {
48
- const navBarVisible = isNavBarVisible(
49
- "",
50
- {
51
- hookPlugin: {
52
- module: {
53
- presentFullScreen: false,
54
- },
55
- },
56
- },
57
- undefined,
58
- false
59
- );
60
-
61
- expect(navBarVisible).toBe(true);
62
- });
63
-
64
- it("returns false if presentFullScreen flag is set to true", () => {
65
- const navBarVisible = isNavBarVisible(
66
- "",
67
- {
68
- hookPlugin: {
69
- module: {
70
- presentFullScreen: true,
71
- },
72
- },
73
- },
74
- undefined,
75
- false
76
- );
77
-
78
- expect(navBarVisible).toBe(false);
79
- });
80
- });
81
-
82
- it("returns false if the screen's general settings allow screen presentation", () => {
83
- const navBarVisible = isNavBarVisible(
84
- "",
85
- {
86
- general: {
87
- allow_screen_plugin_presentation: true,
88
- },
89
- },
90
- undefined,
91
- false
92
- );
93
-
94
- expect(navBarVisible).toBe(false);
95
- });
96
-
97
- it("returns false if the screen's general settings hide app nav bar", () => {
98
- const navBarVisible = isNavBarVisible(
99
- "",
100
- {
101
- general: {
102
- hide_app_nav_bar: true,
103
- },
104
- },
105
- undefined,
106
- false
107
- );
108
-
109
- expect(navBarVisible).toBe(false);
110
- });
111
-
112
- it("returns false if it's secondary nav bar and hide_secondary_level_menu is true", () => {
113
- const navBarVisible = isNavBarVisible(
114
- "",
115
- {
116
- navigations: [
117
- {
118
- styles: {
119
- hide_secondary_level_menu: true,
120
- },
121
- },
122
- ],
123
- },
124
- undefined,
125
- true
126
- );
127
-
128
- expect(navBarVisible).toBe(false);
129
- });
130
-
131
- it("returns true if it's secondary nav bar and hide_secondary_level_menu is false", () => {
132
- const navBarVisible = isNavBarVisible(
133
- "",
134
- {
135
- navigations: [
136
- {
137
- styles: {
138
- hide_secondary_level_menu: false,
139
- },
140
- },
141
- ],
142
- },
143
- undefined,
144
- true
145
- );
146
-
147
- expect(navBarVisible).toBe(true);
148
- });
149
-
150
- it("returns true if it's first level menu and hide_secondary_level_menu is true", () => {
151
- const navBarVisible = isNavBarVisible(
152
- "",
153
- {
154
- navigations: [
155
- {
156
- styles: {
157
- hide_secondary_level_menu: false,
158
- },
159
- },
160
- ],
161
- },
162
- undefined,
163
- false
164
- );
165
-
166
- expect(navBarVisible).toBe(true);
167
- });
168
-
169
- it("returns true otherwise", () => {
170
- const navBarVisible = isNavBarVisible(
171
- "",
172
- { navigations: [] },
173
- undefined,
174
- false
175
- );
176
-
177
- expect(navBarVisible).toBe(true);
178
- });
179
- });
180
-
181
4
  describe("isMenuVisible", () => {
182
5
  it("returns false when the route is a player route", () => {
183
6
  const menuVisible = isMenuVisible("/playable/some_vod_item", {});