@applicaster/zapp-react-native-ui-components 12.0.0-alpha.9233494544 → 12.0.0-alpha.9262177070

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 (69) hide show
  1. package/Components/BaseFocusable/index.tsx +2 -2
  2. package/Components/Cell/Cell.tsx +5 -9
  3. package/Components/Cell/CellWithFocusable.tsx +6 -4
  4. package/Components/Cell/TvOSCellComponent.tsx +3 -7
  5. package/Components/Focusable/Focusable.tsx +6 -1
  6. package/Components/FocusableGroup/index.tsx +10 -2
  7. package/Components/Layout/TV/__tests__/__snapshots__/index.test.tsx.snap +10 -50
  8. package/Components/Layout/TV/__tests__/index.test.tsx +19 -75
  9. package/Components/Layout/TV/index.tsx +26 -124
  10. package/Components/Layout/TV/index.web.tsx +33 -0
  11. package/Components/Layout/index.tsx +15 -11
  12. package/Components/MasterCell/DefaultComponents/ActionButton.tsx +2 -0
  13. package/Components/MasterCell/DefaultComponents/BorderContainerView/index.tsx +88 -112
  14. package/Components/MasterCell/DefaultComponents/DynamicBadge.tsx +4 -2
  15. package/Components/MasterCell/DefaultComponents/FocusableView/index.tsx +4 -1
  16. package/Components/MasterCell/DefaultComponents/ImageContainer/index.tsx +5 -1
  17. package/Components/MasterCell/DefaultComponents/Text/index.tsx +14 -2
  18. package/Components/MasterCell/DefaultComponents/__tests__/text.test.tsx +24 -9
  19. package/Components/MasterCell/DefaultComponents/tv/ButtonContainerView/index.android.tsx +4 -1
  20. package/Components/MasterCell/DefaultComponents/tv/ButtonContainerView/index.tsx +10 -2
  21. package/Components/MasterCell/SharedUI/CollapsibleTextContainer/index.ts +1 -3
  22. package/Components/MasterCell/hooks/useAsyncRendering/index.ts +1 -1
  23. package/Components/MasterCell/utils/__tests__/insertBetween.test.js +9 -0
  24. package/Components/MasterCell/utils/index.ts +17 -30
  25. package/Components/MeasurmentsPortal/BasicMeasurementsPortal.tsx +11 -7
  26. package/Components/MeasurmentsPortal/MeasurementsPortal.tsx +10 -1
  27. package/Components/Navigator/StackNavigator.tsx +48 -0
  28. package/Components/Navigator/index.ts +1 -0
  29. package/Components/PlayerContainer/PlayerContainer.tsx +6 -0
  30. package/Components/River/ComponentsMap/ComponentsMap.tsx +24 -17
  31. package/Components/River/RefreshControl.tsx +55 -1
  32. package/Components/River/TV/River.tsx +0 -22
  33. package/Components/RouteManager/index.tsx +2 -2
  34. package/Components/Screen/TV/hooks/index.ts +3 -0
  35. package/Components/Screen/TV/hooks/useInitialFocus.ts +70 -0
  36. package/Components/Screen/TV/hooks/useRestoreFocus.ts +22 -0
  37. package/Components/Screen/TV/index.web.tsx +44 -35
  38. package/Components/Screen/__tests__/Screen.test.tsx +3 -0
  39. package/Components/Screen/index.tsx +29 -1
  40. package/Components/Transitioner/Scene.tsx +24 -19
  41. package/Components/Transitioner/Transitioner.tsx +21 -28
  42. package/Components/Transitioner/__tests__/__snapshots__/Scene.test.js.snap +6 -2
  43. package/Components/Transitioner/__tests__/__snapshots__/transitioner.test.js.snap +1 -0
  44. package/Components/VideoLive/LiveImageManager.ts +28 -1
  45. package/Components/VideoModal/ModalAnimation/AnimatedScrollModal.tsx +48 -38
  46. package/Components/VideoModal/ModalAnimation/AnimatedVideoPlayerComponent.tsx +40 -33
  47. package/Components/VideoModal/ModalAnimation/AnimationComponent.tsx +98 -81
  48. package/Components/VideoModal/ModalAnimation/ModalAnimationContext.tsx +23 -4
  49. package/Components/VideoModal/ModalAnimation/utils.ts +6 -4
  50. package/Components/VideoModal/PlayerDetails.tsx +3 -3
  51. package/Components/VideoModal/PlayerWrapper.tsx +67 -60
  52. package/Components/VideoModal/VideoModal.tsx +17 -17
  53. package/Components/VideoModal/__tests__/PlayerWrapper.test.tsx +7 -0
  54. package/Components/VideoModal/__tests__/__snapshots__/PlayerWrapper.test.tsx.snap +32 -12
  55. package/Components/VideoModal/utils.ts +5 -2
  56. package/Components/Viewport/ViewportTracker/ViewportTracker.tsx +31 -40
  57. package/Contexts/FocusableGroupContext/FocusableGroupContext.ts +3 -0
  58. package/Contexts/FocusableGroupContext/FocusableGroupContextProvider.tsx +16 -0
  59. package/Contexts/FocusableGroupContext/__tests__/FocusableGroupContextProvider.test.tsx +22 -0
  60. package/Contexts/FocusableGroupContext/__tests__/withFocusableContext.test.tsx +26 -0
  61. package/Contexts/FocusableGroupContext/index.ts +7 -0
  62. package/Contexts/FocusableGroupContext/withFocusableContext.tsx +17 -0
  63. package/Contexts/ScreenContext/index.tsx +2 -2
  64. package/Contexts/ScreenDataContext/index.tsx +20 -0
  65. package/events/index.ts +1 -0
  66. package/package.json +5 -5
  67. package/Components/Layout/TV/TransitionOverlay.tsx +0 -64
  68. /package/Components/FocusableGroup/{index.android.js → index.android.ts} +0 -0
  69. /package/Components/FocusableGroup/{index.ios.js → index.ios.ts} +0 -0
