@applicaster/zapp-react-native-ui-components 12.0.0-alpha.4201443043 → 12.0.0-alpha.4223432180

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 (93) hide show
  1. package/Components/BaseFocusable/index.tsx +2 -2
  2. package/Components/Cell/Cell.tsx +34 -6
  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/Focusable/__tests__/index.android.test.tsx +72 -0
  7. package/Components/Focusable/index.android.tsx +15 -9
  8. package/Components/FocusableGroup/index.tsx +10 -2
  9. package/Components/FocusableList/FocusableChild.ts +2 -4
  10. package/Components/FocusableList/index.tsx +11 -12
  11. package/Components/FocusableScrollView/index.tsx +1 -1
  12. package/Components/FreezeWithCallback/Freeze.tsx +31 -0
  13. package/Components/FreezeWithCallback/LICENSE +21 -0
  14. package/Components/FreezeWithCallback/Suspender.tsx +17 -0
  15. package/Components/FreezeWithCallback/__tests__/index.test.tsx +170 -0
  16. package/Components/FreezeWithCallback/index.tsx +3 -0
  17. package/Components/Layout/TV/ScreenContainer.tsx +79 -5
  18. package/Components/Layout/TV/__tests__/ScreenContainer.test.tsx +38 -28
  19. package/Components/Layout/TV/__tests__/__snapshots__/ScreenContainer.test.tsx.snap +25 -13
  20. package/Components/Layout/TV/__tests__/index.test.tsx +3 -2
  21. package/Components/Layout/TV/index.tsx +52 -9
  22. package/Components/Layout/TV/index.web.tsx +33 -0
  23. package/Components/Layout/index.tsx +15 -11
  24. package/Components/MasterCell/DefaultComponents/ActionButton.tsx +2 -1
  25. package/Components/MasterCell/DefaultComponents/BorderContainerView/index.tsx +86 -116
  26. package/Components/MasterCell/DefaultComponents/FocusableView/index.tsx +16 -1
  27. package/Components/MasterCell/DefaultComponents/Image/Image.ios.tsx +6 -5
  28. package/Components/MasterCell/DefaultComponents/Image/Image.web.tsx +2 -2
  29. package/Components/MasterCell/DefaultComponents/ImageBorderContainer/index.ts +71 -0
  30. package/Components/MasterCell/DefaultComponents/LiveImage/index.tsx +20 -0
  31. package/Components/MasterCell/DefaultComponents/__tests__/image.test.js +1 -1
  32. package/Components/MasterCell/DefaultComponents/index.ts +2 -0
  33. package/Components/MasterCell/DefaultComponents/tv/ButtonContainerView/index.tsx +6 -1
  34. package/Components/MasterCell/SharedUI/ProgressBar/hooks/useFillInPercent.ts +7 -1
  35. package/Components/MasterCell/dataAdapter.ts +21 -7
  36. package/Components/MasterCell/index.tsx +5 -3
  37. package/Components/MasterCell/utils/__tests__/insertBetween.test.js +9 -0
  38. package/Components/MasterCell/utils/index.ts +17 -30
  39. package/Components/Navigator/StackNavigator.tsx +14 -5
  40. package/Components/PlayerContainer/PlayerContainer.tsx +16 -8
  41. package/Components/Screen/TV/hooks/index.ts +0 -2
  42. package/Components/Screen/TV/index.web.tsx +40 -41
  43. package/Components/Screen/__tests__/Screen.test.tsx +3 -49
  44. package/Components/Screen/index.tsx +55 -76
  45. package/Components/Screen/navigationHandler.ts +6 -3
  46. package/Components/Screen/orientationHandler.ts +18 -7
  47. package/Components/Screen/utils.ts +16 -0
  48. package/Components/ScreenResolver/index.tsx +6 -11
  49. package/Components/Transitioner/Scene.tsx +20 -12
  50. package/Components/Transitioner/Transitioner.tsx +52 -51
  51. package/Components/Transitioner/__tests__/Scene.test.js +7 -0
  52. package/Components/Transitioner/__tests__/__snapshots__/Scene.test.js.snap +8 -4
  53. package/Components/Transitioner/__tests__/__snapshots__/transitioner.test.js.snap +1 -0
  54. package/Components/VideoLive/LiveImageManager.ts +10 -0
  55. package/Components/VideoLive/PlayerLiveImageComponent.tsx +52 -24
  56. package/Components/VideoLive/__tests__/__snapshots__/PlayerLiveImageComponent.test.tsx.snap +31 -24
  57. package/Components/VideoModal/ModalAnimation/AnimatedPlayerModalWrapper.tsx +2 -14
  58. package/Components/VideoModal/ModalAnimation/AnimatedScrollModal.tsx +81 -46
  59. package/Components/VideoModal/ModalAnimation/AnimatedVideoPlayerComponent.tsx +47 -33
  60. package/Components/VideoModal/ModalAnimation/AnimationComponent.tsx +129 -86
  61. package/Components/VideoModal/ModalAnimation/ModalAnimationContext.tsx +32 -4
  62. package/Components/VideoModal/ModalAnimation/utils.ts +7 -4
  63. package/Components/VideoModal/PlayerDetails.tsx +19 -5
  64. package/Components/VideoModal/PlayerWrapper.tsx +49 -19
  65. package/Components/VideoModal/VideoModal.tsx +31 -25
  66. package/Components/VideoModal/__tests__/PlayerDetails.test.tsx +7 -0
  67. package/Components/VideoModal/__tests__/__snapshots__/PlayerDetails.test.tsx.snap +2 -0
  68. package/Components/VideoModal/__tests__/__snapshots__/PlayerWrapper.test.tsx.snap +134 -22
  69. package/Components/VideoModal/hooks/useModalSize.ts +10 -12
  70. package/Components/VideoModal/utils.ts +5 -2
  71. package/Components/ZappFrameworkComponents/BarView/BarView.tsx +7 -3
  72. package/Components/ZappFrameworkComponents/BarView/Buttons/BackButton.tsx +7 -2
  73. package/Components/ZappFrameworkComponents/BarView/Buttons/CloseButton.tsx +7 -2
  74. package/Components/ZappFrameworkComponents/BarView/__tests__/BarView.test.tsx +87 -0
  75. package/Components/ZappFrameworkComponents/Buttons/ActionButton.tsx +9 -4
  76. package/Components/default-cell-renderer/__tests__/__snapshots__/defaultCellRenderer.test.tsx.snap +4 -4
  77. package/Contexts/CachedDimensionsContext/index.ts +13 -9
  78. package/Contexts/ConfirmDialogState/index.ts +1 -1
  79. package/Contexts/FocusableGroupContext/FocusableGroupContext.ts +3 -0
  80. package/Contexts/FocusableGroupContext/FocusableGroupContextProvider.tsx +16 -0
  81. package/Contexts/FocusableGroupContext/__tests__/FocusableGroupContextProvider.test.tsx +22 -0
  82. package/Contexts/FocusableGroupContext/__tests__/withFocusableContext.test.tsx +26 -0
  83. package/Contexts/FocusableGroupContext/index.ts +7 -0
  84. package/Contexts/FocusableGroupContext/withFocusableContext.tsx +17 -0
  85. package/Contexts/ScreenContext/index.tsx +6 -1
  86. package/Contexts/ScreenDataContext/index.tsx +20 -0
  87. package/const.ts +6 -0
  88. package/index.js +3 -0
  89. package/package.json +5 -5
  90. package/Components/Screen/TV/hooks/useRestoreFocus.ts +0 -22
  91. package/Contexts/ScreenDataContext/index.ts +0 -3
  92. /package/Components/FocusableGroup/{index.android.js → index.android.ts} +0 -0
  93. /package/Components/FocusableGroup/{index.ios.js → index.ios.ts} +0 -0
