@applicaster/zapp-react-native-ui-components 14.0.0-alpha.4552519200 → 14.0.0-alpha.4596155133

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 (84) hide show
  1. package/Components/AudioPlayer/mobile/Layout.tsx +1 -1
  2. package/Components/AudioPlayer/tv/Artwork.tsx +3 -2
  3. package/Components/AudioPlayer/tv/Channel.tsx +7 -7
  4. package/Components/AudioPlayer/tv/Layout.tsx +100 -93
  5. package/Components/AudioPlayer/tv/Runtime.tsx +7 -1
  6. package/Components/AudioPlayer/tv/Summary.tsx +6 -2
  7. package/Components/AudioPlayer/tv/Title.tsx +6 -2
  8. package/Components/AudioPlayer/tv/__tests__/__snapshots__/Runtime.test.js.snap +2 -2
  9. package/Components/AudioPlayer/tv/__tests__/__snapshots__/audioPlayer.test.js.snap +20 -26
  10. package/Components/AudioPlayer/tv/__tests__/__snapshots__/channel.test.js.snap +8 -17
  11. package/Components/AudioPlayer/tv/__tests__/__snapshots__/summary.test.js.snap +1 -2
  12. package/Components/AudioPlayer/tv/__tests__/__snapshots__/title.test.js.snap +1 -2
  13. package/Components/AudioPlayer/tv/helpers.tsx +10 -3
  14. package/Components/AudioPlayer/tv/index.tsx +6 -0
  15. package/Components/Cell/index.js +7 -3
  16. package/Components/ComponentResolver/index.ts +1 -1
  17. package/Components/FeedLoader/index.js +1 -1
  18. package/Components/Focusable/Focusable.tsx +5 -3
  19. package/Components/Focusable/FocusableiOS.tsx +2 -2
  20. package/Components/Focusable/__tests__/index.android.test.tsx +3 -0
  21. package/Components/Focusable/index.android.tsx +12 -8
  22. package/Components/Focusable/index.tsx +1 -1
  23. package/Components/FocusableList/index.tsx +4 -0
  24. package/Components/GeneralContentScreen/utils/__tests__/useCurationAPI.test.js +42 -59
  25. package/Components/GeneralContentScreen/utils/useCurationAPI.ts +12 -8
  26. package/Components/HandlePlayable/HandlePlayable.tsx +11 -1
  27. package/Components/Layout/TV/LayoutBackground.tsx +1 -1
  28. package/Components/MasterCell/DefaultComponents/Button.tsx +1 -1
  29. package/Components/MasterCell/DefaultComponents/FocusableView/index.tsx +4 -27
  30. package/Components/MasterCell/DefaultComponents/Image/hoc/withDimensions.tsx +1 -1
  31. package/Components/MasterCell/DefaultComponents/ImageContainer/index.tsx +1 -1
  32. package/Components/MasterCell/index.tsx +1 -1
  33. package/Components/MasterCell/utils/behaviorProvider.ts +82 -14
  34. package/Components/MasterCell/utils/index.ts +27 -3
  35. package/Components/OfflineHandler/__tests__/index.test.tsx +20 -22
  36. package/Components/PlayerContainer/ErrorDisplay/index.ts +1 -1
  37. package/Components/PlayerContainer/PlayerContainer.tsx +15 -8
  38. package/Components/PlayerContainer/ProgramInfo/index.tsx +1 -1
  39. package/Components/PlayerContainer/index.ts +1 -1
  40. package/Components/River/ComponentsMap/hooks/__tests__/useLoadingState.test.ts +379 -0
  41. package/Components/River/ComponentsMap/hooks/useLoadingState.ts +2 -2
  42. package/Components/River/RefreshControl.tsx +6 -4
  43. package/Components/River/TV/River.tsx +2 -17
  44. package/Components/River/TV/index.tsx +3 -1
  45. package/Components/River/TV/withPipesV1DataLoader.tsx +43 -0
  46. package/Components/River/TV/withRiverDataLoader.tsx +17 -0
  47. package/Components/River/index.tsx +1 -1
  48. package/Components/Screen/__tests__/Screen.test.tsx +23 -12
  49. package/Components/ScreenRevealManager/ScreenRevealManager.ts +76 -0
  50. package/Components/ScreenRevealManager/__tests__/ScreenRevealManager.test.ts +107 -0
  51. package/Components/ScreenRevealManager/__tests__/withScreenRevealManager.test.tsx +96 -0
  52. package/Components/ScreenRevealManager/index.ts +1 -0
  53. package/Components/ScreenRevealManager/withScreenRevealManager.tsx +79 -0
  54. package/Components/Tabs/TV/Tabs.android.tsx +0 -2
  55. package/Components/VideoModal/ModalAnimation/ModalAnimationContext.tsx +32 -8
  56. package/Components/VideoModal/PlayerDetails.tsx +24 -2
  57. package/Components/VideoModal/PlayerWrapper.tsx +26 -142
  58. package/Components/VideoModal/VideoModal.tsx +3 -17
  59. package/Components/VideoModal/__tests__/PlayerWrapper.test.tsx +1 -7
  60. package/Components/VideoModal/__tests__/__snapshots__/PlayerWrapper.test.tsx.snap +44 -240
  61. package/Components/VideoModal/hooks/index.ts +0 -2
  62. package/Components/VideoModal/hooks/useModalSize.ts +18 -2
  63. package/Components/VideoModal/utils.ts +6 -0
  64. package/Components/Viewport/VisibilitySensor/VisibilitySensor.tsx +3 -3
  65. package/Components/default-cell-renderer/viewTrees/tv/DefaultCell/index.ts +3 -3
  66. package/Contexts/ScreenContext/index.tsx +44 -0
  67. package/Decorators/RiverFeedLoader/index.tsx +12 -2
  68. package/Decorators/RiverFeedLoader/utils/index.ts +19 -2
  69. package/Decorators/RiverResolver/__tests__/riverResolver.test.tsx +3 -6
  70. package/Decorators/ZappPipesDataConnector/ResolverSelector.tsx +25 -0
  71. package/Decorators/ZappPipesDataConnector/__tests__/NullFeedResolver.test.tsx +78 -0
  72. package/Decorators/ZappPipesDataConnector/__tests__/ResolverSelector.test.tsx +205 -0
  73. package/Decorators/ZappPipesDataConnector/__tests__/StaticFeedResolver.test.tsx +251 -0
  74. package/Decorators/ZappPipesDataConnector/__tests__/UrlFeedResolver.test.tsx +368 -0
  75. package/Decorators/ZappPipesDataConnector/__tests__/utils.test.ts +39 -0
  76. package/Decorators/ZappPipesDataConnector/index.tsx +26 -293
  77. package/Decorators/ZappPipesDataConnector/resolvers/NullFeedResolver.tsx +25 -0
  78. package/Decorators/ZappPipesDataConnector/resolvers/StaticFeedResolver.tsx +87 -0
  79. package/Decorators/ZappPipesDataConnector/resolvers/UrlFeedResolver.tsx +268 -0
  80. package/Decorators/ZappPipesDataConnector/types.ts +29 -0
  81. package/Decorators/ZappPipesDataConnector/utils/mongoFilter.ts +738 -0
  82. package/Decorators/ZappPipesDataConnector/utils/useFilter.tsx +162 -0
  83. package/package.json +5 -9
  84. package/Components/VideoModal/hooks/useBackgroundColor.ts +0 -10