@@ -0,0 +1,48 @@
1
+ import * as React from "react";
2
+ import { isEmpty } from "ramda";
3
+
4
+ import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
5
+ import { getPathAttributes } from "@applicaster/zapp-react-native-utils/navigationUtils";
6
+ import { FocusableGroup } from "@applicaster/zapp-react-native-ui-components/Components/FocusableGroup";
7
+ import { ScreenDataContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenDataContext";
8
+ import { PathnameContext } from "@applicaster/zapp-react-native-ui-components/Contexts/PathnameContext";
9
+
10
+ import { Screen } from "../Screen/TV/index.web";
11
+
12
+ type Components = {
13
+ NavBar: React.ComponentType<any>;
14
+ Background: React.ComponentType<any>;
15
+ };
16
+
17
+ type Props = {
18
+ Components: Components;
19
+ };
20
+
21
+ export const StackNavigator = ({ Components }: Props) => {
22
+ const { mainStack, currentRoute } = useNavigation();
23
+
24
+ const renderScreen = ({ route, state }) => {
25
+ const pathAttributes = getPathAttributes({ pathname: route });
26
+
27
+ if (isEmpty(pathAttributes)) {
28
+ return null;
29
+ }
30
+
31
+ return (
32
+ <FocusableGroup
33
+ id={route}
34
+ preferredFocus={route === currentRoute}
35
+ excludeFromFocusSearching
36
+ key={route}
37
+ >
38
+ <ScreenDataContext.Provider value={state}>
39
+ <PathnameContext.Provider value={route}>
40
+ <Screen route={route} Components={Components} />
41
+ </PathnameContext.Provider>
42
+ </ScreenDataContext.Provider>
43
+ </FocusableGroup>
44
+ );
45
+ };
46
+
47
+ return <>{mainStack.map(renderScreen)}</>;
48
+ };
@@ -0,0 +1 @@
1
+ export { StackNavigator } from "./StackNavigator";
@@ -252,6 +252,11 @@ const PlayerContainerComponent = (props: Props) => {
252
252
  }
253
253
 
254
254
  showNavBar(true);
255
+
256
+ // Hack to close player screen on mobile only (tv handles that in InteractionManager)
257
+ if (!isTV()) {
258
+ navigator.goBack();
259
+ }
255
260
  }, [isModal, navigator.goBack, showNavBar]);
