@applicaster/zapp-react-native-utils 16.0.0-rc.7 → 16.0.0-rc.71
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/ActionExecutor.ts +47 -11
- package/actionsExecutor/ActionExecutorContext.tsx +87 -316
- package/actionsExecutor/__tests__/feedDecorator.test.ts +61 -0
- package/actionsExecutor/actions/__tests__/dismissBottomSheet.test.ts +22 -0
- package/actionsExecutor/actions/__tests__/loadItemsFromSource.test.ts +88 -0
- package/actionsExecutor/actions/__tests__/navigateToScreen.test.ts +133 -0
- package/actionsExecutor/actions/__tests__/openBottomSheet.customContent.test.ts +76 -0
- package/actionsExecutor/actions/__tests__/openBottomSheet.inlineItems.test.ts +100 -0
- package/actionsExecutor/actions/__tests__/showToast.test.ts +88 -0
- package/actionsExecutor/actions/appRestart.ts +24 -0
- package/actionsExecutor/actions/confirmDialog.ts +53 -0
- package/actionsExecutor/actions/dismissBottomSheet.ts +22 -0
- package/actionsExecutor/actions/index.ts +34 -0
- package/actionsExecutor/actions/localStorageRemove.ts +27 -0
- package/actionsExecutor/actions/localStorageSet.ts +28 -0
- package/actionsExecutor/actions/localStorageToggleFlag.ts +28 -0
- package/actionsExecutor/actions/navigateToScreen.ts +137 -0
- package/actionsExecutor/actions/openBottomSheet.ts +320 -0
- package/actionsExecutor/actions/refreshComponent.ts +85 -0
- package/actionsExecutor/actions/screenSetVariable.ts +35 -0
- package/actionsExecutor/actions/screenToggleFlag.ts +38 -0
- package/actionsExecutor/actions/sendCloudEvent.ts +93 -0
- package/actionsExecutor/actions/sessionStorageRemove.ts +19 -0
- package/actionsExecutor/actions/sessionStorageSet.ts +20 -0
- package/actionsExecutor/actions/sessionStorageToggleFlag.ts +15 -0
- package/actionsExecutor/actions/showToast.ts +87 -0
- package/actionsExecutor/actions/switchLayout.ts +40 -0
- package/actionsExecutor/consts.ts +23 -0
- package/actionsExecutor/feedDecorator.ts +6 -6
- package/actionsExecutor/types.ts +59 -0
- package/analyticsUtils/AnalyticsEvents/sendMenuClickEvent.ts +2 -2
- package/analyticsUtils/PlayerAnalyticsManager.ts +12 -2
- package/analyticsUtils/__tests__/analyticsMapper.test.ts +35 -0
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testACP_events.json +1 -1
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testBlockUnlistedParams_rules.json +1 -1
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testEmptyRenameKeepsName_events.json +4 -0
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testEmptyRenameKeepsName_rules.json +6 -0
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testEventRegex_events.json +3 -9
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testIgnoreOrdering_events.json +18 -0
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testIgnoreOrdering_rules.json +16 -0
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testRegexEventNoFallback_events.json +4 -0
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testRegexEventNoFallback_rules.json +6 -0
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testRegexMultiGroupRename_events.json +4 -0
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testRegexMultiGroupRename_rules.json +6 -0
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testRegexNonNamedFullMatch_events.json +4 -0
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testRegexNonNamedFullMatch_rules.json +6 -0
- package/analyticsUtils/__tests__/fixtures/index.js +20 -0
- package/analyticsUtils/analyticsMapper.ts +4 -1
- package/analyticsUtils/playerAnalyticsTracker.ts +26 -3
- package/appUtils/HooksManager/index.ts +12 -8
- package/appUtils/contextKeysManager/__tests__/getKey/failure.test.ts +1 -1
- package/appUtils/contextKeysManager/__tests__/removeKey/failure.test.ts +1 -1
- package/appUtils/contextKeysManager/__tests__/setKey/failure/invalidKey.test.ts +4 -4
- package/appUtils/contextKeysManager/index.ts +1 -1
- package/appUtils/contextKeysManager/utils/index.ts +38 -25
- package/appUtils/playerManager/OverlayObserver/OverlaysObserver.ts +143 -53
- package/appUtils/playerManager/OverlayObserver/__tests__/liveContent.test.ts +205 -0
- package/appUtils/playerManager/OverlayObserver/__tests__/utils.test.ts +49 -0
- package/appUtils/playerManager/OverlayObserver/getUpcomingQueue.android.tv.ts +4 -0
- package/appUtils/playerManager/OverlayObserver/getUpcomingQueue.ios.tv.ts +4 -0
- package/appUtils/playerManager/OverlayObserver/getUpcomingQueue.ts +11 -0
- package/appUtils/playerManager/OverlayObserver/getUpcomingQueue.web.ts +4 -0
- package/appUtils/playerManager/OverlayObserver/utils.ts +54 -20
- package/appUtils/playerManager/__tests__/playerContent.test.ts +403 -0
- package/appUtils/playerManager/__tests__/playerFactory.test.ts +150 -0
- package/appUtils/playerManager/__tests__/playerNative.test.ts +38 -0
- package/appUtils/playerManager/__tests__/usePlayerContent.test.tsx +64 -0
- package/appUtils/playerManager/{conts.ts → const.ts} +20 -0
- package/appUtils/playerManager/index.ts +1 -1
- package/appUtils/playerManager/player.ts +115 -3
- package/appUtils/playerManager/playerFactory.ts +18 -35
- package/appUtils/playerManager/playerNative.ts +6 -4
- package/appUtils/playerManager/usePlayerContent.tsx +43 -0
- package/appUtils/playerManager/usePlayerControllerSetup.tsx +1 -1
- package/appUtils/playerManager/userLanguagePreference.ts +1 -1
- package/arrayUtils/__tests__/{anyThruthy.test.ts → anyTruthy.test.ts} +8 -0
- package/arrayUtils/__tests__/arrayUtils.test.ts +165 -108
- package/arrayUtils/__tests__/isEmptyArray.test.ts +11 -0
- package/arrayUtils/__tests__/isFilledArray.test.ts +12 -0
- package/arrayUtils/__tests__/isFirst.test.ts +17 -0
- package/arrayUtils/__tests__/isIndexInRange.test.ts +14 -0
- package/arrayUtils/__tests__/isLast.test.ts +31 -0
- package/arrayUtils/__tests__/makeListOf.test.ts +31 -0
- package/arrayUtils/__tests__/makeListOfIndexes.test.ts +20 -0
- package/arrayUtils/__tests__/reorderByIds.test.ts +50 -0
- package/arrayUtils/__tests__/sample.test.ts +61 -0
- package/arrayUtils/index.ts +136 -20
- package/bottomSheet/__tests__/scrollContext.test.tsx +35 -0
- package/bottomSheet/index.ts +17 -0
- package/cellUtils/index.ts +33 -8
- package/colorUtils/__tests__/isTransparentColor.test.ts +76 -0
- package/colorUtils/__tests__/isValidColor.test.ts +70 -0
- package/colorUtils/index.ts +50 -0
- package/configurationUtils/__tests__/modalBlocksParser.test.ts +107 -0
- package/configurationUtils/manifestKeyParser.ts +38 -9
- package/configurationUtils/modalBlocksParser.ts +178 -0
- package/manifestUtils/__tests__/player.audioControls.test.js +158 -0
- package/manifestUtils/_internals/index.js +6 -0
- package/manifestUtils/defaultManifestConfigurations/generalContent.js +35 -0
- package/manifestUtils/defaultManifestConfigurations/player.js +327 -19
- package/manifestUtils/fieldUtils/__tests__/fieldUtils.test.js +84 -0
- package/manifestUtils/fieldUtils/index.js +125 -0
- package/manifestUtils/index.js +3 -0
- package/manifestUtils/keys.js +9 -0
- package/manifestUtils/mobileAction/button/index.js +16 -0
- package/manifestUtils/mobileAction/container/index.js +3 -1
- package/manifestUtils/mobileAction/groups/defaults.js +3 -1
- package/manifestUtils/modalBlocks.js +304 -0
- package/manifestUtils/platformIsTV.js +1 -0
- package/modalState/ContentViewModel.ts +113 -0
- package/modalState/EditableCollection.ts +17 -0
- package/modalState/EditableCollectionRegistry.ts +51 -0
- package/modalState/ModalOrchestrator.ts +199 -0
- package/modalState/RemoteEditableCollection.ts +227 -0
- package/modalState/__tests__/ContentViewModel.editable.test.ts +69 -0
- package/modalState/__tests__/ContentViewModel.test.ts +165 -0
- package/modalState/__tests__/EditableCollectionRegistry.test.ts +112 -0
- package/modalState/__tests__/ModalOrchestrator.phase3.test.ts +47 -0
- package/modalState/__tests__/RemoteEditableCollection.test.ts +326 -0
- package/modalState/__tests__/useBottomSheetContent.test.ts +349 -0
- package/modalState/index.ts +30 -83
- package/modalState/store.ts +102 -0
- package/modalState/types.ts +133 -0
- package/modalState/useBottomSheetContent.ts +102 -0
- package/numberUtils/__tests__/isMinusZero.test.ts +20 -0
- package/numberUtils/__tests__/isZero.test.ts +27 -0
- package/numberUtils/__tests__/requireNumber.test.ts +50 -0
- package/numberUtils/__tests__/toNumber.test.ts +27 -0
- package/numberUtils/__tests__/toNumberWithDefault.test.ts +64 -0
- package/numberUtils/__tests__/toNumberWithDefaultZero.test.ts +48 -0
- package/numberUtils/index.ts +27 -8
- package/package.json +2 -2
- package/pipesUtils/__tests__/buildUrlWithQuery.test.ts +33 -0
- package/pipesUtils/__tests__/withPipesEndpoint.test.tsx +56 -0
- package/pipesUtils/index.ts +1 -0
- package/pipesUtils/withPipesEndpoint.tsx +54 -0
- package/playerUtils/__tests__/contentDataKeys.test.ts +297 -0
- package/playerUtils/__tests__/resolvePlayerTitleSubtitle.test.ts +180 -0
- package/playerUtils/contentDataKeys.ts +134 -0
- package/playerUtils/index.ts +41 -14
- package/playerUtils/isAudioItem.ts +26 -0
- package/playerUtils/resolvePlayerTitleSubtitle.ts +76 -0
- package/reactHooks/actions/index.ts +51 -1
- package/reactHooks/cell-click/index.ts +18 -10
- package/reactHooks/feed/__mocks__/useMarkPipesDataStale.ts +4 -0
- package/reactHooks/feed/__tests__/useInflatedUrl.test.tsx +25 -0
- package/reactHooks/feed/index.ts +5 -1
- package/reactHooks/feed/useBatchLoading.ts +9 -1
- package/reactHooks/feed/{usePipesCacheReset.ts → useMarkPipesDataStale.ts} +12 -4
- package/reactHooks/index.ts +2 -0
- package/reactHooks/layout/index.ts +1 -1
- package/reactHooks/navigation/__mocks__/index.ts +4 -0
- package/reactHooks/navigation/__tests__/useIsScreenActive.test.ts +42 -0
- package/reactHooks/navigation/index.ts +1 -1
- package/reactHooks/navigation/useIsScreenActive.ts +29 -8
- package/reactHooks/state/useComponentScreenState.ts +1 -1
- package/reactHooks/usePluginConfiguration.ts +4 -1
- package/reactHooks/utils/__tests__/index.test.js +22 -2
- package/reactHooks/utils/index.ts +13 -2
- package/reactHooks/videoModal/hooks/useVideoModalScreenData.tsx +22 -4
- package/riverComponetsMeasurementProvider/index.tsx +12 -8
- package/stringUtils/__tests__/stringUtils.test.js +42 -0
- package/stringUtils/index.ts +2 -2
- package/uiActionsRegistrator/index.ts +203 -0
- package/zappFrameworkUtils/__tests__/localStorageHelper.test.ts +146 -0
- package/zappFrameworkUtils/localStorageHelper.ts +19 -15
- package/appUtils/playerManager/usePlayerTitleSummaryOverlay.tsx +0 -56
- package/reactHooks/feed/__mocks__/usePipesCacheReset.ts +0 -1
- /package/reactHooks/actions/__tests__/{index.test.js → index.test.tsx} +0 -0
|
@@ -0,0 +1,297 @@
|
|
|
1
|
+
import {
|
|
2
|
+
resolvePlayerContentText,
|
|
3
|
+
VIDEO_PLAYER_CONTENT_DATA_KEYS,
|
|
4
|
+
AUDIO_PLAYER_CONTENT_DATA_KEYS,
|
|
5
|
+
createConfigValueGetter,
|
|
6
|
+
} from "../contentDataKeys";
|
|
7
|
+
|
|
8
|
+
const entry = {
|
|
9
|
+
id: "1",
|
|
10
|
+
type: { value: "audio" },
|
|
11
|
+
title: "Default Title",
|
|
12
|
+
summary: "Default Summary",
|
|
13
|
+
extensions: {
|
|
14
|
+
episode_name: "Custom Episode",
|
|
15
|
+
episode_subtitle: "Custom Subtitle",
|
|
16
|
+
blank: "",
|
|
17
|
+
show: { name: "Nested Show Name" },
|
|
18
|
+
genres: ["Drama", "Comedy"],
|
|
19
|
+
rating: 0,
|
|
20
|
+
is_featured: true,
|
|
21
|
+
},
|
|
22
|
+
} as unknown as ZappEntry;
|
|
23
|
+
|
|
24
|
+
const valueFrom =
|
|
25
|
+
(config: Record<string, unknown>): GetValue =>
|
|
26
|
+
(key: string) =>
|
|
27
|
+
(config[key] ?? null) as never;
|
|
28
|
+
|
|
29
|
+
const resolveTitle = (config: Record<string, unknown>, target = entry) =>
|
|
30
|
+
resolvePlayerContentText({
|
|
31
|
+
entry: target,
|
|
32
|
+
field: "title",
|
|
33
|
+
value: valueFrom(config),
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
const resolveSubtitle = (config: Record<string, unknown>, target = entry) =>
|
|
37
|
+
resolvePlayerContentText({
|
|
38
|
+
entry: target,
|
|
39
|
+
field: "subtitle",
|
|
40
|
+
value: valueFrom(config),
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
describe("resolvePlayerContentText", () => {
|
|
44
|
+
describe("backward compatibility", () => {
|
|
45
|
+
it("returns entry.title when no configuration is stored", () => {
|
|
46
|
+
expect(resolveTitle({})).toBe("Default Title");
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
it("returns entry.summary when no configuration is stored", () => {
|
|
50
|
+
expect(resolveSubtitle({})).toBe("Default Summary");
|
|
51
|
+
});
|
|
52
|
+
|
|
53
|
+
it("returns the defaults when the source is explicitly the default option", () => {
|
|
54
|
+
expect(
|
|
55
|
+
resolveTitle({
|
|
56
|
+
title_data_key_source: "title",
|
|
57
|
+
title_custom_data_key: "extensions.episode_name",
|
|
58
|
+
})
|
|
59
|
+
).toBe("Default Title");
|
|
60
|
+
|
|
61
|
+
expect(
|
|
62
|
+
resolveSubtitle({
|
|
63
|
+
subtitle_data_key_source: "summary",
|
|
64
|
+
subtitle_custom_data_key: "extensions.episode_subtitle",
|
|
65
|
+
})
|
|
66
|
+
).toBe("Default Summary");
|
|
67
|
+
});
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
describe("custom data key", () => {
|
|
71
|
+
it("resolves a dot path on the entry for the title", () => {
|
|
72
|
+
expect(
|
|
73
|
+
resolveTitle({
|
|
74
|
+
title_data_key_source: "other",
|
|
75
|
+
title_custom_data_key: "extensions.episode_name",
|
|
76
|
+
})
|
|
77
|
+
).toBe("Custom Episode");
|
|
78
|
+
});
|
|
79
|
+
|
|
80
|
+
it("resolves a dot path on the entry for the subtitle", () => {
|
|
81
|
+
expect(
|
|
82
|
+
resolveSubtitle({
|
|
83
|
+
subtitle_data_key_source: "other",
|
|
84
|
+
subtitle_custom_data_key: "extensions.episode_subtitle",
|
|
85
|
+
})
|
|
86
|
+
).toBe("Custom Subtitle");
|
|
87
|
+
});
|
|
88
|
+
|
|
89
|
+
it("resolves a nested dot path", () => {
|
|
90
|
+
expect(
|
|
91
|
+
resolveTitle({
|
|
92
|
+
title_data_key_source: "other",
|
|
93
|
+
title_custom_data_key: "extensions.show.name",
|
|
94
|
+
})
|
|
95
|
+
).toBe("Nested Show Name");
|
|
96
|
+
});
|
|
97
|
+
|
|
98
|
+
it("resolves a top level entry key", () => {
|
|
99
|
+
expect(
|
|
100
|
+
resolveTitle({
|
|
101
|
+
title_data_key_source: "other",
|
|
102
|
+
title_custom_data_key: "summary",
|
|
103
|
+
})
|
|
104
|
+
).toBe("Default Summary");
|
|
105
|
+
});
|
|
106
|
+
|
|
107
|
+
it("trims surrounding whitespace from the configured key", () => {
|
|
108
|
+
expect(
|
|
109
|
+
resolveTitle({
|
|
110
|
+
title_data_key_source: "other",
|
|
111
|
+
title_custom_data_key: " extensions.episode_name ",
|
|
112
|
+
})
|
|
113
|
+
).toBe("Custom Episode");
|
|
114
|
+
});
|
|
115
|
+
});
|
|
116
|
+
|
|
117
|
+
describe("fallbacks", () => {
|
|
118
|
+
it("falls back to the default when the custom key is empty", () => {
|
|
119
|
+
expect(
|
|
120
|
+
resolveTitle({
|
|
121
|
+
title_data_key_source: "other",
|
|
122
|
+
title_custom_data_key: "",
|
|
123
|
+
})
|
|
124
|
+
).toBe("Default Title");
|
|
125
|
+
});
|
|
126
|
+
|
|
127
|
+
it("falls back to the default when the custom key is whitespace only", () => {
|
|
128
|
+
expect(
|
|
129
|
+
resolveTitle({
|
|
130
|
+
title_data_key_source: "other",
|
|
131
|
+
title_custom_data_key: " ",
|
|
132
|
+
})
|
|
133
|
+
).toBe("Default Title");
|
|
134
|
+
});
|
|
135
|
+
|
|
136
|
+
it("falls back to the default when the custom key does not resolve", () => {
|
|
137
|
+
expect(
|
|
138
|
+
resolveTitle({
|
|
139
|
+
title_data_key_source: "other",
|
|
140
|
+
title_custom_data_key: "extensions.does_not_exist",
|
|
141
|
+
})
|
|
142
|
+
).toBe("Default Title");
|
|
143
|
+
});
|
|
144
|
+
|
|
145
|
+
it("falls back to the default when the custom key resolves to an empty string", () => {
|
|
146
|
+
expect(
|
|
147
|
+
resolveTitle({
|
|
148
|
+
title_data_key_source: "other",
|
|
149
|
+
title_custom_data_key: "extensions.blank",
|
|
150
|
+
})
|
|
151
|
+
).toBe("Default Title");
|
|
152
|
+
});
|
|
153
|
+
|
|
154
|
+
// The Studio field is free text, so a customer can easily stop one
|
|
155
|
+
// segment short (`extensions.show` rather than `extensions.show.name`)
|
|
156
|
+
// or aim the key at a list field. Rendering those would throw
|
|
157
|
+
// "Objects are not valid as a React child" and red-screen every screen
|
|
158
|
+
// containing the player.
|
|
159
|
+
it("falls back to the default when the custom key resolves to an object", () => {
|
|
160
|
+
expect(
|
|
161
|
+
resolveTitle({
|
|
162
|
+
title_data_key_source: "other",
|
|
163
|
+
title_custom_data_key: "extensions.show",
|
|
164
|
+
})
|
|
165
|
+
).toBe("Default Title");
|
|
166
|
+
});
|
|
167
|
+
|
|
168
|
+
it("falls back to the default when the custom key resolves to an array", () => {
|
|
169
|
+
expect(
|
|
170
|
+
resolveSubtitle({
|
|
171
|
+
subtitle_data_key_source: "other",
|
|
172
|
+
subtitle_custom_data_key: "extensions.genres",
|
|
173
|
+
})
|
|
174
|
+
).toBe("Default Summary");
|
|
175
|
+
});
|
|
176
|
+
|
|
177
|
+
it("falls back to the default when the custom key resolves to a boolean", () => {
|
|
178
|
+
expect(
|
|
179
|
+
resolveTitle({
|
|
180
|
+
title_data_key_source: "other",
|
|
181
|
+
title_custom_data_key: "extensions.is_featured",
|
|
182
|
+
})
|
|
183
|
+
).toBe("Default Title");
|
|
184
|
+
});
|
|
185
|
+
|
|
186
|
+
// Numbers are renderable, so the guard above must not swallow them -
|
|
187
|
+
// including 0, which is falsy but perfectly displayable.
|
|
188
|
+
it("returns a numeric custom value rather than falling back", () => {
|
|
189
|
+
expect(
|
|
190
|
+
resolveTitle({
|
|
191
|
+
title_data_key_source: "other",
|
|
192
|
+
title_custom_data_key: "extensions.rating",
|
|
193
|
+
})
|
|
194
|
+
).toBe(0);
|
|
195
|
+
});
|
|
196
|
+
});
|
|
197
|
+
|
|
198
|
+
describe("missing entry", () => {
|
|
199
|
+
it("returns undefined without throwing when the entry is undefined", () => {
|
|
200
|
+
expect(
|
|
201
|
+
resolvePlayerContentText({
|
|
202
|
+
entry: undefined,
|
|
203
|
+
field: "title",
|
|
204
|
+
value: valueFrom({}),
|
|
205
|
+
})
|
|
206
|
+
).toBeUndefined();
|
|
207
|
+
});
|
|
208
|
+
|
|
209
|
+
it("returns undefined without throwing when a custom key is set", () => {
|
|
210
|
+
expect(
|
|
211
|
+
resolvePlayerContentText({
|
|
212
|
+
entry: undefined,
|
|
213
|
+
field: "title",
|
|
214
|
+
value: valueFrom({
|
|
215
|
+
title_data_key_source: "other",
|
|
216
|
+
title_custom_data_key: "extensions.episode_name",
|
|
217
|
+
}),
|
|
218
|
+
})
|
|
219
|
+
).toBeUndefined();
|
|
220
|
+
});
|
|
221
|
+
});
|
|
222
|
+
});
|
|
223
|
+
|
|
224
|
+
describe("custom data key sets", () => {
|
|
225
|
+
it("reads the TV video keys when given that key set", () => {
|
|
226
|
+
const value = createConfigValueGetter({
|
|
227
|
+
video_player_title_data_key_source: "other",
|
|
228
|
+
video_player_title_custom_data_key: "extensions.episode_name",
|
|
229
|
+
});
|
|
230
|
+
|
|
231
|
+
expect(
|
|
232
|
+
resolvePlayerContentText({
|
|
233
|
+
entry,
|
|
234
|
+
field: "title",
|
|
235
|
+
value,
|
|
236
|
+
dataKeys: VIDEO_PLAYER_CONTENT_DATA_KEYS,
|
|
237
|
+
})
|
|
238
|
+
).toBe("Custom Episode");
|
|
239
|
+
});
|
|
240
|
+
|
|
241
|
+
it("reads the TV audio keys when given that key set", () => {
|
|
242
|
+
const value = createConfigValueGetter({
|
|
243
|
+
audio_player_summary_data_key_source: "other",
|
|
244
|
+
audio_player_summary_custom_data_key: "extensions.episode_subtitle",
|
|
245
|
+
});
|
|
246
|
+
|
|
247
|
+
expect(
|
|
248
|
+
resolvePlayerContentText({
|
|
249
|
+
entry,
|
|
250
|
+
field: "subtitle",
|
|
251
|
+
value,
|
|
252
|
+
dataKeys: AUDIO_PLAYER_CONTENT_DATA_KEYS,
|
|
253
|
+
})
|
|
254
|
+
).toBe("Custom Subtitle");
|
|
255
|
+
});
|
|
256
|
+
|
|
257
|
+
it("ignores the mobile keys when a TV key set is supplied", () => {
|
|
258
|
+
const value = createConfigValueGetter({
|
|
259
|
+
title_data_key_source: "other",
|
|
260
|
+
title_custom_data_key: "extensions.episode_name",
|
|
261
|
+
});
|
|
262
|
+
|
|
263
|
+
expect(
|
|
264
|
+
resolvePlayerContentText({
|
|
265
|
+
entry,
|
|
266
|
+
field: "title",
|
|
267
|
+
value,
|
|
268
|
+
dataKeys: VIDEO_PLAYER_CONTENT_DATA_KEYS,
|
|
269
|
+
})
|
|
270
|
+
).toBe("Default Title");
|
|
271
|
+
});
|
|
272
|
+
|
|
273
|
+
it("defaults to the mobile key set when dataKeys is omitted", () => {
|
|
274
|
+
const value = createConfigValueGetter({
|
|
275
|
+
title_data_key_source: "other",
|
|
276
|
+
title_custom_data_key: "extensions.episode_name",
|
|
277
|
+
});
|
|
278
|
+
|
|
279
|
+
expect(resolvePlayerContentText({ entry, field: "title", value })).toBe(
|
|
280
|
+
"Custom Episode"
|
|
281
|
+
);
|
|
282
|
+
});
|
|
283
|
+
});
|
|
284
|
+
|
|
285
|
+
describe("createConfigValueGetter", () => {
|
|
286
|
+
it("returns null for a missing key", () => {
|
|
287
|
+
expect(createConfigValueGetter({})("anything")).toBeNull();
|
|
288
|
+
});
|
|
289
|
+
|
|
290
|
+
it("returns null for an undefined configuration", () => {
|
|
291
|
+
expect(createConfigValueGetter(undefined)("anything")).toBeNull();
|
|
292
|
+
});
|
|
293
|
+
|
|
294
|
+
it("returns the stored value", () => {
|
|
295
|
+
expect(createConfigValueGetter({ a: "b" })("a")).toBe("b");
|
|
296
|
+
});
|
|
297
|
+
});
|
|
@@ -0,0 +1,180 @@
|
|
|
1
|
+
import {
|
|
2
|
+
resolvePlayerTitleSubtitle,
|
|
3
|
+
getPlayerContentDataKeys,
|
|
4
|
+
} from "../resolvePlayerTitleSubtitle";
|
|
5
|
+
import {
|
|
6
|
+
VIDEO_PLAYER_CONTENT_DATA_KEYS,
|
|
7
|
+
AUDIO_PLAYER_CONTENT_DATA_KEYS,
|
|
8
|
+
} from "../contentDataKeys";
|
|
9
|
+
|
|
10
|
+
const entry = {
|
|
11
|
+
id: "1",
|
|
12
|
+
title: "Default Title",
|
|
13
|
+
summary: "Default Summary",
|
|
14
|
+
extensions: {
|
|
15
|
+
episode_name: "Custom Episode",
|
|
16
|
+
episode_subtitle: "Custom Subtitle",
|
|
17
|
+
},
|
|
18
|
+
} as unknown as ZappEntry;
|
|
19
|
+
|
|
20
|
+
describe("resolvePlayerTitleSubtitle", () => {
|
|
21
|
+
it("returns entry.title/entry.summary when nothing is configured", () => {
|
|
22
|
+
expect(
|
|
23
|
+
resolvePlayerTitleSubtitle({ entry, pluginConfiguration: {} })
|
|
24
|
+
).toEqual({
|
|
25
|
+
title: "Default Title",
|
|
26
|
+
summary: "Default Summary",
|
|
27
|
+
});
|
|
28
|
+
});
|
|
29
|
+
|
|
30
|
+
it("returns entry.title/entry.summary when pluginConfiguration is undefined", () => {
|
|
31
|
+
expect(
|
|
32
|
+
resolvePlayerTitleSubtitle({ entry, pluginConfiguration: undefined })
|
|
33
|
+
).toEqual({
|
|
34
|
+
title: "Default Title",
|
|
35
|
+
summary: "Default Summary",
|
|
36
|
+
});
|
|
37
|
+
});
|
|
38
|
+
|
|
39
|
+
it("returns null for both fields without throwing when entry is missing", () => {
|
|
40
|
+
expect(
|
|
41
|
+
resolvePlayerTitleSubtitle({
|
|
42
|
+
entry: undefined,
|
|
43
|
+
pluginConfiguration: {
|
|
44
|
+
title_data_key_source: "other",
|
|
45
|
+
title_custom_data_key: "extensions.episode_name",
|
|
46
|
+
},
|
|
47
|
+
})
|
|
48
|
+
).toEqual({ title: null, summary: null });
|
|
49
|
+
});
|
|
50
|
+
|
|
51
|
+
it("does not mutate the entry it is given", () => {
|
|
52
|
+
const original = JSON.parse(JSON.stringify(entry));
|
|
53
|
+
|
|
54
|
+
resolvePlayerTitleSubtitle({
|
|
55
|
+
entry,
|
|
56
|
+
pluginConfiguration: {
|
|
57
|
+
title_data_key_source: "other",
|
|
58
|
+
title_custom_data_key: "extensions.episode_name",
|
|
59
|
+
},
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
expect(entry).toEqual(original);
|
|
63
|
+
});
|
|
64
|
+
|
|
65
|
+
describe("default (mobile) key set", () => {
|
|
66
|
+
it("resolves the title from the default (mobile) custom data key", () => {
|
|
67
|
+
expect(
|
|
68
|
+
resolvePlayerTitleSubtitle({
|
|
69
|
+
entry,
|
|
70
|
+
pluginConfiguration: {
|
|
71
|
+
title_data_key_source: "other",
|
|
72
|
+
title_custom_data_key: "extensions.episode_name",
|
|
73
|
+
},
|
|
74
|
+
})
|
|
75
|
+
).toEqual({
|
|
76
|
+
title: "Custom Episode",
|
|
77
|
+
summary: "Default Summary",
|
|
78
|
+
});
|
|
79
|
+
});
|
|
80
|
+
|
|
81
|
+
it("ignores TV-only custom data keys", () => {
|
|
82
|
+
expect(
|
|
83
|
+
resolvePlayerTitleSubtitle({
|
|
84
|
+
entry,
|
|
85
|
+
pluginConfiguration: {
|
|
86
|
+
video_player_title_data_key_source: "other",
|
|
87
|
+
video_player_title_custom_data_key: "extensions.episode_name",
|
|
88
|
+
},
|
|
89
|
+
})
|
|
90
|
+
).toEqual({
|
|
91
|
+
title: "Default Title",
|
|
92
|
+
summary: "Default Summary",
|
|
93
|
+
});
|
|
94
|
+
});
|
|
95
|
+
});
|
|
96
|
+
|
|
97
|
+
describe("dataKeys parameter (e.g. VIDEO_PLAYER_CONTENT_DATA_KEYS)", () => {
|
|
98
|
+
it("resolves the title from the TV video custom data key when dataKeys is VIDEO_PLAYER_CONTENT_DATA_KEYS", () => {
|
|
99
|
+
expect(
|
|
100
|
+
resolvePlayerTitleSubtitle({
|
|
101
|
+
entry,
|
|
102
|
+
pluginConfiguration: {
|
|
103
|
+
video_player_title_data_key_source: "other",
|
|
104
|
+
video_player_title_custom_data_key: "extensions.episode_name",
|
|
105
|
+
video_player_summary_data_key_source: "other",
|
|
106
|
+
video_player_summary_custom_data_key: "extensions.episode_subtitle",
|
|
107
|
+
},
|
|
108
|
+
dataKeys: VIDEO_PLAYER_CONTENT_DATA_KEYS,
|
|
109
|
+
})
|
|
110
|
+
).toEqual({
|
|
111
|
+
title: "Custom Episode",
|
|
112
|
+
summary: "Custom Subtitle",
|
|
113
|
+
});
|
|
114
|
+
});
|
|
115
|
+
|
|
116
|
+
it("ignores mobile custom data keys when dataKeys is VIDEO_PLAYER_CONTENT_DATA_KEYS", () => {
|
|
117
|
+
expect(
|
|
118
|
+
resolvePlayerTitleSubtitle({
|
|
119
|
+
entry,
|
|
120
|
+
pluginConfiguration: {
|
|
121
|
+
title_data_key_source: "other",
|
|
122
|
+
title_custom_data_key: "extensions.episode_name",
|
|
123
|
+
},
|
|
124
|
+
dataKeys: VIDEO_PLAYER_CONTENT_DATA_KEYS,
|
|
125
|
+
})
|
|
126
|
+
).toEqual({
|
|
127
|
+
title: "Default Title",
|
|
128
|
+
summary: "Default Summary",
|
|
129
|
+
});
|
|
130
|
+
});
|
|
131
|
+
|
|
132
|
+
it("produces a different resolved title than the default key set for the same configuration object", () => {
|
|
133
|
+
const pluginConfiguration = {
|
|
134
|
+
title_data_key_source: "other",
|
|
135
|
+
title_custom_data_key: "extensions.episode_name",
|
|
136
|
+
video_player_title_data_key_source: "other",
|
|
137
|
+
video_player_title_custom_data_key: "extensions.episode_subtitle",
|
|
138
|
+
};
|
|
139
|
+
|
|
140
|
+
const defaultResolved = resolvePlayerTitleSubtitle({
|
|
141
|
+
entry,
|
|
142
|
+
pluginConfiguration,
|
|
143
|
+
});
|
|
144
|
+
|
|
145
|
+
const tvResolved = resolvePlayerTitleSubtitle({
|
|
146
|
+
entry,
|
|
147
|
+
pluginConfiguration,
|
|
148
|
+
dataKeys: VIDEO_PLAYER_CONTENT_DATA_KEYS,
|
|
149
|
+
});
|
|
150
|
+
|
|
151
|
+
expect(defaultResolved.title).toBe("Custom Episode");
|
|
152
|
+
expect(tvResolved.title).toBe("Custom Subtitle");
|
|
153
|
+
expect(defaultResolved.title).not.toBe(tvResolved.title);
|
|
154
|
+
});
|
|
155
|
+
});
|
|
156
|
+
});
|
|
157
|
+
|
|
158
|
+
describe("getPlayerContentDataKeys", () => {
|
|
159
|
+
it("returns AUDIO_PLAYER_CONTENT_DATA_KEYS for TV audio content", () => {
|
|
160
|
+
expect(getPlayerContentDataKeys({ isTV: true, isAudioContent: true })).toBe(
|
|
161
|
+
AUDIO_PLAYER_CONTENT_DATA_KEYS
|
|
162
|
+
);
|
|
163
|
+
});
|
|
164
|
+
|
|
165
|
+
it("returns VIDEO_PLAYER_CONTENT_DATA_KEYS for TV video content", () => {
|
|
166
|
+
expect(
|
|
167
|
+
getPlayerContentDataKeys({ isTV: true, isAudioContent: false })
|
|
168
|
+
).toBe(VIDEO_PLAYER_CONTENT_DATA_KEYS);
|
|
169
|
+
});
|
|
170
|
+
|
|
171
|
+
it("returns undefined (the default/mobile key set) on mobile, regardless of content type", () => {
|
|
172
|
+
expect(
|
|
173
|
+
getPlayerContentDataKeys({ isTV: false, isAudioContent: true })
|
|
174
|
+
).toBeUndefined();
|
|
175
|
+
|
|
176
|
+
expect(
|
|
177
|
+
getPlayerContentDataKeys({ isTV: false, isAudioContent: false })
|
|
178
|
+
).toBeUndefined();
|
|
179
|
+
});
|
|
180
|
+
});
|
|
@@ -0,0 +1,134 @@
|
|
|
1
|
+
import { get } from "@applicaster/zapp-react-native-utils/utils";
|
|
2
|
+
import { isNotEmptyString } from "@applicaster/zapp-react-native-utils/stringUtils";
|
|
3
|
+
|
|
4
|
+
type GetValue = <T = string | number | null>(key: string) => T;
|
|
5
|
+
|
|
6
|
+
export type PlayerContentField = "title" | "subtitle";
|
|
7
|
+
|
|
8
|
+
const CUSTOM_SOURCE = "other";
|
|
9
|
+
|
|
10
|
+
const DEFAULT_ENTRY_PATH: Record<PlayerContentField, string> = {
|
|
11
|
+
title: "title",
|
|
12
|
+
subtitle: "summary",
|
|
13
|
+
};
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* Configuration keys backing each field, exported so callers can build a
|
|
17
|
+
* stable configuration getter without duplicating the key strings.
|
|
18
|
+
*/
|
|
19
|
+
export const PLAYER_CONTENT_DATA_KEYS: Record<
|
|
20
|
+
PlayerContentField,
|
|
21
|
+
{ source: string; custom: string }
|
|
22
|
+
> = {
|
|
23
|
+
title: {
|
|
24
|
+
source: "title_data_key_source",
|
|
25
|
+
custom: "title_custom_data_key",
|
|
26
|
+
},
|
|
27
|
+
subtitle: {
|
|
28
|
+
source: "subtitle_data_key_source",
|
|
29
|
+
custom: "subtitle_custom_data_key",
|
|
30
|
+
},
|
|
31
|
+
};
|
|
32
|
+
|
|
33
|
+
export type PlayerContentDataKeys = Record<
|
|
34
|
+
PlayerContentField,
|
|
35
|
+
{ source: string; custom: string }
|
|
36
|
+
>;
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* TV keeps separate Title/Summary configuration per media type. Mobile has
|
|
40
|
+
* no equivalent split - it shares a single `PLAYER_CONTENT_DATA_KEYS` set
|
|
41
|
+
* for both video and audio - which is why these sets carry a media-type
|
|
42
|
+
* prefix (`video_player_*` / `audio_player_*`) and mobile's doesn't.
|
|
43
|
+
*/
|
|
44
|
+
export const VIDEO_PLAYER_CONTENT_DATA_KEYS: PlayerContentDataKeys = {
|
|
45
|
+
title: {
|
|
46
|
+
source: "video_player_title_data_key_source",
|
|
47
|
+
custom: "video_player_title_custom_data_key",
|
|
48
|
+
},
|
|
49
|
+
subtitle: {
|
|
50
|
+
source: "video_player_summary_data_key_source",
|
|
51
|
+
custom: "video_player_summary_custom_data_key",
|
|
52
|
+
},
|
|
53
|
+
};
|
|
54
|
+
|
|
55
|
+
export const AUDIO_PLAYER_CONTENT_DATA_KEYS: PlayerContentDataKeys = {
|
|
56
|
+
title: {
|
|
57
|
+
source: "audio_player_title_data_key_source",
|
|
58
|
+
custom: "audio_player_title_custom_data_key",
|
|
59
|
+
},
|
|
60
|
+
subtitle: {
|
|
61
|
+
source: "audio_player_summary_data_key_source",
|
|
62
|
+
custom: "audio_player_summary_custom_data_key",
|
|
63
|
+
},
|
|
64
|
+
};
|
|
65
|
+
|
|
66
|
+
/**
|
|
67
|
+
* Builds a GetValue over a plugin configuration object. Callers that hold a
|
|
68
|
+
* configuration rather than a `value` closure use this instead of hand-rolling
|
|
69
|
+
* the lookup.
|
|
70
|
+
*/
|
|
71
|
+
export const createConfigValueGetter =
|
|
72
|
+
(configuration: Option<Record<string, any>>): GetValue =>
|
|
73
|
+
<T>(key: string) =>
|
|
74
|
+
(configuration?.[key] ?? null) as T;
|
|
75
|
+
|
|
76
|
+
type ResolvePlayerContentTextParams = {
|
|
77
|
+
entry: Option<ZappEntry>;
|
|
78
|
+
field: PlayerContentField;
|
|
79
|
+
value: GetValue;
|
|
80
|
+
dataKeys?: PlayerContentDataKeys;
|
|
81
|
+
};
|
|
82
|
+
|
|
83
|
+
/**
|
|
84
|
+
* Resolves the text shown for the player's Title or Subtitle.
|
|
85
|
+
*
|
|
86
|
+
* Unless the customer explicitly selected the "Other" data key source and
|
|
87
|
+
* supplied a resolvable key, this returns the hardcoded entry field the
|
|
88
|
+
* player has always used, which keeps existing apps unchanged.
|
|
89
|
+
*/
|
|
90
|
+
export const resolvePlayerContentText = ({
|
|
91
|
+
entry,
|
|
92
|
+
field,
|
|
93
|
+
value,
|
|
94
|
+
dataKeys,
|
|
95
|
+
}: ResolvePlayerContentTextParams): Option<string | number> => {
|
|
96
|
+
if (!entry) {
|
|
97
|
+
return undefined;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
const defaultValue = get(entry, DEFAULT_ENTRY_PATH[field]);
|
|
101
|
+
|
|
102
|
+
const { source, custom } = (dataKeys ?? PLAYER_CONTENT_DATA_KEYS)[field];
|
|
103
|
+
|
|
104
|
+
if (value(source) !== CUSTOM_SOURCE) {
|
|
105
|
+
return defaultValue;
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
const customKey = value<Option<string>>(custom);
|
|
109
|
+
|
|
110
|
+
// Only trim when the config value really is a string - it comes from
|
|
111
|
+
// free-text Studio configuration and can be a non-string (or null/undefined),
|
|
112
|
+
// and calling .trim() on that would throw.
|
|
113
|
+
const trimmedKey = isNotEmptyString(customKey) ? customKey.trim() : customKey;
|
|
114
|
+
|
|
115
|
+
if (!isNotEmptyString(trimmedKey)) {
|
|
116
|
+
return defaultValue;
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
const customValue = get(entry, trimmedKey);
|
|
120
|
+
|
|
121
|
+
if (customValue === null || customValue === undefined || customValue === "") {
|
|
122
|
+
return defaultValue;
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
// The key is free text in the Studio, so it can easily land on an object or
|
|
126
|
+
// an array (`extensions.show` instead of `extensions.show.name`). Those
|
|
127
|
+
// reach <Text> untouched and throw "Objects are not valid as a React child",
|
|
128
|
+
// so they fall back like every other unusable key.
|
|
129
|
+
if (typeof customValue !== "string" && typeof customValue !== "number") {
|
|
130
|
+
return defaultValue;
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
return customValue;
|
|
134
|
+
};
|
package/playerUtils/index.ts
CHANGED
|
@@ -9,6 +9,36 @@ import { Dimensions } from "react-native";
|
|
|
9
9
|
|
|
10
10
|
export { getPlayerActionButtons } from "./getPlayerActionButtons";
|
|
11
11
|
|
|
12
|
+
export {
|
|
13
|
+
resolvePlayerContentText,
|
|
14
|
+
PLAYER_CONTENT_DATA_KEYS,
|
|
15
|
+
VIDEO_PLAYER_CONTENT_DATA_KEYS,
|
|
16
|
+
AUDIO_PLAYER_CONTENT_DATA_KEYS,
|
|
17
|
+
createConfigValueGetter,
|
|
18
|
+
} from "./contentDataKeys";
|
|
19
|
+
|
|
20
|
+
export type {
|
|
21
|
+
PlayerContentField,
|
|
22
|
+
PlayerContentDataKeys,
|
|
23
|
+
} from "./contentDataKeys";
|
|
24
|
+
|
|
25
|
+
export {
|
|
26
|
+
resolvePlayerTitleSubtitle,
|
|
27
|
+
getPlayerContentDataKeys,
|
|
28
|
+
} from "./resolvePlayerTitleSubtitle";
|
|
29
|
+
|
|
30
|
+
export { isAudioItem } from "./isAudioItem";
|
|
31
|
+
|
|
32
|
+
export const HLS_MIME_TYPES = [
|
|
33
|
+
"application/x-mpegURL",
|
|
34
|
+
"application/vnd.apple.mpegurl",
|
|
35
|
+
];
|
|
36
|
+
|
|
37
|
+
export const STREAMING_VIDEO_MIME_TYPES = [
|
|
38
|
+
...HLS_MIME_TYPES,
|
|
39
|
+
"application/dash+xml",
|
|
40
|
+
];
|
|
41
|
+
|
|
12
42
|
/**
|
|
13
43
|
* Gets duration value from player manager, and from extensions
|
|
14
44
|
* then checks whether the value from either is a not a valid number
|
|
@@ -27,7 +57,7 @@ export function isLiveLegacy(content) {
|
|
|
27
57
|
]);
|
|
28
58
|
|
|
29
59
|
const durationFromExt = R.path(["extensions", "duration"], content);
|
|
30
|
-
const durationFromMgr = playerManager.getDuration();
|
|
60
|
+
const durationFromMgr = playerManager.getInstanceController()?.getDuration();
|
|
31
61
|
const duration = Math.floor(durationFromExt || durationFromMgr);
|
|
32
62
|
|
|
33
63
|
const isLive = R.anyPass([isNotaValidNumber, R.lte(R.__, 0)])(duration);
|
|
@@ -71,7 +101,9 @@ function isLiveByManager(): boolean {
|
|
|
71
101
|
return true;
|
|
72
102
|
}
|
|
73
103
|
|
|
74
|
-
const durationFromPlayerManager = playerManager
|
|
104
|
+
const durationFromPlayerManager = playerManager
|
|
105
|
+
.getInstanceController()
|
|
106
|
+
?.getDuration();
|
|
75
107
|
|
|
76
108
|
return isLiveByDuration(durationFromPlayerManager);
|
|
77
109
|
}
|
|
@@ -80,19 +112,14 @@ export function isLive(entry: ZappEntry): boolean {
|
|
|
80
112
|
return isEntryLive(entry) || isLiveByManager();
|
|
81
113
|
}
|
|
82
114
|
|
|
83
|
-
export const
|
|
84
|
-
|
|
85
|
-
isString(item?.content?.type) &&
|
|
86
|
-
item?.content?.type?.includes?.("audio")
|
|
87
|
-
) {
|
|
88
|
-
return true;
|
|
89
|
-
}
|
|
90
|
-
|
|
91
|
-
if (isString(item?.type?.value) && item?.type?.value?.includes?.("audio")) {
|
|
92
|
-
return true;
|
|
93
|
-
}
|
|
115
|
+
export const isVideoItem = (item: Option<ZappEntry>) => {
|
|
116
|
+
const contentType = item?.content?.type;
|
|
94
117
|
|
|
95
|
-
return
|
|
118
|
+
return (
|
|
119
|
+
isString(contentType) &&
|
|
120
|
+
(contentType.includes("video") ||
|
|
121
|
+
STREAMING_VIDEO_MIME_TYPES.includes(contentType))
|
|
122
|
+
);
|
|
96
123
|
};
|
|
97
124
|
|
|
98
125
|
export const isInlineTV = (screenData) => {
|