@@ -4,10 +4,6 @@ import * as React from "react";
4
4
  import { Text } from "react-native";
5
5
  import * as R from "ramda";
6
6
 
7
- import {
8
- useFeedLoader,
9
- useLayoutVersion,
10
- } from "@applicaster/zapp-react-native-utils/reactHooks";
11
7
  import { GeneralContentScreen } from "../../GeneralContentScreen";
12
8
  import { ScreenResolver } from "@applicaster/zapp-react-native-ui-components/Components/ScreenResolver";
13
9
  import { utilsLogger } from "@applicaster/zapp-react-native-utils/logger";
@@ -21,6 +17,7 @@ type Props = {
21
17
  screenId: string;
22
18
  screenData: ZappRiver | ZappEntry;
23
19
  feedUrl?: string;
20
+ feedData?: PipesDataObject["data"];
24
21
  extraProps?: any;
25
22
  screenResolverExtraProps?: any;
26
23
  componentsMapExtraProps?: any;
@@ -32,7 +29,7 @@ type Props = {
32
29
  export const River = (props: Props) => {
33
30
  const {
34
31
  screenId,
35
- feedUrl,
32
+ feedData,
36
33
  extraProps,
37
34
  screenResolverExtraProps,
38
35
  componentsMapExtraProps,
@@ -46,7 +43,6 @@ export const River = (props: Props) => {
46
43
  useSetNavbarState();
47
44
 
48
45
  const rivers = useRivers();
49
- const isV2 = useLayoutVersion({ isV2: true });
50
46
 
51
47
  const river = React.useMemo(() => rivers?.[screenId], [screenId]);
52
48
 
@@ -55,17 +51,6 @@ export const River = (props: Props) => {
55
51
  [screenId]
56
52
  );
57
53
 
58
- const connectedScreenUrl = React.useMemo(() => {
59
- // Avoid using feedUrl or content.src on layouts v2
60
- if (isV2) return null;
61
-
62
- return feedUrl || R.path(["content", "src"], screenData);
63
- }, [feedUrl, screenData]);
64
-
65
- const { data: feedData } = useFeedLoader({
66
- feedUrl: connectedScreenUrl,
67
- });
68
-
69
54
  const stringOrEmpty = (value: string | number | undefined): string =>
70
55
  R.isNil(value) ? "" : String(value);
71
56
 
@@ -2,8 +2,10 @@ import { compose } from "ramda";
2
2
  import { River as RiverComponent } from "./River";
3
3
  import { withTvEventHandler } from "./withTVEventHandler";
4
4
  import { withComponentsMapOffsetContext } from "../../../Contexts/ComponentsMapOffsetContext";
5
+ import { withRiverDataLoader } from "./withRiverDataLoader";
5
6
 
6
7
  export const River = compose(
7
8
  withTvEventHandler,
8
- withComponentsMapOffsetContext
9
+ withComponentsMapOffsetContext,
10
+ withRiverDataLoader
9
11
  )(RiverComponent);
@@ -0,0 +1,43 @@
1
+ import React, { useMemo } from "react";
2
+ import { path } from "ramda";
3
+
4
+ import {
5
+ useFeedLoader,
6
+ useRivers,
7
+ } from "@applicaster/zapp-react-native-utils/reactHooks";
8
+
9
+ type Props = {
10
+ screenId: string;
11
+ screenData: ZappRiver | ZappEntry;
12
+ feedUrl?: string;
13
+ river?: ZappRiver | ZappEntry;
14
+ };
15
+
16
+ export const withPipesV1DataLoader = (
17
+ WrappedComponent: React.ComponentType<any>
18
+ ) => {
19
+ return function WithPipesV1DataLoaderComponent(props: Props) {
20
+ const { screenId, feedUrl } = props;
21
+
22
+ const rivers = useRivers();
23
+
24
+ const river = React.useMemo(() => rivers?.[screenId], [screenId]);
25
+
26
+ const screenData = React.useMemo(
27
+ () => props.screenData || props.river || river,
28
+ [screenId]
29
+ );
30
+
31
+ const connectedScreenUrl = useMemo(() => {
32
+ // Avoid using feedUrl or content.src on layouts v2
33
+
34
+ return feedUrl || path(["content", "src"], screenData);
35
+ }, [feedUrl, screenData]);
36
+
37
+ const { data: feedData } = useFeedLoader({
38
+ feedUrl: connectedScreenUrl,
39
+ });
40
+
41
+ return <WrappedComponent {...props} feedData={feedData} />;
42
+ };
43
+ };
@@ -0,0 +1,17 @@
1
+ import { useLayoutVersion } from "@applicaster/zapp-react-native-utils/reactHooks";
2
+ import React from "react";
3
+ import { withPipesV1DataLoader } from "./withPipesV1DataLoader";
4
+
5
+ export const withRiverDataLoader = (
6
+ WrappedComponent: React.ComponentType<any>
7
+ ) => {
8
+ return function WithRiverDataLoaderComponent(props) {
9
+ const isV2 = useLayoutVersion({ isV2: true });
10
+
11
+ if (isV2) {
12
+ return <WrappedComponent {...props} />;
13
+ }
14
+
15
+ return withPipesV1DataLoader(WrappedComponent)(props);
16
+ };
17
+ };
@@ -1,5 +1,5 @@
1
1
  import * as R from "ramda";
2
- import { connectToStore } from "@applicaster/zapp-react-native-redux";
2
+ import { connectToStore } from "@applicaster/zapp-react-native-redux/utils/connectToStore";
3
3
 
4
4
  import { withRiver } from "../../Decorators/RiverResolver";
5
5
  import { withNavigator } from "../../Decorators/Navigator";
@@ -68,12 +68,33 @@ jest.mock(
68
68
  })
69
69
  );
70
70
 
71
+ jest.mock(
72
+ "@applicaster/zapp-react-native-utils/reactHooks/state/useRivers",
73
+ () => ({
74
+ useRivers: jest.fn(() => ({
75
+ rivers: [{ id: "testId", name: "Test River" }],
76
+ })),
77
+ })
78
+ );
79
+
71
80
  jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation", () => ({
72
81
  isNavBarVisible: mockIsNavBarVisible,
73
82
  useIsScreenActive: jest.fn().mockReturnValue(true),
83
+ useNavigation: jest.fn(() => ({
84
+ canGoBack: () => false,
85
+ currentRoute: "/river/testId",
86
+ activeRiver: { id: "testId" },
87
+ screenData: { id: "testId" },
88
+ data: { screen: { id: "testId" } },
89
+ })),
90
+ useRoute: jest.fn(() => ({
91
+ pathname: "/river/testId",
92
+ screenData: { id: "testId" },
93
+ })),
74
94
  }));
