@applicaster/zapp-react-native-ui-components 14.0.0-alpha.5974411329 → 14.0.0-alpha.6000342231

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 (95) hide show
  1. package/Components/AnimatedInOut/index.tsx +69 -26
  2. package/Components/BaseFocusable/index.tsx +23 -12
  3. package/Components/Cell/Cell.tsx +91 -64
  4. package/Components/Cell/CellWithFocusable.tsx +3 -0
  5. package/Components/Cell/FocusableWrapper.tsx +44 -0
  6. package/Components/Cell/TvOSCellComponent.tsx +80 -14
  7. package/Components/Cell/__tests__/CellWIthFocusable.test.js +3 -2
  8. package/Components/FeedLoader/FeedLoader.tsx +7 -16
  9. package/Components/FeedLoader/FeedLoaderHOC.tsx +21 -0
  10. package/Components/FeedLoader/index.js +2 -8
  11. package/Components/Focusable/Focusable.tsx +10 -3
  12. package/Components/Focusable/FocusableTvOS.tsx +2 -2
  13. package/Components/Focusable/Touchable.tsx +5 -3
  14. package/Components/Focusable/index.android.tsx +8 -4
  15. package/Components/FocusableGroup/FocusableTvOS.tsx +1 -1
  16. package/Components/FocusableList/FocusableItem.tsx +4 -3
  17. package/Components/FocusableList/FocusableListItemWrapper.tsx +2 -1
  18. package/Components/FocusableList/hooks/useCellState.android.ts +13 -3
  19. package/Components/FocusableList/index.tsx +16 -9
  20. package/Components/FreezeWithCallback/__tests__/index.test.tsx +67 -43
  21. package/Components/GeneralContentScreen/utils/useCurationAPI.ts +14 -17
  22. package/Components/HandlePlayable/HandlePlayable.tsx +14 -65
  23. package/Components/HandlePlayable/const.ts +3 -0
  24. package/Components/HandlePlayable/utils.ts +74 -0
  25. package/Components/Layout/TV/__tests__/index.test.tsx +0 -1
  26. package/Components/MasterCell/DefaultComponents/ActionButton.tsx +6 -2
  27. package/Components/MasterCell/DefaultComponents/FocusableView/index.tsx +0 -12
  28. package/Components/MasterCell/DefaultComponents/SecondaryImage/Image.tsx +65 -17
  29. package/Components/MasterCell/DefaultComponents/SecondaryImage/__tests__/Image.test.tsx +21 -3
  30. package/Components/MasterCell/DefaultComponents/SecondaryImage/__tests__/__snapshots__/Image.test.tsx.snap +6 -3
  31. package/Components/MasterCell/DefaultComponents/Text/index.tsx +26 -6
  32. package/Components/MasterCell/DefaultComponents/__tests__/image.test.js +10 -10
  33. package/Components/MasterCell/DefaultComponents/__tests__/text.test.tsx +18 -18
  34. package/Components/MasterCell/SharedUI/CollapsibleTextContainer/__tests__/index.test.tsx +10 -10
  35. package/Components/MasterCell/utils/behaviorProvider.ts +2 -2
  36. package/Components/MasterCell/utils/index.ts +1 -19
  37. package/Components/OfflineHandler/__tests__/index.test.tsx +6 -13
  38. package/Components/PlayerContainer/PlayerContainer.tsx +5 -17
  39. package/Components/PlayerImageBackground/index.tsx +3 -22
  40. package/Components/River/ComponentsMap/ComponentsMap.tsx +49 -42
  41. package/Components/River/ComponentsMap/ContextProviders/ComponentsMapHeightContext.ts +8 -0
  42. package/Components/River/ComponentsMap/ContextProviders/ComponentsMapRefContext.ts +8 -0
  43. package/Components/River/ComponentsMap/hooks/__tests__/useLoadingState.test.ts +0 -1
  44. package/Components/River/RefreshControl.tsx +11 -19
  45. package/Components/River/__tests__/river.test.js +12 -26
  46. package/Components/Screen/TV/hooks/useInitialFocus.ts +14 -4
  47. package/Components/Screen/__tests__/Screen.test.tsx +5 -17
  48. package/Components/Screen/__tests__/__snapshots__/Screen.test.tsx.snap +2 -0
  49. package/Components/Screen/__tests__/navigationHandler.test.ts +133 -22
  50. package/Components/Screen/index.tsx +22 -5
  51. package/Components/Screen/navigationHandler.ts +20 -2
  52. package/Components/ScreenRevealManager/__tests__/ScreenRevealManager.test.ts +2 -2
  53. package/Components/ScreenRevealManager/utils/index.ts +23 -0
  54. package/Components/ScreenRevealManager/withScreenRevealManager.tsx +54 -24
  55. package/Components/Tabs/TV/Tabs.android.tsx +1 -1
  56. package/Components/Tabs/Tabs.tsx +2 -3
  57. package/Components/TextInputTv/__tests__/__snapshots__/TextInputTv.test.js.snap +13 -0
  58. package/Components/TextInputTv/index.tsx +11 -0
  59. package/Components/Touchable/__tests__/touchable.test.tsx +12 -17
  60. package/Components/VideoLive/__tests__/__snapshots__/PlayerLiveImageComponent.test.tsx.snap +1 -0
  61. package/Components/VideoModal/ModalAnimation/ModalAnimationContext.tsx +117 -157
  62. package/Components/VideoModal/ModalAnimation/index.ts +2 -13
  63. package/Components/VideoModal/ModalAnimation/utils.ts +1 -327
  64. package/Components/VideoModal/PlayerDetails.tsx +5 -5
  65. package/Components/VideoModal/PlayerWrapper.tsx +14 -88
  66. package/Components/VideoModal/__tests__/PlayerDetails.test.tsx +5 -5
  67. package/Components/VideoModal/__tests__/PlayerWrapper.test.tsx +1 -0
  68. package/Components/VideoModal/hooks/__tests__/useDelayedPlayerDetails.test.ts +9 -1
  69. package/Components/VideoModal/hooks/useDelayedPlayerDetails.ts +40 -15
  70. package/Components/VideoModal/hooks/useModalSize.ts +10 -5
  71. package/Components/VideoModal/hooks/utils/__tests__/showDetails.test.ts +2 -2
  72. package/Components/VideoModal/hooks/utils/index.ts +4 -0
  73. package/Components/VideoModal/playerWrapperStyle.ts +70 -0
  74. package/Components/VideoModal/playerWrapperUtils.ts +91 -0
  75. package/Contexts/CellFocusedStateContext/index.tsx +27 -0
  76. package/Contexts/ConfigutaionContext/__tests__/ConfigurationProvider.test.tsx +3 -3
  77. package/Contexts/ScreenContext/index.tsx +28 -32
  78. package/Decorators/ConfigurationWrapper/__tests__/withConfigurationProvider.test.tsx +3 -3
  79. package/Decorators/RiverFeedLoader/__tests__/__snapshots__/riverFeedLoader.test.tsx.snap +221 -209
  80. package/Decorators/RiverFeedLoader/__tests__/riverFeedLoader.test.tsx +14 -16
  81. package/Decorators/RiverFeedLoader/__tests__/utils.test.ts +0 -20
  82. package/Decorators/RiverFeedLoader/index.tsx +21 -13
  83. package/Decorators/RiverFeedLoader/utils/getDatasourceUrl.ts +6 -10
  84. package/Decorators/RiverFeedLoader/utils/index.ts +0 -35
  85. package/Decorators/ZappPipesDataConnector/__tests__/UrlFeedResolver.test.tsx +27 -27
  86. package/Decorators/ZappPipesDataConnector/resolvers/UrlFeedResolver.tsx +3 -5
  87. package/Decorators/ZappPipesDataConnector/utils/useFilter.tsx +68 -76
  88. package/events/index.ts +3 -0
  89. package/package.json +5 -5
  90. package/Components/River/__tests__/__snapshots__/river.test.js.snap +0 -27
  91. package/Components/VideoModal/ModalAnimation/AnimatedPlayerModalWrapper.tsx +0 -60
  92. package/Components/VideoModal/ModalAnimation/AnimatedScrollModal.tsx +0 -421
  93. package/Components/VideoModal/ModalAnimation/AnimatedVideoPlayerComponent.tsx +0 -176
  94. package/Components/VideoModal/ModalAnimation/AnimationComponent.tsx +0 -500
  95. package/Components/VideoModal/ModalAnimation/__tests__/getMoveUpValue.test.ts +0 -108
