@applicaster/zapp-react-native-ui-components 13.0.0-alpha.3592223128 → 13.0.0-alpha.3637360334

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 (200) hide show
  1. package/Components/AppContainer/__tests__/AppContainer.test.js +4 -6
  2. package/Components/AppContainer/__tests__/__snapshots__/AppContainer.test.js.snap +1 -1
  3. package/Components/AudioPlayer/AudioPlayer.tsx +7 -0
  4. package/Components/AudioPlayer/__tests__/Runtime.test.js +5 -8
  5. package/Components/AudioPlayer/__tests__/__snapshots__/Runtime.test.js.snap +4 -4
  6. package/Components/AudioPlayer/__tests__/__snapshots__/artWork.test.js.snap +3 -3
  7. package/Components/AudioPlayer/__tests__/__snapshots__/audioPlayer.test.js.snap +56 -113
  8. package/Components/AudioPlayer/__tests__/__snapshots__/audioPlayerLayout.test.js.snap +39 -23
  9. package/Components/AudioPlayer/__tests__/__snapshots__/channel.test.js.snap +3 -3
  10. package/Components/AudioPlayer/__tests__/__snapshots__/summary.test.js.snap +2 -2
  11. package/Components/AudioPlayer/__tests__/__snapshots__/title.test.js.snap +2 -2
  12. package/Components/AudioPlayer/__tests__/artWork.test.js +3 -5
  13. package/Components/AudioPlayer/__tests__/audioPlayer.test.js +3 -5
  14. package/Components/AudioPlayer/__tests__/audioPlayerLayout.test.js +7 -8
  15. package/Components/AudioPlayer/__tests__/channel.test.js +3 -5
  16. package/Components/AudioPlayer/__tests__/summary.test.js +3 -5
  17. package/Components/AudioPlayer/__tests__/title.test.js +3 -5
  18. package/Components/AudioPlayer/helpers.tsx +1 -0
  19. package/Components/BaseFocusable/index.ios.ts +1 -1
  20. package/Components/BaseFocusable/index.tsx +67 -31
  21. package/Components/Cell/Cell.tsx +18 -22
  22. package/Components/Cell/CellWithFocusable.tsx +49 -60
  23. package/Components/Cell/CellWrapper.ts +5 -0
  24. package/Components/Cell/TvOSCellComponent.tsx +23 -30
  25. package/Components/Cell/__tests__/CellWIthFocusable.test.js +13 -6
  26. package/Components/Cell/index.js +3 -1
  27. package/Components/Cell/styles.ts +17 -0
  28. package/Components/CellRendererResolver/__tests__/cellRendererResolver.test.js +50 -50
  29. package/Components/ComponentResolver/__tests__/__snapshots__/componentResolver.test.js.snap +1 -42
  30. package/Components/ComponentResolver/__tests__/componentResolver.test.js +26 -30
  31. package/Components/ContentScreen/__tests__/contentScreen.test.js +3 -3
  32. package/Components/DisplayState/__tests__/__snapshots__/displayState.test.js.snap +2 -2
  33. package/Components/ErrorScreen/index.tsx +14 -6
  34. package/Components/Focusable/Focusable.tsx +1 -54
  35. package/Components/Focusable/FocusableTvOS.tsx +6 -2
  36. package/Components/Focusable/Touchable.tsx +19 -20
  37. package/Components/Focusable/index.android.tsx +10 -3
  38. package/Components/FocusableCell/index.tsx +1 -1
  39. package/Components/FocusableGroup/FocusableTvOS.tsx +34 -86
  40. package/Components/FocusableGroup/index.tsx +0 -3
  41. package/Components/FocusableList/index.tsx +26 -10
  42. package/Components/FocusableScrollView/index.tsx +43 -13
  43. package/Components/GeneralContentScreen/utils/__tests__/useCurationAPI.test.js +76 -7
  44. package/Components/GeneralContentScreen/utils/useCurationAPI.ts +53 -9
  45. package/Components/HandlePlayable/HandlePlayable.tsx +14 -27
  46. package/Components/Layout/TV/NavBarContainer.tsx +19 -23
  47. package/Components/Layout/TV/ScreenContainer.tsx +8 -1
  48. package/Components/Layout/TV/ScreenLayoutContextProvider.tsx +5 -0
  49. package/Components/Layout/TV/__tests__/ScreenContainer.test.tsx +3 -1
  50. package/Components/Layout/TV/__tests__/__snapshots__/LayoutContainer.test.tsx.snap +1 -1
  51. package/Components/Layout/TV/__tests__/__snapshots__/NavBarContainer.test.tsx.snap +6 -5
  52. package/Components/Layout/TV/__tests__/__snapshots__/ScreenContainer.test.tsx.snap +12 -11
  53. package/Components/Layout/TV/__tests__/__snapshots__/index.test.tsx.snap +1 -1
  54. package/Components/Layout/TV/__tests__/index.test.tsx +7 -3
  55. package/Components/MasterCell/DefaultComponents/ActionButton.tsx +2 -3
  56. package/Components/MasterCell/DefaultComponents/BorderContainerView/__tests__/index.test.tsx +66 -0
  57. package/Components/MasterCell/DefaultComponents/BorderContainerView/index.tsx +4 -1
  58. package/Components/MasterCell/DefaultComponents/Image/Image.ios.tsx +10 -15
  59. package/Components/MasterCell/DefaultComponents/Image/hooks/useImage.ts +11 -7
  60. package/Components/MasterCell/DefaultComponents/ImageBorderContainer/__tests__/index.test.ts +93 -0
  61. package/Components/MasterCell/DefaultComponents/LiveImage/index.tsx +2 -2
  62. package/Components/MasterCell/DefaultComponents/SecondaryImage/__tests__/__snapshots__/Image.test.tsx.snap +3 -3
  63. package/Components/MasterCell/DefaultComponents/SecondaryImage/utils.ts +1 -1
  64. package/Components/MasterCell/DefaultComponents/__tests__/image.test.js +1 -1
  65. package/Components/MasterCell/SharedUI/CollapsibleTextContainer/__tests__/__snapshots__/index.test.tsx.snap +1 -1
  66. package/Components/MasterCell/SharedUI/ProgressBar/hooks/useFillInPercent.ts +2 -8
  67. package/Components/MasterCell/__tests__/__snapshots__/dataAdapter.test.js.snap +180 -180
  68. package/Components/MasterCell/__tests__/__snapshots__/elementMapper.test.js.snap +11 -19
  69. package/Components/MasterCell/__tests__/__snapshots__/masterCell.test.js.snap +6 -235
  70. package/Components/MasterCell/__tests__/elementMapper.test.js +18 -5
  71. package/Components/MasterCell/__tests__/masterCell.test.js +26 -26
  72. package/Components/MasterCell/hooks/useAsyncRendering/MasterCellAsyncRenderManager.ts +2 -2
  73. package/Components/MasterCell/hooks/useAsyncRendering/index.ts +2 -2
  74. package/Components/MasterCell/utils/behaviorProvider.ts +136 -0
  75. package/Components/MasterCell/utils/index.ts +9 -135
  76. package/Components/ModalComponent/Button/assets.ts +1 -1
  77. package/Components/ModalComponent/Button/index.tsx +6 -6
  78. package/Components/ModalComponent/Header/index.tsx +3 -3
  79. package/Components/NativeFocusables/{index.js → index.ts} +4 -2
  80. package/Components/OfflineHandler/NotificationView/NotificationView.lg.tsx +2 -2
  81. package/Components/OfflineHandler/NotificationView/NotificationView.samsung.tsx +2 -2
  82. package/Components/OfflineHandler/NotificationView/__tests__/index.test.tsx +0 -5
  83. package/Components/OfflineHandler/__tests__/__snapshots__/index.test.tsx.snap +7 -7
  84. package/Components/OfflineHandler/__tests__/index.test.tsx +28 -25
  85. package/Components/OfflineHandler/utils/index.ts +1 -1
  86. package/Components/PlayerContainer/PlayerContainer.tsx +22 -24
  87. package/Components/PlayerContainer/PlayerContainerContext.tsx +9 -0
  88. package/Components/PlayerContainer/ProgramInfo/index.tsx +2 -2
  89. package/Components/PlayerImageBackground/index.tsx +1 -1
  90. package/Components/River/ComponentsMap/ComponentsMap.tsx +42 -65
  91. package/Components/River/ComponentsMap/hooks/useLoadingState.ts +78 -51
  92. package/Components/River/RefreshControl.tsx +1 -1
  93. package/Components/River/RiverFooter.tsx +39 -9
  94. package/Components/River/RiverItem.tsx +37 -2
  95. package/Components/River/TV/index.tsx +6 -1
  96. package/Components/River/__tests__/__snapshots__/componentsMap.test.js.snap +114 -45
  97. package/Components/River/__tests__/__snapshots__/river.test.js.snap +21 -83
  98. package/Components/River/__tests__/componentsMap.test.js +64 -17
  99. package/Components/River/__tests__/river.test.js +75 -40
  100. package/Components/RouteManager/__tests__/__snapshots__/routeManager.test.js.snap +12 -5
  101. package/Components/RouteManager/__tests__/routeManager.test.js +29 -14
  102. package/Components/RouteManager/__tests__/testId.test.js +8 -6
  103. package/Components/Screen/TV/index.web.tsx +5 -6
  104. package/Components/Screen/__tests__/Screen.test.tsx +41 -27
  105. package/Components/Screen/__tests__/__snapshots__/Screen.test.tsx.snap +4 -4
  106. package/Components/Screen/hooks.ts +53 -0
  107. package/Components/Screen/index.tsx +16 -42
  108. package/Components/ScreenResolver/__tests__/screenResolver.test.js +95 -70
  109. package/Components/Tabs/Tab.tsx +12 -9
  110. package/Components/TextInputTv/__tests__/TextInputTv.test.js +42 -42
  111. package/Components/TextInputTv/__tests__/__snapshots__/TextInputTv.test.js.snap +7 -0
  112. package/Components/TextInputTv/index.tsx +6 -5
  113. package/Components/Touchable/__tests__/__snapshots__/touchable.test.tsx.snap +2 -2
  114. package/Components/TrackedView/index.tsx +1 -0
  115. package/Components/Transitioner/AnimationManager.js +15 -15
  116. package/Components/Transitioner/Scene.tsx +53 -24
  117. package/Components/Transitioner/Transitioner.tsx +3 -3
  118. package/Components/Transitioner/__tests__/Scene.test.js +25 -14
  119. package/Components/Transitioner/__tests__/__snapshots__/AnimationManager.test.js.snap +26 -26
  120. package/Components/Transitioner/__tests__/__snapshots__/Scene.test.js.snap +10 -50
  121. package/Components/Transitioner/__tests__/__snapshots__/config.test.js.snap +20 -20
  122. package/Components/Transitioner/__tests__/__snapshots__/transitioner.test.js.snap +4 -4
  123. package/Components/Transitioner/__tests__/transitioner.test.js +13 -4
  124. package/Components/Transitioner/index.js +8 -4
  125. package/Components/VideoLive/LiveImageManager.ts +27 -1
  126. package/Components/VideoLive/PlayerLiveImageComponent.tsx +36 -24
  127. package/Components/VideoLive/__tests__/PlayerLiveImageComponent.test.tsx +63 -8
  128. package/Components/VideoLive/__tests__/__snapshots__/PlayerLiveImageComponent.test.tsx.snap +6 -10
  129. package/Components/VideoModal/ModalAnimation/AnimatedPlayerModalWrapper.tsx +1 -1
  130. package/Components/VideoModal/ModalAnimation/AnimatedScrollModal.tsx +52 -32
  131. package/Components/VideoModal/ModalAnimation/AnimatedVideoPlayerComponent.tsx +8 -4
  132. package/Components/VideoModal/ModalAnimation/AnimationComponent.tsx +44 -22
  133. package/Components/VideoModal/ModalAnimation/ModalAnimationContext.tsx +8 -15
  134. package/Components/VideoModal/ModalAnimation/__tests__/getMoveUpValue.test.ts +108 -0
  135. package/Components/VideoModal/ModalAnimation/const.ts +5 -0
  136. package/Components/VideoModal/ModalAnimation/index.ts +4 -1
  137. package/Components/VideoModal/ModalAnimation/useModalAnimationContext.ts +6 -0
  138. package/Components/VideoModal/ModalAnimation/utils.ts +38 -2
  139. package/Components/VideoModal/OpaqueLayer.tsx +33 -0
  140. package/Components/VideoModal/PlayerDetails.tsx +9 -6
  141. package/Components/VideoModal/PlayerWrapper.tsx +18 -44
  142. package/Components/VideoModal/VideoModal.tsx +16 -25
  143. package/Components/VideoModal/__tests__/PlayerDetails.test.tsx +5 -2
  144. package/Components/VideoModal/__tests__/PlayerWrapper.test.tsx +13 -10
  145. package/Components/VideoModal/__tests__/__snapshots__/PlayerDetails.test.tsx.snap +4 -4
  146. package/Components/VideoModal/__tests__/__snapshots__/PlayerWrapper.test.tsx.snap +72 -162
  147. package/Components/VideoModal/hooks/__tests__/useDelayedPlayerDetails.test.ts +89 -0
  148. package/Components/VideoModal/hooks/index.ts +7 -0
  149. package/Components/VideoModal/hooks/useDelayedPlayerDetails.ts +49 -0
  150. package/Components/VideoModal/hooks/utils/__tests__/showDetails.test.ts +91 -0
  151. package/Components/VideoModal/hooks/utils/index.ts +33 -0
  152. package/Components/VideoModal/utils.ts +3 -5
  153. package/Components/Viewport/ViewportAware/__tests__/__snapshots__/viewportAware.test.js.snap +24 -36
  154. package/Components/Viewport/ViewportAware/__tests__/viewportAware.test.js +12 -18
  155. package/Components/Viewport/ViewportTracker/__tests__/__snapshots__/viewportTracker.test.js.snap +1 -1
  156. package/Components/Viewport/__tests__/utils.test.js +5 -4
  157. package/Components/ZappFrameworkComponents/BarView/BarView.tsx +1 -0
  158. package/Components/ZappUIComponent/Placeholder.tsx +3 -1
  159. package/Components/ZappUIComponent/__tests__/{ZappUIComponent.test.js → ZappUIComponent.test.tsx} +26 -10
  160. package/Components/ZappUIComponent/index.tsx +3 -16
  161. package/Components/default-cell-renderer/__tests__/defaultCellRenderer.test.tsx +20 -17
  162. package/Components/default-cell-renderer/viewTrees/tv/DefaultCell/__tests__/DefaultCell.test.tsx +15 -11
  163. package/Contexts/ComponentsMapOffsetContext/index.tsx +49 -0
  164. package/Contexts/ConfigutaionContext/__tests__/__snapshots__/ConfigurationProvider.test.tsx.snap +1 -1
  165. package/Contexts/FocusableGroupContext/withFocusableContext.tsx +12 -11
  166. package/Contexts/HeaderOffsetContext/index.tsx +4 -6
  167. package/Contexts/ScreenContext/index.tsx +6 -12
  168. package/Contexts/ScreenLayoutContext/index.tsx +5 -3
  169. package/Decorators/Analytics/{index.js → index.tsx} +11 -11
  170. package/Decorators/Navigator/__tests__/navigator.test.js +16 -16
  171. package/Decorators/Navigator/index.tsx +1 -1
  172. package/Decorators/RiverFeedLoader/__tests__/__snapshots__/riverFeedLoader.test.tsx.snap +77 -77
  173. package/Decorators/RiverFeedLoader/__tests__/riverFeedLoader.test.tsx +34 -39
  174. package/Decorators/RiverFeedLoader/__tests__/utils.test.ts +0 -9
  175. package/Decorators/RiverFeedLoader/index.tsx +1 -1
  176. package/Decorators/RiverFeedLoader/utils/getDatasourceUrl.ts +39 -0
  177. package/Decorators/RiverFeedLoader/utils/index.ts +29 -0
  178. package/Decorators/RiverFeedLoader/utils/usePipesContexts.ts +40 -0
  179. package/Decorators/RiverResolver/__tests__/riverResolver.test.tsx +27 -27
  180. package/Decorators/RiverResolver/index.tsx +6 -8
  181. package/Decorators/ZappPipesDataConnector/__tests__/Hero.js +1 -1
  182. package/Decorators/ZappPipesDataConnector/__tests__/zappPipesDataConnector.test.js +29 -22
  183. package/Decorators/ZappPipesDataConnector/index.tsx +7 -3
  184. package/package.json +13 -11
  185. package/tsconfig.json +2 -3
  186. package/.babelrc +0 -8
  187. package/Components/Cell/CellStyles/FallbackCellStyle/index.js +0 -157
  188. package/Components/Cell/CellStyles/Hero/index.js +0 -111
  189. package/Components/Cell/CellStyles/ScreenSelector/index.js +0 -68
  190. package/Components/Cell/CellStyles/cellStylesResolver.ts +0 -19
  191. package/Components/Cell/CellStyles/colors.js +0 -40
  192. package/Components/Cell/CellStyles/index.js +0 -15
  193. package/Components/CellRendererResolver/__tests__/__snapshots__/cellRendererResolver.test.js.snap +0 -53
  194. package/Components/RouteManager/__tests__/__snapshots__/testId.test.js.snap +0 -17
  195. package/Components/ScreenResolver/__tests__/__snapshots__/screenResolver.test.js.snap +0 -17
  196. package/Components/ZappUIComponent/__tests__/__snapshots__/ZappUIComponent.test.js.snap +0 -91
  197. package/Components/default-cell-renderer/__tests__/__snapshots__/defaultCellRenderer.test.tsx.snap +0 -338
  198. package/Decorators/Navigator/__tests__/__snapshots__/navigator.test.js.snap +0 -18
  199. package/Decorators/RiverFeedLoader/utils.ts +0 -100
  200. package/Decorators/RiverResolver/__tests__/__snapshots__/riverResolver.test.tsx.snap +0 -28