@@ -8,6 +8,8 @@ import { ScreenDataContext } from "@applicaster/zapp-react-native-ui-components/
8
8
  import { PathnameContext } from "@applicaster/zapp-react-native-ui-components/Contexts/PathnameContext";
9
9
 
10
10
  import { Screen } from "../Screen/TV/index.web";
11
+ import { isLast } from "@applicaster/zapp-react-native-utils/arrayUtils";
12
+ import { ScreenContextProvider } from "../../Contexts/ScreenContext";
11
13
 
12
14
  type Components = {
13
15
  NavBar: React.ComponentType<any>;
@@ -19,25 +21,32 @@ type Props = {
19
21
  };
20
22
 
21
23
  export const StackNavigator = ({ Components }: Props) => {
22
- const { mainStack, currentRoute } = useNavigation();
24
+ const { mainStack } = useNavigation();
23
25
 
24
- const renderScreen = ({ route, state }) => {
26
+ const renderScreen = ({ route, state }, index) => {
25
27
  const pathAttributes = getPathAttributes({ pathname: route });
26
28
 
27
29
  if (isEmpty(pathAttributes)) {
28
30
  return null;
29
31
  }
30
32
 
33
+ // HACK: Adding index to route to avoid conflicts in the navigator.
34
+ // Startup hooks are all using PUSH navigation action to navigate, but their routes are always like root routes.
35
+ // This means some hooks can have the same routes, e.g., ["hooks/context-setter", "/hooks/login-plug", "hooks/context-setter"].
36
+ const routeId = `${route}--${index}`;
37
+
31
38
  return (
32
39
  <FocusableGroup
33
40
  id={route}
34
- preferredFocus={route === currentRoute}
41
+ preferredFocus={isLast(index, mainStack.length)}
35
42
  excludeFromFocusSearching
36
- key={route}
43
+ key={routeId}
37
44
  >
38
45
  <ScreenDataContext.Provider value={state}>
39
46
  <PathnameContext.Provider value={route}>
40
- <Screen route={route} Components={Components} />
47
+ <ScreenContextProvider pathname={route}>
48
+ <Screen route={route} Components={Components} />
49
+ </ScreenContextProvider>
41
50
  </PathnameContext.Provider>
42
51
  </ScreenDataContext.Provider>
43
52
  </FocusableGroup>
@@ -124,6 +124,7 @@ const nativeStyles = {
124
124
  playerScreen: {
125
125
  flex: 1,
126
126
  backgroundColor: "black",
127
+ overflow: "hidden",
127
128
  },
128
129
  playerWrapper: {
129
130
  flex: 1,
@@ -252,6 +253,7 @@ const PlayerContainerComponent = (props: Props) => {
252
253
  }
253
254
 
254
255
  showNavBar(true);
256
+ navigator.goBack();
255
257
  }, [isModal, navigator.goBack, showNavBar]);
256
258
 
257
259
  const playEntry = (entry) => navigator.replaceTop(entry, { mode });
@@ -360,13 +362,15 @@ const PlayerContainerComponent = (props: Props) => {
360
362
  const toggleFullscreen = (event) => {
361
363
  const { fullscreen = false } = event || {};
362
364
 
363
- if (fullscreen) {
364
- playerEvent("onFullscreenPlayerWillPresent");
365
- navigator.fullscreenVideoModal();
366
- } else {
367
- playerEvent("onFullscreenPlayerWillDismiss");
368
- navigator.maximiseVideoModal();
369
- }
365
+ setTimeout(() => {
366
+ if (fullscreen) {
367
+ navigator.fullscreenVideoModal();
368
+ playerEvent("onFullscreenPlayerWillPresent");
369
+ } else {
370
+ navigator.maximiseVideoModal();
371
+ playerEvent("onFullscreenPlayerWillDismiss");
372
+ }
373
+ });
370
374
  };
371
375
 
372
376
  const onCellTap = (entry) => {
@@ -461,6 +465,10 @@ const PlayerContainerComponent = (props: Props) => {
461
465
 
462
466
  if (mode === VideoModalMode.FULLSCREEN) {
463
467
  toggleFullscreen({ fullscreen: false });
468
+
469
+ if (!isModal) {
470
+ playerManager.closeNativePlayer();
471
+ }
464
472
  }
465
473
 
466
474
  return !!(
@@ -517,7 +525,7 @@ const PlayerContainerComponent = (props: Props) => {
517
525
  }
518
526
 
519
527
  return () => {
520
- playerEvent("player_did_close");
528
+ playerEvent("player_did_close", { item });
521
529
 
522
530
  if (!isModal) {
523
531
  showNavBar(true);
@@ -1,3 +1 @@
1
1
  export { useInitialFocus } from "./useInitialFocus";
2
-
3
- export { useRestoreFocus } from "./useRestoreFocus";
@@ -1,20 +1,29 @@
1
- import * as React from "react";
2
- import { last, pathOr } from "ramda";
3
- import { View, StyleSheet } from "react-native";
1
+ import React from "react";
2
+ import { last } from "ramda";
3
+ import { StyleSheet, View } from "react-native";
4
4
  import {
5
+ findMenuPlugin,
5
6
  getNavigationProps,
6
7
  getPathAttributes,
7
- resolveNavigationPlugin,
8
8
  } from "@applicaster/zapp-react-native-utils/navigationUtils";
9
- import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks";
9
+ import {
10
+ useIsScreenActive,
11
+ useNavigation,
12
+ } from "@applicaster/zapp-react-native-utils/reactHooks";
10
13
  import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
11
14
  import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
12
- import { useScreenBackgroundColor } from "@applicaster/zapp-react-native-utils/reactHooks/screen";
15
+ import {
16
+ useNavbarState,
17
+ useScreenBackgroundColor,
18
+ } from "@applicaster/zapp-react-native-utils/reactHooks/screen";
13
19
  import { isNilOrEmpty } from "@applicaster/zapp-react-native-utils/reactUtils/helpers";
14
20
 
15
21
  import { NavBarContainer } from "../../Layout/TV/NavBarContainer";
16
22
  import { ScreenResolver } from "../../ScreenResolver";
17
- import { useInitialFocus, useRestoreFocus } from "./hooks";
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";
18
27
 
19
28
  const styles = StyleSheet.create({
20
29
  container: {
@@ -36,18 +45,6 @@ type Props = {
36
45
  Components: Components;
37
46
  };
38
47
 
39
- const getPluginType = pathOr("unknown_plugin_type", [
40
- "state",
41
- "screen",
42
- "plugin_type",
43
- ]);
44
-
45
- const isPlayerPlugin = (routeState): boolean =>
46
- getPluginType(routeState) === "player";
47
-
48
- const isLoginPlugin = (routeState): boolean =>
49
- getPluginType(routeState) === "login";
50
-
51
48
  const getActiveRiver = ({
52
49
  screenId,
53
50
  screenType,
@@ -111,7 +108,6 @@ export const Screen = ({ route, Components }: Props) => {
111
108
  const backgroundColor = useScreenBackgroundColor(screenId);
112
109
 
113
110
  useInitialFocus();
114
- useRestoreFocus();
115
111
 
116
112
  const activeRiver = getActiveRiver({
117
113
  screenId,
@@ -139,41 +135,44 @@ export const Screen = ({ route, Components }: Props) => {
139
135
  fallbackNavigations: navigator.activeRiver.navigations,
140
136
  });
141
137
 
142
- const menuPlugin = resolveNavigationPlugin({
143
- category: "menu",
144
- navigations,
145
- plugins,
146
- }) as QuickBrickPlugin;
138
+ const menuPlugin = findMenuPlugin(navigations, plugins);
147
139
 
148
140
  const NavBar = (Components.NavBar ||
149
141
  menuPlugin.module) as React.ComponentType<any>;
150
142
 
151
143
  const isPlayer = isPlayerPlugin(routeState);
152
- const isLogin = isLoginPlugin(routeState);
153
144
 
154
- const isNavBarVisible = !isPlayer && !isLogin;
145
+ const { visible: isNavBarVisible } = useNavbarState();
155
146
 
156
147
  const screenData =
157
148
  screenType === "hooks" || isPlayer
158
149
  ? routeState?.state?.entry
159
150
  : routeState?.state?.screen;
160
151
 
152
+ const isScreenActive = useIsScreenActive();
153
+
161
154
  return (
162
- <View style={[styles.container, { backgroundColor }]}>
163
- <NavBarContainer isVisible={isNavBarVisible} onReady={noop}>
164
- <NavBar
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}
165
173
  groupId={route}
166
- isVisible={isNavBarVisible}
167
- menuPlugin={menuPlugin}
168
- navigationProps={navigationProps}
169
174
  />
170
- </NavBarContainer>
171
- <ScreenResolver
172
- screenType={screenType}
173
- screenId={screenId}
174
- screenData={screenData}
175
- groupId={route}
176
- />
177
- </View>
175
+ </View>
176
+ </FreezeWithCallback>
178
177
  );
179
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(),
@@ -96,14 +99,6 @@ jest.mock("@applicaster/zapp-react-native-redux/hooks", () => ({
96
99
  }),
97
100
  }));
98
101
 
99
- const {
100
- ORIENTATIONS,
101
- } = require("@applicaster/zapp-react-native-utils/appUtils/orientationHelper");
102
-
103
- const {
104
- useCurrentScreenData,
105
- } = require("@applicaster/zapp-react-native-utils/reactHooks/screen");
106
-
107
102
  const {
108
103
  allowedOrientationsForScreen,
109
104
  getOrientation,
@@ -155,45 +150,4 @@ describe("<Screen Component />", () => {
155
150
  expect(wrapper.toJSON()).toMatchSnapshot();
156
151
  });
157
152
  });
158
-
159
- it("invokes the orientation hook when the route changes", () => {
160
- act(() => {
161
- wrapper = create(<Screen {...screenProps} />);
162
- });
163
-
164
- // @ts-ignore
165
- useCurrentScreenData.mockReturnValue({
166
- id: "player-testId",
167
- general: { screen_orientation: ORIENTATIONS.landscapeSensor },
168
- plugin_type: "player",
169
- });
170
-
171
- act(() => {
172
- wrapper.update(
173
- <Screen
174
- {...screenProps}
175
- pathname="/playable"
176
- screenData={{
177
- id: "player-testId",
178
- general: { screen_orientation: ORIENTATIONS.landscapeSensor },
179
- plugin_type: "player",
180
- }}
181
- />
182
- );
183
- });
184
-
185
- useCurrentScreenData.mockReturnValue({
186
- id: "player-testId",
187
- general: { screen_orientation: ORIENTATIONS.landscapeSensor },
188
- });
189
-
190
- act(() => {
191
- wrapper.update(<Screen {...screenProps} />);
192
- });
193
-
194
- expect(allowedOrientationsForScreen).toHaveBeenNthCalledWith(
195
- 1,
196
- ORIENTATIONS.landscapeSensor
197
- );
198
- });
199
153
  });
@@ -1,16 +1,19 @@
1
1
  /// <reference types="@applicaster/applicaster-types" />
2
2
  import React from "react";
3
- import * as R from "ramda";
4
3
  import { View } from "react-native";
5
4
  import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
5
+ import {
6
+ isOrientationCompatible,
7
+ useGetScreenOrientation,
8
+ } from "@applicaster/zapp-react-native-utils/appUtils/orientationHelper";
6
9
 
7
10
  import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
8
11
  import { getComponentModule } from "@applicaster/zapp-react-native-utils/pluginUtils";
9
12
  import {
10
- getNavigationPropsV2,
11
- resolveNavigationPlugin,
13
+ shouldNavBarDisplayMenu,
14
+ getNavBarProps,
15
+ getScreenId,
12
16
  } from "@applicaster/zapp-react-native-utils/navigationUtils";
13
- import { useSafeAreaInsets } from "react-native-safe-area-context";
14
17
  import {
15
18
  useDimensions,
16
19
  useRoute,
@@ -21,39 +24,18 @@ import {
21
24
  } from "@applicaster/zapp-react-native-utils/reactHooks";
22
25
  import { getNavigationPluginModule } from "@applicaster/zapp-react-native-app/App/Layout/layoutHelpers";
23
26
 
24
- import { ScreenContextProvider } from "../../Contexts/ScreenContext";
25
27
  import { RouteManager } from "../RouteManager";
26
28
  import { useScreenConfiguration } from "../River/useScreenConfiguration";
27
- import { useScreenOrientationHandler } from "./orientationHandler";
28
-
29
- const getScreenId = (
30
- screenData: LegacyNavigationScreenData,
31
- fallbackRiver: ZappRiver
32
- ) => {
33
- return screenData?.targetScreen
34
- ? screenData?.targetScreen?.id ?? fallbackRiver.id
35
- : "screen_id" in screenData
36
- ? screenData.screen_id
37
- : fallbackRiver.id;
29
+ import { isValidColor } from "./utils";
30
+
31
+ const screenStyles = {
32
+ flex: 1,
33
+ paddingTop: 0,
34
+ // paddingBottom: insets.bottom, // Should be applied directly by UI plugin
35
+ // paddingLeft: insets.left, // Should be applied directly by UI plugin
36
+ // paddingRight: insets.right, // Should be applied directly by UI plugin
38
37
  };
39
38
 
40
- function colorIsNotTransparent(color) {
41
- const layers = R.compose(
42
- R.map(R.trim),
43
- R.split(","),
44
- R.replace(")", ""),
45
- R.replace("rgba(", "")
46
- )(color);
47
-
48
- const alpha = Number(layers?.[3]);
49
-
50
- return alpha > 0;
51
- }
52
-
53
- function isValidColor(string) {
54
- return string && string !== "transparent" && colorIsNotTransparent(string);
55
- }
56
-
57
39
  type Props = {
58
40
  pathname: unknown;
59
41
  screenData: unknown;
@@ -67,9 +49,12 @@ export function Screen(_props: Props) {
67
49
  // Gets the data for the current screen configuration
68
50
  const currentScreenData = useCurrentScreenData();
69
51
  const { backgroundColor } = useScreenConfiguration(currentScreenData.id);
70
- const insets = useSafeAreaInsets();
71
52
 
72
- const { width: screenWidth } = useDimensions("screen", {
53
+ const {
54
+ width: screenWidth,
55
+ height,
56
+ deviceInfo,
57
+ } = useDimensions("screen", {
73
58
  fullDimensions: true,
74
59
  });
75
60
 
@@ -81,30 +66,19 @@ export function Screen(_props: Props) {
81
66
 
82
67
  const { title } = useNavbarState();
83
68
 
84
- const hasMenu =
85
- resolveNavigationPlugin({
86
- category: "menu",
87
- navigations: currentRiver.navigations,
88
- plugins,
89
- })?.identifier === "quick_brick_side_menu";
90
-
91
- const navBarProps = React.useMemo<MobileNavBarPluginProps | null>(() => {
92
- const props = getNavigationPropsV2({
93
- currentRiver,
94
- title,
95
- category: "nav_bar",
96
- });
97
-
98
- if (props) {
99
- return {
100
- ...props,
101
- id: pathname,
102
- pathname: pathname,
103
- };
104
- }
105
-
106
- return null;
107
- }, [currentRiver, pathname]);
69
+ const isTablet = deviceInfo?.isTablet;
70
+
71
+ const { appData } = usePickFromState(["appData"]);
72
+ const isTabletPortrait = appData?.isTabletPortrait;
73
+
74
+ const layoutData = { isTablet, isTabletPortrait, width: screenWidth, height };
75
+
76
+ const hasMenu = shouldNavBarDisplayMenu(currentRiver, plugins);
77
+
78
+ const navBarProps = React.useMemo<MobileNavBarPluginProps | null>(
79
+ getNavBarProps(currentRiver, pathname, title),
80
+ [currentRiver, pathname]
81
+ );
108
82
 
109
83
  const NavBar = React.useMemo(
110
84
  () =>
@@ -126,33 +100,38 @@ export function Screen(_props: Props) {
126
100
 
127
101
  const style = React.useMemo(
128
102
  () => ({
129
- flex: 1,
103
+ ...screenStyles,
130
104
  backgroundColor: isValidColor(backgroundColor)
131
105
  ? backgroundColor
132
106
  : theme.app_background_color,
133
- paddingTop: 0,
134
- // paddingBottom: insets.bottom, // Should be applied directly by UI plugin
135
- // paddingLeft: insets.left, // Should be applied directly by UI plugin
136
- // paddingRight: insets.right, // Should be applied directly by UI plugin
137
107
  }),
138
- [insets, screenWidth, theme.app_background_color, backgroundColor]
108
+ [theme.app_background_color, backgroundColor]
139
109
  );
140
110
 
141
111
  const targetScreenData =
142
112
  currentScreenData || (screenData as any)?.targetScreen || screenData;
143
113
 
144
- useScreenOrientationHandler({ screenData: targetScreenData });
114
+ const orientation = useGetScreenOrientation(targetScreenData);
115
+
116
+ // We prevent rendering of the screen until UI is actually rotated to screen desired orientation.
117
+ // This saves unnecessary re-renders and user will not see distorted aspect screen.
118
+ if (
119
+ !isOrientationCompatible({
120
+ orientation,
121
+ layoutData,
122
+ })
123
+ ) {
124
+ return <View style={style} />;
125
+ }
145
126
 
146
127
  return (
147
- <ScreenContextProvider pathname={pathname}>
148
- <View style={style}>
149
- {navBarProps && <NavBar {...navBarProps} hasMenu={hasMenu} />}
150
-
151
- <OfflineFallbackScreen screenData={targetScreenData}>
152
- {/* @TODO RouteManager doesn't use props, can they be removed ? */}
153
- <RouteManager pathname={pathname} screenData={screenData} />
154
- </OfflineFallbackScreen>
155
- </View>
156
- </ScreenContextProvider>
128
+ <View style={style}>
129
+ {navBarProps && <NavBar {...navBarProps} hasMenu={hasMenu} />}
130
+
131
+ <OfflineFallbackScreen screenData={targetScreenData}>
132
+ {/* @TODO RouteManager doesn't use props, can they be removed ? */}
133
+ <RouteManager pathname={pathname} screenData={screenData} />
134
+ </OfflineFallbackScreen>
135
+ </View>
157
136
  );
158
137
  }
@@ -5,6 +5,11 @@
5
5
  * is similar to the navbar, except that it covers scenarios where only the navbar (and not)
6
6
  * the menu, will be hidden
7
7
  *
8
+ * - playable screens
9
+ * - qb_search_screen
10
+ * - screen hooks that specify showNavBar or presentFullScreen
11
+ * - screens or nested screens that have allow_screen_plugin_presentation set to true
12
+ *
8
13
  * @param {String} route current route of the screen
9
14
  * @param {Object} screenData payload associated with the currently presented screen
10
15
  * @returns {Boolean}
@@ -21,9 +26,7 @@ export function isMenuVisible(route, screenData) {
21
26
  if (screenData?.hookPlugin) {
22
27
  const hookPlugin = screenData?.hookPlugin?.module;
23
28
 
24
- return (
25
- hookPlugin?.showNavBar || hookPlugin?.presentFullScreen !== true || false
26
- );
29
+ return hookPlugin?.showNavBar || hookPlugin?.presentFullScreen !== true;
27
30
  }
28
31
 
29
32
  if (
@@ -1,14 +1,16 @@
1
1
  import React, { useLayoutEffect } from "react";
2
+
2
3
  import {
3
4
  allowedOrientationsForScreen,
4
5
  ORIENTATIONS,
5
6
  getOrientation,
6
7
  useGetScreenOrientation,
7
8
  } from "@applicaster/zapp-react-native-utils/appUtils/orientationHelper";
8
-
9
+ import { usePrevious } from "@applicaster/zapp-react-native-utils/reactHooks/utils";
9
10
  import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
10
11
  import { findPluginByType } from "@applicaster/zapp-react-native-utils/pluginUtils";
11
12
  import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
13
+
12
14
  import { ZappHookModalContext } from "../../Contexts";
13
15
  import { HookModalContextT } from "../../Contexts/ZappHookModalContext";
14
16
 
@@ -79,14 +81,23 @@ export function useNewOrientationForScreenData({
79
81
  screenOrientation;
80
82
  }
81
83
 
82
- export function useScreenOrientationHandler({
83
- screenData,
84
- }: OrientationHookArgs) {
84
+ type Props = {
85
+ screenData: {
86
+ screen: {};
87
+ };
88
+ isActive: boolean;
89
+ };
90
+
91
+ export function useScreenOrientationHandler({ screenData, isActive }: Props) {
85
92
  const { isHooksExecutionInProgress } = React.useContext<HookModalContextT>(
86
93
  ZappHookModalContext.ReactContext
87
94
  );
88
95
 
89
- const newOrientation = useNewOrientationForScreenData({ screenData });
96
+ const prevIsActive = usePrevious(isActive);
97
+
98
+ const newOrientation = useNewOrientationForScreenData({
99
+ screenData: screenData.screen,
100
+ });
90
101
 
91
102
  useLayoutEffect(() => {
92
103
  // Null means screen does not have orientation preference, so we can skip rotate
@@ -100,12 +111,12 @@ export function useScreenOrientationHandler({
100
111
  return;
101
112
  }
102
113
 
103
- if (newOrientation !== current) {
114
+ if (!prevIsActive && isActive && newOrientation !== current) {
104
115
  current = newOrientation;
105
116
 
106
117
  setOrientation(newOrientation);
107
118
  }
108
- }, [newOrientation, isHooksExecutionInProgress]);
119
+ }, [newOrientation, isHooksExecutionInProgress, prevIsActive, isActive]);
109
120
  }
110
121
 
111
122
  export function useOrientationHandler({ screenData }: OrientationHookArgs) {
@@ -0,0 +1,16 @@
1
+ import { map, split, replace, compose, trim } from "ramda";
2
+
3
+ function colorIsNotTransparent(color) {
4
+ const layers = compose(
5
+ map(trim),
6
+ split(","),
7
+ replace(")", ""),
8
+ replace("rgba(", "")
9
+ )(color);
10
+
11
+ return Number(layers?.[3]) > 0;
12
+ }
13
+
14
+ export function isValidColor(string) {
15
+ return string && string !== "transparent" && colorIsNotTransparent(string);
16
+ }
@@ -1,6 +1,5 @@
1
1
  import * as React from "react";
2
- import * as R from "ramda";
3
- import { useDispatch } from "react-redux";
2
+ import { path, prop } from "ramda";
4
3
  import {
5
4
  findPluginByType,
6
5
  findPluginByIdentifier,
@@ -15,7 +14,6 @@ import { componentsLogger } from "../../Helpers/logger";
15
14
  import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
16
15
  import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks";
17
16
  import { useScreenAnalytics } from "@applicaster/zapp-react-native-utils/analyticsUtils/helpers/hooks";
18
- import { setAppStateHasFinishedTransitioning } from "@applicaster/zapp-react-native-redux/appState";
19
17
 
20
18
  const logger = componentsLogger.addSubsystem("ScreenResolver");
21
19
 
@@ -54,11 +52,8 @@ export function ScreenResolverComponent(props: Props) {
54
52
 
55
53
  const [, setScreenContext] = ZappPipesScreenContext.useZappPipesContext();
56
54
 
57
- const dispatch = useDispatch();
58
-
59
55
  React.useEffect(() => {
60
56
  setScreenContext(rivers[screenId]);
61
- dispatch(setAppStateHasFinishedTransitioning());
62
57
  }, [screenId]);
63
58
 
64
59
  const ScreenPlugin =
@@ -100,14 +95,14 @@ export function ScreenResolverComponent(props: Props) {
100
95
  }
101
96
 
102
97
  const ScreenComponent =
103
- R.path(["module", "Component"], ScreenPlugin) ||
104
- R.prop("module", ScreenPlugin) ||
105
- R.prop("Component", ScreenPlugin) ||
98
+ path(["module", "Component"], ScreenPlugin) ||
99
+ prop("module", ScreenPlugin) ||
100
+ prop("Component", ScreenPlugin) ||
106
101
  ScreenPlugin;
107
102
 
108
103
  const configuration =
109
- R.prop("configuration", ScreenPlugin) ||
110
- R.prop("__plugin_configuration", ScreenComponent);
104
+ prop("configuration", ScreenPlugin) ||
105
+ prop("__plugin_configuration", ScreenComponent);
111
106
 
112
107
  if (ScreenComponent) {
113
108
  return (