@applicaster/zapp-react-native-utils 14.0.0-alpha.6931095759 → 14.0.0-alpha.7900711229
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 +60 -83
- package/actionsExecutor/ScreenActions.ts +163 -0
- package/actionsExecutor/StorageActions.ts +110 -0
- package/actionsExecutor/feedDecorator.ts +171 -0
- package/actionsExecutor/screenResolver.ts +11 -0
- package/appUtils/accessibilityManager/index.ts +4 -1
- package/appUtils/contextKeysManager/contextResolver.ts +14 -1
- package/arrayUtils/__tests__/isEmptyArray.test.ts +63 -0
- package/arrayUtils/__tests__/isFilledArray.test.ts +1 -1
- package/arrayUtils/index.ts +7 -2
- package/audioPlayerUtils/__tests__/getArtworkImage.test.ts +144 -0
- package/audioPlayerUtils/__tests__/getBackgroundImage.test.ts +72 -0
- package/audioPlayerUtils/__tests__/getImageFromEntry.test.ts +110 -0
- package/audioPlayerUtils/assets/index.ts +2 -0
- package/audioPlayerUtils/index.ts +242 -0
- package/conf/player/__tests__/selectors.test.ts +34 -0
- package/conf/player/selectors.ts +10 -0
- package/configurationUtils/__tests__/configurationUtils.test.js +0 -31
- package/configurationUtils/__tests__/getMediaItems.test.ts +65 -0
- package/configurationUtils/__tests__/imageSrcFromMediaItem.test.ts +34 -0
- package/configurationUtils/index.ts +63 -34
- package/manifestUtils/_internals/getDefaultConfiguration.js +28 -0
- package/manifestUtils/{_internals.js → _internals/index.js} +2 -25
- package/manifestUtils/createConfig.js +4 -1
- package/manifestUtils/defaultManifestConfigurations/player.js +1231 -200
- package/manifestUtils/progressBar/__tests__/mobileProgressBar.test.js +0 -30
- package/manifestUtils/sharedConfiguration/screenPicker/stylesFields.js +1 -2
- package/package.json +2 -2
- package/playerUtils/__tests__/configurationUtils.test.ts +1 -65
- package/playerUtils/__tests__/getPlayerActionButtons.test.ts +54 -0
- package/playerUtils/_internals/__tests__/utils.test.ts +71 -0
- package/playerUtils/_internals/index.ts +1 -0
- package/playerUtils/_internals/utils.ts +31 -0
- package/playerUtils/configurationUtils.ts +0 -44
- package/playerUtils/getPlayerActionButtons.ts +17 -0
- package/playerUtils/index.ts +2 -0
- package/playerUtils/useValidatePlayerConfig.tsx +22 -19
- package/reactHooks/cell-click/index.ts +8 -1
- package/reactHooks/feed/__tests__/useFeedLoader.test.tsx +20 -0
- package/reactHooks/feed/useBatchLoading.ts +2 -2
- package/reactHooks/feed/useFeedLoader.tsx +12 -5
- package/reactHooks/navigation/useRoute.ts +7 -2
- package/reactHooks/navigation/useScreenStateStore.ts +11 -0
- package/storage/ScreenSingleValueProvider.ts +197 -0
- package/storage/ScreenStateMultiSelectProvider.ts +282 -0
- package/storage/StorageMultiSelectProvider.ts +192 -0
- package/storage/StorageSingleSelectProvider.ts +108 -0
- package/utils/index.ts +12 -1
- package/playerUtils/configurationGenerator.ts +0 -2572
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { selectActionButtons } from "@applicaster/zapp-react-native-utils/conf/player/selectors";
|
|
2
|
+
|
|
3
|
+
describe("selectActionButtons", () => {
|
|
4
|
+
it("returns the player_action_buttons array if present", () => {
|
|
5
|
+
const pluginConf = {
|
|
6
|
+
player_action_buttons: [
|
|
7
|
+
{ id: "like", label: "Like" },
|
|
8
|
+
{ id: "share", label: "Share" },
|
|
9
|
+
],
|
|
10
|
+
};
|
|
11
|
+
|
|
12
|
+
expect(selectActionButtons(pluginConf)).toEqual(
|
|
13
|
+
pluginConf.player_action_buttons
|
|
14
|
+
);
|
|
15
|
+
});
|
|
16
|
+
|
|
17
|
+
it("returns null if player_action_buttons is not present", () => {
|
|
18
|
+
const pluginConf = { some_other_key: [] };
|
|
19
|
+
expect(selectActionButtons(pluginConf)).toBeNull();
|
|
20
|
+
});
|
|
21
|
+
|
|
22
|
+
it("returns null if pluginConf is undefined", () => {
|
|
23
|
+
expect(selectActionButtons(undefined)).toBeNull();
|
|
24
|
+
});
|
|
25
|
+
|
|
26
|
+
it("returns null if pluginConf is null", () => {
|
|
27
|
+
expect(selectActionButtons(null)).toBeNull();
|
|
28
|
+
});
|
|
29
|
+
|
|
30
|
+
it("returns null if player_action_buttons is explicitly set to null", () => {
|
|
31
|
+
const pluginConf = { player_action_buttons: null };
|
|
32
|
+
expect(selectActionButtons(pluginConf)).toBeNull();
|
|
33
|
+
});
|
|
34
|
+
});
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { get } from "@applicaster/zapp-react-native-utils/utils";
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Selects the action buttons from the player configuration.
|
|
5
|
+
* @param {Object} pluginConf - player plugin config
|
|
6
|
+
* @returns {Array|null} An array of action buttons or null if not found.
|
|
7
|
+
*/
|
|
8
|
+
export const selectActionButtons = (pluginConf: any) => {
|
|
9
|
+
return get(pluginConf, "player_action_buttons", null);
|
|
10
|
+
};
|
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
import * as R from "ramda";
|
|
2
1
|
import {
|
|
3
2
|
populateConfigurationValues,
|
|
4
|
-
imageSrcFromMediaItem,
|
|
5
3
|
getBoolFromConfigValue,
|
|
6
4
|
remapUpdatedKeys,
|
|
7
5
|
} from "../";
|
|
8
|
-
import { entry } from "./testEntry";
|
|
9
6
|
|
|
10
7
|
describe("getBoolFromConfigValue", () => {
|
|
11
8
|
it('returns true if value is "true" string', () => {
|
|
@@ -57,34 +54,6 @@ describe("getBoolFromConfigValue", () => {
|
|
|
57
54
|
});
|
|
58
55
|
});
|
|
59
56
|
|
|
60
|
-
describe("imageSrcFromMediaItem", () => {
|
|
61
|
-
describe("returns the src value of first media_item", () => {
|
|
62
|
-
it("when the matching key is found and the src is not empty", () => {
|
|
63
|
-
const result = imageSrcFromMediaItem(entry, ["logo_thumbnail"]);
|
|
64
|
-
|
|
65
|
-
expect(result).toEqual(entry.media_group[1].media_item[0].src);
|
|
66
|
-
expect(result).not.toEqual("");
|
|
67
|
-
});
|
|
68
|
-
});
|
|
69
|
-
|
|
70
|
-
it("returns a media item with the 'image_base' key as a fallback", () => {
|
|
71
|
-
const result = imageSrcFromMediaItem(entry, ["does_not_exist"]);
|
|
72
|
-
const fallback = entry.media_group[0].media_item[0];
|
|
73
|
-
expect(result).toEqual(fallback.src);
|
|
74
|
-
expect(fallback.key).toBe("image_base");
|
|
75
|
-
});
|
|
76
|
-
|
|
77
|
-
it("returns undefined if the key was found but the source was empty", () => {
|
|
78
|
-
const badEntry = R.set(
|
|
79
|
-
R.lensPath(["media_group", 0, "media_item", 0, "src"]),
|
|
80
|
-
"",
|
|
81
|
-
entry
|
|
82
|
-
);
|
|
83
|
-
|
|
84
|
-
expect(imageSrcFromMediaItem(badEntry, ["image_base"])).toBeUndefined();
|
|
85
|
-
});
|
|
86
|
-
});
|
|
87
|
-
|
|
88
57
|
describe("populateConfigurationValues", () => {
|
|
89
58
|
it("transforms and returns the valid values", () => {
|
|
90
59
|
const fields = [
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import { getMediaItems } from "..";
|
|
2
|
+
import { entry as baseEntry } from "./testEntry";
|
|
3
|
+
|
|
4
|
+
describe("getMediaItems", () => {
|
|
5
|
+
it("returns both image and thumbnail media items", () => {
|
|
6
|
+
const items = getMediaItems(baseEntry);
|
|
7
|
+
expect(items).toHaveLength(2);
|
|
8
|
+
expect(items[0].key).toBe("image_base");
|
|
9
|
+
expect(items[1].key).toBe("logo_thumbnail");
|
|
10
|
+
});
|
|
11
|
+
|
|
12
|
+
it("returns only image media items if no thumbnail present", () => {
|
|
13
|
+
const entry = {
|
|
14
|
+
...baseEntry,
|
|
15
|
+
media_group: [
|
|
16
|
+
{
|
|
17
|
+
type: "image",
|
|
18
|
+
media_item: [
|
|
19
|
+
{ key: "image_base", src: "img.png" },
|
|
20
|
+
{ key: "other", src: "other.png" },
|
|
21
|
+
],
|
|
22
|
+
},
|
|
23
|
+
],
|
|
24
|
+
};
|
|
25
|
+
|
|
26
|
+
const items = getMediaItems(entry);
|
|
27
|
+
expect(items).toHaveLength(2);
|
|
28
|
+
expect(items[0].key).toBe("image_base");
|
|
29
|
+
expect(items[1].key).toBe("other");
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
it("returns only thumbnail media items if no image present", () => {
|
|
33
|
+
const entry = {
|
|
34
|
+
...baseEntry,
|
|
35
|
+
media_group: [
|
|
36
|
+
{
|
|
37
|
+
type: "thumbnail",
|
|
38
|
+
media_item: [{ key: "thumb1", src: "thumb1.png" }],
|
|
39
|
+
},
|
|
40
|
+
],
|
|
41
|
+
};
|
|
42
|
+
|
|
43
|
+
const items = getMediaItems(entry);
|
|
44
|
+
expect(items).toHaveLength(1);
|
|
45
|
+
expect(items[0].key).toBe("thumb1");
|
|
46
|
+
});
|
|
47
|
+
|
|
48
|
+
it("returns undefined if no media_group present", () => {
|
|
49
|
+
const entry = { ...baseEntry };
|
|
50
|
+
delete entry.media_group;
|
|
51
|
+
expect(getMediaItems(entry)).toBeUndefined();
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
it("returns undefined if media_group is present but has no image or thumbnail", () => {
|
|
55
|
+
const entry = {
|
|
56
|
+
...baseEntry,
|
|
57
|
+
media_group: [
|
|
58
|
+
{ type: "audio", media_item: [{ key: "audio1", src: "audio1.mp3" }] },
|
|
59
|
+
],
|
|
60
|
+
};
|
|
61
|
+
|
|
62
|
+
const items = getMediaItems(entry);
|
|
63
|
+
expect(items).toBeUndefined();
|
|
64
|
+
});
|
|
65
|
+
});
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import * as R from "ramda";
|
|
2
|
+
import { imageSrcFromMediaItem } from "../";
|
|
3
|
+
import { entry } from "./testEntry";
|
|
4
|
+
|
|
5
|
+
describe("imageSrcFromMediaItem", () => {
|
|
6
|
+
it("when the matching key is found and the src is not empty", () => {
|
|
7
|
+
const result = imageSrcFromMediaItem(entry as ZappEntry, [
|
|
8
|
+
"logo_thumbnail",
|
|
9
|
+
]);
|
|
10
|
+
|
|
11
|
+
expect(result).toEqual(entry.media_group[1].media_item[0].src);
|
|
12
|
+
expect(result).not.toEqual("");
|
|
13
|
+
});
|
|
14
|
+
|
|
15
|
+
it("returns a media item with the 'image_base' key as a fallback", () => {
|
|
16
|
+
const result = imageSrcFromMediaItem(entry as ZappEntry, [
|
|
17
|
+
"does_not_exist",
|
|
18
|
+
]);
|
|
19
|
+
|
|
20
|
+
const fallback = entry.media_group[0].media_item[0];
|
|
21
|
+
expect(result).toEqual(fallback.src);
|
|
22
|
+
expect(fallback.key).toBe("image_base");
|
|
23
|
+
});
|
|
24
|
+
|
|
25
|
+
it("returns undefined if the key was found but the source was empty", () => {
|
|
26
|
+
const badEntry: ZappEntry = R.set(
|
|
27
|
+
R.lensPath(["media_group", 0, "media_item", 0, "src"]),
|
|
28
|
+
"",
|
|
29
|
+
entry
|
|
30
|
+
);
|
|
31
|
+
|
|
32
|
+
expect(imageSrcFromMediaItem(badEntry, ["image_base"])).toBeUndefined();
|
|
33
|
+
});
|
|
34
|
+
});
|
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
/// <reference types="@applicaster/applicaster-types" />
|
|
2
2
|
import * as R from "ramda";
|
|
3
3
|
import { Platform } from "react-native";
|
|
4
|
+
import {
|
|
5
|
+
isFilledArray,
|
|
6
|
+
isEmptyArray,
|
|
7
|
+
} from "@applicaster/zapp-react-native-utils/arrayUtils";
|
|
8
|
+
import { isEmpty } from "@applicaster/zapp-react-native-utils/utils";
|
|
9
|
+
|
|
4
10
|
import { applyTransform } from "../transform";
|
|
5
11
|
import { ManifestField } from "../types";
|
|
6
12
|
import { isNilOrEmpty } from "../reactUtils/helpers";
|
|
@@ -122,54 +128,77 @@ export function flattenFields(
|
|
|
122
128
|
}
|
|
123
129
|
|
|
124
130
|
/**
|
|
125
|
-
* Retrieves the
|
|
126
|
-
*
|
|
127
|
-
*
|
|
128
|
-
* @
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
131
|
+
* Retrieves all media items from the entry's media_group that are of type "image" or "thumbnail".
|
|
132
|
+
*
|
|
133
|
+
* @param {ZappEntry} entry - The entry object containing the media_group array.
|
|
134
|
+
* @returns {Option<ZappMediaItem[]>} An array of media items of type "image" or "thumbnail", or undefined if no media_group is present.
|
|
135
|
+
*/
|
|
136
|
+
export function getMediaItems(entry: ZappEntry): Option<ZappMediaItem[]> {
|
|
137
|
+
const mediaGroup = entry?.media_group || [];
|
|
138
|
+
|
|
139
|
+
if (isEmptyArray(mediaGroup)) {
|
|
140
|
+
return undefined;
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
const mediaItems = mediaGroup
|
|
144
|
+
.filter((group) => ["image", "thumbnail"].includes(group.type))
|
|
145
|
+
.flatMap((group) =>
|
|
146
|
+
Array.isArray(group.media_item) ? group.media_item : [group.media_item]
|
|
147
|
+
);
|
|
148
|
+
|
|
149
|
+
if (isFilledArray(mediaItems)) {
|
|
150
|
+
return mediaItems;
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
return undefined;
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
/**
|
|
157
|
+
* Retrieves the "src" value from a media item in the entry's media group,
|
|
158
|
+
* based on a provided key, with fallback logic.
|
|
159
|
+
*
|
|
160
|
+
* Fallback order:
|
|
161
|
+
* 1. Attempts to find a media item with the specified key (or "image_base" if none provided).
|
|
162
|
+
* 2. If not found, attempts to find a media item with the key "image_base".
|
|
163
|
+
* 3. If still not found, falls back to the first available media item.
|
|
164
|
+
*
|
|
165
|
+
* Special handling: If the resolved item's "src" is an empty string, returns undefined,
|
|
166
|
+
* since empty URIs are invalid in some platforms (e.g., React Native).
|
|
167
|
+
*
|
|
168
|
+
* @param {ZappEntry} entry - The entry object containing a media group.
|
|
169
|
+
* @param {string[] | unknown} arg - A single-element array containing the key to look up, or any unknown value.
|
|
170
|
+
* @returns {?string} The "src" URI from the matched media item, or undefined if not found or empty.
|
|
132
171
|
*/
|
|
133
172
|
export function imageSrcFromMediaItem(
|
|
134
173
|
entry: ZappEntry,
|
|
135
174
|
arg: string[] | unknown
|
|
136
|
-
) {
|
|
175
|
+
): Option<string> {
|
|
137
176
|
const args: unknown = R.unless(Array.isArray, Array)(arg || []);
|
|
138
177
|
const imageKey: string = args?.[0] || "image_base"; // always a single key in this function
|
|
139
|
-
const mediaGroup = R.path<ZappMediaGroup[]>(["media_group"], entry);
|
|
140
178
|
|
|
141
|
-
|
|
179
|
+
const mediaItems = getMediaItems(entry);
|
|
180
|
+
|
|
181
|
+
if (!mediaItems) {
|
|
142
182
|
return undefined;
|
|
143
183
|
}
|
|
144
184
|
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
R.propEq("type", "thumbnail")
|
|
148
|
-
);
|
|
149
|
-
|
|
150
|
-
const pickMediaItemProp = R.prop<ZappMediaItem>("media_item");
|
|
185
|
+
// Try to find the item with the given key
|
|
186
|
+
let foundItem = mediaItems.find((item) => item.key === imageKey);
|
|
151
187
|
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
)(mediaGroup);
|
|
188
|
+
// If not found and key was not "image_base", try to find "image_base"
|
|
189
|
+
if (!foundItem && imageKey !== "image_base") {
|
|
190
|
+
foundItem = mediaItems.find((item) => item.key === "image_base");
|
|
191
|
+
}
|
|
157
192
|
|
|
158
|
-
|
|
159
|
-
|
|
193
|
+
// If still not found, default to first item
|
|
194
|
+
if (!foundItem) {
|
|
195
|
+
foundItem = mediaItems[0];
|
|
160
196
|
}
|
|
161
197
|
|
|
162
|
-
const src =
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
R.find(R.propEq("key", imageKey))
|
|
167
|
-
)(mediaItems);
|
|
168
|
-
|
|
169
|
-
// Special case for react native - uri cannot be an empty string (yellow warning).
|
|
170
|
-
// R.isEmpty is tailored specifically for checks like these,
|
|
171
|
-
// it returns false for undefined values.
|
|
172
|
-
return R.isEmpty(src) ? undefined : src;
|
|
198
|
+
const src = foundItem?.src;
|
|
199
|
+
|
|
200
|
+
// React Native quirk: empty string is invalid for URIs
|
|
201
|
+
return isEmpty(src) ? undefined : src;
|
|
173
202
|
}
|
|
174
203
|
|
|
175
204
|
/**
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
const R = require("ramda");
|
|
2
|
+
const { defaultConfigurations } = require("../defaultManifestConfigurations");
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* returns default configuration keys for provided plugin type
|
|
6
|
+
* @param {('general-content'|'player')} pluginType
|
|
7
|
+
* @param options manifest generator information
|
|
8
|
+
* @param {string} options.version manifest version
|
|
9
|
+
* @param {string} options.platform qb platform value
|
|
10
|
+
*/
|
|
11
|
+
function getDefaultConfiguration(pluginType, options) {
|
|
12
|
+
const defConfig = R.compose(
|
|
13
|
+
R.unless(R.isNil, (fn) => fn(options)),
|
|
14
|
+
R.propOr(null, pluginType)
|
|
15
|
+
)(defaultConfigurations);
|
|
16
|
+
|
|
17
|
+
if (!defConfig) {
|
|
18
|
+
const availableKeys = R.keys(defaultConfigurations);
|
|
19
|
+
|
|
20
|
+
const message = `Requested key "${pluginType}" doesn't exist in the default configuration\nAvailable keys: ${availableKeys}`;
|
|
21
|
+
// eslint-disable-next-line no-console
|
|
22
|
+
console.warn(message);
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
return defConfig;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
module.exports = { getDefaultConfiguration };
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
const R = require("ramda");
|
|
2
2
|
const camelize = require("camelize");
|
|
3
|
-
|
|
3
|
+
|
|
4
|
+
const { getDefaultConfiguration } = require("./getDefaultConfiguration");
|
|
4
5
|
|
|
5
6
|
const toSnakeCase = R.compose(R.replace(/\s/g, "_"), R.toLower, R.trim);
|
|
6
7
|
|
|
@@ -173,30 +174,6 @@ function generateFieldsFromDefaultsWithoutPrefixedLabel(
|
|
|
173
174
|
)(fields);
|
|
174
175
|
}
|
|
175
176
|
|
|
176
|
-
/**
|
|
177
|
-
* returns default configuration keys for provided plugin type
|
|
178
|
-
* @param {('general-content'|'player')} pluginType
|
|
179
|
-
* @param options manifest generator information
|
|
180
|
-
* @param {string} options.version manifest version
|
|
181
|
-
* @param {string} options.platform qb platform value
|
|
182
|
-
*/
|
|
183
|
-
function getDefaultConfiguration(pluginType, options) {
|
|
184
|
-
const defConfig = R.compose(
|
|
185
|
-
R.unless(R.isNil, (fn) => fn(options)),
|
|
186
|
-
R.propOr(null, pluginType)
|
|
187
|
-
)(defaultConfigurations);
|
|
188
|
-
|
|
189
|
-
if (!defConfig) {
|
|
190
|
-
const availableKeys = R.keys(defaultConfigurations);
|
|
191
|
-
|
|
192
|
-
const message = `Requested key "${pluginType}" doesn't exist in the default configuration\nAvailable keys: ${availableKeys}`;
|
|
193
|
-
// eslint-disable-next-line no-console
|
|
194
|
-
console.warn(message);
|
|
195
|
-
}
|
|
196
|
-
|
|
197
|
-
return defConfig;
|
|
198
|
-
}
|
|
199
|
-
|
|
200
177
|
module.exports = {
|
|
201
178
|
toSnakeCase,
|
|
202
179
|
toCamelCase,
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
const R = require("ramda");
|
|
2
|
-
|
|
2
|
+
|
|
3
|
+
const {
|
|
4
|
+
getDefaultConfiguration,
|
|
5
|
+
} = require("./_internals/getDefaultConfiguration");
|
|
3
6
|
|
|
4
7
|
const indexByKey = R.indexBy((obj) => R.prop(obj.group ? "label" : "key", obj));
|
|
5
8
|
const propIfExist = R.curry((prop) => R.when(R.prop(prop), R.prop(prop)));
|