@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.
- package/Components/AnimatedInOut/index.tsx +69 -26
- package/Components/BaseFocusable/index.tsx +23 -12
- package/Components/Cell/Cell.tsx +91 -64
- package/Components/Cell/CellWithFocusable.tsx +3 -0
- package/Components/Cell/FocusableWrapper.tsx +44 -0
- package/Components/Cell/TvOSCellComponent.tsx +80 -14
- package/Components/Cell/__tests__/CellWIthFocusable.test.js +3 -2
- package/Components/FeedLoader/FeedLoader.tsx +7 -16
- package/Components/FeedLoader/FeedLoaderHOC.tsx +21 -0
- package/Components/FeedLoader/index.js +2 -8
- package/Components/Focusable/Focusable.tsx +10 -3
- package/Components/Focusable/FocusableTvOS.tsx +2 -2
- package/Components/Focusable/Touchable.tsx +5 -3
- package/Components/Focusable/index.android.tsx +8 -4
- package/Components/FocusableGroup/FocusableTvOS.tsx +1 -1
- package/Components/FocusableList/FocusableItem.tsx +4 -3
- package/Components/FocusableList/FocusableListItemWrapper.tsx +2 -1
- package/Components/FocusableList/hooks/useCellState.android.ts +13 -3
- package/Components/FocusableList/index.tsx +16 -9
- package/Components/FreezeWithCallback/__tests__/index.test.tsx +67 -43
- package/Components/GeneralContentScreen/utils/useCurationAPI.ts +14 -17
- package/Components/HandlePlayable/HandlePlayable.tsx +14 -65
- package/Components/HandlePlayable/const.ts +3 -0
- package/Components/HandlePlayable/utils.ts +74 -0
- package/Components/Layout/TV/__tests__/index.test.tsx +0 -1
- package/Components/MasterCell/DefaultComponents/ActionButton.tsx +6 -2
- package/Components/MasterCell/DefaultComponents/FocusableView/index.tsx +0 -12
- package/Components/MasterCell/DefaultComponents/SecondaryImage/Image.tsx +65 -17
- package/Components/MasterCell/DefaultComponents/SecondaryImage/__tests__/Image.test.tsx +21 -3
- package/Components/MasterCell/DefaultComponents/SecondaryImage/__tests__/__snapshots__/Image.test.tsx.snap +6 -3
- package/Components/MasterCell/DefaultComponents/Text/index.tsx +26 -6
- package/Components/MasterCell/DefaultComponents/__tests__/image.test.js +10 -10
- package/Components/MasterCell/DefaultComponents/__tests__/text.test.tsx +18 -18
- package/Components/MasterCell/SharedUI/CollapsibleTextContainer/__tests__/index.test.tsx +10 -10
- package/Components/MasterCell/utils/behaviorProvider.ts +2 -2
- package/Components/MasterCell/utils/index.ts +1 -19
- package/Components/OfflineHandler/__tests__/index.test.tsx +6 -13
- package/Components/PlayerContainer/PlayerContainer.tsx +5 -17
- package/Components/PlayerImageBackground/index.tsx +3 -22
- package/Components/River/ComponentsMap/ComponentsMap.tsx +49 -42
- package/Components/River/ComponentsMap/ContextProviders/ComponentsMapHeightContext.ts +8 -0
- package/Components/River/ComponentsMap/ContextProviders/ComponentsMapRefContext.ts +8 -0
- package/Components/River/ComponentsMap/hooks/__tests__/useLoadingState.test.ts +0 -1
- package/Components/River/RefreshControl.tsx +11 -19
- package/Components/River/__tests__/river.test.js +12 -26
- package/Components/Screen/TV/hooks/useInitialFocus.ts +14 -4
- package/Components/Screen/__tests__/Screen.test.tsx +5 -17
- package/Components/Screen/__tests__/__snapshots__/Screen.test.tsx.snap +2 -0
- package/Components/Screen/__tests__/navigationHandler.test.ts +133 -22
- package/Components/Screen/index.tsx +22 -5
- package/Components/Screen/navigationHandler.ts +20 -2
- package/Components/ScreenRevealManager/__tests__/ScreenRevealManager.test.ts +2 -2
- package/Components/ScreenRevealManager/utils/index.ts +23 -0
- package/Components/ScreenRevealManager/withScreenRevealManager.tsx +54 -24
- package/Components/Tabs/TV/Tabs.android.tsx +1 -1
- package/Components/Tabs/Tabs.tsx +2 -3
- package/Components/TextInputTv/__tests__/__snapshots__/TextInputTv.test.js.snap +13 -0
- package/Components/TextInputTv/index.tsx +11 -0
- package/Components/Touchable/__tests__/touchable.test.tsx +12 -17
- package/Components/VideoLive/__tests__/__snapshots__/PlayerLiveImageComponent.test.tsx.snap +1 -0
- package/Components/VideoModal/ModalAnimation/ModalAnimationContext.tsx +117 -157
- package/Components/VideoModal/ModalAnimation/index.ts +2 -13
- package/Components/VideoModal/ModalAnimation/utils.ts +1 -327
- package/Components/VideoModal/PlayerDetails.tsx +5 -5
- package/Components/VideoModal/PlayerWrapper.tsx +14 -88
- package/Components/VideoModal/__tests__/PlayerDetails.test.tsx +5 -5
- package/Components/VideoModal/__tests__/PlayerWrapper.test.tsx +1 -0
- package/Components/VideoModal/hooks/__tests__/useDelayedPlayerDetails.test.ts +9 -1
- package/Components/VideoModal/hooks/useDelayedPlayerDetails.ts +40 -15
- package/Components/VideoModal/hooks/useModalSize.ts +10 -5
- package/Components/VideoModal/hooks/utils/__tests__/showDetails.test.ts +2 -2
- package/Components/VideoModal/hooks/utils/index.ts +4 -0
- package/Components/VideoModal/playerWrapperStyle.ts +70 -0
- package/Components/VideoModal/playerWrapperUtils.ts +91 -0
- package/Contexts/CellFocusedStateContext/index.tsx +27 -0
- package/Contexts/ConfigutaionContext/__tests__/ConfigurationProvider.test.tsx +3 -3
- package/Contexts/ScreenContext/index.tsx +28 -32
- package/Decorators/ConfigurationWrapper/__tests__/withConfigurationProvider.test.tsx +3 -3
- package/Decorators/RiverFeedLoader/__tests__/__snapshots__/riverFeedLoader.test.tsx.snap +221 -209
- package/Decorators/RiverFeedLoader/__tests__/riverFeedLoader.test.tsx +14 -16
- package/Decorators/RiverFeedLoader/__tests__/utils.test.ts +0 -20
- package/Decorators/RiverFeedLoader/index.tsx +21 -13
- package/Decorators/RiverFeedLoader/utils/getDatasourceUrl.ts +6 -10
- package/Decorators/RiverFeedLoader/utils/index.ts +0 -35
- package/Decorators/ZappPipesDataConnector/__tests__/UrlFeedResolver.test.tsx +27 -27
- package/Decorators/ZappPipesDataConnector/resolvers/UrlFeedResolver.tsx +3 -5
- package/Decorators/ZappPipesDataConnector/utils/useFilter.tsx +68 -76
- package/events/index.ts +3 -0
- package/package.json +5 -5
- package/Components/River/__tests__/__snapshots__/river.test.js.snap +0 -27
- package/Components/VideoModal/ModalAnimation/AnimatedPlayerModalWrapper.tsx +0 -60
- package/Components/VideoModal/ModalAnimation/AnimatedScrollModal.tsx +0 -421
- package/Components/VideoModal/ModalAnimation/AnimatedVideoPlayerComponent.tsx +0 -176
- package/Components/VideoModal/ModalAnimation/AnimationComponent.tsx +0 -500
- package/Components/VideoModal/ModalAnimation/__tests__/getMoveUpValue.test.ts +0 -108
|
@@ -1,10 +1,16 @@
|
|
|
1
1
|
import React from "react";
|
|
2
|
-
import { render } from "@testing-library/react-native";
|
|
3
2
|
import * as useFeedLoaderModule from "@applicaster/zapp-react-native-utils/reactHooks/feed/useFeedLoader";
|
|
4
3
|
import * as useFeedRefreshModule from "@applicaster/zapp-react-native-utils/reactHooks/feed/useFeedRefresh";
|
|
5
|
-
import * as zappPipesClientModule from "@applicaster/zapp-pipes-v2-client";
|
|
6
4
|
import { favoritesListener } from "@applicaster/zapp-react-native-bridge/Favorites";
|
|
7
5
|
import { UrlFeedResolver } from "../resolvers/UrlFeedResolver";
|
|
6
|
+
import { renderWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
|
|
7
|
+
import * as ZappPipesModule from "@applicaster/zapp-pipes-v2-client";
|
|
8
|
+
|
|
9
|
+
const mockSubscribeForKeyChanges = jest.fn();
|
|
10
|
+
|
|
11
|
+
jest
|
|
12
|
+
.spyOn(ZappPipesModule, "subscribeForKeyChanges")
|
|
13
|
+
.mockImplementation(mockSubscribeForKeyChanges);
|
|
8
14
|
|
|
9
15
|
jest.mock("@applicaster/zapp-react-native-utils/reactHooks/feed/useFeedLoader");
|
|
10
16
|
|
|
@@ -35,9 +41,6 @@ describe("UrlFeedResolver", () => {
|
|
|
35
41
|
const mockReloadData = jest.fn();
|
|
36
42
|
const mockLoadNext = jest.fn();
|
|
37
43
|
|
|
38
|
-
const mockSubscribeForUrlContextKeyChanges =
|
|
39
|
-
zappPipesClientModule.subscribeForUrlContextKeyChanges as jest.Mock;
|
|
40
|
-
|
|
41
44
|
const mockAddDataSourceListener = jest.fn().mockReturnValue(jest.fn());
|
|
42
45
|
|
|
43
46
|
beforeEach(() => {
|
|
@@ -51,8 +54,6 @@ describe("UrlFeedResolver", () => {
|
|
|
51
54
|
url: "test-url",
|
|
52
55
|
data: { entry: [{ id: "1" }] },
|
|
53
56
|
});
|
|
54
|
-
|
|
55
|
-
mockSubscribeForUrlContextKeyChanges.mockReturnValue(jest.fn());
|
|
56
57
|
});
|
|
57
58
|
|
|
58
59
|
it("should use feedUrl directly when provided", () => {
|
|
@@ -63,7 +64,7 @@ describe("UrlFeedResolver", () => {
|
|
|
63
64
|
riverId: "test-river",
|
|
64
65
|
};
|
|
65
66
|
|
|
66
|
-
|
|
67
|
+
renderWithProviders(<UrlFeedResolver {...props} />);
|
|
67
68
|
|
|
68
69
|
expect(useFeedLoaderModule.useFeedLoader).toHaveBeenCalledWith({
|
|
69
70
|
feedUrl: "https://example.com/feed",
|
|
@@ -83,7 +84,7 @@ describe("UrlFeedResolver", () => {
|
|
|
83
84
|
riverId: "test-river",
|
|
84
85
|
};
|
|
85
86
|
|
|
86
|
-
|
|
87
|
+
renderWithProviders(<UrlFeedResolver {...props} />);
|
|
87
88
|
|
|
88
89
|
expect(useFeedLoaderModule.useFeedLoader).toHaveBeenCalledWith({
|
|
89
90
|
feedUrl: "https://example.com/source",
|
|
@@ -104,7 +105,7 @@ describe("UrlFeedResolver", () => {
|
|
|
104
105
|
riverId: "test-river",
|
|
105
106
|
};
|
|
106
107
|
|
|
107
|
-
|
|
108
|
+
renderWithProviders(<UrlFeedResolver {...props} />);
|
|
108
109
|
|
|
109
110
|
expect(useFeedLoaderModule.useFeedLoader).toHaveBeenCalledWith({
|
|
110
111
|
feedUrl: "favorites-source",
|
|
@@ -133,7 +134,7 @@ describe("UrlFeedResolver", () => {
|
|
|
133
134
|
riverId: "test-river",
|
|
134
135
|
};
|
|
135
136
|
|
|
136
|
-
|
|
137
|
+
renderWithProviders(<UrlFeedResolver {...props} />);
|
|
137
138
|
|
|
138
139
|
expect(useFeedLoaderModule.useFeedLoader).toHaveBeenCalledWith({
|
|
139
140
|
feedUrl:
|
|
@@ -156,7 +157,7 @@ describe("UrlFeedResolver", () => {
|
|
|
156
157
|
plugins: [],
|
|
157
158
|
};
|
|
158
159
|
|
|
159
|
-
|
|
160
|
+
renderWithProviders(<UrlFeedResolver {...props} />);
|
|
160
161
|
|
|
161
162
|
expect(useFeedLoaderModule.useFeedLoader).toHaveBeenCalledWith({
|
|
162
163
|
feedUrl: expect.stringContaining(
|
|
@@ -174,13 +175,12 @@ describe("UrlFeedResolver", () => {
|
|
|
174
175
|
riverId: "test-river",
|
|
175
176
|
};
|
|
176
177
|
|
|
177
|
-
|
|
178
|
+
renderWithProviders(<UrlFeedResolver {...props} />);
|
|
178
179
|
|
|
179
|
-
expect(
|
|
180
|
-
"https://example.com/feed",
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
);
|
|
180
|
+
expect(mockSubscribeForKeyChanges.mock.calls[0][0]).toMatchObject({
|
|
181
|
+
url: "https://example.com/feed",
|
|
182
|
+
callback: mockReloadData,
|
|
183
|
+
});
|
|
184
184
|
});
|
|
185
185
|
|
|
186
186
|
it("should set up pipesv2 URL listener from plugin if available", () => {
|
|
@@ -199,10 +199,10 @@ describe("UrlFeedResolver", () => {
|
|
|
199
199
|
] as any,
|
|
200
200
|
};
|
|
201
201
|
|
|
202
|
-
|
|
202
|
+
renderWithProviders(<UrlFeedResolver {...props} />);
|
|
203
203
|
|
|
204
204
|
expect(mockAddDataSourceListener).toHaveBeenCalledWith(mockReloadData);
|
|
205
|
-
expect(
|
|
205
|
+
expect(mockSubscribeForKeyChanges).not.toHaveBeenCalled();
|
|
206
206
|
});
|
|
207
207
|
|
|
208
208
|
it("should apply item limit from component rules", () => {
|
|
@@ -226,7 +226,7 @@ describe("UrlFeedResolver", () => {
|
|
|
226
226
|
data: { entry: [{ id: "1" }, { id: "2" }, { id: "3" }] },
|
|
227
227
|
});
|
|
228
228
|
|
|
229
|
-
|
|
229
|
+
renderWithProviders(<UrlFeedResolver {...props} />);
|
|
230
230
|
|
|
231
231
|
expect(mockChildren).toHaveBeenCalledWith(
|
|
232
232
|
expect.objectContaining({
|
|
@@ -252,7 +252,7 @@ describe("UrlFeedResolver", () => {
|
|
|
252
252
|
isLast: true,
|
|
253
253
|
};
|
|
254
254
|
|
|
255
|
-
|
|
255
|
+
renderWithProviders(<UrlFeedResolver {...props1} />);
|
|
256
256
|
|
|
257
257
|
expect(mockChildren).toHaveBeenCalledWith(
|
|
258
258
|
expect.objectContaining({
|
|
@@ -274,7 +274,7 @@ describe("UrlFeedResolver", () => {
|
|
|
274
274
|
isLast: false,
|
|
275
275
|
};
|
|
276
276
|
|
|
277
|
-
|
|
277
|
+
renderWithProviders(<UrlFeedResolver {...props2} />);
|
|
278
278
|
|
|
279
279
|
expect(mockChildren).toHaveBeenCalledWith(
|
|
280
280
|
expect.objectContaining({
|
|
@@ -296,7 +296,7 @@ describe("UrlFeedResolver", () => {
|
|
|
296
296
|
isLast: false,
|
|
297
297
|
};
|
|
298
298
|
|
|
299
|
-
|
|
299
|
+
renderWithProviders(<UrlFeedResolver {...props3} />);
|
|
300
300
|
|
|
301
301
|
expect(mockChildren).toHaveBeenCalledWith(
|
|
302
302
|
expect.objectContaining({
|
|
@@ -313,7 +313,7 @@ describe("UrlFeedResolver", () => {
|
|
|
313
313
|
riverId: "test-river",
|
|
314
314
|
};
|
|
315
315
|
|
|
316
|
-
|
|
316
|
+
renderWithProviders(<UrlFeedResolver {...props} />);
|
|
317
317
|
|
|
318
318
|
expect(mockChildren).toHaveBeenCalledWith({
|
|
319
319
|
zappPipesData: {
|
|
@@ -335,7 +335,7 @@ describe("UrlFeedResolver", () => {
|
|
|
335
335
|
riverId: "test-river",
|
|
336
336
|
};
|
|
337
337
|
|
|
338
|
-
|
|
338
|
+
renderWithProviders(<UrlFeedResolver {...props} />);
|
|
339
339
|
|
|
340
340
|
expect(useFeedRefreshModule.useFeedRefresh).toHaveBeenCalledWith({
|
|
341
341
|
reloadData: mockReloadData,
|
|
@@ -356,7 +356,7 @@ describe("UrlFeedResolver", () => {
|
|
|
356
356
|
riverId: "test-river",
|
|
357
357
|
};
|
|
358
358
|
|
|
359
|
-
const { unmount } =
|
|
359
|
+
const { unmount } = renderWithProviders(<UrlFeedResolver {...props} />);
|
|
360
360
|
|
|
361
361
|
unmount();
|
|
362
362
|
|
|
@@ -206,11 +206,9 @@ export function UrlFeedResolver({
|
|
|
206
206
|
}
|
|
207
207
|
|
|
208
208
|
if (dataSourceUrl?.includes("pipesv2://")) {
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
return addListener(reloadData);
|
|
213
|
-
}
|
|
209
|
+
(
|
|
210
|
+
getListenerFromPlugin(dataSourceUrl, plugins) as AddDataSourceListener
|
|
211
|
+
)?.(reloadData);
|
|
214
212
|
} else {
|
|
215
213
|
return subscribeForKeyChanges({
|
|
216
214
|
url: dataSourceUrl,
|
|
@@ -6,7 +6,6 @@ import { localStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/
|
|
|
6
6
|
import { sessionStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/SessionStorage";
|
|
7
7
|
|
|
8
8
|
import {
|
|
9
|
-
EntryResolver,
|
|
10
9
|
extractAtValues,
|
|
11
10
|
resolveObjectValues,
|
|
12
11
|
} from "@applicaster/zapp-react-native-utils/appUtils/contextKeysManager/contextResolver";
|
|
@@ -14,8 +13,9 @@ import { createLogger } from "@applicaster/zapp-react-native-utils/logger";
|
|
|
14
13
|
import { ScreenSingleValueProvider } from "@applicaster/zapp-react-native-utils/storage/ScreenSingleValueProvider";
|
|
15
14
|
import { useScreenStateStore } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useScreenStateStore";
|
|
16
15
|
import { useRoute } from "@applicaster/zapp-react-native-utils/reactHooks";
|
|
16
|
+
import { useScreenResolvers } from "@applicaster/zapp-react-native-utils/actionsExecutor/screenResolver";
|
|
17
17
|
|
|
18
|
-
const { log_error } = createLogger({
|
|
18
|
+
const { log_debug, log_error } = createLogger({
|
|
19
19
|
subsystem: "General",
|
|
20
20
|
category: "UseFilter",
|
|
21
21
|
});
|
|
@@ -27,97 +27,76 @@ export const useFilter: (
|
|
|
27
27
|
zappPipesData: ZappPipesData,
|
|
28
28
|
_component
|
|
29
29
|
) => {
|
|
30
|
+
const { pathname } = useRoute();
|
|
31
|
+
const screenStateStore = useScreenStateStore();
|
|
30
32
|
const [filter, setFilter] = React.useState(null);
|
|
31
|
-
|
|
32
33
|
const [inflatedFilter, setInflatedFilter] = React.useState(null);
|
|
34
|
+
const screenResolvers = useScreenResolvers();
|
|
33
35
|
|
|
34
|
-
|
|
35
|
-
const { pathname } = useRoute();
|
|
36
|
-
|
|
37
|
-
const rebuildFilter = useCallback(() => {
|
|
36
|
+
useEffect(() => {
|
|
38
37
|
if (!filter) {
|
|
39
38
|
setInflatedFilter(null);
|
|
40
39
|
|
|
41
40
|
return;
|
|
42
41
|
}
|
|
43
42
|
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
);
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
if (atValues.length) {
|
|
63
|
-
const screenSubscriptions: (() => void)[] = atValues
|
|
64
|
-
.filter((data) => data.startsWith("screen/"))
|
|
65
|
-
.map((data: string) => {
|
|
66
|
-
const keyName = data.replace("screen/", "");
|
|
67
|
-
|
|
68
|
-
const provider = ScreenSingleValueProvider.getProvider(
|
|
69
|
-
keyName,
|
|
70
|
-
pathname,
|
|
71
|
-
screenStateStore
|
|
72
|
-
);
|
|
73
|
-
|
|
74
|
-
const subscription = provider.getObservable().subscribe((value) => {
|
|
75
|
-
if (value !== undefined) {
|
|
76
|
-
rebuildFilter();
|
|
77
|
-
}
|
|
78
|
-
});
|
|
79
|
-
|
|
80
|
-
return () => subscription.unsubscribe();
|
|
43
|
+
const atValues = extractAtValues(filter);
|
|
44
|
+
|
|
45
|
+
log_debug("Extracted @ values from filter", { atValues });
|
|
46
|
+
|
|
47
|
+
if (!atValues.length) {
|
|
48
|
+
// no dynamic values - can apply right now
|
|
49
|
+
setInflatedFilter(filter);
|
|
50
|
+
} else {
|
|
51
|
+
const rebuildFilter = () =>
|
|
52
|
+
resolveObjectValues(filter, screenResolvers)
|
|
53
|
+
.then((resolvedFilter) => {
|
|
54
|
+
log_debug("Resolved filter values", { resolvedFilter });
|
|
55
|
+
setInflatedFilter(resolvedFilter);
|
|
56
|
+
})
|
|
57
|
+
.catch((error) => {
|
|
58
|
+
log_error(`Error resolving filter values: ${error.message}`);
|
|
59
|
+
setInflatedFilter(null);
|
|
81
60
|
});
|
|
82
61
|
|
|
83
|
-
|
|
84
|
-
.filter((data) => !data.startsWith("screen/"))
|
|
85
|
-
.flatMap((data: string) => {
|
|
86
|
-
const keyName = data.replace("ctx/", "");
|
|
87
|
-
const { namespace, key } = getNamespaceAndKey(keyName);
|
|
62
|
+
rebuildFilter(); // have dynamic values - need to resolve before applying
|
|
88
63
|
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
64
|
+
// subscribe for future changes of dynamic values
|
|
65
|
+
const screenSubscriptions: (() => void)[] = atValues
|
|
66
|
+
.filter((data) => data.startsWith("screen/"))
|
|
67
|
+
.map((data: string) => {
|
|
68
|
+
const keyName = data.replace("screen/", "");
|
|
94
69
|
|
|
95
|
-
|
|
70
|
+
const provider = ScreenSingleValueProvider.getProvider(
|
|
71
|
+
keyName,
|
|
72
|
+
pathname,
|
|
73
|
+
screenStateStore
|
|
74
|
+
);
|
|
96
75
|
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
76
|
+
const subscription = provider.getObservable().subscribe((value) => {
|
|
77
|
+
if (value !== undefined) {
|
|
78
|
+
rebuildFilter();
|
|
79
|
+
}
|
|
80
|
+
});
|
|
101
81
|
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
rebuildFilter();
|
|
82
|
+
return () => subscription.unsubscribe();
|
|
83
|
+
});
|
|
105
84
|
|
|
106
|
-
const
|
|
85
|
+
const storageSubscriptions: (() => void)[] = atValues
|
|
86
|
+
.filter((data) => !data.startsWith("screen/"))
|
|
87
|
+
.flatMap((data: string) => {
|
|
88
|
+
const keyName = data.replace("ctx/", "");
|
|
89
|
+
const { namespace, key } = getNamespaceAndKey(keyName);
|
|
107
90
|
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
const keyName = data.replace("ctx/", "");
|
|
114
|
-
const { namespace, key } = getNamespaceAndKey(keyName);
|
|
91
|
+
return [
|
|
92
|
+
localStorage.addListener({ key, namespace }, rebuildFilter),
|
|
93
|
+
sessionStorage.addListener({ key, namespace }, rebuildFilter),
|
|
94
|
+
];
|
|
95
|
+
});
|
|
115
96
|
|
|
116
|
-
|
|
117
|
-
});
|
|
97
|
+
const subscriptions = [...screenSubscriptions, ...storageSubscriptions];
|
|
118
98
|
|
|
119
|
-
|
|
120
|
-
}
|
|
99
|
+
return () => subscriptions.forEach((listener) => listener());
|
|
121
100
|
}
|
|
122
101
|
}, [filter]);
|
|
123
102
|
|
|
@@ -132,14 +111,27 @@ export const useFilter: (
|
|
|
132
111
|
const noResultBehavior =
|
|
133
112
|
data?.extensions?.filter?.no_result_behavior || "show_nothing";
|
|
134
113
|
|
|
135
|
-
|
|
136
|
-
|
|
114
|
+
const filterExpression = data?.extensions?.filter?.expression;
|
|
115
|
+
|
|
116
|
+
if (filterExpression) {
|
|
117
|
+
setFilter(filterExpression);
|
|
118
|
+
|
|
119
|
+
// if there is a filter, but it is not inflated yet,
|
|
120
|
+
// and the behavior is "show_nothing" - return no results
|
|
121
|
+
if (noResultBehavior === "show_nothing" && !inflatedFilter) {
|
|
122
|
+
return {
|
|
123
|
+
...zappPipesData,
|
|
124
|
+
data: { ...data, entry: [] },
|
|
125
|
+
} as ZappPipesData;
|
|
126
|
+
}
|
|
137
127
|
}
|
|
138
128
|
|
|
139
129
|
if (!inflatedFilter) {
|
|
140
130
|
return zappPipesData;
|
|
141
131
|
}
|
|
142
132
|
|
|
133
|
+
log_debug("Applying filter to data", { filter, inflatedFilter });
|
|
134
|
+
|
|
143
135
|
const filteredEntries = filterObjects(data.entry, inflatedFilter);
|
|
144
136
|
|
|
145
137
|
if (!filteredEntries.length && noResultBehavior === "show_all") {
|
package/events/index.ts
CHANGED
|
@@ -2,4 +2,7 @@ export enum QBUIComponentEvents {
|
|
|
2
2
|
toggleGradient = "toggleGradient",
|
|
3
3
|
topMenuBarTV_onFocus = "topMenuBarTV_onFocus",
|
|
4
4
|
navigatorReplaceItem = "navigatorReplaceItem",
|
|
5
|
+
scrollVerticallyToInitialOffset = "scrollVerticallyToInitialOffset",
|
|
6
|
+
focusOnSelectedTab = "focusOnSelectedTab",
|
|
7
|
+
focusOnSelectedTopMenuItem = "focusOnSelectedTopMenuItem",
|
|
5
8
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@applicaster/zapp-react-native-ui-components",
|
|
3
|
-
"version": "14.0.0-alpha.
|
|
3
|
+
"version": "14.0.0-alpha.6000342231",
|
|
4
4
|
"description": "Applicaster Zapp React Native ui components for the Quick Brick App",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"types": "index.d.ts",
|
|
@@ -28,10 +28,10 @@
|
|
|
28
28
|
},
|
|
29
29
|
"homepage": "https://github.com/applicaster/quickbrick#readme",
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@applicaster/applicaster-types": "14.0.0-alpha.
|
|
32
|
-
"@applicaster/zapp-react-native-bridge": "14.0.0-alpha.
|
|
33
|
-
"@applicaster/zapp-react-native-redux": "14.0.0-alpha.
|
|
34
|
-
"@applicaster/zapp-react-native-utils": "14.0.0-alpha.
|
|
31
|
+
"@applicaster/applicaster-types": "14.0.0-alpha.6000342231",
|
|
32
|
+
"@applicaster/zapp-react-native-bridge": "14.0.0-alpha.6000342231",
|
|
33
|
+
"@applicaster/zapp-react-native-redux": "14.0.0-alpha.6000342231",
|
|
34
|
+
"@applicaster/zapp-react-native-utils": "14.0.0-alpha.6000342231",
|
|
35
35
|
"promise": "^8.3.0",
|
|
36
36
|
"url": "^0.11.0",
|
|
37
37
|
"uuid": "^3.3.2"
|
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
|
2
|
-
|
|
3
|
-
exports[`When River has a general_content type renders River component correctly 1`] = `
|
|
4
|
-
<View
|
|
5
|
-
onLayout={[Function]}
|
|
6
|
-
style={
|
|
7
|
-
{
|
|
8
|
-
"flex": 1,
|
|
9
|
-
}
|
|
10
|
-
}
|
|
11
|
-
testID="on-layout-view"
|
|
12
|
-
>
|
|
13
|
-
<View
|
|
14
|
-
style={
|
|
15
|
-
{
|
|
16
|
-
"display": "none",
|
|
17
|
-
"flex": 1,
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
>
|
|
21
|
-
<View
|
|
22
|
-
screenId="A1234"
|
|
23
|
-
testID="general-content-screen"
|
|
24
|
-
/>
|
|
25
|
-
</View>
|
|
26
|
-
</View>
|
|
27
|
-
`;
|
|
@@ -1,60 +0,0 @@
|
|
|
1
|
-
import React from "react";
|
|
2
|
-
import { Animated, ViewStyle } from "react-native";
|
|
3
|
-
|
|
4
|
-
import {
|
|
5
|
-
useModalAnimationContext,
|
|
6
|
-
PlayerAnimationStateEnum,
|
|
7
|
-
} from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
|
|
8
|
-
|
|
9
|
-
type Props = {
|
|
10
|
-
style: ViewStyle[];
|
|
11
|
-
children: React.ReactNode;
|
|
12
|
-
};
|
|
13
|
-
|
|
14
|
-
export const AnimatedPlayerModalWrapper = (props: Props) => {
|
|
15
|
-
const {
|
|
16
|
-
playerAnimationState,
|
|
17
|
-
animatedValues: { lastScrollY, dragScrollY, translateYOffset },
|
|
18
|
-
modalSnapPoints,
|
|
19
|
-
setStartComponentsAnimation,
|
|
20
|
-
} = useModalAnimationContext();
|
|
21
|
-
|
|
22
|
-
const interpolateConfig: Animated.InterpolationConfigType = React.useMemo(
|
|
23
|
-
() => ({
|
|
24
|
-
inputRange: modalSnapPoints,
|
|
25
|
-
outputRange: modalSnapPoints,
|
|
26
|
-
extrapolate: "clamp",
|
|
27
|
-
}),
|
|
28
|
-
[modalSnapPoints]
|
|
29
|
-
);
|
|
30
|
-
|
|
31
|
-
let translateY;
|
|
32
|
-
|
|
33
|
-
if (playerAnimationState === PlayerAnimationStateEnum.drag_player) {
|
|
34
|
-
translateY = translateYOffset.interpolate(interpolateConfig);
|
|
35
|
-
} else {
|
|
36
|
-
const reverseLastScrollY = Animated.multiply(
|
|
37
|
-
new Animated.Value(-1),
|
|
38
|
-
lastScrollY
|
|
39
|
-
);
|
|
40
|
-
|
|
41
|
-
translateY = Animated.add(
|
|
42
|
-
translateYOffset,
|
|
43
|
-
Animated.add(dragScrollY, reverseLastScrollY)
|
|
44
|
-
).interpolate(interpolateConfig);
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
React.useEffect(() => {
|
|
48
|
-
(playerAnimationState === PlayerAnimationStateEnum.minimize ||
|
|
49
|
-
playerAnimationState === PlayerAnimationStateEnum.maximize) &&
|
|
50
|
-
setStartComponentsAnimation(true);
|
|
51
|
-
}, [playerAnimationState]);
|
|
52
|
-
|
|
53
|
-
return (
|
|
54
|
-
<Animated.View
|
|
55
|
-
style={[props.style, { transform: [{ translateY: translateY }] }]}
|
|
56
|
-
>
|
|
57
|
-
{props.children}
|
|
58
|
-
</Animated.View>
|
|
59
|
-
);
|
|
60
|
-
};
|