@@ -0,0 +1,33 @@
1
+ import * as React from "react";
2
+ import { StyleSheet, View } from "react-native";
3
+
4
+ import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
5
+
6
+ import { Spinner } from "../Spinner";
7
+
8
+ const styles = StyleSheet.create({
9
+ container: {
10
+ ...StyleSheet.absoluteFillObject,
11
+ alignItems: "center",
12
+ justifyContent: "center",
13
+ },
14
+ });
15
+
16
+ export const OpaqueLayer = () => {
17
+ const theme = useTheme();
18
+
19
+ return (
20
+ <View
21
+ style={[
22
+ styles.container,
23
+ {
24
+ // we assume that it's non-transparent and we could show spinner always until it will be covered by player
25
+ // this spinner hides all content under modal
26
+ backgroundColor: theme?.app_background_color,
27
+ },
28
+ ]}
29
+ >
30
+ <Spinner />
31
+ </View>
32
+ );
33
+ };
@@ -1,10 +1,11 @@
1
1
  import React, { useEffect, useRef } from "react";
2
2
  import {
3
- StyleProp,
4
- ViewStyle,
5
3
  Animated,
6
- Easing,
7
4
  Dimensions,
5
+ Easing,
6
+ StyleProp,
7
+ ViewStyle,
8
+ StyleSheet,
8
9
  } from "react-native";