@@ -1,214 +1,226 @@
1
1
  // Jest Snapshot v1, https://goo.gl/fbAQLP
2
2
 
3
3
  exports[`WithRiverFeedLoader renders correctly 1`] = `
4
- <View
5
- dispatch={[MockFunction]}
6
- river={
7
- {
8
- "id": "A1234",
9
- "ui_components": [
10
- {
11
- "data": {
12
- "source": "http://datasource0",
13
- },
14
- "rules": {
15
- "clear_cache_on_reload": false,
16
- },
17
- },
18
- {
19
- "data": {
20
- "source": "http://datasource1",
21
- },
22
- "rules": {
23
- "clear_cache_on_reload": false,
24
- },
25
- },
26
- {
27
- "data": {
28
- "source": "http://datasource2",
29
- },
30
- "rules": {
31
- "clear_cache_on_reload": false,
32
- },
33
- },
34
- {
35
- "data": {
36
- "source": "http://datasource3",
37
- },
38
- "rules": {
39
- "clear_cache_on_reload": false,
40
- },
41
- },
42
- {
43
- "data": {
44
- "source": "http://datasource4",
45
- },
46
- "rules": {
47
- "clear_cache_on_reload": false,
48
- },
49
- },
50
- {
51
- "data": {
52
- "source": "http://datasource5",
53
- },
54
- "rules": {
55
- "clear_cache_on_reload": false,
56
- },
57
- },
58
- {
59
- "data": {
60
- "source": "http://datasource6",
61
- },
62
- "rules": {
63
- "clear_cache_on_reload": false,
64
- },
65
- },
66
- {
67
- "data": {
68
- "source": "http://datasource7",
69
- },
70
- "rules": {
71
- "clear_cache_on_reload": false,
72
- },
73
- },
74
- {
75
- "data": {
76
- "source": "http://datasource8",
77
- },
78
- "rules": {
79
- "clear_cache_on_reload": false,
80
- },
81
- },
82
- {
83
- "data": {
84
- "source": "http://datasource9",
85
- },
86
- "rules": {
87
- "clear_cache_on_reload": false,
88
- },
89
- },
90
- {
91
- "data": {
92
- "source": "http://datasource10",
93
- },
94
- "rules": {
95
- "clear_cache_on_reload": false,
96
- },
97
- },
98
- {
99
- "data": {
100
- "source": "http://datasource11",
101
- },
102
- "rules": {
103
- "clear_cache_on_reload": false,
104
- },
105
- },
106
- {
107
- "data": {
108
- "source": "http://datasource12",
109
- },
110
- "rules": {
111
- "clear_cache_on_reload": true,
112
- },
113
- },
114
- {
115
- "data": {
116
- "source": "http://datasource13",
117
- },
118
- "rules": {
119
- "clear_cache_on_reload": false,
120
- },
121
- },
122
- {
123
- "data": {
124
- "source": "http://datasource14",
125
- },
126
- "rules": {
127
- "clear_cache_on_reload": false,
128
- },
129
- },
130
- {
131
- "data": {
132
- "source": "http://datasource15",
133
- },
134
- "rules": {
135
- "clear_cache_on_reload": false,
136
- },
137
- },
138
- {
139
- "data": {
140
- "source": "http://datasource16",
141
- },
142
- "rules": {
143
- "clear_cache_on_reload": false,
144
- },
145
- },
146
- {
147
- "data": {
148
- "source": "http://datasource17",
149
- },
150
- "rules": {
151
- "clear_cache_on_reload": false,
152
- },
153
- },
154
- {
155
- "data": {
156
- "source": "http://datasource18",
157
- },
158
- "rules": {
159
- "clear_cache_on_reload": false,
160
- },
161
- },
162
- {
163
- "data": {
164
- "source": "http://datasource19",
165
- },
166
- "rules": {
167
- "clear_cache_on_reload": false,
168
- },
169
- },
170
- {
171
- "data": {
172
- "source": "http://datasource20",
173
- },
174
- "rules": {
175
- "clear_cache_on_reload": true,
176
- },
177
- },
178
- {
179
- "data": {
180
- "source": "http://datasource21",
181
- },
182
- "rules": {
183
- "clear_cache_on_reload": false,
184
- },
185
- },
186
- {
187
- "data": {
188
- "source": "http://datasource22",
189
- },
190
- "rules": {
191
- "clear_cache_on_reload": false,
192
- },
193
- },
194
- {
195
- "data": {
196
- "source": "http://datasource23",
197
- },
198
- "rules": {
199
- "clear_cache_on_reload": false,
200
- },
201
- },
202
- {
203
- "data": {
204
- "source": "http://datasource24",
205
- },
206
- "rules": {
207
- "clear_cache_on_reload": false,
208
- },
209
- },
210
- ],
211
- }
4
+ <RNCSafeAreaProvider
5
+ onInsetsChange={[Function]}
6
+ style={
7
+ [
8
+ {
9
+ "flex": 1,
10
+ },
11
+ undefined,
12
+ ]
212
13
  }
213
- />
14
+ >
15
+ <View
16
+ dispatch={[MockFunction]}
17
+ river={
18
+ {
19
+ "id": "A1234",
20
+ "ui_components": [
21
+ {
22
+ "data": {
23
+ "source": "http://datasource0",
24
+ },
25
+ "rules": {
26
+ "clear_cache_on_reload": false,
27
+ },
28
+ },
29
+ {
30
+ "data": {
31
+ "source": "http://datasource1",
32
+ },
33
+ "rules": {
34
+ "clear_cache_on_reload": false,
35
+ },
36
+ },
37
+ {
38
+ "data": {
39
+ "source": "http://datasource2",
40
+ },
41
+ "rules": {
42
+ "clear_cache_on_reload": false,
43
+ },
44
+ },
45
+ {
46
+ "data": {
47
+ "source": "http://datasource3",
48
+ },
49
+ "rules": {
50
+ "clear_cache_on_reload": false,
51
+ },
52
+ },
53
+ {
54
+ "data": {
55
+ "source": "http://datasource4",
56
+ },
57
+ "rules": {
58
+ "clear_cache_on_reload": false,
59
+ },
60
+ },
61
+ {
62
+ "data": {
63
+ "source": "http://datasource5",
64
+ },
65
+ "rules": {
66
+ "clear_cache_on_reload": false,
67
+ },
68
+ },
69
+ {
70
+ "data": {
71
+ "source": "http://datasource6",
72
+ },
73
+ "rules": {
74
+ "clear_cache_on_reload": false,
75
+ },
76
+ },
77
+ {
78
+ "data": {
79
+ "source": "http://datasource7",
80
+ },
81
+ "rules": {
82
+ "clear_cache_on_reload": false,
83
+ },
84
+ },
85
+ {
86
+ "data": {
87
+ "source": "http://datasource8",
88
+ },
89
+ "rules": {
90
+ "clear_cache_on_reload": false,
91
+ },
92
+ },
93
+ {
94
+ "data": {
95
+ "source": "http://datasource9",
96
+ },
97
+ "rules": {
98
+ "clear_cache_on_reload": false,
99
+ },
100
+ },
101
+ {
102
+ "data": {
103
+ "source": "http://datasource10",
104
+ },
105
+ "rules": {
106
+ "clear_cache_on_reload": false,
107
+ },
108
+ },
109
+ {
110
+ "data": {
111
+ "source": "http://datasource11",
112
+ },
113
+ "rules": {
114
+ "clear_cache_on_reload": false,
115
+ },
116
+ },
117
+ {
118
+ "data": {
119
+ "source": "http://datasource12",
120
+ },
121
+ "rules": {
122
+ "clear_cache_on_reload": true,
123
+ },
124
+ },
125
+ {
126
+ "data": {
127
+ "source": "http://datasource13",
128
+ },
129
+ "rules": {
130
+ "clear_cache_on_reload": false,
131
+ },
132
+ },
133
+ {
134
+ "data": {
135
+ "source": "http://datasource14",
136
+ },
137
+ "rules": {
138
+ "clear_cache_on_reload": false,
139
+ },
140
+ },
141
+ {
142
+ "data": {
143
+ "source": "http://datasource15",
144
+ },
145
+ "rules": {
146
+ "clear_cache_on_reload": false,
147
+ },
148
+ },
149
+ {
150
+ "data": {
151
+ "source": "http://datasource16",
152
+ },
153
+ "rules": {
154
+ "clear_cache_on_reload": false,
155
+ },
156
+ },
157
+ {
158
+ "data": {
159
+ "source": "http://datasource17",
160
+ },
161
+ "rules": {
162
+ "clear_cache_on_reload": false,
163
+ },
164
+ },
165
+ {
166
+ "data": {
167
+ "source": "http://datasource18",
168
+ },
169
+ "rules": {
170
+ "clear_cache_on_reload": false,
171
+ },
172
+ },
173
+ {
174
+ "data": {
175
+ "source": "http://datasource19",
176
+ },
177
+ "rules": {
178
+ "clear_cache_on_reload": false,
179
+ },
180
+ },
181
+ {
182
+ "data": {
183
+ "source": "http://datasource20",
184
+ },
185
+ "rules": {
186
+ "clear_cache_on_reload": true,
187
+ },
188
+ },
189
+ {
190
+ "data": {
191
+ "source": "http://datasource21",
192
+ },
193
+ "rules": {
194
+ "clear_cache_on_reload": false,
195
+ },
196
+ },
197
+ {
198
+ "data": {
199
+ "source": "http://datasource22",
200
+ },
201
+ "rules": {
202
+ "clear_cache_on_reload": false,
203
+ },
204
+ },
205
+ {
206
+ "data": {
207
+ "source": "http://datasource23",
208
+ },
209
+ "rules": {
210
+ "clear_cache_on_reload": false,
211
+ },
212
+ },
213
+ {
214
+ "data": {
215
+ "source": "http://datasource24",
216
+ },
217
+ "rules": {
218
+ "clear_cache_on_reload": false,
219
+ },
220
+ },
221
+ ],
222
+ }
223
+ }
224
+ />
225
+ </RNCSafeAreaProvider>
214
226
  `;
