@applicaster/zapp-react-native-ui-components 13.0.0-alpha.6525006318 → 13.0.0-alpha.7120331332
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/AppContainer/__tests__/__snapshots__/AppContainer.test.js.snap +1 -1
- package/Components/AudioPlayer/__tests__/__snapshots__/Runtime.test.js.snap +4 -4
- package/Components/AudioPlayer/__tests__/__snapshots__/artWork.test.js.snap +3 -3
- package/Components/AudioPlayer/__tests__/__snapshots__/audioPlayer.test.js.snap +6 -6
- package/Components/AudioPlayer/__tests__/__snapshots__/audioPlayerLayout.test.js.snap +7 -7
- package/Components/AudioPlayer/__tests__/__snapshots__/channel.test.js.snap +3 -3
- package/Components/AudioPlayer/__tests__/__snapshots__/summary.test.js.snap +2 -2
- package/Components/AudioPlayer/__tests__/__snapshots__/title.test.js.snap +2 -2
- package/Components/Cell/Cell.tsx +10 -9
- package/Components/Cell/CellWithFocusable.tsx +1 -1
- package/Components/Cell/TvOSCellComponent.tsx +3 -4
- package/Components/CellRendererResolver/__tests__/__snapshots__/cellRendererResolver.test.js.snap +20 -20
- package/Components/CellRendererResolver/__tests__/cellRendererResolver.test.js +5 -3
- package/Components/ComponentResolver/__tests__/__snapshots__/componentResolver.test.js.snap +5 -5
- package/Components/ComponentResolver/__tests__/componentResolver.test.js +11 -9
- package/Components/DisplayState/__tests__/__snapshots__/displayState.test.js.snap +2 -2
- package/Components/GeneralContentScreen/utils/__tests__/useCurationAPI.test.js +76 -7
- package/Components/GeneralContentScreen/utils/useCurationAPI.ts +53 -9
- package/Components/Layout/TV/__tests__/ScreenContainer.test.tsx +1 -0
- package/Components/Layout/TV/__tests__/__snapshots__/LayoutContainer.test.tsx.snap +1 -1
- package/Components/Layout/TV/__tests__/__snapshots__/NavBarContainer.test.tsx.snap +3 -3
- package/Components/Layout/TV/__tests__/__snapshots__/ScreenContainer.test.tsx.snap +9 -9
- package/Components/Layout/TV/__tests__/__snapshots__/index.test.tsx.snap +1 -1
- package/Components/Layout/TV/__tests__/index.test.tsx +7 -3
- package/Components/MasterCell/DefaultComponents/SecondaryImage/__tests__/__snapshots__/Image.test.tsx.snap +3 -3
- package/Components/MasterCell/SharedUI/CollapsibleTextContainer/__tests__/__snapshots__/index.test.tsx.snap +1 -1
- package/Components/MasterCell/__tests__/__snapshots__/dataAdapter.test.js.snap +180 -180
- package/Components/MasterCell/__tests__/__snapshots__/elementMapper.test.js.snap +7 -7
- package/Components/MasterCell/__tests__/__snapshots__/masterCell.test.js.snap +34 -34
- package/Components/NativeFocusables/{index.js → index.ts} +4 -2
- package/Components/OfflineHandler/__tests__/__snapshots__/index.test.tsx.snap +7 -7
- package/Components/OfflineHandler/__tests__/index.test.tsx +28 -25
- package/Components/PlayerContainer/PlayerContainer.tsx +2 -4
- package/Components/River/RefreshControl.tsx +1 -1
- package/Components/River/__tests__/__snapshots__/componentsMap.test.js.snap +17 -17
- package/Components/River/__tests__/__snapshots__/river.test.js.snap +12 -12
- package/Components/River/__tests__/componentsMap.test.js +47 -12
- package/Components/RouteManager/__tests__/__snapshots__/routeManager.test.js.snap +1 -1
- package/Components/RouteManager/__tests__/__snapshots__/testId.test.js.snap +1 -1
- package/Components/Screen/__tests__/Screen.test.tsx +41 -27
- package/Components/Screen/__tests__/__snapshots__/Screen.test.tsx.snap +4 -4
- package/Components/ScreenResolver/__tests__/__snapshots__/screenResolver.test.js.snap +2 -2
- package/Components/ScreenResolver/__tests__/screenResolver.test.js +31 -27
- package/Components/Tabs/Tab.tsx +1 -0
- package/Components/TextInputTv/__tests__/TextInputTv.test.js +42 -42
- package/Components/TextInputTv/__tests__/__snapshots__/TextInputTv.test.js.snap +7 -0
- package/Components/TextInputTv/index.tsx +2 -2
- package/Components/Touchable/__tests__/__snapshots__/touchable.test.tsx.snap +2 -2
- package/Components/Transitioner/__tests__/__snapshots__/AnimationManager.test.js.snap +26 -26
- package/Components/Transitioner/__tests__/__snapshots__/Scene.test.js.snap +9 -9
- package/Components/Transitioner/__tests__/__snapshots__/config.test.js.snap +20 -20
- package/Components/Transitioner/__tests__/__snapshots__/transitioner.test.js.snap +2 -2
- package/Components/VideoLive/__tests__/PlayerLiveImageComponent.test.tsx +12 -7
- package/Components/VideoLive/__tests__/__snapshots__/PlayerLiveImageComponent.test.tsx.snap +6 -6
- package/Components/VideoModal/ModalAnimation/ModalAnimationContext.tsx +4 -10
- package/Components/VideoModal/ModalAnimation/index.ts +2 -1
- package/Components/VideoModal/ModalAnimation/useModalAnimationContext.ts +6 -0
- package/Components/VideoModal/__tests__/PlayerDetails.test.tsx +5 -2
- package/Components/VideoModal/__tests__/PlayerWrapper.test.tsx +12 -9
- package/Components/VideoModal/__tests__/__snapshots__/PlayerDetails.test.tsx.snap +4 -4
- package/Components/VideoModal/__tests__/__snapshots__/PlayerWrapper.test.tsx.snap +78 -78
- package/Components/VideoModal/utils.ts +2 -4
- package/Components/Viewport/ViewportAware/__tests__/__snapshots__/viewportAware.test.js.snap +2 -2
- package/Components/Viewport/ViewportTracker/__tests__/__snapshots__/viewportTracker.test.js.snap +1 -1
- package/Components/ZappFrameworkComponents/BarView/BarView.tsx +1 -0
- package/Components/ZappUIComponent/__tests__/__snapshots__/ZappUIComponent.test.js.snap +11 -11
- package/Components/default-cell-renderer/__tests__/__snapshots__/defaultCellRenderer.test.tsx.snap +30 -30
- package/Contexts/ConfigutaionContext/__tests__/__snapshots__/ConfigurationProvider.test.tsx.snap +1 -1
- package/Contexts/FocusableGroupContext/withFocusableContext.tsx +18 -11
- package/Decorators/Analytics/{index.js → index.tsx} +11 -11
- package/Decorators/Navigator/__tests__/__snapshots__/navigator.test.js.snap +2 -2
- package/Decorators/RiverFeedLoader/__tests__/__snapshots__/riverFeedLoader.test.tsx.snap +77 -77
- package/Decorators/RiverFeedLoader/__tests__/riverFeedLoader.test.tsx +34 -39
- package/Decorators/RiverFeedLoader/__tests__/utils.test.ts +0 -9
- package/Decorators/RiverFeedLoader/index.tsx +1 -1
- package/Decorators/RiverFeedLoader/utils/getDatasourceUrl.ts +39 -0
- package/Decorators/RiverFeedLoader/utils/index.ts +29 -0
- package/Decorators/RiverFeedLoader/utils/usePipesContexts.ts +40 -0
- package/Decorators/RiverResolver/__tests__/__snapshots__/riverResolver.test.tsx.snap +5 -5
- package/Decorators/RiverResolver/__tests__/riverResolver.test.tsx +16 -10
- package/Decorators/ZappPipesDataConnector/index.tsx +1 -1
- package/package.json +5 -5
- package/Decorators/RiverFeedLoader/utils.ts +0 -100
|
@@ -9,6 +9,18 @@ import { loadPipesData } from "@applicaster/zapp-react-native-redux/ZappPipes";
|
|
|
9
9
|
import { isEmptyOrNil } from "@applicaster/zapp-react-native-utils/cellUtils";
|
|
10
10
|
import { Categories } from "./logger";
|
|
11
11
|
import { createLogger } from "@applicaster/zapp-react-native-utils/logger";
|
|
12
|
+
import { useRoute } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useRoute";
|
|
13
|
+
import {
|
|
14
|
+
ZappPipesEntryContext,
|
|
15
|
+
ZappPipesScreenContext,
|
|
16
|
+
ZappPipesSearchContext,
|
|
17
|
+
} from "@applicaster/zapp-react-native-ui-components/Contexts";
|
|
18
|
+
|
|
19
|
+
import {
|
|
20
|
+
getInflatedDataSourceUrl,
|
|
21
|
+
getSearchContext,
|
|
22
|
+
} from "@applicaster/zapp-react-native-utils/reactHooks/feed/useInflatedUrl";
|
|
23
|
+
|
|
12
24
|
import { produce } from "immer";
|
|
13
25
|
// types reference
|
|
14
26
|
|
|
@@ -20,6 +32,7 @@ type LayoutPresets = PresetsMapping["presets_mappings"];
|
|
|
20
32
|
|
|
21
33
|
const SMART_COMPONENT_TYPE = "quick-brick-smart-component";
|
|
22
34
|
const SOURCE_PATH = ["data", "source"];
|
|
35
|
+
const MAPPING_PATH = ["data", "mapping"];
|
|
23
36
|
|
|
24
37
|
const isSmartComponent = (component) =>
|
|
25
38
|
component.component_type === SMART_COMPONENT_TYPE;
|
|
@@ -58,13 +71,14 @@ export const enrichComponent = (
|
|
|
58
71
|
comp: ZappUIComponent,
|
|
59
72
|
index: number,
|
|
60
73
|
feeds: Feeds,
|
|
61
|
-
layoutPresets: LayoutPresets
|
|
74
|
+
layoutPresets: LayoutPresets,
|
|
75
|
+
urlsMap: { [key: string]: string }
|
|
62
76
|
): ZappUIComponent[] | null => {
|
|
63
77
|
if (!isSmartComponent(comp)) {
|
|
64
78
|
return [comp];
|
|
65
79
|
}
|
|
66
80
|
|
|
67
|
-
const presets = prop<string[]>(
|
|
81
|
+
const presets = prop<string[]>(urlsMap[comp.id], feeds);
|
|
68
82
|
|
|
69
83
|
if (presets && presets.data && presets.data.entry) {
|
|
70
84
|
return presets.data.entry
|
|
@@ -113,11 +127,35 @@ export const useCurationAPI = (
|
|
|
113
127
|
[components]
|
|
114
128
|
);
|
|
115
129
|
|
|
116
|
-
const
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
130
|
+
const { pathname } = useRoute();
|
|
131
|
+
const [entryContext] = ZappPipesEntryContext.useZappPipesContext(pathname);
|
|
132
|
+
const [searchContext] = ZappPipesSearchContext.useZappPipesContext();
|
|
133
|
+
const [screenContext] = ZappPipesScreenContext.useZappPipesContext();
|
|
134
|
+
|
|
135
|
+
const urlsMap = useMemo<{ [key: string]: string }>(() => {
|
|
136
|
+
const map = {};
|
|
137
|
+
|
|
138
|
+
smartComponents?.forEach?.((component) => {
|
|
139
|
+
const url = path(SOURCE_PATH, component);
|
|
140
|
+
const mapping = path(MAPPING_PATH, component);
|
|
141
|
+
|
|
142
|
+
map[component.id] = mapping
|
|
143
|
+
? getInflatedDataSourceUrl({
|
|
144
|
+
source: url,
|
|
145
|
+
contexts: {
|
|
146
|
+
entry: entryContext,
|
|
147
|
+
screen: screenContext,
|
|
148
|
+
search: getSearchContext(searchContext, mapping),
|
|
149
|
+
},
|
|
150
|
+
mapping,
|
|
151
|
+
})
|
|
152
|
+
: url;
|
|
153
|
+
});
|
|
154
|
+
|
|
155
|
+
return map;
|
|
156
|
+
}, [smartComponents, entryContext, screenContext, searchContext]);
|
|
157
|
+
|
|
158
|
+
const urls = useMemo<string[]>(() => Object.values(urlsMap), [urlsMap]);
|
|
121
159
|
|
|
122
160
|
useEffect(() => {
|
|
123
161
|
urls.forEach((url, index) => {
|
|
@@ -138,11 +176,17 @@ export const useCurationAPI = (
|
|
|
138
176
|
if (!components) return [];
|
|
139
177
|
|
|
140
178
|
return components.reduce((acc, comp, index) => {
|
|
141
|
-
const enrichedComp = enrichComponent(
|
|
179
|
+
const enrichedComp = enrichComponent(
|
|
180
|
+
comp,
|
|
181
|
+
index,
|
|
182
|
+
feeds,
|
|
183
|
+
layoutPresets,
|
|
184
|
+
urlsMap
|
|
185
|
+
);
|
|
142
186
|
|
|
143
187
|
return enrichedComp ? [...acc, ...enrichedComp] : acc;
|
|
144
188
|
}, [] as Array<ZappUIComponent>);
|
|
145
|
-
}, [components, feeds, layoutPresets]);
|
|
189
|
+
}, [components, feeds, layoutPresets, urlsMap]);
|
|
146
190
|
|
|
147
191
|
return getFinalComponents(
|
|
148
192
|
enrichedComponents,
|
|
@@ -4,8 +4,8 @@ exports[`ScreenContainer renders 1`] = `
|
|
|
4
4
|
<RNCSafeAreaProvider
|
|
5
5
|
onInsetsChange={[Function]}
|
|
6
6
|
style={
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
[
|
|
8
|
+
{
|
|
9
9
|
"flex": 1,
|
|
10
10
|
},
|
|
11
11
|
undefined,
|
|
@@ -14,14 +14,14 @@ exports[`ScreenContainer renders 1`] = `
|
|
|
14
14
|
>
|
|
15
15
|
<View
|
|
16
16
|
style={
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
[
|
|
18
|
+
{
|
|
19
19
|
"position": "absolute",
|
|
20
20
|
"top": 0,
|
|
21
21
|
"width": 1920,
|
|
22
22
|
"zIndex": 10,
|
|
23
23
|
},
|
|
24
|
-
|
|
24
|
+
{
|
|
25
25
|
"maxHeight": 10,
|
|
26
26
|
},
|
|
27
27
|
]
|
|
@@ -30,7 +30,7 @@ exports[`ScreenContainer renders 1`] = `
|
|
|
30
30
|
>
|
|
31
31
|
<View
|
|
32
32
|
isVisible={true}
|
|
33
|
-
menuPlugin={
|
|
33
|
+
menuPlugin={{}}
|
|
34
34
|
navigationProps={null}
|
|
35
35
|
/>
|
|
36
36
|
</View>
|
|
@@ -38,13 +38,13 @@ exports[`ScreenContainer renders 1`] = `
|
|
|
38
38
|
`;
|
|
39
39
|
|
|
40
40
|
exports[`ScreenContainer sets margins provided by the theme 1`] = `
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
[
|
|
42
|
+
{
|
|
43
43
|
"flex": 1,
|
|
44
44
|
"height": "100%",
|
|
45
45
|
"width": "100%",
|
|
46
46
|
},
|
|
47
|
-
|
|
47
|
+
{
|
|
48
48
|
"backgroundColor": "transparent",
|
|
49
49
|
"marginBottom": 10,
|
|
50
50
|
"paddingBottom": 0,
|
|
@@ -8,9 +8,13 @@ import configureStore from "redux-mock-store";
|
|
|
8
8
|
|
|
9
9
|
const withoutChildren = omit(["children"]);
|
|
10
10
|
|
|
11
|
-
jest.mock("../../../Screen/TV/index.web", () =>
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
jest.mock("../../../Screen/TV/index.web", () => {
|
|
12
|
+
const View = jest.requireActual("react-native").View;
|
|
13
|
+
|
|
14
|
+
return {
|
|
15
|
+
Screen: View,
|
|
16
|
+
};
|
|
17
|
+
});
|
|
14
18
|
|
|
15
19
|
const Layout = require("../index.web").default;
|
|
16
20
|
|
|
@@ -6,7 +6,7 @@ exports[`SecondaryImage - Image SecondaryImage should render if known dimensions
|
|
|
6
6
|
<View
|
|
7
7
|
onLayout={[Function]}
|
|
8
8
|
style={
|
|
9
|
-
|
|
9
|
+
{
|
|
10
10
|
"borderRadius": 10,
|
|
11
11
|
"height": 100,
|
|
12
12
|
"width": 100,
|
|
@@ -16,12 +16,12 @@ exports[`SecondaryImage - Image SecondaryImage should render if known dimensions
|
|
|
16
16
|
<Image
|
|
17
17
|
onAsyncRender={[Function]}
|
|
18
18
|
source={
|
|
19
|
-
|
|
19
|
+
{
|
|
20
20
|
"uri": "",
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
style={
|
|
24
|
-
|
|
24
|
+
{
|
|
25
25
|
"aspectRatio": 1,
|
|
26
26
|
"borderRadius": 10,
|
|
27
27
|
"height": 100,
|