9
10
  import { useTargetScreenData } from "@applicaster/zapp-react-native-utils/reactHooks/screen";
10
11
  import { ComponentsMap } from "@applicaster/zapp-react-native-ui-components/Components/River/ComponentsMap";
@@ -90,17 +91,19 @@ export const PlayerDetails = ({
90
91
  {
91
92
  // workaround for avoid wrong text-height after going back to portrait rotation
92
93
  // we don't see this view in landscape mode, so we are able to use fixed width from portrait mode
93
- width: isTablet ? undefined : SCREEN_WIDTH,
94
+ width: isTablet
95
+ ? undefined
96
+ : (StyleSheet.flatten(style)?.width ?? SCREEN_WIDTH),
94
97
  },
95
98
  ]}
96
99
  >
97
- {screenData && (
100
+ {screenData ? (
98
101
  <ComponentsMap
99
102
  riverId={screenData.id}
100
103
  feed={screenData?.data?.source}
101
104
  riverComponents={screenData.ui_components}
102
105
  />
103
- )}
106
+ ) : null}
104
107
  </Animated.View>
105
108
  );
106
109
  };
@@ -10,7 +10,8 @@ import { Edge, SafeAreaView } from "react-native-safe-area-context";
10
10
  import { isTV } from "@applicaster/zapp-react-native-utils/reactUtils";