256
261
 
257
262
  const playEntry = (entry) => navigator.replaceTop(entry, { mode });
@@ -673,6 +678,7 @@ const PlayerContainerComponent = (props: Props) => {
673
678
  setNextVideoPreloadThresholdPercentage={
674
679
  setNextVideoPreloadThresholdPercentage
675
680
  }
681
+ startComponentsAnimation={startComponentsAnimation}
676
682
  >
677
683
  {renderApplePlayer(applePlayerProps)}
678
684
  </Player>
@@ -1,6 +1,6 @@
1
1
  import * as React from "react";
2
2
  import * as R from "ramda";
3
- import { View, StyleSheet, Platform, Animated, FlatList } from "react-native";
3
+ import { View, StyleSheet, Platform, FlatList } from "react-native";
4
4
  import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
5
5
  import { RiverItem } from "../RiverItem";
6
6
  import { RiverFooter } from "../RiverFooter";
@@ -217,7 +217,7 @@ function ComponentsMapComponent(props: Props) {
217
217
 
218
218
  const { height: headerHeight, scrollState } = navBarStore.getState();
219
219
 
220
- const offsetY = nativeEvent.contentOffset.y;
220
+ const offsetY = Math.max(0, nativeEvent.contentOffset.y);
221
221
 
222
222
  if (
223
223
  !(scrollState === 0 || scrollState === -headerHeight) &&
@@ -240,7 +240,7 @@ function ComponentsMapComponent(props: Props) {
240
240
  const _onScrollEndDrag = React.useCallback(({ nativeEvent }) => {
241
241
  const { height: headerHeight, scrollState } = navBarStore.getState();
242
242
 
243
- const offsetY = nativeEvent.contentOffset.y;
243
+ const offsetY = Math.max(0, nativeEvent.contentOffset.y);
244
244
 
245
245
  if (
246
246
  !(scrollState === 0 || scrollState === -headerHeight) &&
@@ -260,6 +260,26 @@ function ComponentsMapComponent(props: Props) {
260
260
  }
261
261
  }, []);
262
262
 
263
+ const onScroll = React.useCallback((event) => {
264
+ const {
265
+ nativeEvent: {
266
+ contentOffset: { y },
267
+ layoutMeasurement: { height },
268
+ contentSize: { height: contentHeight },
269
+ },
270
+ } = event;
271
+
272
+ if (y >= 0 && y + height <= contentHeight) {
273
+ scrollY.setValue(y);
274
+ } else {
275
+ if (y <= 0) {
276
+ scrollY.setValue(0);
277
+ } else if (y + height > contentHeight) {
278
+ scrollY.setValue(contentHeight - height);
279
+ }
280
+ }
281
+ }, []);
282
+
263
283
  if (shouldShowLoadingError) {
264
284
  return <RiverError />;
265
285
  }
@@ -298,20 +318,7 @@ function ComponentsMapComponent(props: Props) {
298
318
  ListFooterComponent={renderFooter}
299
319
  refreshControl={refreshControl}
300
320
  onScrollBeginDrag={onScrollBeginDrag}
301
- onScroll={Animated.event(
302
- [
303
- {
304
- nativeEvent: {
305
- contentOffset: {
306
- y: scrollY,
307
- },
308
- },
309
- },
310
- ],
311
- {
312
- useNativeDriver: false,
313
- }
314
- )}
321
+ onScroll={onScroll}
315
322
  onMomentumScrollEnd={_onMomentumScrollEnd}
316
323
  onScrollEndDrag={_onScrollEndDrag}
317
324
  scrollEventThrottle={16}
@@ -1,5 +1,9 @@
1
1
  import * as React from "react";
2
- import { RefreshControl as RNRefreshControl } from "react-native";
2
+ import {
3
+ Platform,
4
+ RefreshControl as RNRefreshControl,
5
+ StyleSheet,
6
+ } from "react-native";
3
7
  import * as R from "ramda";
4
8
  import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
5
9
  import { useLocalizedStrings } from "@applicaster/zapp-react-native-utils/localizationUtils";
@@ -8,10 +12,30 @@ import { useSendAnalyticsEventWithFunction } from "@applicaster/zapp-react-nativ
8
12
  import { useCurrentScreenData } from "@applicaster/zapp-react-native-utils/reactHooks/screen";
9
13
  import { loadPipesData } from "@applicaster/zapp-react-native-redux/ZappPipes";
10
14
  import { useDispatch } from "react-redux";
15
+ import { useShallow } from "zustand/react/shallow";
16
+ import { useScreenContextV2 } from "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenContext";
17
+ import { useSafeAreaInsets } from "react-native-safe-area-context";
11
18
 
12
19
  const BRIGHTNESS_THRESHOLD = 160;
13
20
  const ABOVE_DEFAULT_COLOR = "gray";
14
21
  const BELOW_DEFAULT_COLOR = "white";
22
+ const BASE_INDICATOR_HEIGHT = 40;
23
+ const BASE_INDICATOR_OFFSET = 16;
24
+
25
+ /** Return spacing required to position indicator below the navbar bottom line (Android only) */
26
+ const getRefreshControlOffset = () => {
27
+ return Platform.OS === "ios"
28
+ ? 0
29
+ : BASE_INDICATOR_HEIGHT + BASE_INDICATOR_OFFSET;
30
+ };
31
+
32
+ const styles = StyleSheet.create({
33
+ // eslint-disable-next-line react-native/no-color-literals
34
+ control: {
35
+ zIndex: 1,
36
+ backgroundColor: "transparent",
37
+ },
38
+ });
15
39
 
16
40
  const getBrightness = (RGBcolor) => {
17
41
  const RGBvalues = RGBcolor.substring(
@@ -91,6 +115,34 @@ export const usePullToRefresh = (
91
115
  };
92
116
  };
93
117
 
118
+ /** Returns the offset for the progress view of the RefreshControl component
119
+ * based on navbar content position */
120
+ export const useGetProgressViewOffset = () => {
121
+ const { _navBarStore } = useScreenContextV2();
122
+ const { top } = useSafeAreaInsets();
123
+
124
+ const offset = getRefreshControlOffset();
125
+
126
+ const { height, contentPosition } = _navBarStore(
127
+ useShallow(({ contentPosition, height }) => ({ contentPosition, height }))
128
+ );
129
+
130
+ if (height === 0) {
131
+ return offset;
132
+ }
133
+
134
+ switch (contentPosition) {
135
+ case "on_bottom_status_bar":
136
+ // navbar height
137
+ return offset + height;
138
+ case "on_top_screen":
139
+ // navbar height + status bar height
140
+ return offset + height + top;
141
+ default:
142
+ return offset;
143
+ }
144
+ };
145
+
94
146
  export function RefreshControl(props: {
95
147
  pullToRefreshPipesV1RefreshingStateUpdater?: (refreshing: boolean) => void;
96
148
  refreshingPipesV1?: boolean;
@@ -211,6 +263,7 @@ export function RefreshControl(props: {
211
263
  refreshing={refreshing}
212
264
  onRefresh={onRefreshHandler}
213
265
  colors={[preparedIndicatorColor]}
266
+ progressViewOffset={useGetProgressViewOffset()}
214
267
  progressBackgroundColor={preparedIndicatorBackgroundColor}
215
268
  // @ts-ignore in RN68 this `size` became string
216
269
  size={indicatorSize}
@@ -222,6 +275,7 @@ export function RefreshControl(props: {
222
275
  : null
223
276
  }
224
277
  titleColor={preparedTitleUnderIndicatorColor}
278
+ style={styles.control}
225
279
  />
226
280
  );
227
281
  }
@@ -7,14 +7,10 @@ import * as R from "ramda";
7
7
  import {
8
8
  useFeedLoader,
9
9
  useLayoutVersion,
10
- useNavigationPluginData,
11
10
  } from "@applicaster/zapp-react-native-utils/reactHooks";
12
11
  import { GeneralContentScreen } from "../../GeneralContentScreen";
13
12
  import { ScreenResolver } from "@applicaster/zapp-react-native-ui-components/Components/ScreenResolver";
14
13
  import { utilsLogger } from "@applicaster/zapp-react-native-utils/logger";
15
- import { focusManager } from "@applicaster/zapp-react-native-utils/appUtils";
16
- import { toBooleanWithDefaultFalse } from "@applicaster/zapp-react-native-utils/booleanUtils";
17
- import { isWeb } from "@applicaster/zapp-react-native-utils/reactUtils";
18
14
  import {
19
15
  useNavbarState,
20
16
  useSetNavbarState,
@@ -51,8 +47,6 @@ export const River = (props: Props) => {
51
47
  const { setTitle: setScreenTitle, setSummary: setScreenSummary } =
52
48
  useSetNavbarState();
53
49
 
54
- const navigationPluginData = useNavigationPluginData();
55
-
56
50
  const rivers = useRivers();
57
51
  const isV2 = useLayoutVersion({ isV2: true });
58
52
 
@@ -99,22 +93,6 @@ export const River = (props: Props) => {
99
93
  }
100
94
  }, [feedData, screenData, screenTitle, screenSummary]);
101
95
 
102
- React.useEffect(() => {
103
- if (
104
- isWeb() &&
105
- toBooleanWithDefaultFalse(
106
- navigationPluginData?.rules?.focus_on_content
107
- ) &&
108
- river &&
109
- river.type !== "general_content"
110
- ) {
111
- const groupId = R.pathOr("river", ["groupId"], componentsMapExtraProps);
112
-
113
- focusManager.setupInitialFocus(groupId, true);
114
- focusManager.setInitialFocus();
115
- }
116
- }, [river, componentsMapExtraProps]);
117
-
118
96
  if (!river) {
119
97
  utilsLogger.error({
120
98
  message: `River ${screenData.id} not found!`,
@@ -14,7 +14,7 @@ type Props = { pathname: string; screenData: Record<string, any> };
14
14
  * @param {Props}: see props above
15
15
  */
16
16
  export function RouteManager(props: Props) {
17
- const { pathname, screenData: _screenData } = useRoute();
17
+ const { pathname, screenData } = useRoute();
18
18
  const pathAttributes = getPathAttributes({ pathname });
19
19
 
20
20
  const { screenType, screenId } = R.last(pathAttributes);
@@ -25,7 +25,7 @@ export function RouteManager(props: Props) {
25
25
  screenType={screenType}
26
26
  screenId={screenId}
27
27
  {...props}
28
- screenData={props.screenData}
28
+ screenData={screenData}
29
29
  />
30
30
  </TestId>
31
31
  );
@@ -0,0 +1,3 @@
1
+ export { useInitialFocus } from "./useInitialFocus";
2
+
3
+ export { useRestoreFocus } from "./useRestoreFocus";
@@ -0,0 +1,70 @@
1
+ import * as React from "react";
2
+ import {
3
+ useNavigationPluginData,
4
+ useIsNavBarVisible,
5
+ useRoute,
6
+ } from "@applicaster/zapp-react-native-utils/reactHooks";
7
+ import { toBooleanWithDefaultFalse } from "@applicaster/zapp-react-native-utils/booleanUtils";
8
+ import {
9
+ setFocusOnContent,
10
+ setFocusOnMenu,
11
+ } from "@applicaster/zapp-react-native-utils/appUtils/focusManagerAux";
12
+
13
+ type Return =
14
+ | {
15
+ onContent: true;
16
+ onMenu: false;
17
+ }
18
+ | {
19
+ onContent: false;
20
+ onMenu: true;
21
+ };
22
+
23
+ const getInitialFocus = (focusOnContent, isNavBarVisible): Return => {
24
+ if (focusOnContent) {
25
+ return {
26
+ onContent: true,
27
+ onMenu: false,
28
+ };
29
+ }
30
+
31
+ if (!focusOnContent && isNavBarVisible) {
32
+ // put focus on navbar
33
+ return {
34
+ onContent: false,
35
+ onMenu: true,
36
+ };
37
+ }
38
+
39
+ // we don't have navbar, put focus on content anyway
40
+ return {
41
+ onContent: true,
42
+ onMenu: false,
43
+ };
44
+ };
45
+
46
+ export const useInitialFocus = (): void => {
47
+ const navigationPluginData = useNavigationPluginData();
48
+
49
+ const focusOnContent = toBooleanWithDefaultFalse(
50
+ navigationPluginData?.rules?.focus_on_content
51
+ );
52
+
53
+ const isNavBarVisible = useIsNavBarVisible();
54
+
55
+ const { pathname: currentRoute } = useRoute();
56
+
57
+ React.useEffect(() => {
58
+ const initialFocus = getInitialFocus(focusOnContent, isNavBarVisible);
59
+
60
+ if (initialFocus.onContent) {
61
+ setFocusOnContent(currentRoute);
62
+
63
+ return;
64
+ }
65
+
66
+ if (initialFocus.onMenu) {
67
+ setFocusOnMenu(currentRoute);
68
+ }
69
+ }, []);
70
+ };
@@ -0,0 +1,22 @@
1
+ import * as React from "react";
2
+ import { isNil } from "ramda";
3
+ import { useIsScreenActive } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
4
+ import { usePrevious } from "@applicaster/zapp-react-native-utils/reactHooks/utils";
5
+ import { focusManager } from "@applicaster/zapp-react-native-utils/appUtils/focusManager";
6
+
7
+ export const useRestoreFocus = (): void => {
8
+ const isScreenActive = useIsScreenActive();
9
+ const previousIsScreenActive = usePrevious(isScreenActive);
10
+
11
+ React.useEffect(() => {
12
+ if (isNil(previousIsScreenActive)) {
13
+ // it's initial mounting of the screen, do nothing here
14
+ return;
15
+ }
16
+
17
+ if (!previousIsScreenActive && isScreenActive) {
18
+ // restore focus when we go back from next screen
19
+ focusManager.setInitialFocus();
20
+ }
21
+ }, [previousIsScreenActive, isScreenActive]);
22
+ };
@@ -1,20 +1,30 @@
1
1
  import * as React from "react";
2
2
  import { last, pathOr } from "ramda";
3
- import { ScreenResolver } from "../../ScreenResolver";
3
+ import { View, StyleSheet } from "react-native";
4
4
  import {
5
5
  getNavigationProps,
6
6
  getPathAttributes,
7
7
  resolveNavigationPlugin,
8
8
  } from "@applicaster/zapp-react-native-utils/navigationUtils";
9
9
  import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks";
10
- import { NavBarContainer } from "../../Layout/TV/NavBarContainer";
11
10
  import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
12
11
  import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
12
+ import { useScreenBackgroundColor } from "@applicaster/zapp-react-native-utils/reactHooks/screen";
13
+ import { isNilOrEmpty } from "@applicaster/zapp-react-native-utils/reactUtils/helpers";
13
14
 
14
- import {
15
- useInitialFocus,
16
- useRestoreFocus,
17
- } from "@applicaster/zapp-react-dom-ui-components/Components/River/hooks";
15
+ import { NavBarContainer } from "../../Layout/TV/NavBarContainer";
16
+ import { ScreenResolver } from "../../ScreenResolver";
17
+ import { useInitialFocus, useRestoreFocus } from "./hooks";
18
+
19
+ const styles = StyleSheet.create({
20
+ container: {
21
+ position: "absolute",
22
+ top: 0,
23
+ left: 0,
24
+ right: 0,
25
+ bottom: 0,
26
+ },
27
+ });
18
28
 
19
29
  type Components = {
20
30
  NavBar: React.ComponentType<any>;
@@ -26,15 +36,17 @@ type Props = {
26
36
  Components: Components;
27
37
  };
28
38
 
29
- const isPlayer = (routeState): boolean => {
30
- const pluginType = pathOr(
31
- "unknown_plugin_type",
32
- ["state", "screen", "plugin_type"],
33
- routeState
34
- );
39
+ const getPluginType = pathOr("unknown_plugin_type", [
40
+ "state",
41
+ "screen",
42
+ "plugin_type",
43
+ ]);
35
44
 
36
- return pluginType === "player";
37
- };
45
+ const isPlayerPlugin = (routeState): boolean =>
46
+ getPluginType(routeState) === "player";
47
+
48
+ const isLoginPlugin = (routeState): boolean =>
49
+ getPluginType(routeState) === "login";
38
50
 
39
51
  const getActiveRiver = ({
40
52
  screenId,
@@ -46,6 +58,7 @@ const getActiveRiver = ({
46
58
  if (rivers[screenId]) {
47
59
  if (screenType === "hooks") {
48
60
  const navigations = routeState?.state?.entry?.payload?.navigations;
61
+
49
62
  if (navigations) {
50
63
  return routeState.state.entry.payload;
51
64
  }
@@ -69,6 +82,7 @@ const getNavigations = ({
69
82
  // river presents
70
83
  if (screenType === "hooks") {
71
84
  const navigations = routeState?.state?.entry?.payload?.navigations;
85
+
72
86
  if (navigations) {
73
87
  return navigations;
74
88
  }
@@ -81,19 +95,21 @@ const getNavigations = ({
81
95
  return fallbackNavigations;
82
96
  };
83
97
 
84
- export const Screen = (props: Props) => {
85
- if (!props.route) {
86
- throw new Error("Required props route is missing");
98
+ export const Screen = ({ route, Components }: Props) => {
99
+ if (isNilOrEmpty(route)) {
100
+ throw Error("Required props: route is missing");
87
101
  }
88
102
 
89
103
  const navigator = useNavigation();
90
104
  const { plugins = [], rivers = [] } = usePickFromState(["plugins", "rivers"]);
91
105
 
92
- const pathAttributes = getPathAttributes({ pathname: props.route });
93
- const routeState = navigator.getStackForPathname(props.route);
106
+ const pathAttributes = getPathAttributes({ pathname: route });
107
+ const routeState = navigator.getStackForPathname(route);
94
108
 
95
109
  const { screenType, screenId } = last(pathAttributes);
96
110
 
111
+ const backgroundColor = useScreenBackgroundColor(screenId);
112
+
97
113
  useInitialFocus();
98
114
  useRestoreFocus();
99
115
 
@@ -105,14 +121,6 @@ export const Screen = (props: Props) => {
105
121
  fallbackActiveRiver: navigator.activeRiver,
106
122
  });
107
123
 
108
- console.log("debug_2", "Screen", {
109
- screenType,
110
- routeState,
111
- route: props.route,
112
- navigator,
113
- activeRiver,
114
- });
115
-
116
124
  const navigationProps = getNavigationProps({
117
125
  navigator: {
118
126
  // @ts-ignore
@@ -137,33 +145,34 @@ export const Screen = (props: Props) => {
137
145
  plugins,
138
146
  }) as QuickBrickPlugin;
139
147
 
140
- const NavBar = (props.Components.NavBar ||
148
+ const NavBar = (Components.NavBar ||
141
149
  menuPlugin.module) as React.ComponentType<any>;
142
150
 
143
- const isNavBarVisible = !isPlayer(routeState);
151
+ const isPlayer = isPlayerPlugin(routeState);
152
+ const isLogin = isLoginPlugin(routeState);
153
+
154
+ const isNavBarVisible = !isPlayer && !isLogin;
144
155
 
145
156
  const screenData =
146
- screenType === "hooks"
157
+ screenType === "hooks" || isPlayer
147
158
  ? routeState?.state?.entry
148
159
  : routeState?.state?.screen;
149
160
 
150
161
  return (
151
- <>
162
+ <View style={[styles.container, { backgroundColor }]}>
152
163
  <NavBarContainer isVisible={isNavBarVisible} onReady={noop}>
153
164
  <NavBar
154
- groupId={props.route}
155
165
  isVisible={isNavBarVisible}
156
166
  menuPlugin={menuPlugin}
157
167
  navigationProps={navigationProps}
158
- // Maybe activeRiver?
159
168
  />
160
169
  </NavBarContainer>
161
170
  <ScreenResolver
162
171
  screenType={screenType}
163
172
  screenId={screenId}
164
173
  screenData={screenData}
165
- groupId={props.route}
174
+ groupId={route}
166
175
  />
167
- </>
176
+ </View>
168
177
  );
169
178
  };
@@ -10,6 +10,8 @@ const mock_navBarVisibleFlag = true;
10
10
 
11
11
  const mockIsNavBarVisible = jest.fn(() => mock_navBarVisibleFlag);
12
12
 
13
+ const mockIsOrientationCompatible = jest.fn(() => true);
14
+
13
15
  jest.mock("react-native-safe-area-context", () => ({
14
16
  useSafeAreaInsets: () => ({ top: 44 }),
15
17
  }));
@@ -21,6 +23,7 @@ jest.mock("../../RouteManager", () => ({
21
23
  jest.mock(
22
24
  "@applicaster/zapp-react-native-utils/appUtils/orientationHelper",
23
25
  () => ({
26
+ isOrientationCompatible: mockIsOrientationCompatible,
24
27
  allowedOrientationsForScreen: jest.fn(),
25
28
  getOrientation: jest.fn(),
26
29
  getScreenOrientation: jest.fn(),
@@ -3,6 +3,10 @@ import React from "react";
3
3
  import * as R from "ramda";
4
4
  import { View } from "react-native";
5
5
  import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
6
+ import {
7
+ isOrientationCompatible,
8
+ useGetScreenOrientation,
9
+ } from "@applicaster/zapp-react-native-utils/appUtils/orientationHelper";
6
10
 
7
11
  import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
8
12
  import { getComponentModule } from "@applicaster/zapp-react-native-utils/pluginUtils";
@@ -69,7 +73,11 @@ export function Screen(_props: Props) {
69
73
  const { backgroundColor } = useScreenConfiguration(currentScreenData.id);
70
74
  const insets = useSafeAreaInsets();
71
75
 
72
- const { width: screenWidth } = useDimensions("screen", {
76
+ const {
77
+ width: screenWidth,
78
+ height,
79
+ deviceInfo,
80
+ } = useDimensions("screen", {
73
81
  fullDimensions: true,
74
82
  });
75
83
 
@@ -81,6 +89,13 @@ export function Screen(_props: Props) {
81
89
 
82
90
  const { title } = useNavbarState();
83
91
 
92
+ const isTablet = deviceInfo?.isTablet;
93
+
94
+ const { appData } = usePickFromState(["appData"]);
95
+ const isTabletPortrait = appData?.isTabletPortrait;
96
+
97
+ const layoutData = { isTablet, isTabletPortrait, width: screenWidth, height };
98
+
84
99
  const hasMenu =
85
100
  resolveNavigationPlugin({
86
101
  category: "menu",
@@ -143,6 +158,19 @@ export function Screen(_props: Props) {
143
158
 
144
159
  useScreenOrientationHandler({ screenData: targetScreenData });
145
160
 
161
+ const orientation = useGetScreenOrientation(targetScreenData);
162
+
163
+ // We prevent rendering of the screen until UI is actually rotated to screen desired orientation.
164
+ // This saves unnecessary re-renders and user will not see distorted aspect screen.
165
+ if (
166
+ !isOrientationCompatible({
167
+ orientation,
168
+ layoutData,
169
+ })
170
+ ) {
171
+ return null;
172
+ }
173
+
146
174
  return (
147
175
  <ScreenContextProvider pathname={pathname}>
148
176
  <View style={style}>