75
95
 
76
96
  jest.mock("@applicaster/zapp-react-native-utils/reactHooks", () => ({
97
+ ...jest.requireActual("@applicaster/zapp-react-native-utils/reactHooks"),
77
98
  useCurrentScreenData: jest.fn(() => ({
78
99
  id: "testId",
79
100
  })),
@@ -84,17 +105,6 @@ jest.mock("@applicaster/zapp-react-native-utils/reactHooks", () => ({
84
105
  id: "testId",
85
106
  navigations: [{ id: "testId", category: "nav_bar" }],
86
107
  })),
87
- useNavigation: jest.fn(() => ({
88
- canGoBack: () => false,
89
- currentRoute: "/river/testId",
90
- activeRiver: { id: "testId" },
91
- screenData: { id: "testId" },
92
- data: { screen: { id: "testId" } },
93
- })),
94
- useRoute: jest.fn(() => ({
95
- pathname: "/river/testId",
96
- screenData: { id: "testId" },
97
- })),
98
108
  useDimensions: jest.fn(() => ({
99
109
  width: 1920,
100
110
  height: 1080,
@@ -102,10 +112,11 @@ jest.mock("@applicaster/zapp-react-native-utils/reactHooks", () => ({
102
112
  useIsTablet: jest.fn(() => false),
103
113
  }));
104
114
 
105
- jest.mock("@applicaster/zapp-react-native-redux/hooks/usePickFromState", () => {
115
+ jest.mock("@applicaster/zapp-react-native-redux/hooks", () => {
106
116
  const View = jest.requireActual("react-native").View;
107
117
 
108
118
  return {
119
+ ...jest.requireActual("@applicaster/zapp-react-native-redux/hooks"),
109
120
  usePickFromState: () => ({
110
121
  plugins: [
111
122
  {
@@ -0,0 +1,76 @@
1
+ import { makeListOf } from "@applicaster/zapp-react-native-utils/arrayUtils";
2
+ import { isFirstComponentGallery } from "@applicaster/zapp-react-native-utils/componentsUtils";
3
+ import { once } from "ramda";
4
+
5
+ const INITIAL_NUMBER_TO_LOAD = 3;
6
+
7
+ // Infer the values of COMPONENT_LOADING_STATE as a type
8
+ type ComponentLoadingState =
9
+ (typeof COMPONENT_LOADING_STATE)[keyof typeof COMPONENT_LOADING_STATE];
10
+
11
+ export const COMPONENT_LOADING_STATE = {
12
+ UNKNOWN: "UNKNOWN",
13
+ LOADED_WITH_SUCCESS: "LOADED_WITH_SUCCESS",
14
+ LOADED_WITH_FAILURE: "LOADED_WITH_FAILURE",
15
+ } as const;
16
+
17
+ // Function to get the number of loaded components
18
+ const getNumberOfLoaded = (states: ComponentLoadingState[]): number => {
19
+ return states.filter((value) => value !== COMPONENT_LOADING_STATE.UNKNOWN)
20
+ .length;
21
+ };
22
+
23
+ const getNumberOfComponentsWaitToLoadBeforePresent = (
24
+ componentsToRender: ZappUIComponent[]
25
+ ): number => {
26
+ // when Gallery is the first component, no need to wait the others
27
+ if (isFirstComponentGallery(componentsToRender)) {
28
+ return 1;
29
+ }
30
+
31
+ return Math.min(INITIAL_NUMBER_TO_LOAD, componentsToRender.length);
32
+ };
33
+
34
+ export class ScreenRevealManager {
35
+ public numberOfComponentsWaitToLoadBeforePresent: number;
36
+ private renderingState: Array<ComponentLoadingState>;
37
+ private callback: Callback;
38
+
39
+ constructor(componentsToRender: ZappUIComponent[], callback: Callback) {
40
+ this.numberOfComponentsWaitToLoadBeforePresent =
41
+ getNumberOfComponentsWaitToLoadBeforePresent(componentsToRender);
42
+
43
+ this.renderingState = makeListOf<ComponentLoadingState>(
44
+ COMPONENT_LOADING_STATE.UNKNOWN,
45
+ this.numberOfComponentsWaitToLoadBeforePresent
46
+ );
47
+
48
+ this.callback = once(callback);
49
+ }
50
+
51
+ onLoadFinished = (index: number): void => {
52
+ this.renderingState[index] = COMPONENT_LOADING_STATE.LOADED_WITH_SUCCESS;
53
+
54
+ if (
55
+ getNumberOfLoaded(this.renderingState) >=
56
+ this.numberOfComponentsWaitToLoadBeforePresent
57
+ ) {
58
+ this.setIsReadyToShow();
59
+ }
60
+ };
61
+
62
+ onLoadFailed = (index: number): void => {
63
+ this.renderingState[index] = COMPONENT_LOADING_STATE.LOADED_WITH_FAILURE;
64
+
65
+ if (
66
+ getNumberOfLoaded(this.renderingState) >=
67
+ this.numberOfComponentsWaitToLoadBeforePresent
68
+ ) {
69
+ this.setIsReadyToShow();
70
+ }
71
+ };
72
+
73
+ setIsReadyToShow = (): void => {
74
+ this.callback();
75
+ };
76
+ }
@@ -0,0 +1,107 @@
1
+ import {
2
+ ScreenRevealManager,
3
+ COMPONENT_LOADING_STATE,
4
+ } from "../ScreenRevealManager";
5
+
6
+ describe("ScreenRevealManager", () => {
7
+ const mockCallback = jest.fn();
8
+
9
+ beforeEach(() => {
10
+ jest.clearAllMocks();
11
+ });
12
+
13
+ it("should initialize with the correct number of components to wait for", () => {
14
+ const componentsToRender: ZappUIComponent[] = [
15
+ { component_type: "component1" },
16
+ { component_type: "component2" },
17
+ { component_type: "component3" },
18
+ ];
19
+
20
+ const manager = new ScreenRevealManager(componentsToRender, mockCallback);
21
+
22
+ expect(manager["numberOfComponentsWaitToLoadBeforePresent"]).toBe(3);
23
+
24
+ expect(manager["renderingState"]).toEqual([
25
+ COMPONENT_LOADING_STATE.UNKNOWN,
26
+ COMPONENT_LOADING_STATE.UNKNOWN,
27
+ COMPONENT_LOADING_STATE.UNKNOWN,
28
+ ]);
29
+ });
30
+
31
+ it("should call the callback when the required number of components are loaded successfully", () => {
32
+ const componentsToRender: ZappUIComponent[] = [
33
+ { component_type: "component1" },
34
+ { component_type: "component2" },
35
+ { component_type: "component3" },
36
+ ];
37
+
38
+ const manager = new ScreenRevealManager(componentsToRender, mockCallback);
39
+
40
+ manager.onLoadFinished(0);
41
+ manager.onLoadFinished(1);
42
+ manager.onLoadFinished(2);
43
+
44
+ expect(mockCallback).toHaveBeenCalledTimes(1);
45
+ });
46
+
47
+ it("should call the callback when the required number of components fail to load", () => {
48
+ const componentsToRender: ZappUIComponent[] = [
49
+ { component_type: "component1" },
50
+ { component_type: "component2" },
51
+ { component_type: "component3" },
52
+ ];
53
+
54
+ const manager = new ScreenRevealManager(componentsToRender, mockCallback);
55
+
56
+ manager.onLoadFailed(0);
57
+ manager.onLoadFailed(1);
58
+ manager.onLoadFailed(2);
59
+
60
+ expect(mockCallback).toHaveBeenCalledTimes(1);
61
+ });
62
+
63
+ it("should call the callback when a mix of successful and failed loads meet the required number", () => {
64
+ const componentsToRender: ZappUIComponent[] = [
65
+ { component_type: "component1" },
66
+ { component_type: "component2" },
67
+ { component_type: "component3" },
68
+ ];
69
+
70
+ const manager = new ScreenRevealManager(componentsToRender, mockCallback);
71
+
72
+ manager.onLoadFinished(0);
73
+ manager.onLoadFailed(1);
74
+ manager.onLoadFinished(2);
75
+
76
+ expect(mockCallback).toHaveBeenCalledTimes(1);
77
+ });
78
+
79
+ it("should not call the callback if the required number of components are not loaded", () => {
80
+ const componentsToRender: ZappUIComponent[] = [
81
+ { component_type: "component1" },
82
+ { component_type: "component2" },
83
+ { component_type: "component3" },
84
+ ];
85
+
86
+ const manager = new ScreenRevealManager(componentsToRender, mockCallback);
87
+
88
+ manager.onLoadFinished(0);
89
+ manager.onLoadFailed(1);
90
+
91
+ expect(mockCallback).not.toHaveBeenCalled();
92
+ });
93
+
94
+ it("should call the callback when the when first component is gallery and it was loaded successfully", () => {
95
+ const componentsToRender: ZappUIComponent[] = [
96
+ { component_type: "gallery-qb" },
97
+ { component_type: "component2" },
98
+ { component_type: "component3" },
99
+ ];
100
+
101
+ const manager = new ScreenRevealManager(componentsToRender, mockCallback);
102
+
103
+ manager.onLoadFinished(0);
104
+
105
+ expect(mockCallback).toHaveBeenCalledTimes(1);
106
+ });
107
+ });
@@ -0,0 +1,96 @@
1
+ /* eslint-disable react/prop-types */
2
+
3
+ import * as React from "react";
4
+ import { render, screen, act } from "@testing-library/react-native";
5
+ import { View } from "react-native";
6
+ import {
7
+ withScreenRevealManager,
8
+ SHOWN,
9
+ TIMEOUT,
10
+ } from "../withScreenRevealManager";
11
+
12
+ // jest.mock("react-native/Libraries/Animated/NativeAnimatedHelper");
13
+
14
+ const MockComponent = ({
15
+ initialNumberToLoad,
16
+ onLoadFinishedFromScreenRevealManager,
17
+ onLoadFailedFromScreenRevealManager,
18
+ }) => {
19
+ React.useEffect(() => {
20
+ // Simulate loading components
21
+ for (let i = 0; i < initialNumberToLoad; i++) {
22
+ onLoadFinishedFromScreenRevealManager(i);
23
+ }
24
+ }, [initialNumberToLoad, onLoadFinishedFromScreenRevealManager]);
25
+
26
+ return (
27
+ <View
28
+ testID="mock-component"
29
+ initialNumberToLoad={initialNumberToLoad}
30
+ onLoadFinishedFromScreenRevealManager={
31
+ onLoadFinishedFromScreenRevealManager
32
+ }
33
+ onLoadFailedFromScreenRevealManager={onLoadFailedFromScreenRevealManager}
34
+ />
35
+ );
36
+ };
37
+
38
+ const WrappedComponent = withScreenRevealManager(MockComponent);
39
+
40
+ describe.skip("withScreenRevealManager", () => {
41
+ beforeEach(() => {
42
+ jest.clearAllMocks();
43
+ jest.useFakeTimers();
44
+ });
45
+
46
+ afterEach(() => {
47
+ jest.runOnlyPendingTimers();
48
+ jest.useRealTimers();
49
+ });
50
+
51
+ it("should render the wrapped component", () => {
52
+ render(
53
+ <WrappedComponent
54
+ componentsToRender={[{ id: "1" }, { id: "2" }, { id: "3" }]}
55
+ />
56
+ );
57
+
58
+ expect(screen.getByTestId("mock-component")).toBeTruthy();
59
+ });
60
+
61
+ it("should animate opacity when ready to show", () => {
62
+ render(
63
+ <WrappedComponent
64
+ componentsToRender={[{ id: "1" }, { id: "2" }, { id: "3" }]}
65
+ />
66
+ );
67
+
68
+ const animatedView = screen.getByTestId("animated-component");
69
+
70
+ act(() => {
71
+ jest.advanceTimersByTime(TIMEOUT + 100);
72
+ });
73
+
74
+ expect(animatedView.props.style.opacity).toBe(SHOWN);
75
+ });
76
+
77
+ it("should pass initialNumberToLoad, onLoadFinishedFromScreenRevealManager, and onLoadFailedFromScreenRevealManager to the wrapped component", () => {
78
+ render(
79
+ <WrappedComponent
80
+ componentsToRender={[{ id: "1" }, { id: "2" }, { id: "3" }]}
81
+ />
82
+ );
83
+
84
+ const mockComponent = screen.getByTestId("mock-component");
85
+
86
+ expect(mockComponent.props.initialNumberToLoad).toBe(3);
87
+
88
+ expect(
89
+ mockComponent.props.onLoadFinishedFromScreenRevealManager
90
+ ).toBeInstanceOf(Function);
91
+
92
+ expect(
93
+ mockComponent.props.onLoadFailedFromScreenRevealManager
94
+ ).toBeInstanceOf(Function);
95
+ });
96
+ });
@@ -0,0 +1 @@
1
+ export { withScreenRevealManager } from "./withScreenRevealManager";
@@ -0,0 +1,79 @@
1
+ import * as React from "react";
2
+ import { Animated } from "react-native";
3
+ import { isFirstComponentScreenPicker } from "@applicaster/zapp-react-native-utils/componentsUtils";
4
+ import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
5
+ import { useRefWithInitialValue } from "@applicaster/zapp-react-native-utils/reactHooks/state/useRefWithInitialValue";
6
+
7
+ import { ScreenRevealManager } from "./ScreenRevealManager";
8
+
9
+ const flex = platformSelect({
10
+ tvos: 1,
11
+ android_tv: 1,
12
+ web: undefined,
13
+ samsung_tv: undefined,
14
+ lg_tv: undefined,
15
+ default: undefined,
16
+ });
17
+
18
+ export const TIMEOUT = 500; // 500 ms
19
+
20
+ const HIDDEN = 0; // opacity = 0
21
+
22
+ export const SHOWN = 1; // opacity = 1
23
+
24
+ type Props = {
25
+ componentsToRender: ZappUIComponent[];
26
+ };
27
+
28
+ export const withScreenRevealManager = (Component) => {
29
+ return function WithScreenRevealManager(props: Props) {
30
+ const { componentsToRender } = props;
31
+
32
+ const [isReadyToShow, setIsReadyToShow] = React.useState(false);
33
+
34
+ const handleSetIsReadyToShow = React.useCallback(() => {
35
+ setIsReadyToShow(true);
36
+ }, []);
37
+
38
+ const managerRef = useRefWithInitialValue<ScreenRevealManager>(
39
+ () => new ScreenRevealManager(componentsToRender, handleSetIsReadyToShow)
40
+ );
41
+
42
+ const opacityRef = useRefWithInitialValue<Animated.Value>(
43
+ () => new Animated.Value(HIDDEN)
44
+ );
45
+
46
+ React.useEffect(() => {
47
+ if (isReadyToShow) {
48
+ Animated.timing(opacityRef.current, {
49
+ toValue: SHOWN,
50
+ duration: TIMEOUT,
51
+ useNativeDriver: true,
52
+ }).start();
53
+ }
54
+ }, [isReadyToShow]);
55
+
56
+ if (isFirstComponentScreenPicker(componentsToRender)) {
57
+ // for screen-picker with have additional internal ComponentsMap, no need to add this wrapper
58
+ return <Component {...props} />;
59
+ }
60
+
61
+ return (
62
+ <Animated.View
63
+ style={{ opacity: opacityRef.current, flex }}
64
+ testID="animated-component"
65
+ >
66
+ <Component
67
+ {...props}
68
+ initialNumberToLoad={
69
+ managerRef.current.numberOfComponentsWaitToLoadBeforePresent
70
+ }
71
+ onLoadFinishedFromScreenRevealManager={
72
+ managerRef.current.onLoadFinished
73
+ }
74
+ onLoadFailedFromScreenRevealManager={managerRef.current.onLoadFailed}
75
+ />
76
+ </Animated.View>
77
+ );
78
+ };
79
+ };
@@ -7,7 +7,6 @@ import { isEmptyOrNil } from "@applicaster/zapp-react-native-utils/cellUtils";
7
7
 
8
8
  import Tab from "./Tab";
9
9
  import { Gutter } from "../Gutter";
10
- import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
11
10
  import { ImageBackground, View } from "react-native";
12
11
  import { getStyles } from "./styles";
13
12
  import {
@@ -100,7 +99,6 @@ const TabsComponent = ({
100
99
  >
101
100
  <FocusableList
102
101
  horizontal
103
- onScrollToIndexFailed={noop}
104
102
  onLayout={onLayoutChange}
105
103
  contentContainerStyle={tabsListContentContainer}
106
104
  ref={flatListRef}
@@ -1,5 +1,5 @@
1
1
  import React, { useEffect } from "react";
2
- import { Animated } from "react-native";
2
+ import { Animated, Dimensions } from "react-native";
3
3
 
4
4
  import {
5
5
  useSafeAreaInsets,
@@ -11,6 +11,7 @@ import { isLive } from "@applicaster/zapp-react-native-utils/playerUtils";
11
11
 
12
12
  import { PROGRESS_BAR_HEIGHT } from "./utils";
13
13
  import { useConfiguration } from "../utils";
14
+ import { useIsTabletLandscape } from "@applicaster/zapp-react-native-utils/reactHooks/device/useMemoizedIsTablet";
14
15
 
15
16
  export enum PlayerAnimationStateEnum {
16
17
  minimize = "minimize",
@@ -23,6 +24,7 @@ export enum PlayerAnimationStateEnum {
23
24
  export type PlayerAnimationStateT = number | PlayerAnimationStateEnum | null;
24
25
 
25
26
  export type ModalAnimationContextT = {
27
+ yTranslate: React.MutableRefObject<Animated.Value | null>;
26
28
  isActiveGesture: boolean;
27
29
  playerAnimationState: PlayerAnimationStateT;
28
30
  setPlayerAnimationState: (value: PlayerAnimationStateT) => void;
@@ -48,6 +50,7 @@ export type ModalAnimationContextT = {
48
50
  };
49
51
 
50
52
  export const ReactContext = React.createContext<ModalAnimationContextT>({
53
+ yTranslate: React.createRef<Animated.Value | null>(),
51
54
  isActiveGesture: false,
52
55
  playerAnimationState: null,
53
56
  setPlayerAnimationState: () => null,
@@ -73,6 +76,10 @@ export const ReactContext = React.createContext<ModalAnimationContextT>({
73
76
  });
74
77
 
75
78
  const Provider = ({ children }: { children: React.ReactNode }) => {
79
+ const yTranslate = React.useRef(
80
+ new Animated.Value(Dimensions.get("window").height)
81
+ );
82
+
76
83
  const [playerAnimationState, setPlayerAnimationState] =
77
84
  React.useState<PlayerAnimationStateT>(null);
78
85
 
@@ -96,13 +103,6 @@ const Provider = ({ children }: { children: React.ReactNode }) => {
96
103
  setStartComponentsAnimation(false);
97
104
  }, []);
98
105
 
99
- useEffect(() => {
100
- // Reset player animation state when video modal is closed
101
- if (!visible) {
102
- resetPlayerAnimationState();
103
- }
104
- }, [visible, resetPlayerAnimationState]);
105
-
106
106
  // Animated values
107
107
  const lastScrollY = React.useRef(new Animated.Value(0)).current;
108
108
  const dragScrollY = React.useRef(new Animated.Value(0)).current;
@@ -115,6 +115,29 @@ const Provider = ({ children }: { children: React.ReactNode }) => {
115
115
  const { bottom: bottomSafeArea } = useSafeAreaInsets();
116
116
  const bottomTabBarHeight = useGetBottomTabBarHeight();
117
117
  const startComponentsAnimationDistance = Math.round((height * 60) / 100);
118
+ const isTabletLandscape = useIsTabletLandscape();
119
+ const windowDimensions = Dimensions.get("window");
120
+
121
+ useEffect(() => {
122
+ // Reset player animation state when video modal is closed
123
+ if (!visible) {
124
+ resetPlayerAnimationState();
125
+
126
+ if (!isTabletLandscape) {
127
+ // restore to portrait ( in portrait mode height is bigger)
128
+ if (windowDimensions.height > windowDimensions.width) {
129
+ yTranslate.current?.setValue(windowDimensions.height);
130
+ }
131
+ } else {
132
+ yTranslate.current?.setValue(windowDimensions.height);
133
+ }
134
+ }
135
+ }, [
136
+ visible,
137
+ resetPlayerAnimationState,
138
+ windowDimensions.height,
139
+ isTabletLandscape,
140
+ ]);
118
141
 
119
142
  React.useEffect(() => {
120
143
  if (visible && mode === "MAXIMIZED" && height !== safeAreaFrameHeight) {
@@ -141,6 +164,7 @@ const Provider = ({ children }: { children: React.ReactNode }) => {
141
164
  return (
142
165
  <ReactContext.Provider
143
166
  value={{
167
+ yTranslate,
144
168
  startComponentsAnimation,
145
169
  setStartComponentsAnimation,
146
170
  isActiveGesture: playerAnimationState !== null,