11
11
  import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
12
12
  import { PlayerDetails } from "./PlayerDetails";
13
- import { playerDimesionsHack } from "./utils";
13
+ import { playerDimensionsHack } from "./utils";
14
+ import { useDelayedPlayerDetails } from "./hooks";
14
15
 
15
16
  import {
16
17
  AnimatedScrollModal,
@@ -121,45 +122,10 @@ const getTabletWidth = (
121
122
  return Number(width) - sidebarWidth;
122
123
  };
123
124
 
124
- const getStyles = (baseStyle, isMobile, isPortrait) => {
125
- if (isMobile && isPortrait) {
126
- return { width: SCREEN_WIDTH, height: SCREEN_HEIGHT };
127
- }
128
-
129
- if (isMobile && !isPortrait) {
130
- return { width: SCREEN_HEIGHT, height: SCREEN_WIDTH };
131
- }
132
-
133
- return baseStyle;
134
- };
135
-
136
- const showDetails = (
137
- isMobile: boolean,
138
- docked: boolean,
139
- isInlineModal
140
- ): boolean => {
141
- if (!isInlineModal) {
142
- return false;
143
- }
144
-
145
- // for mobile we always show details. Mounting of it very heavy operation.
146
- if (isMobile) {
147
- return true;
148
- }
149
-
150
- // workaround for tablets we need to mount/unmount in order to avoid PlayerDetails content dissappearing
151
- // FIXME - find out the reason of dissapearing of content
152
- if (docked) {
153
- return false;
154
- }
155
-
156
- return true;
157
- };
158
-
159
125
  const PlayerWrapperComponent = (props: Props) => {
160
126
  const {
161
127
  entry,
162
- style: baseStyle,
128
+ style,
163
129
  containerStyle,
164
130
  inline,
165
131
  docked,
@@ -174,7 +140,15 @@ const PlayerWrapperComponent = (props: Props) => {
174
140
 
175
141
  const isInlineModal = inline && isModal;
176
142
 
177
- const style = getStyles(baseStyle, !isTablet, isInlineModal);
143
+ // Mounting the PlayerDetails component is a resource-intensive process.
144
+ // Therefore, for performance reasons, we mount it with a delay to make the rotation process as smooth as possible.
145
+ // The flow is as follows: the rotation occurs first, and then, after a short delay, we mount the PlayerDetails component.
146
+ // This helps to avoid blocking the rotation and any animations related to the rotation.
147
+ const isShowPlayerDetails = useDelayedPlayerDetails({
148
+ isInline: isInlineModal,
149
+ isDocked: docked,
150
+ isPip: pip,
151
+ });
178
152
 
179
153
  const isTabletLandscape = !isTV() && isTablet && !isTabletPortrait;
180
154
 
@@ -210,8 +184,8 @@ const PlayerWrapperComponent = (props: Props) => {
210
184
  const WrapperView = React.useMemo(() => (isTV() ? View : SafeAreaView), []);
211
185
 
212
186
  const childrenStyles = React.useMemo(
213
- () => ({ ...playerDimensions, ...playerDimesionsHack }),
214
- [containerDimensions, playerDimesionsHack]
187
+ () => ({ ...playerDimensions, ...playerDimensionsHack }),
188
+ [containerDimensions, playerDimensionsHack]
215
189
  );
216
190
 
217
191
  return (
@@ -220,7 +194,7 @@ const PlayerWrapperComponent = (props: Props) => {
220
194
  style={[
221
195
  safeAreaStyles(configuration, isTablet),
222
196
  style,
223
- playerDimesionsHack,
197
+ playerDimensionsHack,
224
198
  ]}
225
199
  >
226
200
  <AnimationComponent
@@ -234,7 +208,7 @@ const PlayerWrapperComponent = (props: Props) => {
234
208
  defaultStyles.playerContainer,
235
209
  containerDimensions,
236
210
  containerStyle,
237
- playerDimesionsHack,
211
+ playerDimensionsHack,
238
212
  ]}
239
213
  >
240
214
  <AnimationComponent
@@ -253,7 +227,7 @@ const PlayerWrapperComponent = (props: Props) => {
253
227
  </View>
254
228
 
255
229
  <AnimatedScrollModal>
256
- {showDetails(!isTablet, docked, isInlineModal) && (
230
+ {isShowPlayerDetails ? (
257
231
  <AnimationComponent
258
232
  animationType={ComponentAnimationType.componentFade}
259
233
  style={defaultStyles.flex}
@@ -266,7 +240,7 @@ const PlayerWrapperComponent = (props: Props) => {
266
240
  isTablet={isTablet}
267
241
  />
268
242
  </AnimationComponent>
269
- )}
243
+ ) : null}
270
244
  </AnimatedScrollModal>
271
245
  </AnimationComponent>
272
246
  </WrapperView>
@@ -1,6 +1,6 @@
1
1
  import React from "react";
2
- import * as R from "ramda";
3
- import { StyleSheet, View, StatusBar } from "react-native";
2
+ import { equals } from "ramda";
3
+ import { StyleSheet, StatusBar } from "react-native";
4
4
 
5
5
  import { HandlePlayable } from "@applicaster/zapp-react-native-ui-components/Components/HandlePlayable";
6
6
  import {
@@ -17,17 +17,20 @@ import {
17
17
  import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks/device/useIsTablet";
18
18
 
19
19
  import { withModalNavigationContextProvider } from "../../Contexts/ModalNavigationContext";
20
- import { useModalSize } from "./hooks/useModalSize";
21
- import { useBackgroundColor } from "./hooks/useBackgroundColor";
22
- import { useInitialPlayerState } from "./hooks/useInitialPlayerState";
20
+ import {
21
+ useModalSize,
22
+ useBackgroundColor,
23
+ useInitialPlayerState,
24
+ } from "./hooks";
25
+
23
26
  import { APP_EVENTS } from "@applicaster/zapp-react-native-utils/appUtils/events";
24
- import { Spinner } from "../Spinner";
25
27
  import { PathnameContext } from "@applicaster/zapp-react-native-ui-components/Contexts/PathnameContext";
26
28
  import { ROUTE_TYPES } from "@applicaster/zapp-react-native-utils/navigationUtils/routeTypes";
27
29
  import { useSubscriberFor } from "@applicaster/zapp-react-native-utils/reactHooks/useSubscriberFor";
28
30
  import { requiresAuthentication } from "@applicaster/zapp-react-native-utils/configurationUtils";
29
31
  import { playerManager } from "@applicaster/zapp-react-native-utils/appUtils";
30
32
  import { ScreenContextProvider } from "../../Contexts/ScreenContext";
33
+ import { OpaqueLayer } from "./OpaqueLayer";
31
34
 
32
35
  import { AnimatedPlayerModalWrapper } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
33
36
 
@@ -39,17 +42,6 @@ const styles = StyleSheet.create({
39
42
  bottom: 0,
40
43
  position: "absolute",
41
44
  },
42
- // eslint-disable-next-line react-native/no-color-literals
43
- loaderContainer: {
44
- top: 0,
45
- left: 0,
46
- right: 0,
47
- bottom: 0,
48
- position: "absolute",
49
- alignItems: "center",
50
- justifyContent: "center",
51
- backgroundColor: "rgba(64,64,64,.5)",
52
- },
53
45
  });
54
46
 
55
47
  const VideoModalComponent = () => {
@@ -100,7 +92,7 @@ const VideoModalComponent = () => {
100
92
 
101
93
  const onHooksSuccess = ({ payload }) => {
102
94
  // set new modified entry
103
- if (!R.equals(payload, item)) {
95
+ if (!equals(payload, item)) {
104
96
  onVideoModalHookSuccessAnalyticsEvent();
105
97
  setVideoModalItem(payload);
106
98
  }
@@ -136,27 +128,26 @@ const VideoModalComponent = () => {
136
128
 
137
129
  <PathnameContext.Provider value={pathname}>
138
130
  <ScreenContextProvider pathname={pathname}>
139
- {itemIdHooksFinished === item?.id ? (
131
+ {/* Hide content underneath when we switch to next video in fullscreen mode */}
132
+ {mode === "FULLSCREEN" && <OpaqueLayer />}
133
+
134
+ {itemIdHooksFinished === item?.id && (
140
135
  <AnimatedPlayerModalWrapper
141
136
  style={[
142
137
  styles.container,
143
138
  {
144
139
  backgroundColor,
140
+ width: modalSize.width,
141
+ height: modalSize.height,
145
142
  },
146
143
  ]}
147
144
  >
148
145
  <HandlePlayable
149
146
  item={item}
150
147
  isModal={mode !== "PIP"}
151
- modalHeight={modalSize.height}
152
- modalWidth={modalSize.width}
153
148
  mode={mode}
154
149
  />
155
150
  </AnimatedPlayerModalWrapper>
156
- ) : (
157
- <View style={styles.loaderContainer}>
158
- <Spinner />
159
- </View>
160
151
  )}
161
152
  </ScreenContextProvider>
162
153
  </PathnameContext.Provider>
@@ -1,6 +1,5 @@
1
1
  import React from "react";
2
2
  import renderer from "react-test-renderer";
3
- import { View } from "react-native";
4
3
 
5
4
  const props = {
6
5
  entry: {},
@@ -24,7 +23,11 @@ jest.mock("react-native-safe-area-context", () => ({
24
23
 
25
24
  jest.mock(
26
25
  "@applicaster/zapp-react-native-ui-components/Components/River/ComponentsMap",
27
- () => ({ ComponentsMap: View })
26
+ () => {
27
+ const View = jest.requireActual("react-native").View;
28
+
29
+ return { ComponentsMap: View };
30
+ }
28
31
  );
29
32
 
30
33
  jest.mock("@applicaster/zapp-react-native-utils/reactHooks/screen", () => ({
@@ -1,7 +1,5 @@
1
1
  import React from "react";
2
2
 
3
- import { View } from "react-native";
4
-
5
3
  import { renderWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
6
4
 
7
5
  const props = {
@@ -17,13 +15,17 @@ const props = {
17
15
  },
18
16
  };
19
17
 
20
- const useIsTablet = jest.fn();
18
+ const mockUseIsDeviceTablet = jest.fn();
21
19
 
22
20
  jest.mock("react-native");
23
21
 
24
22
  jest.mock("react-native-gesture-handler");
25
23
 
26
- jest.mock("../PlayerDetails", () => ({ PlayerDetails: View }));
24
+ jest.mock("../PlayerDetails", () => {
25
+ const View = jest.requireActual("react-native").View;
26
+
27
+ return { PlayerDetails: View };
28
+ });
27
29
 
28
30
  jest.mock(
29
31
  "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenContext",
@@ -33,10 +35,11 @@ jest.mock(
33
35
  );
34
36
 
35
37
  jest.mock("@applicaster/zapp-react-native-utils/reactHooks/device", () => ({
36
- useIsTablet,
38
+ useIsTablet: mockUseIsDeviceTablet,
37
39
  }));
38
40
 
39
41
  jest.mock("@applicaster/zapp-react-native-utils/theme", () => ({
42
+ ...jest.requireActual("@applicaster/zapp-react-native-utils/theme"),
40
43
  useTheme: jest.fn(() => ({})),
41
44
  }));
42
45
 
@@ -59,7 +62,7 @@ jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation", () => ({
59
62
  })),
60
63
  }));
61
64
 
62
- jest.mock("../utils", () => ({ playerDimesionsHack: {} }));
65
+ jest.mock("../utils", () => ({ playerDimensionsHack: {} }));
63
66
 
64
67
  const { PlayerWrapper } = require("../PlayerWrapper");
65
68
 
@@ -68,7 +71,7 @@ const children = jest.fn(() => {});
68
71
 
69
72
  describe("PlayerWrapper", () => {
70
73
  it("renders properly", () => {
71
- useIsTablet.mockReturnValue(false);
74
+ mockUseIsDeviceTablet.mockReturnValue(false);
72
75
 
73
76
  const element = renderWithProviders(
74
77
  <PlayerWrapper {...props}>{children}</PlayerWrapper>
@@ -78,7 +81,7 @@ describe("PlayerWrapper", () => {
78
81
  });
79
82
 
80
83
  it("renders inline", () => {
81
- useIsTablet.mockReturnValue(false);
84
+ mockUseIsDeviceTablet.mockReturnValue(false);
82
85
 
83
86
  const element = renderWithProviders(
84
87
  <PlayerWrapper {...props} inline={true} isModal={true}>
@@ -90,7 +93,7 @@ describe("PlayerWrapper", () => {
90
93
  });
91
94
 
92
95
  it("renders inline on tablet in landscape orientation", () => {
93
- useIsTablet.mockReturnValue(true);
96
+ mockUseIsDeviceTablet.mockReturnValue(true);
94
97
 
95
98
  const element = renderWithProviders(
96
99
  <PlayerWrapper {...props} inline={true} isModal={true}>
@@ -102,7 +105,7 @@ describe("PlayerWrapper", () => {
102
105
  });
103
106
 
104
107
  it("renders inline and docked", () => {
105
- useIsTablet.mockReturnValue(false);
108
+ mockUseIsDeviceTablet.mockReturnValue(false);
106
109
 
107
110
  const children = jest.fn(() => {});
108
111
  const dimensions = { height: undefined, width: props.style.width };
@@ -4,7 +4,7 @@ exports[`PlayerDetails renders properly 1`] = `
4
4
  <View
5
5
  collapsable={false}
6
6
  style={
7
- Object {
7
+ {
8
8
  "backgroundColor": "transparent",
9
9
  "flex": 1,
10
10
  "marginTop": -8,
@@ -15,7 +15,7 @@ exports[`PlayerDetails renders properly 1`] = `
15
15
  >
16
16
  <View
17
17
  feed="test-source"
18
- riverComponents={Array []}
18
+ riverComponents={[]}
19
19
  riverId="test-id"
20
20
  />
21
21
  </View>
@@ -25,7 +25,7 @@ exports[`PlayerDetails renders properly on tablet in landscape orientation 1`] =
25
25
  <View
26
26
  collapsable={false}
27
27
  style={
28
- Object {
28
+ {
29
29
  "backgroundColor": "transparent",
30
30
  "flex": 1,
31
31
  "marginTop": -20,
@@ -36,7 +36,7 @@ exports[`PlayerDetails renders properly on tablet in landscape orientation 1`] =
36
36
  >
37
37
  <View
38
38
  feed="test-source"
39
- riverComponents={Array []}
39
+ riverComponents={[]}
40
40
  riverId="test-id"
41
41
  />
42
42
  </View>