@applicaster/zapp-react-native-ui-components 15.0.0-alpha.5485312433 → 15.0.0-alpha.5531846549
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.
- package/Components/GeneralContentScreen/GeneralContentScreen.tsx +39 -28
- package/Components/GeneralContentScreen/__tests__/GeneralContentScreen.test.tsx +104 -0
- package/Components/GeneralContentScreen/utils/__tests__/getScreenDataSource.test.ts +19 -0
- package/Components/GeneralContentScreen/utils/getScreenDataSource.ts +9 -0
- package/Components/HandlePlayable/HandlePlayable.tsx +16 -29
- package/Components/HandlePlayable/utils.ts +31 -0
- package/Components/HookRenderer/HookRenderer.tsx +40 -10
- package/Components/HookRenderer/__tests__/HookRenderer.test.tsx +60 -0
- package/Components/Layout/TV/NavBarContainer.tsx +1 -10
- package/Components/Layout/TV/__tests__/__snapshots__/NavBarContainer.test.tsx.snap +7 -12
- package/Components/Layout/TV/__tests__/__snapshots__/ScreenContainer.test.tsx.snap +7 -12
- package/Components/MasterCell/DefaultComponents/ActionButtonsCore/__tests__/model.test.ts +80 -0
- package/Components/MasterCell/DefaultComponents/ActionButtonsCore/__tests__/placement.test.ts +187 -0
- package/Components/MasterCell/DefaultComponents/ActionButtonsCore/__tests__/selectors.test.ts +45 -0
- package/Components/MasterCell/DefaultComponents/ActionButtonsCore/__tests__/style.test.ts +49 -0
- package/Components/MasterCell/DefaultComponents/ActionButtonsCore/model.ts +47 -0
- package/Components/MasterCell/DefaultComponents/ActionButtonsCore/placement.ts +170 -0
- package/Components/MasterCell/DefaultComponents/ActionButtonsCore/selectors.ts +26 -0
- package/Components/MasterCell/DefaultComponents/ActionButtonsCore/style.ts +29 -0
- package/Components/MasterCell/DefaultComponents/ActionButtonsCore/types.ts +37 -0
- package/Components/MasterCell/DefaultComponents/Button.tsx +0 -15
- package/Components/MasterCell/DefaultComponents/LiveImage/__tests__/prepareEntry.test.ts +352 -0
- package/Components/MasterCell/DefaultComponents/LiveImage/executePreloadHooks.ts +136 -0
- package/Components/MasterCell/DefaultComponents/LiveImage/index.tsx +33 -16
- package/Components/MasterCell/DefaultComponents/PressableView.tsx +261 -0
- package/Components/MasterCell/DefaultComponents/Text/index.tsx +2 -6
- package/Components/MasterCell/DefaultComponents/index.ts +2 -0
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/Asset.ts +42 -0
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/Button.ts +127 -0
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/ButtonContainerView.ts +23 -0
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/Spacer.ts +16 -0
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/TextLabel.ts +67 -0
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/TextLabelsContainer.ts +32 -0
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/__tests__/PressableView.test.tsx +195 -0
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/__tests__/builders.test.ts +140 -0
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/__tests__/index.test.ts +222 -0
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/helpers.ts +105 -0
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/index.ts +104 -0
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/utils/__tests__/insertButtons.test.ts +118 -0
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/utils/index.ts +73 -0
- package/Components/MasterCell/DefaultComponents/tv/TvActionButtons/__tests__/index.test.ts +86 -0
- package/Components/MasterCell/DefaultComponents/tv/TvActionButtons/index.ts +35 -52
- package/Components/MasterCell/DefaultComponents/tv/TvActionButtons/utils/__tests__/getPluginIdentifier.test.ts +35 -171
- package/Components/MasterCell/DefaultComponents/tv/TvActionButtons/utils/index.ts +36 -145
- package/Components/MasterCell/elementMapper.tsx +1 -0
- package/Components/PlayerContainer/PlayerContainer.tsx +1 -18
- package/Components/PreloaderWrapper/__tests__/index.test.tsx +26 -0
- package/Components/PreloaderWrapper/index.tsx +15 -0
- package/Components/River/ComponentsMap/ComponentsMap.tsx +18 -16
- package/Components/River/RefreshControl.tsx +19 -83
- package/Components/River/River.tsx +9 -82
- package/Components/River/RiverItem.tsx +26 -20
- package/Components/River/__tests__/__snapshots__/componentsMap.test.js.snap +2 -0
- package/Components/River/__tests__/componentsMap.test.js +38 -0
- package/Components/River/hooks/__tests__/usePullToRefresh.test.ts +132 -0
- package/Components/River/hooks/index.ts +1 -0
- package/Components/River/hooks/usePullToRefresh.ts +51 -0
- package/Components/Screen/__tests__/Screen.test.tsx +1 -0
- package/Components/Screen/hooks.ts +73 -3
- package/Components/Screen/index.tsx +7 -1
- package/Components/ScreenFeedLoader/ScreenFeedLoader.tsx +46 -0
- package/Components/ScreenFeedLoader/__tests__/ScreenFeedLoader.test.tsx +94 -0
- package/Components/ScreenFeedLoader/index.ts +1 -0
- package/Components/ScreenResolver/__tests__/screenResolver.test.js +24 -0
- package/Components/ScreenResolver/hooks/index.ts +3 -0
- package/Components/ScreenResolver/hooks/useGetComponent.ts +15 -0
- package/Components/ScreenResolver/hooks/useScreenComponentResolver.tsx +90 -0
- package/Components/ScreenResolver/index.tsx +15 -117
- package/Components/ScreenResolver/utils/__tests__/getScreenTypeProps.test.ts +45 -0
- package/Components/ScreenResolver/utils/getScreenTypeProps.ts +43 -0
- package/Components/ScreenResolver/utils/index.ts +1 -0
- package/Components/ScreenResolver/withDefaultScreenContext.tsx +16 -0
- package/Components/ScreenResolverFeedProvider/ScreenResolverFeedProvider.tsx +25 -0
- package/Components/ScreenResolverFeedProvider/__tests__/ScreenResolverFeedProvider.test.tsx +44 -0
- package/Components/ScreenResolverFeedProvider/index.ts +1 -0
- package/Components/Tabs/TabContent.tsx +7 -4
- package/Components/TopCutoffOverlay/hooks/__tests__/useMarginTop.test.ts +130 -0
- package/Components/TopCutoffOverlay/hooks/index.ts +1 -0
- package/Components/TopCutoffOverlay/hooks/useMarginTop.ts +59 -0
- package/Components/TopCutoffOverlay/index.tsx +55 -0
- package/Components/Transitioner/Scene.tsx +9 -15
- package/Components/VideoLive/LiveImageManager.ts +199 -54
- package/Components/VideoLive/PlayerLiveImageComponent.tsx +31 -33
- package/Components/VideoLive/__tests__/PlayerLiveImageComponent.test.tsx +2 -17
- package/Components/Viewport/ViewportAware/__tests__/viewportAware.test.js +0 -2
- package/Components/Viewport/ViewportAware/index.tsx +16 -7
- package/Components/ZappUIComponent/index.tsx +12 -6
- package/Components/default-cell-renderer/viewTrees/mobile/index.ts +0 -3
- package/Components/index.js +1 -1
- package/Contexts/ScreenContext/__tests__/index.test.tsx +57 -0
- package/Contexts/ScreenContext/index.tsx +71 -19
- package/Contexts/ZappPipesContext/ZappPipesContextFactory.tsx +18 -7
- package/Decorators/ZappPipesDataConnector/ResolverSelector.tsx +25 -7
- package/Decorators/ZappPipesDataConnector/__tests__/ResolverSelector.test.tsx +212 -5
- package/Decorators/ZappPipesDataConnector/__tests__/UrlFeedResolver.test.tsx +39 -21
- package/Decorators/ZappPipesDataConnector/resolvers/UrlFeedResolver.tsx +18 -7
- package/events/index.ts +2 -0
- package/events/scrollEndReached.ts +15 -0
- package/package.json +5 -5
- package/Components/MasterCell/DefaultComponents/Text/utils/__tests__/withAdjustedLineHeight.test.ts +0 -46
- package/Components/MasterCell/DefaultComponents/Text/utils/index.ts +0 -21
- package/Components/PlayerContainer/ErrorDisplay/ErrorDisplay.tsx +0 -57
- package/Components/PlayerContainer/ErrorDisplay/index.ts +0 -9
- package/Components/PlayerContainer/useRestrictMobilePlayback.tsx +0 -101
- /package/Components/HookRenderer/{index.tsx → index.ts} +0 -0
|
@@ -11,6 +11,7 @@ const mockIsOrientationCompatible = jest.fn(() => true);
|
|
|
11
11
|
jest.mock("react-native-safe-area-context", () => ({
|
|
12
12
|
...jest.requireActual("react-native-safe-area-context"),
|
|
13
13
|
useSafeAreaInsets: () => ({ top: 44 }),
|
|
14
|
+
useSafeAreaFrame: () => ({ x: 0, y: 0, width: 375, height: 812 }),
|
|
14
15
|
}));
|
|
15
16
|
|
|
16
17
|
jest.mock("../../RouteManager", () => ({
|
|
@@ -5,15 +5,85 @@ import {
|
|
|
5
5
|
} from "@applicaster/zapp-react-native-utils/appUtils/orientationHelper";
|
|
6
6
|
import {
|
|
7
7
|
useCurrentScreenData,
|
|
8
|
-
useDimensions,
|
|
9
8
|
useRoute,
|
|
10
9
|
useIsTablet,
|
|
10
|
+
useIsScreenActive,
|
|
11
11
|
} from "@applicaster/zapp-react-native-utils/reactHooks";
|
|
12
12
|
import { useMemo, useEffect, useState } from "react";
|
|
13
|
+
import { useSafeAreaFrame } from "react-native-safe-area-context";
|
|
14
|
+
|
|
15
|
+
type MemoizedSafeAreaFrameWithActiveStateOptions = {
|
|
16
|
+
updateForInactiveScreens?: boolean;
|
|
17
|
+
isActive: boolean;
|
|
18
|
+
};
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* Base hook that wraps useSafeAreaFrame with memoization and inactive screen filtering.
|
|
22
|
+
* Requires isActive to be passed explicitly - use useMemoizedSafeAreaFrame for automatic detection.
|
|
23
|
+
*
|
|
24
|
+
* @param options.updateForInactiveScreens - If false, frame won't update when screen is inactive (default: true)
|
|
25
|
+
* @param options.isActive - Whether the screen is currently active
|
|
26
|
+
* @returns The memoized safe area frame { x, y, width, height }
|
|
27
|
+
*/
|
|
28
|
+
export const useMemoizedSafeAreaFrameWithActiveState = (
|
|
29
|
+
options: MemoizedSafeAreaFrameWithActiveStateOptions
|
|
30
|
+
) => {
|
|
31
|
+
const { updateForInactiveScreens = true, isActive } = options;
|
|
32
|
+
const frame = useSafeAreaFrame();
|
|
33
|
+
|
|
34
|
+
const [memoFrame, setMemoFrame] = useState(frame);
|
|
35
|
+
|
|
36
|
+
useEffect(() => {
|
|
37
|
+
const shouldUpdate = isActive || updateForInactiveScreens;
|
|
38
|
+
|
|
39
|
+
const dimensionsChanged =
|
|
40
|
+
frame.width !== memoFrame.width || frame.height !== memoFrame.height;
|
|
41
|
+
|
|
42
|
+
if (shouldUpdate && dimensionsChanged) {
|
|
43
|
+
setMemoFrame(frame);
|
|
44
|
+
}
|
|
45
|
+
}, [
|
|
46
|
+
frame.width,
|
|
47
|
+
frame.height,
|
|
48
|
+
isActive,
|
|
49
|
+
updateForInactiveScreens,
|
|
50
|
+
frame,
|
|
51
|
+
memoFrame.width,
|
|
52
|
+
memoFrame.height,
|
|
53
|
+
]);
|
|
54
|
+
|
|
55
|
+
return memoFrame;
|
|
56
|
+
};
|
|
57
|
+
|
|
58
|
+
type MemoizedSafeAreaFrameOptions = {
|
|
59
|
+
updateForInactiveScreens?: boolean;
|
|
60
|
+
};
|
|
61
|
+
|
|
62
|
+
/**
|
|
63
|
+
* Hook that wraps useSafeAreaFrame with memoization and inactive screen filtering.
|
|
64
|
+
* Uses useIsScreenActive() internally to determine active state - use useMemoizedSafeAreaFrameWithActiveState
|
|
65
|
+
* if you need to pass isActive explicitly.
|
|
66
|
+
*
|
|
67
|
+
* @param options.updateForInactiveScreens - If false, frame won't update when screen is inactive (default: true)
|
|
68
|
+
* @returns The memoized safe area frame { x, y, width, height }
|
|
69
|
+
*/
|
|
70
|
+
export const useMemoizedSafeAreaFrame = (
|
|
71
|
+
options: MemoizedSafeAreaFrameOptions = {}
|
|
72
|
+
) => {
|
|
73
|
+
const { updateForInactiveScreens = true } = options;
|
|
74
|
+
const isActive = useIsScreenActive();
|
|
75
|
+
|
|
76
|
+
return useMemoizedSafeAreaFrameWithActiveState({
|
|
77
|
+
updateForInactiveScreens,
|
|
78
|
+
isActive,
|
|
79
|
+
});
|
|
80
|
+
};
|
|
13
81
|
|
|
14
82
|
export const useWaitForValidOrientation = () => {
|
|
15
|
-
|
|
16
|
-
|
|
83
|
+
// Use memoized safe area frame to synchronize with Scene's dimension source
|
|
84
|
+
// This prevents race conditions where the orientation check passes before
|
|
85
|
+
// Scene's memoFrame has updated to the new dimensions
|
|
86
|
+
const { width: screenWidth, height } = useMemoizedSafeAreaFrame({
|
|
17
87
|
updateForInactiveScreens: false,
|
|
18
88
|
});
|
|
19
89
|
|
|
@@ -92,7 +92,13 @@ export function Screen(_props: Props) {
|
|
|
92
92
|
const isActive = useIsScreenActive();
|
|
93
93
|
|
|
94
94
|
const ref = React.useRef(null);
|
|
95
|
-
const
|
|
95
|
+
const isOrientationReady = useWaitForValidOrientation();
|
|
96
|
+
|
|
97
|
+
// Playable screens handle their own orientation via the native player plugin,
|
|
98
|
+
// so we skip the orientation wait gate to avoid a deadlock where the screen
|
|
99
|
+
// waits for landscape but blocks rendering that would trigger the rotation.
|
|
100
|
+
const isPlayableRoute = pathname?.includes("/playable");
|
|
101
|
+
const isReady = isOrientationReady || isPlayableRoute;
|
|
96
102
|
|
|
97
103
|
React.useEffect(() => {
|
|
98
104
|
if (ref.current && isActive && isReady) {
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import React, { useEffect } from "react";
|
|
2
|
+
import { PreloaderWrapper } from "../PreloaderWrapper";
|
|
3
|
+
import { useScreenContextV2 } from "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenContext";
|
|
4
|
+
import { useFeedLoader } from "@applicaster/zapp-react-native-utils/reactHooks";
|
|
5
|
+
|
|
6
|
+
import { componentsLogger } from "../../Helpers/logger";
|
|
7
|
+
|
|
8
|
+
const logger = componentsLogger.addSubsystem("ScreenFeedLoader");
|
|
9
|
+
|
|
10
|
+
/** Loads and provides `feedData` and store to */
|
|
11
|
+
export const ScreenFeedLoader: React.FC<
|
|
12
|
+
React.PropsWithChildren<{ id: string; feedData: any }>
|
|
13
|
+
> = ({ id, feedData, children }) => {
|
|
14
|
+
const { source: feedUrl, mapping } = feedData;
|
|
15
|
+
|
|
16
|
+
const { data, loading, error } = useFeedLoader({
|
|
17
|
+
feedUrl,
|
|
18
|
+
mapping,
|
|
19
|
+
pipesOptions: {},
|
|
20
|
+
});
|
|
21
|
+
|
|
22
|
+
const feedStore = useScreenContextV2()._feedStore;
|
|
23
|
+
|
|
24
|
+
useEffect(() => {
|
|
25
|
+
if (data && !loading) {
|
|
26
|
+
feedStore.setState({ screenFeed: data, screenFeedError: null });
|
|
27
|
+
|
|
28
|
+
logger.log("screenFeed set for active screen", { data, screenId: id });
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
if (error && !loading) {
|
|
32
|
+
feedStore.setState({ screenFeed: data, screenFeedError: error });
|
|
33
|
+
|
|
34
|
+
logger.warning("Feed data error:", {
|
|
35
|
+
data,
|
|
36
|
+
loading,
|
|
37
|
+
error,
|
|
38
|
+
screenId: id,
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
}, [data, loading, error, feedStore, id]);
|
|
42
|
+
|
|
43
|
+
return (
|
|
44
|
+
<PreloaderWrapper showPreloader={loading}>{children}</PreloaderWrapper>
|
|
45
|
+
);
|
|
46
|
+
};
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
import React from "react";
|
|
2
|
+
import { Text } from "react-native";
|
|
3
|
+
import { render, waitFor } from "@testing-library/react-native";
|
|
4
|
+
import { ScreenFeedLoader } from "../ScreenFeedLoader";
|
|
5
|
+
|
|
6
|
+
const mockUseFeedLoader = jest.fn();
|
|
7
|
+
const mockUseScreenContextV2 = jest.fn();
|
|
8
|
+
const mockSetState = jest.fn();
|
|
9
|
+
|
|
10
|
+
jest.mock("@applicaster/zapp-react-native-utils/reactHooks", () => ({
|
|
11
|
+
useFeedLoader: (...args) => mockUseFeedLoader(...args),
|
|
12
|
+
}));
|
|
13
|
+
|
|
14
|
+
jest.mock(
|
|
15
|
+
"@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenContext",
|
|
16
|
+
() => ({
|
|
17
|
+
useScreenContextV2: (...args) => mockUseScreenContextV2(...args),
|
|
18
|
+
})
|
|
19
|
+
);
|
|
20
|
+
|
|
21
|
+
describe("ScreenFeedLoader", () => {
|
|
22
|
+
beforeEach(() => {
|
|
23
|
+
jest.clearAllMocks();
|
|
24
|
+
|
|
25
|
+
mockUseScreenContextV2.mockReturnValue({
|
|
26
|
+
_feedStore: {
|
|
27
|
+
setState: mockSetState,
|
|
28
|
+
},
|
|
29
|
+
});
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
it("hides children while loading", () => {
|
|
33
|
+
mockUseFeedLoader.mockReturnValue({
|
|
34
|
+
data: null,
|
|
35
|
+
loading: true,
|
|
36
|
+
error: null,
|
|
37
|
+
});
|
|
38
|
+
|
|
39
|
+
const { queryByText } = render(
|
|
40
|
+
<ScreenFeedLoader id="test" feedData={{ source: "url", mapping: {} }}>
|
|
41
|
+
<Text>child</Text>
|
|
42
|
+
</ScreenFeedLoader>
|
|
43
|
+
);
|
|
44
|
+
|
|
45
|
+
expect(queryByText("child")).toBeNull();
|
|
46
|
+
});
|
|
47
|
+
|
|
48
|
+
it("writes loaded feed data to _feedStore", async () => {
|
|
49
|
+
const data = { entry: { id: "1" } };
|
|
50
|
+
|
|
51
|
+
mockUseFeedLoader.mockReturnValue({
|
|
52
|
+
data,
|
|
53
|
+
loading: false,
|
|
54
|
+
error: null,
|
|
55
|
+
});
|
|
56
|
+
|
|
57
|
+
render(
|
|
58
|
+
<ScreenFeedLoader id="test" feedData={{ source: "url", mapping: {} }}>
|
|
59
|
+
<Text>child</Text>
|
|
60
|
+
</ScreenFeedLoader>
|
|
61
|
+
);
|
|
62
|
+
|
|
63
|
+
await waitFor(() => {
|
|
64
|
+
expect(mockSetState).toHaveBeenCalledWith({
|
|
65
|
+
screenFeed: data,
|
|
66
|
+
screenFeedError: null,
|
|
67
|
+
});
|
|
68
|
+
});
|
|
69
|
+
});
|
|
70
|
+
|
|
71
|
+
it("writes feed error to _feedStore", async () => {
|
|
72
|
+
const error = new Error("feed failed");
|
|
73
|
+
const data = { fallback: true };
|
|
74
|
+
|
|
75
|
+
mockUseFeedLoader.mockReturnValue({
|
|
76
|
+
data,
|
|
77
|
+
loading: false,
|
|
78
|
+
error,
|
|
79
|
+
});
|
|
80
|
+
|
|
81
|
+
render(
|
|
82
|
+
<ScreenFeedLoader id="test" feedData={{ source: "url", mapping: {} }}>
|
|
83
|
+
<Text>child</Text>
|
|
84
|
+
</ScreenFeedLoader>
|
|
85
|
+
);
|
|
86
|
+
|
|
87
|
+
await waitFor(() => {
|
|
88
|
+
expect(mockSetState).toHaveBeenCalledWith({
|
|
89
|
+
screenFeed: data,
|
|
90
|
+
screenFeedError: error,
|
|
91
|
+
});
|
|
92
|
+
});
|
|
93
|
+
});
|
|
94
|
+
});
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { ScreenFeedLoader } from "./ScreenFeedLoader";
|
|
@@ -53,6 +53,9 @@ const mockComponents = { ScreenType1, ScreenType2, PlayerController };
|
|
|
53
53
|
|
|
54
54
|
const mockState = {
|
|
55
55
|
components: mockComponents,
|
|
56
|
+
remoteConfigurations: {
|
|
57
|
+
assets: {},
|
|
58
|
+
},
|
|
56
59
|
plugins: [
|
|
57
60
|
mockScreenType3,
|
|
58
61
|
mockScreenType4,
|
|
@@ -127,6 +130,21 @@ const getWrapper = (screenId, screenType, screenData) => {
|
|
|
127
130
|
);
|
|
128
131
|
};
|
|
129
132
|
|
|
133
|
+
const getWrappedWrapper = (screenId, screenType, screenData) => {
|
|
134
|
+
const ScreenResolver = require("../").ScreenResolver;
|
|
135
|
+
|
|
136
|
+
return renderWithProviders(
|
|
137
|
+
<ScreenResolver
|
|
138
|
+
{...{
|
|
139
|
+
screenId,
|
|
140
|
+
screenType,
|
|
141
|
+
screenData,
|
|
142
|
+
}}
|
|
143
|
+
/>,
|
|
144
|
+
mockState
|
|
145
|
+
);
|
|
146
|
+
};
|
|
147
|
+
|
|
130
148
|
describe("<ScreenResolver />", () => {
|
|
131
149
|
it("renders correctly", () => {
|
|
132
150
|
const wrapper = getWrapper("1234", "screen_type_1", {});
|
|
@@ -134,6 +152,12 @@ describe("<ScreenResolver />", () => {
|
|
|
134
152
|
expect(wrapper.getByTestId("screen_type_1")).toBeDefined();
|
|
135
153
|
});
|
|
136
154
|
|
|
155
|
+
it("renders correctly when wrapped with default screen context", () => {
|
|
156
|
+
const wrapper = getWrappedWrapper("1234", "screen_type_1", {});
|
|
157
|
+
|
|
158
|
+
expect(wrapper.getByTestId("screen_type_1")).toBeDefined();
|
|
159
|
+
});
|
|
160
|
+
|
|
137
161
|
it("picks screen from plugins if it exists", () => {
|
|
138
162
|
const wrapper = getWrapper("A1234", "screen_type_3", {});
|
|
139
163
|
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import * as React from "react";
|
|
2
|
+
|
|
3
|
+
import { toPascalCase } from "@applicaster/zapp-react-native-utils/stringUtils";
|
|
4
|
+
import {
|
|
5
|
+
useAppSelector,
|
|
6
|
+
selectComponents,
|
|
7
|
+
} from "@applicaster/zapp-react-native-redux";
|
|
8
|
+
|
|
9
|
+
export const useGetComponent = (screenType) => {
|
|
10
|
+
const components = useAppSelector(selectComponents);
|
|
11
|
+
|
|
12
|
+
return React.useMemo(() => {
|
|
13
|
+
return components[toPascalCase(screenType)];
|
|
14
|
+
}, [components, screenType]);
|
|
15
|
+
};
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
import * as React from "react";
|
|
2
|
+
import { path, prop } from "ramda";
|
|
3
|
+
import {
|
|
4
|
+
findPluginByType,
|
|
5
|
+
findPluginByIdentifier,
|
|
6
|
+
} from "@applicaster/zapp-react-native-utils/pluginUtils";
|
|
7
|
+
import { HandlePlayable } from "../../HandlePlayable";
|
|
8
|
+
import { HookRenderer } from "../../HookRenderer";
|
|
9
|
+
import { LinkHandler } from "../../LinkHandler";
|
|
10
|
+
import { Favorites } from "../../Favorites";
|
|
11
|
+
import { usePlugins } from "@applicaster/zapp-react-native-redux/hooks";
|
|
12
|
+
import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks";
|
|
13
|
+
|
|
14
|
+
import { useCallbackActions } from "@applicaster/zapp-react-native-utils/zappFrameworkUtils/HookCallback/useCallbackActions";
|
|
15
|
+
import { useGetComponent } from "./useGetComponent";
|
|
16
|
+
import { getScreenTypeProps } from "../utils";
|
|
17
|
+
|
|
18
|
+
export enum PresentationType {
|
|
19
|
+
Standalone = "Standalone",
|
|
20
|
+
Hook = "Hook",
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
const screenTypeComponents = {
|
|
24
|
+
favorites: Favorites,
|
|
25
|
+
link: LinkHandler,
|
|
26
|
+
playable: HandlePlayable,
|
|
27
|
+
hooks: HookRenderer,
|
|
28
|
+
};
|
|
29
|
+
|
|
30
|
+
export const useScreenComponentResolver = (screenType, props) => {
|
|
31
|
+
const plugins = usePlugins();
|
|
32
|
+
const { hookPlugin } = props.screenData || {};
|
|
33
|
+
const component = useGetComponent(screenType);
|
|
34
|
+
|
|
35
|
+
const screenAction = useCallbackActions(
|
|
36
|
+
hookPlugin || props.screenData,
|
|
37
|
+
props.screenData.callback
|
|
38
|
+
);
|
|
39
|
+
|
|
40
|
+
const {
|
|
41
|
+
videoModalState: { mode },
|
|
42
|
+
} = useNavigation();
|
|
43
|
+
|
|
44
|
+
const componentProps = {
|
|
45
|
+
...props,
|
|
46
|
+
mode,
|
|
47
|
+
screenAction,
|
|
48
|
+
};
|
|
49
|
+
|
|
50
|
+
const ScreenTypeComponent = screenTypeComponents?.[screenType];
|
|
51
|
+
|
|
52
|
+
if (ScreenTypeComponent) {
|
|
53
|
+
return (
|
|
54
|
+
<ScreenTypeComponent
|
|
55
|
+
{...getScreenTypeProps(screenType, componentProps)}
|
|
56
|
+
/>
|
|
57
|
+
);
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
const ScreenPlugin =
|
|
61
|
+
findPluginByType(screenType, plugins, { skipWarning: true }) ||
|
|
62
|
+
findPluginByIdentifier(screenType, plugins) ||
|
|
63
|
+
findPluginByIdentifier(hookPlugin && hookPlugin.identifier, plugins) ||
|
|
64
|
+
component;
|
|
65
|
+
|
|
66
|
+
const ScreenComponent =
|
|
67
|
+
path(["module", "Component"], ScreenPlugin) ||
|
|
68
|
+
prop("module", ScreenPlugin) ||
|
|
69
|
+
prop("Component", ScreenPlugin) ||
|
|
70
|
+
ScreenPlugin;
|
|
71
|
+
|
|
72
|
+
const configuration =
|
|
73
|
+
prop("configuration", ScreenPlugin) ||
|
|
74
|
+
prop("__plugin_configuration", ScreenComponent);
|
|
75
|
+
|
|
76
|
+
if (!ScreenComponent) {
|
|
77
|
+
return null;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
return (
|
|
81
|
+
<ScreenComponent
|
|
82
|
+
{...props}
|
|
83
|
+
callback={props.resultCallback || screenAction}
|
|
84
|
+
screenId={props.screenId}
|
|
85
|
+
screenData={props.screenData}
|
|
86
|
+
presentationType={PresentationType.Standalone}
|
|
87
|
+
configuration={configuration}
|
|
88
|
+
/>
|
|
89
|
+
);
|
|
90
|
+
};
|
|
@@ -1,29 +1,17 @@
|
|
|
1
1
|
import * as React from "react";
|
|
2
|
-
|
|
3
|
-
import {
|
|
4
|
-
findPluginByType,
|
|
5
|
-
findPluginByIdentifier,
|
|
6
|
-
} from "@applicaster/zapp-react-native-utils/pluginUtils";
|
|
7
|
-
import { HandlePlayable } from "../HandlePlayable";
|
|
8
|
-
import { toPascalCase } from "@applicaster/zapp-react-native-utils/stringUtils";
|
|
9
|
-
import { HookRenderer } from "../HookRenderer";
|
|
10
|
-
import { LinkHandler } from "../LinkHandler";
|
|
11
|
-
import { Favorites } from "../Favorites";
|
|
12
|
-
import { ZappPipesScreenContext } from "../../Contexts";
|
|
2
|
+
|
|
13
3
|
import { componentsLogger } from "../../Helpers/logger";
|
|
14
|
-
|
|
15
|
-
useAppSelector,
|
|
16
|
-
usePlugins,
|
|
17
|
-
} from "@applicaster/zapp-react-native-redux/hooks";
|
|
18
|
-
import {
|
|
19
|
-
useNavigation,
|
|
20
|
-
useRivers,
|
|
21
|
-
} from "@applicaster/zapp-react-native-utils/reactHooks";
|
|
4
|
+
|
|
22
5
|
import { useScreenAnalytics } from "@applicaster/zapp-react-native-utils/analyticsUtils/helpers/hooks";
|
|
23
6
|
|
|
24
|
-
import { useCallbackActions } from "@applicaster/zapp-react-native-utils/zappFrameworkUtils/HookCallback/useCallbackActions";
|
|
25
7
|
import { ScreenResultCallback } from "@applicaster/zapp-react-native-utils/zappFrameworkUtils/HookCallback/callbackNavigationAction";
|
|
26
|
-
import {
|
|
8
|
+
import { useScreenComponentResolver } from "./hooks/useScreenComponentResolver";
|
|
9
|
+
import { withDefaultScreenContext } from "./withDefaultScreenContext";
|
|
10
|
+
|
|
11
|
+
export enum PresentationType {
|
|
12
|
+
Standalone = "Standalone",
|
|
13
|
+
Hook = "Hook",
|
|
14
|
+
}
|
|
27
15
|
|
|
28
16
|
const logger = componentsLogger.addSubsystem("ScreenResolver");
|
|
29
17
|
|
|
@@ -44,102 +32,14 @@ type Props = {
|
|
|
44
32
|
groupId?: string;
|
|
45
33
|
};
|
|
46
34
|
|
|
47
|
-
export enum PresentationType {
|
|
48
|
-
Standalone = "Standalone",
|
|
49
|
-
Hook = "Hook",
|
|
50
|
-
}
|
|
51
|
-
|
|
52
35
|
export function ScreenResolverComponent(props: Props) {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
const { screenType, screenId, screenData, groupId } = props;
|
|
56
|
-
|
|
57
|
-
const { hookPlugin } = screenData || {};
|
|
58
|
-
|
|
59
|
-
const plugins = usePlugins();
|
|
60
|
-
const rivers = useRivers();
|
|
61
|
-
|
|
62
|
-
const components = useAppSelector(selectComponents);
|
|
36
|
+
const { screenType } = props;
|
|
37
|
+
const component = useScreenComponentResolver(screenType, props);
|
|
63
38
|
|
|
64
|
-
|
|
65
|
-
videoModalState: { mode },
|
|
66
|
-
} = useNavigation();
|
|
67
|
-
|
|
68
|
-
const [, setScreenContext] = ZappPipesScreenContext.useZappPipesContext();
|
|
69
|
-
|
|
70
|
-
React.useEffect(() => {
|
|
71
|
-
setScreenContext(rivers[screenId]);
|
|
72
|
-
}, [rivers, screenId, setScreenContext]);
|
|
73
|
-
|
|
74
|
-
const parentCallback = props.resultCallback;
|
|
75
|
-
|
|
76
|
-
const screenAction = useCallbackActions(
|
|
77
|
-
hookPlugin || screenData,
|
|
78
|
-
screenData.callback
|
|
79
|
-
);
|
|
80
|
-
|
|
81
|
-
const callbackAction = parentCallback || screenAction;
|
|
82
|
-
|
|
83
|
-
const ScreenPlugin =
|
|
84
|
-
findPluginByType(screenType, plugins, { skipWarning: true }) ||
|
|
85
|
-
findPluginByIdentifier(screenType, plugins) ||
|
|
86
|
-
findPluginByIdentifier(hookPlugin && hookPlugin.identifier, plugins) ||
|
|
87
|
-
components[toPascalCase(screenType)];
|
|
88
|
-
|
|
89
|
-
if (screenType === "favorites") {
|
|
90
|
-
return <Favorites screenData={screenData} />;
|
|
91
|
-
}
|
|
92
|
-
|
|
93
|
-
if (screenType === "link") {
|
|
94
|
-
return <LinkHandler screenData={screenData} />;
|
|
95
|
-
}
|
|
96
|
-
|
|
97
|
-
if (screenType === "playable") {
|
|
98
|
-
return (
|
|
99
|
-
// @ts-ignore
|
|
100
|
-
<HandlePlayable
|
|
101
|
-
item={screenData}
|
|
102
|
-
mode={mode === "PIP" ? "PIP" : "FULLSCREEN"}
|
|
103
|
-
isModal={false}
|
|
104
|
-
groupId={groupId}
|
|
105
|
-
/>
|
|
106
|
-
);
|
|
107
|
-
}
|
|
108
|
-
|
|
109
|
-
if (hookPlugin || screenType === "hooks") {
|
|
110
|
-
return (
|
|
111
|
-
screenData && (
|
|
112
|
-
<HookRenderer
|
|
113
|
-
callback={callbackAction}
|
|
114
|
-
screenData={screenData}
|
|
115
|
-
focused={props.focused}
|
|
116
|
-
parentFocus={props.parentFocus as ParentFocus}
|
|
117
|
-
/>
|
|
118
|
-
)
|
|
119
|
-
);
|
|
120
|
-
}
|
|
121
|
-
|
|
122
|
-
const ScreenComponent =
|
|
123
|
-
path(["module", "Component"], ScreenPlugin) ||
|
|
124
|
-
prop("module", ScreenPlugin) ||
|
|
125
|
-
prop("Component", ScreenPlugin) ||
|
|
126
|
-
ScreenPlugin;
|
|
127
|
-
|
|
128
|
-
const configuration =
|
|
129
|
-
prop("configuration", ScreenPlugin) ||
|
|
130
|
-
prop("__plugin_configuration", ScreenComponent);
|
|
39
|
+
useScreenAnalytics(props);
|
|
131
40
|
|
|
132
|
-
if (
|
|
133
|
-
return
|
|
134
|
-
<ScreenComponent
|
|
135
|
-
{...props}
|
|
136
|
-
callback={callbackAction}
|
|
137
|
-
screenId={screenId}
|
|
138
|
-
screenData={screenData}
|
|
139
|
-
configuration={configuration}
|
|
140
|
-
presentationType={PresentationType.Standalone}
|
|
141
|
-
/>
|
|
142
|
-
);
|
|
41
|
+
if (component) {
|
|
42
|
+
return component;
|
|
143
43
|
}
|
|
144
44
|
|
|
145
45
|
logger.warning({
|
|
@@ -150,6 +50,4 @@ export function ScreenResolverComponent(props: Props) {
|
|
|
150
50
|
return null;
|
|
151
51
|
}
|
|
152
52
|
|
|
153
|
-
export const ScreenResolver =
|
|
154
|
-
ScreenResolverComponent
|
|
155
|
-
);
|
|
53
|
+
export const ScreenResolver = withDefaultScreenContext(ScreenResolverComponent);
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import { getScreenTypeProps } from "../getScreenTypeProps";
|
|
2
|
+
|
|
3
|
+
const baseProps = {
|
|
4
|
+
screenData: { id: "entry-1" },
|
|
5
|
+
mode: "PIP",
|
|
6
|
+
screenId: "screen-1",
|
|
7
|
+
groupId: "group-1",
|
|
8
|
+
focused: true,
|
|
9
|
+
parentFocus: { nextFocusDown: { current: null } },
|
|
10
|
+
screenAction: jest.fn(),
|
|
11
|
+
resultCallback: null,
|
|
12
|
+
};
|
|
13
|
+
|
|
14
|
+
describe("getScreenTypeProps", () => {
|
|
15
|
+
it("returns props for favorites/link", () => {
|
|
16
|
+
expect(getScreenTypeProps("favorites", baseProps)).toEqual({
|
|
17
|
+
screenData: baseProps.screenData,
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
expect(getScreenTypeProps("link", baseProps)).toEqual({
|
|
21
|
+
screenData: baseProps.screenData,
|
|
22
|
+
});
|
|
23
|
+
});
|
|
24
|
+
|
|
25
|
+
it("returns props for playable", () => {
|
|
26
|
+
expect(getScreenTypeProps("playable", baseProps)).toEqual({
|
|
27
|
+
item: baseProps.screenData,
|
|
28
|
+
mode: "PIP",
|
|
29
|
+
isModal: false,
|
|
30
|
+
groupId: "group-1",
|
|
31
|
+
});
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
it("returns props for hooks", () => {
|
|
35
|
+
const result = getScreenTypeProps("hooks", baseProps);
|
|
36
|
+
|
|
37
|
+
expect(result).toMatchObject({
|
|
38
|
+
screenData: baseProps.screenData,
|
|
39
|
+
focused: true,
|
|
40
|
+
parentFocus: baseProps.parentFocus,
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
expect(result.callback).toBe(baseProps.screenAction);
|
|
44
|
+
});
|
|
45
|
+
});
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
export const getScreenTypeProps = (
|
|
2
|
+
screenType: "favorites" | "link" | "playable" | "hooks",
|
|
3
|
+
props
|
|
4
|
+
) => {
|
|
5
|
+
const {
|
|
6
|
+
screenData,
|
|
7
|
+
mode,
|
|
8
|
+
screenId,
|
|
9
|
+
groupId,
|
|
10
|
+
focused,
|
|
11
|
+
parentFocus,
|
|
12
|
+
screenAction,
|
|
13
|
+
resultCallback,
|
|
14
|
+
} = props;
|
|
15
|
+
|
|
16
|
+
switch (screenType) {
|
|
17
|
+
case "favorites":
|
|
18
|
+
case "link":
|
|
19
|
+
return {
|
|
20
|
+
screenData,
|
|
21
|
+
};
|
|
22
|
+
case "playable":
|
|
23
|
+
return {
|
|
24
|
+
item: screenData,
|
|
25
|
+
mode: mode === "PIP" ? "PIP" : "FULLSCREEN",
|
|
26
|
+
isModal: false,
|
|
27
|
+
groupId: groupId,
|
|
28
|
+
};
|
|
29
|
+
case "hooks":
|
|
30
|
+
return {
|
|
31
|
+
screenData,
|
|
32
|
+
callback: resultCallback || screenAction,
|
|
33
|
+
focused,
|
|
34
|
+
parentFocus: parentFocus as ParentFocus,
|
|
35
|
+
};
|
|
36
|
+
default:
|
|
37
|
+
return {
|
|
38
|
+
callback: resultCallback || screenAction,
|
|
39
|
+
screenId: screenId,
|
|
40
|
+
screenData,
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { getScreenTypeProps } from "./getScreenTypeProps";
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import * as React from "react";
|
|
2
|
+
import { useRivers } from "@applicaster/zapp-react-native-utils/reactHooks";
|
|
3
|
+
import { ZappPipesScreenContext } from "../../Contexts";
|
|
4
|
+
|
|
5
|
+
export function withDefaultScreenContext(Component: React.ComponentType<any>) {
|
|
6
|
+
return function WithDefaultScreenContext(props: any) {
|
|
7
|
+
const screenId = props.screenId;
|
|
8
|
+
const rivers = useRivers();
|
|
9
|
+
|
|
10
|
+
return (
|
|
11
|
+
<ZappPipesScreenContext.Provider initialContextValue={rivers[screenId]}>
|
|
12
|
+
<Component {...props} />
|
|
13
|
+
</ZappPipesScreenContext.Provider>
|
|
14
|
+
);
|
|
15
|
+
};
|
|
16
|
+
}
|