@applicaster/zapp-react-native-utils 15.0.0-alpha.9331298916 → 15.0.0-alpha.9423906047
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/actionsExecutor/ActionExecutorContext.tsx +3 -6
- package/actionsExecutor/feedDecorator.ts +6 -6
- package/adsUtils/index.ts +2 -2
- package/analyticsUtils/README.md +1 -1
- package/appUtils/HooksManager/index.ts +10 -10
- package/appUtils/accessibilityManager/__tests__/utils.test.ts +360 -0
- package/appUtils/accessibilityManager/hooks.ts +20 -13
- package/appUtils/accessibilityManager/index.ts +28 -1
- package/appUtils/accessibilityManager/utils.ts +59 -8
- package/appUtils/focusManager/index.ios.ts +8 -2
- package/appUtils/focusManagerAux/utils/index.ts +1 -1
- package/appUtils/focusManagerAux/utils/utils.ios.ts +60 -3
- package/appUtils/keyCodes/keys/keys.web.ts +1 -4
- package/appUtils/orientationHelper.ts +2 -4
- package/appUtils/platform/platformUtils.ts +115 -16
- package/appUtils/playerManager/playerNative.ts +29 -16
- package/cellUtils/index.ts +32 -0
- package/configurationUtils/__tests__/manifestKeyParser.test.ts +26 -26
- package/focusManager/aux/index.ts +1 -1
- package/manifestUtils/defaultManifestConfigurations/player.js +39 -0
- package/manifestUtils/tvAction/container/index.js +1 -1
- package/package.json +2 -2
- package/playerUtils/usePlayerTTS.ts +8 -3
- package/pluginUtils/index.ts +4 -0
- package/reactHooks/advertising/index.ts +2 -2
- package/reactHooks/debugging/__tests__/index.test.js +4 -4
- package/reactHooks/device/useMemoizedIsTablet.ts +3 -3
- package/reactHooks/feed/__tests__/useEntryScreenId.test.tsx +3 -0
- package/reactHooks/feed/__tests__/{useInflatedUrl.test.ts → useInflatedUrl.test.tsx} +62 -7
- package/reactHooks/feed/useEntryScreenId.ts +2 -2
- package/reactHooks/feed/useInflatedUrl.ts +43 -17
- package/reactHooks/flatList/useLoadNextPageIfNeeded.ts +13 -16
- package/reactHooks/layout/useDimensions/__tests__/{useDimensions.test.ts → useDimensions.test.tsx} +105 -25
- package/reactHooks/layout/useDimensions/useDimensions.ts +2 -2
- package/reactHooks/navigation/index.ts +7 -6
- package/reactHooks/navigation/useRoute.ts +8 -6
- package/reactHooks/resolvers/useCellResolver.ts +6 -2
- package/reactHooks/resolvers/useComponentResolver.ts +8 -2
- package/reactHooks/screen/__tests__/useTargetScreenData.test.tsx +10 -2
- package/reactHooks/screen/useTargetScreenData.ts +4 -2
- package/reactHooks/state/useRivers.ts +1 -1
- package/reactHooks/usePluginConfiguration.ts +2 -2
- package/testUtils/index.tsx +29 -20
- package/utils/__tests__/selectors.test.ts +124 -0
- package/utils/index.ts +10 -0
- package/utils/path.ts +6 -3
- package/utils/pathOr.ts +5 -1
- package/utils/selectors.ts +46 -0
- package/zappFrameworkUtils/HookCallback/callbackNavigationAction.ts +34 -11
- package/zappFrameworkUtils/HookCallback/hookCallbackManifestExtensions.config.js +1 -1
|
@@ -50,7 +50,7 @@ describe("getAllSpecificStyles", () => {
|
|
|
50
50
|
});
|
|
51
51
|
|
|
52
52
|
expect(outStyles).toHaveProperty("default");
|
|
53
|
-
expect(outStyles
|
|
53
|
+
expect(outStyles.default).toEqual({});
|
|
54
54
|
});
|
|
55
55
|
|
|
56
56
|
it("should handle empty configuration", () => {
|
|
@@ -83,7 +83,7 @@ describe("getAllSpecificStyles", () => {
|
|
|
83
83
|
outStyles,
|
|
84
84
|
});
|
|
85
85
|
|
|
86
|
-
expect(outStyles
|
|
86
|
+
expect(outStyles.default).toEqual({
|
|
87
87
|
backgroundColor: "#FF0000",
|
|
88
88
|
borderWidth: 2,
|
|
89
89
|
});
|
|
@@ -104,7 +104,7 @@ describe("getAllSpecificStyles", () => {
|
|
|
104
104
|
outStyles,
|
|
105
105
|
});
|
|
106
106
|
|
|
107
|
-
expect(outStyles
|
|
107
|
+
expect(outStyles.default).toEqual({
|
|
108
108
|
backgroundColor: "#FF0000",
|
|
109
109
|
textSize: 16,
|
|
110
110
|
});
|
|
@@ -126,7 +126,7 @@ describe("getAllSpecificStyles", () => {
|
|
|
126
126
|
outStyles,
|
|
127
127
|
});
|
|
128
128
|
|
|
129
|
-
expect(outStyles
|
|
129
|
+
expect(outStyles.default).toEqual({
|
|
130
130
|
backgroundColor: "#FF0000",
|
|
131
131
|
});
|
|
132
132
|
});
|
|
@@ -148,11 +148,11 @@ describe("getAllSpecificStyles", () => {
|
|
|
148
148
|
outStyles,
|
|
149
149
|
});
|
|
150
150
|
|
|
151
|
-
expect(outStyles
|
|
151
|
+
expect(outStyles.default).toEqual({
|
|
152
152
|
backgroundColor: "#FF0000",
|
|
153
153
|
});
|
|
154
154
|
|
|
155
|
-
expect(outStyles
|
|
155
|
+
expect(outStyles.pressed).toEqual({
|
|
156
156
|
backgroundColor: "#00FF00",
|
|
157
157
|
});
|
|
158
158
|
});
|
|
@@ -171,7 +171,7 @@ describe("getAllSpecificStyles", () => {
|
|
|
171
171
|
outStyles,
|
|
172
172
|
});
|
|
173
173
|
|
|
174
|
-
expect(outStyles
|
|
174
|
+
expect(outStyles.focused).toEqual({
|
|
175
175
|
borderWidth: 3,
|
|
176
176
|
});
|
|
177
177
|
});
|
|
@@ -190,7 +190,7 @@ describe("getAllSpecificStyles", () => {
|
|
|
190
190
|
outStyles,
|
|
191
191
|
});
|
|
192
192
|
|
|
193
|
-
expect(outStyles
|
|
193
|
+
expect(outStyles.selected).toEqual({
|
|
194
194
|
opacity: 0.5,
|
|
195
195
|
});
|
|
196
196
|
});
|
|
@@ -209,7 +209,7 @@ describe("getAllSpecificStyles", () => {
|
|
|
209
209
|
outStyles,
|
|
210
210
|
});
|
|
211
211
|
|
|
212
|
-
expect(outStyles
|
|
212
|
+
expect(outStyles.focused_selected).toEqual({
|
|
213
213
|
scale: 1.2,
|
|
214
214
|
});
|
|
215
215
|
});
|
|
@@ -232,21 +232,21 @@ describe("getAllSpecificStyles", () => {
|
|
|
232
232
|
outStyles,
|
|
233
233
|
});
|
|
234
234
|
|
|
235
|
-
expect(outStyles
|
|
235
|
+
expect(outStyles.default).toEqual({
|
|
236
236
|
backgroundColor: "#FF0000",
|
|
237
237
|
borderWidth: 1,
|
|
238
238
|
opacity: 1,
|
|
239
239
|
});
|
|
240
240
|
|
|
241
241
|
// Pressed should have default styles merged with its specific override
|
|
242
|
-
expect(outStyles
|
|
242
|
+
expect(outStyles.pressed).toEqual({
|
|
243
243
|
backgroundColor: "#00FF00", // Override
|
|
244
244
|
borderWidth: 1, // From default
|
|
245
245
|
opacity: 1, // From default
|
|
246
246
|
});
|
|
247
247
|
|
|
248
248
|
// Focused should have default styles merged with its specific override
|
|
249
|
-
expect(outStyles
|
|
249
|
+
expect(outStyles.focused).toEqual({
|
|
250
250
|
backgroundColor: "#FF0000", // From default
|
|
251
251
|
borderWidth: 1, // From default
|
|
252
252
|
opacity: 0.8, // Override
|
|
@@ -270,7 +270,7 @@ describe("getAllSpecificStyles", () => {
|
|
|
270
270
|
outStyles,
|
|
271
271
|
});
|
|
272
272
|
|
|
273
|
-
expect(outStyles
|
|
273
|
+
expect(outStyles.pressed).toEqual({
|
|
274
274
|
existingKey: "existingValue", // Should be preserved
|
|
275
275
|
backgroundColor: "#FF0000", // From default
|
|
276
276
|
textColor: "#FFFFFF", // New pressed style
|
|
@@ -294,7 +294,7 @@ describe("getAllSpecificStyles", () => {
|
|
|
294
294
|
outStyles,
|
|
295
295
|
});
|
|
296
296
|
|
|
297
|
-
expect(outStyles
|
|
297
|
+
expect(outStyles.default).toEqual({
|
|
298
298
|
backgroundColor: "#FF0000", // Samsung-specific should be included
|
|
299
299
|
});
|
|
300
300
|
});
|
|
@@ -317,7 +317,7 @@ describe("getAllSpecificStyles", () => {
|
|
|
317
317
|
outStyles,
|
|
318
318
|
});
|
|
319
319
|
|
|
320
|
-
expect(outStyles
|
|
320
|
+
expect(outStyles.default).toEqual({
|
|
321
321
|
backgroundColor: "#FFFFFF", // Only non-platform specific
|
|
322
322
|
});
|
|
323
323
|
});
|
|
@@ -336,7 +336,7 @@ describe("getAllSpecificStyles", () => {
|
|
|
336
336
|
outStyles,
|
|
337
337
|
});
|
|
338
338
|
|
|
339
|
-
expect(outStyles
|
|
339
|
+
expect(outStyles.default).toEqual({
|
|
340
340
|
color: "#FF0000",
|
|
341
341
|
});
|
|
342
342
|
});
|
|
@@ -356,7 +356,7 @@ describe("getAllSpecificStyles", () => {
|
|
|
356
356
|
outStyles,
|
|
357
357
|
});
|
|
358
358
|
|
|
359
|
-
expect(outStyles
|
|
359
|
+
expect(outStyles.pressed).toEqual({
|
|
360
360
|
backgroundColor: "#FF0000", // Only samsung style
|
|
361
361
|
});
|
|
362
362
|
});
|
|
@@ -377,7 +377,7 @@ describe("getAllSpecificStyles", () => {
|
|
|
377
377
|
outStyles,
|
|
378
378
|
});
|
|
379
379
|
|
|
380
|
-
expect(outStyles
|
|
380
|
+
expect(outStyles.default).toEqual({
|
|
381
381
|
backgroundColor: "#00FF00", // Samsung-specific should win
|
|
382
382
|
});
|
|
383
383
|
});
|
|
@@ -412,14 +412,14 @@ describe("getAllSpecificStyles", () => {
|
|
|
412
412
|
outStyles,
|
|
413
413
|
});
|
|
414
414
|
|
|
415
|
-
expect(outStyles
|
|
415
|
+
expect(outStyles.default).toEqual({
|
|
416
416
|
backgroundColor: "#FFFFFF",
|
|
417
417
|
textColor: "#000000",
|
|
418
418
|
borderWidth: 1,
|
|
419
419
|
padding: 10,
|
|
420
420
|
});
|
|
421
421
|
|
|
422
|
-
expect(outStyles
|
|
422
|
+
expect(outStyles.pressed).toEqual({
|
|
423
423
|
backgroundColor: "#EEEEEE",
|
|
424
424
|
textColor: "#000000",
|
|
425
425
|
borderWidth: 1,
|
|
@@ -427,7 +427,7 @@ describe("getAllSpecificStyles", () => {
|
|
|
427
427
|
opacity: 0.8,
|
|
428
428
|
});
|
|
429
429
|
|
|
430
|
-
expect(outStyles
|
|
430
|
+
expect(outStyles.focused).toEqual({
|
|
431
431
|
backgroundColor: "#FFFFFF",
|
|
432
432
|
textColor: "#000000",
|
|
433
433
|
borderWidth: 1,
|
|
@@ -453,7 +453,7 @@ describe("getAllSpecificStyles", () => {
|
|
|
453
453
|
outStyles,
|
|
454
454
|
});
|
|
455
455
|
|
|
456
|
-
expect(outStyles
|
|
456
|
+
expect(outStyles.default).toEqual({
|
|
457
457
|
validKey: "included",
|
|
458
458
|
});
|
|
459
459
|
});
|
|
@@ -474,11 +474,11 @@ describe("getAllSpecificStyles", () => {
|
|
|
474
474
|
outStyles,
|
|
475
475
|
});
|
|
476
476
|
|
|
477
|
-
expect(outStyles
|
|
477
|
+
expect(outStyles.focused_selected).toEqual({
|
|
478
478
|
test: "focused_selected_value",
|
|
479
479
|
});
|
|
480
480
|
|
|
481
|
-
expect(outStyles
|
|
481
|
+
expect(outStyles.focused).toEqual({
|
|
482
482
|
another: "focused_value",
|
|
483
483
|
});
|
|
484
484
|
});
|
|
@@ -517,7 +517,7 @@ describe("getAllSpecificStyles", () => {
|
|
|
517
517
|
outStyles,
|
|
518
518
|
});
|
|
519
519
|
|
|
520
|
-
expect(outStyles
|
|
520
|
+
expect(outStyles.pressed.backgroundColor).toBe("#222222");
|
|
521
521
|
});
|
|
522
522
|
|
|
523
523
|
it("should handle frozen outStyles properties", () => {
|
|
@@ -537,7 +537,7 @@ describe("getAllSpecificStyles", () => {
|
|
|
537
537
|
});
|
|
538
538
|
|
|
539
539
|
// Should create new object instead of mutating frozen one
|
|
540
|
-
expect(outStyles
|
|
540
|
+
expect(outStyles.default).toEqual({
|
|
541
541
|
existingProp: "value",
|
|
542
542
|
backgroundColor: "#FF0000",
|
|
543
543
|
});
|
|
@@ -342,6 +342,13 @@ function getPlayerConfiguration({ platform, version }) {
|
|
|
342
342
|
type: "text_input",
|
|
343
343
|
});
|
|
344
344
|
|
|
345
|
+
localizations.fields.push({
|
|
346
|
+
key: "start_over_label",
|
|
347
|
+
label: "Start over label",
|
|
348
|
+
initial_value: "Start Over",
|
|
349
|
+
type: "text_input",
|
|
350
|
+
});
|
|
351
|
+
|
|
345
352
|
styles.fields.push(
|
|
346
353
|
fieldsGroup("Always Show Scrub Bar & Timestamp", "", [
|
|
347
354
|
{
|
|
@@ -671,6 +678,22 @@ function getPlayerConfiguration({ platform, version }) {
|
|
|
671
678
|
}
|
|
672
679
|
|
|
673
680
|
if (isMobile(platform)) {
|
|
681
|
+
localizations.fields.push(
|
|
682
|
+
{
|
|
683
|
+
type: "text_input",
|
|
684
|
+
label: "(Mobile only) Restrict playback on mobile networks alert title",
|
|
685
|
+
key: "mobile_connection_restricted_alert_title",
|
|
686
|
+
initial_value: "Restricted Connection Type",
|
|
687
|
+
},
|
|
688
|
+
{
|
|
689
|
+
type: "text_input",
|
|
690
|
+
label:
|
|
691
|
+
"(Mobile only) This content can only be viewed over a Wi-Fi or LAN network.",
|
|
692
|
+
key: "mobile_connection_restricted_alert_message",
|
|
693
|
+
initial_value: "Restricted Connection Type",
|
|
694
|
+
}
|
|
695
|
+
);
|
|
696
|
+
|
|
674
697
|
general.fields.push(
|
|
675
698
|
{
|
|
676
699
|
section: "Default Timestamp Type",
|
|
@@ -3480,6 +3503,22 @@ function getPlayerConfiguration({ platform, version }) {
|
|
|
3480
3503
|
label_tooltip:
|
|
3481
3504
|
"This field allows you to override the player configuration / initialization options. i.e. html5: { vhs: { limitRenditionByPlayerDimensions: false } } Please ensure your configuration matches the player you are targeting, and that it is a valid json. See config options here: https://videojs.com/guides/options/",
|
|
3482
3505
|
},
|
|
3506
|
+
{
|
|
3507
|
+
key: "advanced_player_styles",
|
|
3508
|
+
label: "Advanced Player Styles",
|
|
3509
|
+
type: "text_input",
|
|
3510
|
+
multiline: true,
|
|
3511
|
+
initial_value: `.vjs-text-track-cue {
|
|
3512
|
+
inset: unset !important;
|
|
3513
|
+
top: 94% !important;
|
|
3514
|
+
bottom: 0 !important;
|
|
3515
|
+
left: 0 !important;
|
|
3516
|
+
right: 0 !important;
|
|
3517
|
+
width: 100% !important;
|
|
3518
|
+
}`,
|
|
3519
|
+
label_tooltip:
|
|
3520
|
+
"This field allows you to inject custom CSS styles to override default player styles. The styles will be injected into the document head and can be used to customize the appearance of the player. Leave empty to use only default styles.",
|
|
3521
|
+
},
|
|
3483
3522
|
{
|
|
3484
3523
|
key: "use_dashjs_player",
|
|
3485
3524
|
label: "Use Enhanced Player for DASH streams",
|
|
@@ -38,7 +38,7 @@ function tvActionButtonsContainer({ label, description, defaults }) {
|
|
|
38
38
|
generateFieldsFromDefaultsWithoutPrefixedLabel(
|
|
39
39
|
label,
|
|
40
40
|
defaults,
|
|
41
|
-
tvActionButtonContainerFields(defaults
|
|
41
|
+
tvActionButtonContainerFields(defaults.position)
|
|
42
42
|
)
|
|
43
43
|
);
|
|
44
44
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@applicaster/zapp-react-native-utils",
|
|
3
|
-
"version": "15.0.0-alpha.
|
|
3
|
+
"version": "15.0.0-alpha.9423906047",
|
|
4
4
|
"description": "Applicaster Zapp React Native utilities package",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"types": "index.d.ts",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
},
|
|
28
28
|
"homepage": "https://github.com/applicaster/quickbrick#readme",
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@applicaster/applicaster-types": "15.0.0-alpha.
|
|
30
|
+
"@applicaster/applicaster-types": "15.0.0-alpha.9423906047",
|
|
31
31
|
"buffer": "^5.2.1",
|
|
32
32
|
"camelize": "^1.0.0",
|
|
33
33
|
"dayjs": "^1.11.10",
|
|
@@ -1,14 +1,19 @@
|
|
|
1
1
|
import * as React from "react";
|
|
2
2
|
import { usePlayer } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayer";
|
|
3
|
-
import {
|
|
3
|
+
import {
|
|
4
|
+
useAccessibilityManager,
|
|
5
|
+
useAccessibilityState,
|
|
6
|
+
} from "@applicaster/zapp-react-native-utils/appUtils/accessibilityManager/hooks";
|
|
4
7
|
import { PlayerTTS } from "@applicaster/zapp-react-native-utils/playerUtils/PlayerTTS";
|
|
5
8
|
|
|
6
9
|
export const usePlayerTTS = () => {
|
|
7
10
|
const player = usePlayer();
|
|
8
11
|
const accessibilityManager = useAccessibilityManager({});
|
|
12
|
+
const accessibilityState = useAccessibilityState();
|
|
13
|
+
const isScreenReaderEnabled = accessibilityState.screenReaderEnabled;
|
|
9
14
|
|
|
10
15
|
React.useEffect(() => {
|
|
11
|
-
if (player && accessibilityManager) {
|
|
16
|
+
if (player && accessibilityManager && isScreenReaderEnabled) {
|
|
12
17
|
const playerTTS = new PlayerTTS(player, accessibilityManager);
|
|
13
18
|
const unsubscribe = playerTTS.init();
|
|
14
19
|
|
|
@@ -17,5 +22,5 @@ export const usePlayerTTS = () => {
|
|
|
17
22
|
playerTTS.destroy();
|
|
18
23
|
};
|
|
19
24
|
}
|
|
20
|
-
}, [player, accessibilityManager]);
|
|
25
|
+
}, [player, accessibilityManager, isScreenReaderEnabled]);
|
|
21
26
|
};
|
package/pluginUtils/index.ts
CHANGED
|
@@ -6,6 +6,7 @@ import { deprecationMessage } from "../appUtils";
|
|
|
6
6
|
|
|
7
7
|
import { pluginUtilsLogger } from "./logger";
|
|
8
8
|
import { platformSelect } from "../reactUtils";
|
|
9
|
+
import { get } from "../utils";
|
|
9
10
|
|
|
10
11
|
type PluginModule = any;
|
|
11
12
|
type Plugin = {
|
|
@@ -254,3 +255,6 @@ const getPluginType = R.pathOr("unknown_plugin_type", [
|
|
|
254
255
|
|
|
255
256
|
export const isPlayerPlugin = (routeState): boolean =>
|
|
256
257
|
getPluginType(routeState) === "player";
|
|
258
|
+
|
|
259
|
+
export const getPluginModuleUrlScheme = (plugin) =>
|
|
260
|
+
get(plugin, ["module", "urlScheme"]);
|
|
@@ -3,7 +3,7 @@ import { View } from "react-native";
|
|
|
3
3
|
import * as R from "ramda";
|
|
4
4
|
|
|
5
5
|
import { useNavigation } from "../navigation";
|
|
6
|
-
import {
|
|
6
|
+
import { usePlugins } from "@applicaster/zapp-react-native-redux/hooks";
|
|
7
7
|
import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
|
|
8
8
|
import { dismissModal, openModal } from "../../modalState";
|
|
9
9
|
|
|
@@ -16,7 +16,7 @@ const ModalContainer = platformSelect({
|
|
|
16
16
|
|
|
17
17
|
export function useAdvertisingInterstitial() {
|
|
18
18
|
const { screenData, currentRoute } = useNavigation();
|
|
19
|
-
const
|
|
19
|
+
const plugins = usePlugins();
|
|
20
20
|
|
|
21
21
|
return useEffect(() => {
|
|
22
22
|
// TODD: typing problem: fix any type
|
|
@@ -27,20 +27,20 @@ describe("Debug utils", () => {
|
|
|
27
27
|
it("should create new timer if timer with a label does not exist", () => {
|
|
28
28
|
performanceNowMock.mockReturnValue(1000);
|
|
29
29
|
time("timer1");
|
|
30
|
-
expect(timers
|
|
31
|
-
expect(timers
|
|
30
|
+
expect(timers.timer1).toBeDefined();
|
|
31
|
+
expect(timers.timer1.startTime).toBe(1000);
|
|
32
32
|
});
|
|
33
33
|
|
|
34
34
|
it("should update start time of timer if timer with a label exists", () => {
|
|
35
35
|
// First call to time()
|
|
36
36
|
performanceNowMock.mockReturnValue(1000);
|
|
37
37
|
time("timer1");
|
|
38
|
-
const previousStartTime = timers
|
|
38
|
+
const previousStartTime = timers.timer1.startTime;
|
|
39
39
|
|
|
40
40
|
// Second call to time()
|
|
41
41
|
performanceNowMock.mockReturnValue(2000);
|
|
42
42
|
time("timer1");
|
|
43
|
-
const currentStartTime = timers
|
|
43
|
+
const currentStartTime = timers.timer1.startTime;
|
|
44
44
|
|
|
45
45
|
expect(previousStartTime).toBe(1000);
|
|
46
46
|
expect(currentStartTime).toBe(2000);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as React from "react";
|
|
2
|
-
import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
|
|
3
2
|
import { useIsTablet } from "./useIsTablet";
|
|
3
|
+
import { useAppData } from "@applicaster/zapp-react-native-redux";
|
|
4
4
|
|
|
5
5
|
export const useMemoizedIsTablet = () => {
|
|
6
6
|
const isTablet = useIsTablet();
|
|
@@ -14,9 +14,9 @@ export const useMemoizedIsTablet = () => {
|
|
|
14
14
|
};
|
|
15
15
|
|
|
16
16
|
export const useIsTabletLandscape = (): boolean => {
|
|
17
|
-
const {
|
|
17
|
+
const { isTabletPortrait } = useAppData();
|
|
18
18
|
|
|
19
19
|
const isTablet = useIsTablet();
|
|
20
20
|
|
|
21
|
-
return isTablet && !
|
|
21
|
+
return isTablet && !isTabletPortrait;
|
|
22
22
|
};
|
|
@@ -1,3 +1,34 @@
|
|
|
1
|
+
import React from "react";
|
|
2
|
+
|
|
3
|
+
import { WrappedWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
|
|
4
|
+
|
|
5
|
+
import {
|
|
6
|
+
getInflatedDataSourceUrl,
|
|
7
|
+
getSearchContext,
|
|
8
|
+
useGetUrlInflater,
|
|
9
|
+
} from "../useInflatedUrl";
|
|
10
|
+
|
|
11
|
+
import { reactHooksLogger } from "../../logger";
|
|
12
|
+
|
|
13
|
+
jest.mock("../../navigation", () => ({
|
|
14
|
+
useRoute: () => ({ pathname: "/mock/path" }),
|
|
15
|
+
}));
|
|
16
|
+
|
|
17
|
+
// mock contexts hooks
|
|
18
|
+
jest.mock("@applicaster/zapp-react-native-ui-components/Contexts", () => ({
|
|
19
|
+
ZappPipesEntryContext: {
|
|
20
|
+
useZappPipesContext: () => [
|
|
21
|
+
{ id: "entry-1", extensions: { showId: "A123" } },
|
|
22
|
+
],
|
|
23
|
+
},
|
|
24
|
+
ZappPipesSearchContext: {
|
|
25
|
+
useZappPipesContext: () => ["user%20query"],
|
|
26
|
+
},
|
|
27
|
+
ZappPipesScreenContext: {
|
|
28
|
+
useZappPipesContext: () => [{ id: "screen-1" }],
|
|
29
|
+
},
|
|
30
|
+
}));
|
|
31
|
+
|
|
1
32
|
jest.mock("../../logger", () => ({
|
|
2
33
|
reactHooksLogger: {
|
|
3
34
|
warning: jest.fn(),
|
|
@@ -5,13 +36,6 @@ jest.mock("../../logger", () => ({
|
|
|
5
36
|
},
|
|
6
37
|
}));
|
|
7
38
|
|
|
8
|
-
const {
|
|
9
|
-
getInflatedDataSourceUrl,
|
|
10
|
-
getSearchContext,
|
|
11
|
-
} = require("../useInflatedUrl");
|
|
12
|
-
|
|
13
|
-
const { reactHooksLogger } = require("../../logger");
|
|
14
|
-
|
|
15
39
|
let mockStore;
|
|
16
40
|
|
|
17
41
|
describe("getInflatedDataSourceUrl", () => {
|
|
@@ -188,3 +212,34 @@ describe("getSearchContext", () => {
|
|
|
188
212
|
expect(result).toHaveProperty(mapping.queryParam.property, searchContext);
|
|
189
213
|
});
|
|
190
214
|
});
|
|
215
|
+
|
|
216
|
+
describe("useGetUrlInflater", () => {
|
|
217
|
+
const { renderHook } = require("@testing-library/react-hooks");
|
|
218
|
+
|
|
219
|
+
it("returns original url when mapping is not provided", () => {
|
|
220
|
+
const { result } = renderHook(() => useGetUrlInflater(), {
|
|
221
|
+
wrapper: WrappedWithProviders,
|
|
222
|
+
});
|
|
223
|
+
|
|
224
|
+
const src = "https://foo.com/feed";
|
|
225
|
+
expect(result.current(src)).toBe(src);
|
|
226
|
+
});
|
|
227
|
+
|
|
228
|
+
it("inflates url using entry/search/screen contexts when mapping provided", () => {
|
|
229
|
+
const { result } = renderHook(() => useGetUrlInflater(), {
|
|
230
|
+
wrapper: ({ children }) => (
|
|
231
|
+
<WrappedWithProviders>{children}</WrappedWithProviders>
|
|
232
|
+
),
|
|
233
|
+
});
|
|
234
|
+
|
|
235
|
+
const source = "https://foo.com/shows/{{showId}}?q={{q}}";
|
|
236
|
+
|
|
237
|
+
const mapping = {
|
|
238
|
+
showId: { source: "entry", property: "extensions.showId" },
|
|
239
|
+
q: { source: "search", property: "q" },
|
|
240
|
+
};
|
|
241
|
+
|
|
242
|
+
const url = result.current(source, mapping);
|
|
243
|
+
expect(url).toBe("https://foo.com/shows/A123?q=user%20query");
|
|
244
|
+
});
|
|
245
|
+
});
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { useContentTypes } from "@applicaster/zapp-react-native-redux";
|
|
2
2
|
|
|
3
3
|
export const useEntryScreenId = (entry?: ZappEntry): string | undefined => {
|
|
4
|
-
const
|
|
4
|
+
const contentTypes = useContentTypes();
|
|
5
5
|
|
|
6
6
|
if (!entry) {
|
|
7
7
|
return;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { useMemo } from "react";
|
|
1
|
+
import { useCallback, useMemo, useRef } from "react";
|
|
2
2
|
import * as R from "ramda";
|
|
3
3
|
|
|
4
4
|
import {
|
|
@@ -169,7 +169,7 @@ const encodeIfNeeded: (string) => string = R.tryCatch(
|
|
|
169
169
|
|
|
170
170
|
export function getSearchContext(
|
|
171
171
|
searchContext: string,
|
|
172
|
-
mapping: ZappTypeMapping
|
|
172
|
+
mapping: Nullable<ZappTypeMapping>
|
|
173
173
|
) {
|
|
174
174
|
if (!mapping) {
|
|
175
175
|
return {};
|
|
@@ -183,31 +183,57 @@ export function getSearchContext(
|
|
|
183
183
|
return { [property]: encodeIfNeeded(searchContext) };
|
|
184
184
|
}
|
|
185
185
|
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
mapping?: ZappTypeMapping;
|
|
192
|
-
}) {
|
|
186
|
+
/**
|
|
187
|
+
* Hook returns a function that replace placeholders with context values
|
|
188
|
+
* @returns function that inflates urls based on contexts
|
|
189
|
+
*/
|
|
190
|
+
export const useGetUrlInflater = () => {
|
|
193
191
|
const { pathname } = useRoute();
|
|
194
192
|
|
|
195
193
|
const [entryContext] = ZappPipesEntryContext.useZappPipesContext(pathname);
|
|
196
194
|
const [searchContext] = ZappPipesSearchContext.useZappPipesContext();
|
|
197
195
|
const [screenContext] = ZappPipesScreenContext.useZappPipesContext();
|
|
198
196
|
|
|
199
|
-
const
|
|
200
|
-
|
|
201
|
-
|
|
197
|
+
const entryContextRef = useRef(entryContext);
|
|
198
|
+
entryContextRef.current = entryContext;
|
|
199
|
+
|
|
200
|
+
const screenContextRef = useRef(screenContext);
|
|
201
|
+
screenContextRef.current = screenContext;
|
|
202
|
+
|
|
203
|
+
const searchContextRef = useRef(searchContext);
|
|
204
|
+
searchContextRef.current = searchContext;
|
|
205
|
+
|
|
206
|
+
return useCallback(
|
|
207
|
+
(
|
|
208
|
+
feedUrl: Nullable<string>,
|
|
209
|
+
mapping?: Nullable<ZappTypeMapping>
|
|
210
|
+
): Nullable<string> => {
|
|
211
|
+
return getInflatedDataSourceUrl({
|
|
202
212
|
source: feedUrl,
|
|
203
213
|
contexts: {
|
|
204
|
-
entry:
|
|
205
|
-
screen:
|
|
206
|
-
search: getSearchContext(
|
|
214
|
+
entry: entryContextRef.current,
|
|
215
|
+
screen: screenContextRef.current,
|
|
216
|
+
search: getSearchContext(searchContextRef.current, mapping),
|
|
207
217
|
},
|
|
208
218
|
mapping,
|
|
209
|
-
})
|
|
210
|
-
|
|
219
|
+
});
|
|
220
|
+
},
|
|
221
|
+
[]
|
|
222
|
+
);
|
|
223
|
+
};
|
|
224
|
+
|
|
225
|
+
export function useInflatedUrl({
|
|
226
|
+
feedUrl,
|
|
227
|
+
mapping,
|
|
228
|
+
}: {
|
|
229
|
+
feedUrl?: string;
|
|
230
|
+
mapping?: ZappTypeMapping;
|
|
231
|
+
}) {
|
|
232
|
+
const urlInflater = useGetUrlInflater();
|
|
233
|
+
|
|
234
|
+
const url = useMemo(
|
|
235
|
+
() => urlInflater(feedUrl, mapping),
|
|
236
|
+
[urlInflater, feedUrl, mapping]
|
|
211
237
|
);
|
|
212
238
|
|
|
213
239
|
return url;
|
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
|
|
2
2
|
import React from "react";
|
|
3
3
|
|
|
4
|
-
type Return = (index: number) => void;
|
|
5
|
-
|
|
6
4
|
type Predicate = (
|
|
7
|
-
|
|
5
|
+
entryLength: number,
|
|
8
6
|
index: number,
|
|
9
7
|
numberOfColumns: number
|
|
10
8
|
) => boolean;
|
|
@@ -12,19 +10,15 @@ type Predicate = (
|
|
|
12
10
|
type Props = {
|
|
13
11
|
ifNeeded: Predicate;
|
|
14
12
|
loadNextData: () => void;
|
|
15
|
-
|
|
13
|
+
entryLength: number;
|
|
16
14
|
numberOfColumns?: number;
|
|
17
15
|
};
|
|
18
16
|
|
|
19
17
|
const handleLoadNextPage =
|
|
20
18
|
(
|
|
21
|
-
ifNeeded:
|
|
22
|
-
entry: ZappEntry[],
|
|
23
|
-
index: number,
|
|
24
|
-
numberOfColumns?: number
|
|
25
|
-
) => boolean,
|
|
19
|
+
ifNeeded: Predicate,
|
|
26
20
|
loadNextData: () => void,
|
|
27
|
-
|
|
21
|
+
entryLength: number,
|
|
28
22
|
numberOfColumns
|
|
29
23
|
) =>
|
|
30
24
|
(index: number) => {
|
|
@@ -32,7 +26,7 @@ const handleLoadNextPage =
|
|
|
32
26
|
* Lazy-Loading, invoke nextLoadData if we reach the end of the List
|
|
33
27
|
*/
|
|
34
28
|
|
|
35
|
-
if (ifNeeded(
|
|
29
|
+
if (ifNeeded(entryLength, index, numberOfColumns)) {
|
|
36
30
|
loadNextData();
|
|
37
31
|
}
|
|
38
32
|
};
|
|
@@ -40,11 +34,14 @@ const handleLoadNextPage =
|
|
|
40
34
|
export const useLoadNextPageIfNeeded = ({
|
|
41
35
|
ifNeeded,
|
|
42
36
|
loadNextData = noop,
|
|
43
|
-
|
|
37
|
+
entryLength,
|
|
44
38
|
numberOfColumns = 0,
|
|
45
|
-
}: Props)
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
39
|
+
}: Props) => {
|
|
40
|
+
const memoFn = React.useMemo(
|
|
41
|
+
() =>
|
|
42
|
+
handleLoadNextPage(ifNeeded, loadNextData, entryLength, numberOfColumns),
|
|
43
|
+
[ifNeeded, loadNextData, entryLength, numberOfColumns]
|
|
49
44
|
);
|
|
45
|
+
|
|
46
|
+
return memoFn;
|
|
50
47
|
};
|