@@ -1,9 +1,8 @@
1
1
  import React from "react";
2
- import * as R from "ramda";
3
2
  import { View } from "react-native";
4
- import { render } from "@testing-library/react-native";
5
3
 
6
4
  import * as mock_fixtures from "./fixtures";
5
+ import { renderWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
7
6
 
8
7
  const mockUsePipesContexts = () => ({
9
8
  entry: mock_fixtures.entryContext,
@@ -11,8 +10,13 @@ const mockUsePipesContexts = () => ({
11
10
  search: mock_fixtures.searchContext,
12
11
  });
13
12
 
14
- const mockGetDatasourceUrl = jest.fn(
15
- R.curry((_, component) => component.data.source)
13
+ const mockDispatchLoadPipesData = jest.fn();
14
+
15
+ jest.mock(
16
+ "@applicaster/zapp-react-native-utils/reactHooks/feed/useLoadPipesDataDispatch",
17
+ () => ({
18
+ useLoadPipesDataDispatch: jest.fn(() => mockDispatchLoadPipesData),
19
+ })
16
20
  );
17
21
 
18
22
  jest.mock(
@@ -31,8 +35,6 @@ jest.mock(
31
35
 
32
36
  jest.mock("../utils", () => ({
33
37
  ...jest.requireActual("../utils"),
34
- loadDatasources: jest.fn(),
35
- getDatasourceUrl: mockGetDatasourceUrl,
36
38
  usePipesContexts: mockUsePipesContexts,
37
39
  }));
38
40
 
@@ -45,27 +47,23 @@ const riverProps = {
45
47
  dispatch: jest.fn(),
46
48
  };
47
49
 
48
- const { loadDatasources, getDatasourceUrl } = require("../utils");
49
-
50
50
  const { WithRiverFeedLoader } = require("..");
51
51
 
52
52
  describe("WithRiverFeedLoader", () => {
53
53
  const DecoratedRiver = WithRiverFeedLoader(River);
54
- const wrapper = render(<DecoratedRiver {...riverProps} />);
54
+ const wrapper = renderWithProviders(<DecoratedRiver {...riverProps} />);
55
55
 
56
56
  it("renders correctly", () => {
57
57
  expect(wrapper.toJSON()).toMatchSnapshot();
58
58
  });
59
59
 
60
60
  it("collects the datasources in the screen and loads them", () => {
61
- expect(getDatasourceUrl).toHaveBeenCalledTimes(1);
62
- expect(loadDatasources).toHaveBeenCalledTimes(1);
61
+ expect(mockDispatchLoadPipesData).toHaveBeenCalledTimes(23);
63
62
 
64
- expect(loadDatasources).toHaveBeenNthCalledWith(
65
- 1,
66
- mock_fixtures.riverDataSources,
67
- mock_fixtures.river.id,
68
- riverProps.dispatch
63
+ expect(mockDispatchLoadPipesData).toHaveBeenLastCalledWith(
64
+ "http://datasource24",
65
+ {},
66
+ { withResolvers: true, withScreenRouteMapping: true }
69
67
  );
70
68
  });
71
69
  });
@@ -14,31 +14,11 @@ jest.mock("@applicaster/zapp-react-native-redux/ZappPipes", () => ({
14
14
  }));
15
15
 
16
16
  const {
17
- loadDatasources,
18
17
  riverIsCurrentRoute,
19
18
  getDatasourceUrl,
20
19
  ignoreComponentsWithClearCacheFlag,
21
20
  } = require("../utils");
22
21
 
23
- const {
24
- loadPipesData,
25
- } = require("@applicaster/zapp-react-native-redux/ZappPipes");
26
-
27
- const dispatch = (value) => Promise.resolve(value);
28
-
29
- describe("loadDataSource", () => {
30
- it("calls loadPipesData for each provided urls", async () => {
31
- const urls = [
32
- ["http://datasource1", "http://datasource2"],
33
- ["http://datasource3", "http://datasource4"],
34
- ];
35
-
36
- await loadDatasources(urls, river.id, dispatch);
37
-
38
- expect(loadPipesData).toHaveBeenCalledTimes(R.flatten(urls).length);
39
- });
40
- });
41
-
42
22
  describe("riverIsCurrentRoute", () => {
43
23
  const route = "/river/homeId/river/screenId";
44
24
  const riverId = "screenId";
@@ -4,17 +4,19 @@ import { DispatchProp } from "react-redux";
4
4
 
5
5
  import { useRoute } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useRoute";
6
6
 
7
- import { mapAndSplit } from "@applicaster/zapp-react-native-utils/arrayUtils";
7
+ import {
8
+ mapAndSplit,
9
+ mapPromises,
10
+ reducePromises,
11
+ } from "@applicaster/zapp-react-native-utils/arrayUtils";
8
12
 
9
13
  import {
10
14
  DATASOURCE_CHUNKS,
11
15
  getDatasourceUrl,
12
16
  ignoreComponentsWithClearCacheFlag,
13
- loadDatasources,
14
17
  usePipesContexts,
15
18
  } from "./utils";
16
- import { useScreenResolvers } from "@applicaster/zapp-react-native-utils/actionsExecutor/screenResolver";
17
- import { useScreenStateStore } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useScreenStateStore";
19
+ import { useLoadPipesDataDispatch } from "@applicaster/zapp-react-native-utils/reactHooks";
18
20
 
19
21
  type RiverProps = {
20
22
  dispatch: DispatchProp;
@@ -27,9 +29,9 @@ export function WithRiverFeedLoader(Component: ZappComponent) {
27
29
  return function WrappedWithRiverFeedLoader(props: RiverProps) {
28
30
  const { river } = props;
29
31
  const { screenData, pathname } = useRoute();
30
- const resolvers = useScreenResolvers();
31
32
  const pipesContexts = usePipesContexts(river.id, pathname);
32
- const screenStateStore = useScreenStateStore();
33
+
34
+ const loadPipesDataDispatcher = useLoadPipesDataDispatch();
33
35
 
34
36
  const componentsToLoad = ignoreComponentsWithClearCacheFlag(
35
37
  river?.ui_components || []
@@ -52,13 +54,19 @@ export function WithRiverFeedLoader(Component: ZappComponent) {
52
54
  item?.filter((item2) => item2 !== undefined)
53
55
  );
54
56
 
55
- loadDatasources(
56
- nonEmptyDataSources,
57
- river?.id,
58
- props.dispatch,
59
- resolvers,
60
- screenStateStore,
61
- pathname
57
+ reducePromises<string, void>(
58
+ mapPromises<string, void>((url) =>
59
+ loadPipesDataDispatcher(
60
+ url,
61
+ {},
62
+ {
63
+ withResolvers: true,
64
+ withScreenRouteMapping: true,
65
+ }
66
+ )
67
+ ),
68
+ undefined,
69
+ nonEmptyDataSources
62
70
  );
63
71
  }, []);
64
72
 
@@ -24,16 +24,12 @@ export const getDatasourceUrl: (
24
24
  ) => {
25
25
  const { source, mapping } = R.propOr({}, ["data"], component);
26
26
 
27
- if (mapping) {
28
- const contexts = {
29
- entry: entryContext,
30
- screen: screenContext || screenData,
31
- search: getSearchContext(searchContext, mapping),
32
- };
27
+ const contexts = {
28
+ entry: entryContext,
29
+ screen: screenContext || screenData,
30
+ search: getSearchContext(searchContext, mapping),
31
+ };
33
32
 
34
- return getInflatedDataSourceUrl({ source, mapping, contexts });
35
- }
36
-
37
- return source;
33
+ return getInflatedDataSourceUrl({ source, mapping, contexts });
38
34
  }
39
35
  );
@@ -1,11 +1,4 @@
1
1
  import * as R from "ramda";
2
- import { loadPipesData } from "@applicaster/zapp-react-native-redux/ZappPipes";
3
-
4
- import {
5
- mapPromises,
6
- reducePromises,
7
- } from "@applicaster/zapp-react-native-utils/arrayUtils";
8
- import { applyScreenRouteDefaults } from "@applicaster/zapp-react-native-redux/ZappPipes/feedProcessor";
9
2
 
10
3
  export { riverIsCurrentRoute, usePipesContexts } from "./usePipesContexts";
11
4
 
@@ -13,34 +6,6 @@ export { getDatasourceUrl } from "./getDatasourceUrl";
13
6
 
14
7
  export const DATASOURCE_CHUNKS = 10;
15
8
 
16
- export async function loadDatasources(
17
- urls: string[][],
18
- riverId,
19
- dispatch,
20
- resolvers,
21
- screenStateStore,
22
- pathname
23
- ) {
24
- return reducePromises<string, void>(
25
- mapPromises<string, void>((url) => {
26
- if (url) {
27
- const onLoadCB = (data, _err) => {
28
- if (data) {
29
- // @TODO check if needed somewhere else
30
- applyScreenRouteDefaults(data, screenStateStore, pathname);
31
- }
32
- };
33
-
34
- return dispatch(
35
- loadPipesData(url, { riverId, resolvers, callback: onLoadCB })
36
- );
37
- }
38
- }),
39
- undefined,
40
- urls
41
- );
42
- }
43
-
44
9
  export const ignoreComponentsWithClearCacheFlag = R.reject(
45
10
  R.pathEq(["rules", "clear_cache_on_reload"], true)
46
11
  );