@applicaster/zapp-react-native-utils 16.0.0-alpha.9225550512 → 16.0.0-alpha.9338540010
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/actionUtils/index.ts +3 -1
- package/actionsExecutor/ActionExecutor.ts +50 -3
- package/actionsExecutor/ActionExecutorContext.tsx +99 -17
- package/actionsExecutor/__tests__/ActionExecutor.test.ts +71 -0
- package/actionsExecutor/__tests__/feedDecorator.test.ts +61 -0
- package/actionsExecutor/actions/__tests__/dismissBottomSheet.test.ts +25 -0
- package/actionsExecutor/actions/__tests__/goBack.test.ts +62 -0
- package/actionsExecutor/actions/__tests__/goHome.test.ts +19 -0
- package/actionsExecutor/actions/__tests__/loadItemsFromSource.test.ts +88 -0
- package/actionsExecutor/actions/__tests__/navigateToScreen.test.ts +267 -0
- package/actionsExecutor/actions/__tests__/openBottomSheet.customContent.test.ts +100 -0
- package/actionsExecutor/actions/__tests__/openBottomSheet.inlineItems.test.ts +300 -0
- package/actionsExecutor/actions/__tests__/presentScreen.test.ts +127 -0
- package/actionsExecutor/actions/__tests__/showAlert.test.ts +49 -0
- package/actionsExecutor/actions/__tests__/showToast.test.ts +88 -0
- package/actionsExecutor/actions/dismissBottomSheet.ts +23 -0
- package/actionsExecutor/actions/goBack.ts +60 -0
- package/actionsExecutor/actions/goHome.ts +31 -0
- package/actionsExecutor/actions/index.ts +12 -0
- package/actionsExecutor/actions/navigateToScreen.ts +43 -45
- package/actionsExecutor/actions/openBottomSheet.ts +339 -0
- package/actionsExecutor/actions/presentScreen.ts +78 -0
- package/actionsExecutor/actions/refreshComponent.ts +6 -0
- package/actionsExecutor/actions/sendCloudEvent.ts +6 -1
- package/actionsExecutor/actions/showAlert.ts +51 -0
- package/actionsExecutor/actions/showToast.ts +64 -8
- package/actionsExecutor/consts.ts +27 -0
- package/actionsExecutor/feedDecorator.ts +6 -6
- package/analyticsUtils/PlayerAnalyticsManager.ts +1 -1
- package/appUtils/HooksManager/index.ts +9 -0
- package/appUtils/playerManager/OverlayObserver/OverlaysObserver.ts +142 -59
- package/appUtils/playerManager/OverlayObserver/__tests__/getUpcomingQueue.test.ts +67 -0
- package/appUtils/playerManager/OverlayObserver/__tests__/liveContent.test.ts +205 -0
- package/appUtils/playerManager/OverlayObserver/__tests__/utils.test.ts +56 -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 +24 -0
- package/appUtils/playerManager/OverlayObserver/getUpcomingQueue.web.ts +4 -0
- package/appUtils/playerManager/OverlayObserver/utils.ts +51 -20
- package/appUtils/playerManager/__tests__/playerContent.test.ts +403 -0
- package/appUtils/playerManager/__tests__/playerFactory.test.ts +1 -1
- package/appUtils/playerManager/__tests__/playerNative.test.ts +114 -0
- package/appUtils/playerManager/__tests__/playerNativeCommand.test.ts +62 -0
- package/appUtils/playerManager/__tests__/playerToolbox.test.ts +97 -0
- package/appUtils/playerManager/__tests__/usePlayerContent.test.tsx +64 -0
- package/appUtils/playerManager/__tests__/usePlayerControllerSetup.test.tsx +62 -0
- package/appUtils/playerManager/{conts.ts → const.ts} +33 -0
- package/appUtils/playerManager/index.ts +8 -1
- package/appUtils/playerManager/player.ts +125 -3
- package/appUtils/playerManager/playerFactory.ts +1 -1
- package/appUtils/playerManager/playerNative.ts +28 -4
- package/appUtils/playerManager/playerNativeCommand.ts +3 -6
- package/appUtils/playerManager/playerToolbox.ts +157 -0
- package/appUtils/playerManager/usePlayerContent.tsx +43 -0
- package/appUtils/playerManager/usePlayerControllerSetup.tsx +7 -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 +63 -0
- package/arrayUtils/__tests__/sample.test.ts +61 -0
- package/arrayUtils/index.ts +119 -20
- package/bottomSheet/__tests__/scrollContext.test.tsx +35 -0
- package/bottomSheet/index.ts +17 -0
- package/cellUtils/__tests__/getButtonsEnabled.test.ts +28 -0
- package/cellUtils/__tests__/getCellNavigationEnabled.test.ts +36 -0
- package/cellUtils/__tests__/getIsCellNavigationEnabled.test.ts +35 -0
- package/cellUtils/__tests__/isCellNavigationEnabled.test.ts +21 -0
- package/cellUtils/index.ts +70 -3
- package/configurationUtils/__tests__/manifestKeyParser.test.ts +21 -0
- package/configurationUtils/__tests__/modalBlocksParser.test.ts +392 -0
- package/configurationUtils/manifestKeyParser.ts +50 -10
- package/configurationUtils/modalBlocksParser.ts +252 -0
- package/entryActions/__tests__/buildEntryActions.test.ts +235 -0
- package/entryActions/aliasPresentation.ts +108 -0
- package/entryActions/buildEntryActions.ts +167 -0
- package/entryActions/index.ts +15 -0
- package/entryActions/types.ts +39 -0
- package/focusManager/FocusManager.ts +26 -0
- package/focusManager/__tests__/FocusManager.test.ts +9 -0
- package/localizationUtils/index.ts +12 -6
- package/logger/__tests__/xrayToolbox.test.ts +69 -0
- package/logger/xrayToolbox.ts +67 -0
- package/manifestUtils/__tests__/player.audioControls.test.js +158 -0
- package/manifestUtils/_internals/index.js +8 -3
- package/manifestUtils/defaultManifestConfigurations/generalContent.js +6 -0
- package/manifestUtils/defaultManifestConfigurations/player.js +342 -5
- package/manifestUtils/index.js +3 -0
- package/manifestUtils/keys.js +6 -1
- package/manifestUtils/mobileAction/container/__tests__/mobileActionButtonsContainer.test.js +21 -0
- package/manifestUtils/mobileAction/groups/__tests__/buildMobileActionButtonGroups.test.js +1 -1
- package/manifestUtils/mobileAction/groups/defaults.js +2 -1
- package/manifestUtils/modalBlocks.js +304 -0
- package/modalState/ContentViewModel.ts +113 -0
- package/modalState/EditableCollection.ts +17 -0
- package/modalState/EditableCollectionRegistry.ts +51 -0
- package/modalState/ModalOrchestrator.ts +212 -0
- package/modalState/RemoteEditableCollection.ts +235 -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 +63 -0
- package/modalState/__tests__/RemoteEditableCollection.test.ts +415 -0
- package/modalState/__tests__/index.test.ts +30 -1
- package/modalState/__tests__/useBottomSheetContent.test.ts +349 -0
- package/modalState/__tests__/useModalStoreState.test.ts +142 -0
- package/modalState/index.ts +35 -83
- package/modalState/store.ts +109 -0
- package/modalState/types.ts +162 -0
- package/modalState/useBottomSheetContent.ts +109 -0
- package/navigationUtils/xrayNavigator.ts +12 -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 +3 -2
- package/playerUtils/__tests__/contentDataKeys.test.ts +297 -0
- package/playerUtils/__tests__/resolvePlayerActions.test.ts +138 -0
- package/playerUtils/__tests__/resolvePlayerTitleSubtitle.test.ts +180 -0
- package/playerUtils/contentDataKeys.ts +134 -0
- package/playerUtils/index.ts +37 -16
- package/playerUtils/isAudioItem.ts +26 -0
- package/playerUtils/resolvePlayerActions.ts +71 -0
- package/playerUtils/resolvePlayerTitleSubtitle.ts +76 -0
- package/pluginUtils/__tests__/pluginUtils.test.js +32 -0
- package/pluginUtils/index.ts +29 -0
- package/quickBrickAssets/__tests__/index.test.ts +18 -0
- package/quickBrickAssets/index.ts +35 -0
- package/reactHooks/__tests__/getPluginConfiguration.test.ts +82 -0
- package/reactHooks/actions/index.ts +67 -2
- package/reactHooks/cell-click/__tests__/index.test.js +64 -0
- package/reactHooks/cell-click/index.ts +21 -14
- package/reactHooks/connection/index.tsx +8 -5
- package/reactHooks/feed/__tests__/useInflatedUrl.test.tsx +25 -0
- package/reactHooks/feed/__tests__/useMarkPipesDataStale.test.tsx +243 -0
- package/reactHooks/feed/useMarkPipesDataStale.ts +68 -23
- package/reactHooks/index.ts +2 -0
- package/reactHooks/layout/index.ts +1 -1
- package/reactHooks/navigation/__tests__/index.test.tsx +176 -1
- package/reactHooks/navigation/__tests__/usePresentScreen.test.ts +154 -0
- package/reactHooks/navigation/index.ts +2 -0
- package/reactHooks/navigation/usePresentScreen.ts +157 -0
- package/reactHooks/navigation/useRoute.ts +22 -5
- package/reactHooks/usePluginConfiguration.ts +88 -47
- package/reactHooks/utils/__tests__/index.test.js +22 -2
- package/reactHooks/utils/index.ts +11 -1
- package/riverComponetsMeasurementProvider/index.tsx +3 -1
- package/stringUtils/__tests__/stringUtils.test.js +42 -0
- package/stringUtils/index.ts +2 -2
- package/uiActionsRegistrator/__tests__/resolveActionIdentifiers.test.ts +93 -0
- package/uiActionsRegistrator/__tests__/subscribe.test.ts +133 -0
- package/uiActionsRegistrator/__tests__/usableActionItems.test.ts +52 -0
- package/uiActionsRegistrator/index.ts +25 -203
- package/uiActionsRegistrator/registry.ts +351 -0
- package/uiActionsRegistrator/resolveActionIdentifiers.ts +100 -0
- package/uiActionsRegistrator/usableActionItems.ts +66 -0
- package/zappFrameworkUtils/__tests__/localStorageHelper.test.ts +146 -0
- package/zappFrameworkUtils/localStorageHelper.ts +19 -15
- package/appUtils/playerManager/usePlayerTitleSummaryOverlay.tsx +0 -56
- package/playerUtils/__tests__/getPlayerActionButtons.test.ts +0 -54
- package/playerUtils/getPlayerActionButtons.ts +0 -17
- /package/reactHooks/actions/__tests__/{index.test.js → index.test.tsx} +0 -0
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import * as R from "ramda";
|
|
2
1
|
import { useMemo } from "react";
|
|
3
2
|
|
|
4
3
|
import { usePlugins } from "@applicaster/zapp-react-native-redux/hooks";
|
|
@@ -6,7 +5,8 @@ import { usePlugins } from "@applicaster/zapp-react-native-redux/hooks";
|
|
|
6
5
|
// importing this way prevents typescript packages importing from this
|
|
7
6
|
// file to go crazy reporting errors on JS
|
|
8
7
|
import { populateConfigurationValues } from "@applicaster/zapp-react-native-utils/configurationUtils";
|
|
9
|
-
import { useLocalizedStrings } from "../localizationUtils";
|
|
8
|
+
import { getLocalizedStrings, useLocalizedStrings } from "../localizationUtils";
|
|
9
|
+
import { isNil, pathOr } from "../utils";
|
|
10
10
|
|
|
11
11
|
const populateFields = (
|
|
12
12
|
data,
|
|
@@ -14,21 +14,80 @@ const populateFields = (
|
|
|
14
14
|
pathToValues: string | string[] = "configuration",
|
|
15
15
|
skipDefaults = false
|
|
16
16
|
) =>
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
)
|
|
17
|
+
populateConfigurationValues(
|
|
18
|
+
manifestFields,
|
|
19
|
+
pathOr({}, pathToValues, data),
|
|
20
|
+
skipDefaults
|
|
21
|
+
);
|
|
22
22
|
|
|
23
23
|
export function parsePluginConfiguration(plugin, manifest) {
|
|
24
24
|
return populateFields(plugin, manifest.custom_configuration_fields);
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
-
|
|
27
|
+
const getDefaultLocalizations = (manifest) =>
|
|
28
|
+
manifest?.localizations?.fields?.reduce(
|
|
29
|
+
(defaults, { key, initial_value }) => ({
|
|
30
|
+
en: { ...defaults.en, [key]: initial_value },
|
|
31
|
+
}),
|
|
32
|
+
{ en: {} }
|
|
33
|
+
) || {};
|
|
34
|
+
|
|
35
|
+
const isPlainObject = (value) =>
|
|
36
|
+
Object.prototype.toString.call(value) === "[object Object]";
|
|
37
|
+
|
|
38
|
+
// Deep merge where configured values win, except nil ones (defaults fill the gaps)
|
|
39
|
+
export const mergeLocalizations = (configured, defaults) => {
|
|
40
|
+
if (!isPlainObject(configured)) return { ...defaults };
|
|
41
|
+
if (!isPlainObject(defaults)) return { ...configured };
|
|
42
|
+
|
|
43
|
+
// Configured keys first, as R.mergeDeepWith: the first language is the fallback
|
|
44
|
+
return Object.keys({ ...configured, ...defaults }).reduce((merged, key) => {
|
|
45
|
+
const left = configured[key];
|
|
46
|
+
const right = defaults[key];
|
|
47
|
+
|
|
48
|
+
if (!(key in defaults)) {
|
|
49
|
+
merged[key] = left;
|
|
50
|
+
} else if (!(key in configured)) {
|
|
51
|
+
merged[key] = right;
|
|
52
|
+
} else if (isPlainObject(left) && isPlainObject(right)) {
|
|
53
|
+
merged[key] = mergeLocalizations(left, right);
|
|
54
|
+
} else {
|
|
55
|
+
merged[key] = isNil(left) ? right : left;
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
return merged;
|
|
59
|
+
}, {});
|
|
60
|
+
};
|
|
61
|
+
|
|
62
|
+
/**
|
|
63
|
+
* usePluginConfiguration outside React: the same result, read once instead of subscribed.
|
|
64
|
+
*/
|
|
65
|
+
export function getPluginConfiguration<T = any, S = Record<string, any>>(
|
|
66
|
+
plugin,
|
|
67
|
+
manifest?: any
|
|
68
|
+
): { configurationFields: T; localizations: S } {
|
|
69
|
+
return {
|
|
70
|
+
configurationFields: populateFields(
|
|
71
|
+
plugin,
|
|
72
|
+
manifest?.custom_configuration_fields
|
|
73
|
+
),
|
|
74
|
+
localizations: getLocalizedStrings(
|
|
75
|
+
mergeLocalizations(
|
|
76
|
+
plugin?.configuration?.localizations,
|
|
77
|
+
getDefaultLocalizations(manifest)
|
|
78
|
+
)
|
|
79
|
+
),
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
export function usePluginConfiguration<T = any, S = Record<string, any>>(
|
|
84
|
+
identifier: string,
|
|
85
|
+
manifest?: any
|
|
86
|
+
) {
|
|
28
87
|
const plugins = usePlugins();
|
|
29
88
|
|
|
30
89
|
const plugin = useMemo(
|
|
31
|
-
() =>
|
|
90
|
+
() => plugins?.find((item) => item?.identifier === identifier),
|
|
32
91
|
[plugins, identifier]
|
|
33
92
|
);
|
|
34
93
|
|
|
@@ -37,29 +96,20 @@ export function usePluginConfiguration<T, S>(identifier, manifest) {
|
|
|
37
96
|
[plugin, manifest]
|
|
38
97
|
);
|
|
39
98
|
|
|
40
|
-
const defaultLocalizations = useMemo(
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
R.assocPath(["en", key], initial_value, defaults),
|
|
45
|
-
{ en: {} }
|
|
46
|
-
) || {}
|
|
47
|
-
);
|
|
48
|
-
}, [manifest]);
|
|
49
|
-
|
|
50
|
-
const localizationsParams = useMemo(() => {
|
|
51
|
-
return {
|
|
52
|
-
localizations: R.mergeDeepWith(
|
|
53
|
-
(left, right) => {
|
|
54
|
-
if (R.isNil(left)) return right;
|
|
99
|
+
const defaultLocalizations = useMemo(
|
|
100
|
+
() => getDefaultLocalizations(manifest),
|
|
101
|
+
[manifest]
|
|
102
|
+
);
|
|
55
103
|
|
|
56
|
-
|
|
57
|
-
|
|
104
|
+
const localizationsParams = useMemo(
|
|
105
|
+
() => ({
|
|
106
|
+
localizations: mergeLocalizations(
|
|
58
107
|
plugin?.configuration?.localizations,
|
|
59
108
|
defaultLocalizations
|
|
60
109
|
),
|
|
61
|
-
}
|
|
62
|
-
|
|
110
|
+
}),
|
|
111
|
+
[plugin?.configuration?.localizations, defaultLocalizations]
|
|
112
|
+
);
|
|
63
113
|
|
|
64
114
|
const localizations: S = useLocalizedStrings(localizationsParams);
|
|
65
115
|
|
|
@@ -102,29 +152,20 @@ export function useLayoutConfiguration<
|
|
|
102
152
|
"localizations",
|
|
103
153
|
];
|
|
104
154
|
|
|
105
|
-
const defaultLocalizations = useMemo(
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
R.assocPath(["en", key], initial_value, defaults),
|
|
110
|
-
{ en: {} }
|
|
111
|
-
) || {}
|
|
112
|
-
);
|
|
113
|
-
}, [manifest]);
|
|
114
|
-
|
|
115
|
-
const localizationsParams = useMemo(() => {
|
|
116
|
-
return {
|
|
117
|
-
localizations: R.mergeDeepWith(
|
|
118
|
-
(left, right) => {
|
|
119
|
-
if (R.isNil(left)) return right;
|
|
155
|
+
const defaultLocalizations = useMemo(
|
|
156
|
+
() => getDefaultLocalizations(manifest),
|
|
157
|
+
[manifest]
|
|
158
|
+
);
|
|
120
159
|
|
|
121
|
-
|
|
122
|
-
|
|
160
|
+
const localizationsParams = useMemo(
|
|
161
|
+
() => ({
|
|
162
|
+
localizations: mergeLocalizations(
|
|
123
163
|
layoutData?.localizations,
|
|
124
164
|
defaultLocalizations
|
|
125
165
|
),
|
|
126
|
-
}
|
|
127
|
-
|
|
166
|
+
}),
|
|
167
|
+
[layoutData?.localizations, defaultLocalizations]
|
|
168
|
+
);
|
|
128
169
|
|
|
129
170
|
// Always call useLocalizedStrings regardless of whether localizations is in the keys
|
|
130
171
|
const localizations: L = useLocalizedStrings(localizationsParams);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { usePrevious, useIsInitialRender } from "../";
|
|
2
|
-
import { renderHook, cleanup } from "@testing-library/react-native";
|
|
1
|
+
import { usePrevious, useIsInitialRender, useForceUpdate } from "../";
|
|
2
|
+
import { renderHook, cleanup, act } from "@testing-library/react-native";
|
|
3
3
|
|
|
4
4
|
describe("usePrevious", () => {
|
|
5
5
|
it("renders", () => {
|
|
@@ -49,3 +49,23 @@ describe("useIsInitialRender", () => {
|
|
|
49
49
|
expect(result.current).toBe(false);
|
|
50
50
|
});
|
|
51
51
|
});
|
|
52
|
+
|
|
53
|
+
describe("useForceUpdate", () => {
|
|
54
|
+
it("forces component to re-render when called", () => {
|
|
55
|
+
let renderCount = 0;
|
|
56
|
+
|
|
57
|
+
const { result } = renderHook(() => {
|
|
58
|
+
renderCount++;
|
|
59
|
+
|
|
60
|
+
return useForceUpdate();
|
|
61
|
+
});
|
|
62
|
+
|
|
63
|
+
expect(renderCount).toBe(1);
|
|
64
|
+
|
|
65
|
+
act(() => {
|
|
66
|
+
result.current();
|
|
67
|
+
});
|
|
68
|
+
|
|
69
|
+
expect(renderCount).toBe(2);
|
|
70
|
+
});
|
|
71
|
+
});
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { useEffect, useRef } from "react";
|
|
1
|
+
import { useEffect, useReducer, useRef } from "react";
|
|
2
2
|
|
|
3
3
|
/**
|
|
4
4
|
* This hook returns a previous value that was passed to it.
|
|
@@ -31,6 +31,16 @@ export const useIsInitialRender = (): boolean => {
|
|
|
31
31
|
return isInitialRenderRef.current;
|
|
32
32
|
};
|
|
33
33
|
|
|
34
|
+
/**
|
|
35
|
+
* Returns a function that forces a re-render of the component when invoked.
|
|
36
|
+
* @return {() => void}
|
|
37
|
+
*/
|
|
38
|
+
export const useForceUpdate = (): (() => void) => {
|
|
39
|
+
const [, forceUpdate] = useReducer((n: number) => n + 1, 0);
|
|
40
|
+
|
|
41
|
+
return forceUpdate;
|
|
42
|
+
};
|
|
43
|
+
|
|
34
44
|
export const checkIsLocalFeed = (feedUrl) => feedUrl?.startsWith("pipesv2://");
|
|
35
45
|
|
|
36
46
|
export const shouldDispatchData = (
|
|
@@ -34,6 +34,7 @@ type Props = {
|
|
|
34
34
|
type ItemProps = {
|
|
35
35
|
children: React.ReactNode;
|
|
36
36
|
index: number;
|
|
37
|
+
testID?: string;
|
|
37
38
|
};
|
|
38
39
|
|
|
39
40
|
type MeasurementContext = {
|
|
@@ -153,11 +154,12 @@ export const ScreenLoadingMeasurements = ({
|
|
|
153
154
|
export const ScreenLoadingMeasurementsListItemWrapper = ({
|
|
154
155
|
children,
|
|
155
156
|
index,
|
|
157
|
+
testID,
|
|
156
158
|
}: ItemProps) => {
|
|
157
159
|
const { onLayout } = React.useContext(MeasurementsSettersContext);
|
|
158
160
|
|
|
159
161
|
return (
|
|
160
|
-
<View style={styles.container} onLayout={onLayout?.(index)}>
|
|
162
|
+
<View style={styles.container} onLayout={onLayout?.(index)} testID={testID}>
|
|
161
163
|
{children}
|
|
162
164
|
</View>
|
|
163
165
|
);
|
|
@@ -122,6 +122,48 @@ describe("inflate string", () => {
|
|
|
122
122
|
"this is a string with custom separators"
|
|
123
123
|
);
|
|
124
124
|
});
|
|
125
|
+
|
|
126
|
+
it("does not HTML-escape search variables containing single quotes or apostrophes", () => {
|
|
127
|
+
const string = "https://api.example.com/search?q={{search.query}}";
|
|
128
|
+
const data = { search: { query: "L'aventure" } };
|
|
129
|
+
|
|
130
|
+
expect(inflateString({ string, data })).toBe(
|
|
131
|
+
"https://api.example.com/search?q=L'aventure"
|
|
132
|
+
);
|
|
133
|
+
});
|
|
134
|
+
|
|
135
|
+
it("search context with straight apostrophe", () => {
|
|
136
|
+
const string =
|
|
137
|
+
"https://api.pc-cms.tele.quebec/api/applicaster/v1/tv/search?q={{search.q}}";
|
|
138
|
+
|
|
139
|
+
const data = { search: { q: "l'a" } };
|
|
140
|
+
|
|
141
|
+
expect(inflateString({ string, data })).toBe(
|
|
142
|
+
"https://api.pc-cms.tele.quebec/api/applicaster/v1/tv/search?q=l'a"
|
|
143
|
+
);
|
|
144
|
+
});
|
|
145
|
+
|
|
146
|
+
it("search context with backtick apostrophe", () => {
|
|
147
|
+
const string =
|
|
148
|
+
"https://api.pc-cms.tele.quebec/api/applicaster/v1/tv/search?q={{search.q}}";
|
|
149
|
+
|
|
150
|
+
const data = { search: { q: "l`a" } };
|
|
151
|
+
|
|
152
|
+
expect(inflateString({ string, data })).toBe(
|
|
153
|
+
"https://api.pc-cms.tele.quebec/api/applicaster/v1/tv/search?q=l`a"
|
|
154
|
+
);
|
|
155
|
+
});
|
|
156
|
+
|
|
157
|
+
it("search context with right single quotation mark", () => {
|
|
158
|
+
const string =
|
|
159
|
+
"https://api.pc-cms.tele.quebec/api/applicaster/v1/tv/search?q={{search.q}}";
|
|
160
|
+
|
|
161
|
+
const data = { search: { q: "l’a" } };
|
|
162
|
+
|
|
163
|
+
expect(inflateString({ string, data })).toBe(
|
|
164
|
+
"https://api.pc-cms.tele.quebec/api/applicaster/v1/tv/search?q=l’a"
|
|
165
|
+
);
|
|
166
|
+
});
|
|
125
167
|
});
|
|
126
168
|
|
|
127
169
|
describe("objectToReadableString", () => {
|
package/stringUtils/index.ts
CHANGED
|
@@ -72,8 +72,8 @@ const valueIsNull = (value) => () => value === null;
|
|
|
72
72
|
const encodeHelper = "encodeURL";
|
|
73
73
|
|
|
74
74
|
const encodeHandlebarsExpressions = R.compose(
|
|
75
|
-
R.replace(/{{([^}]+)}}/g, (
|
|
76
|
-
p1.includes("search") ?
|
|
75
|
+
R.replace(/{{([^}]+)}}/g, (_, p1) =>
|
|
76
|
+
p1.includes("search") ? `{{{${p1}}}}` : `{{{${encodeHelper} ${p1}}}}`
|
|
77
77
|
)
|
|
78
78
|
);
|
|
79
79
|
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import {
|
|
2
|
+
parseActionIdentifiers,
|
|
3
|
+
resolveActionIdentifiers,
|
|
4
|
+
} from "../resolveActionIdentifiers";
|
|
5
|
+
import { uiActionsRegistry } from "../registry";
|
|
6
|
+
|
|
7
|
+
const action = (identifier: string) =>
|
|
8
|
+
({ identifier, action: { invokeAction: jest.fn() } }) as any;
|
|
9
|
+
|
|
10
|
+
describe("parseActionIdentifiers", () => {
|
|
11
|
+
it("parses comma-separated identifiers", () => {
|
|
12
|
+
expect(parseActionIdentifiers(" a, b , ,c ")).toEqual(["a", "b", "c"]);
|
|
13
|
+
});
|
|
14
|
+
|
|
15
|
+
it("parses identifier arrays", () => {
|
|
16
|
+
expect(parseActionIdentifiers([" a ", "", "b", " ", "c"])).toEqual([
|
|
17
|
+
"a",
|
|
18
|
+
"b",
|
|
19
|
+
"c",
|
|
20
|
+
]);
|
|
21
|
+
});
|
|
22
|
+
|
|
23
|
+
it("returns empty array for nil config", () => {
|
|
24
|
+
expect(parseActionIdentifiers(null)).toEqual([]);
|
|
25
|
+
expect(parseActionIdentifiers(undefined)).toEqual([]);
|
|
26
|
+
});
|
|
27
|
+
});
|
|
28
|
+
|
|
29
|
+
describe("resolveActionIdentifiers", () => {
|
|
30
|
+
const entry = { id: "entry-1" } as any;
|
|
31
|
+
|
|
32
|
+
beforeEach(() => {
|
|
33
|
+
jest
|
|
34
|
+
.spyOn(uiActionsRegistry, "getActions")
|
|
35
|
+
.mockImplementation((identifier) => [action(identifier)] as any);
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
afterEach(() => {
|
|
39
|
+
jest.restoreAllMocks();
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
it("resolves through registry by default", () => {
|
|
43
|
+
const result = resolveActionIdentifiers({
|
|
44
|
+
identifiers: "favorites,share",
|
|
45
|
+
entry,
|
|
46
|
+
});
|
|
47
|
+
|
|
48
|
+
expect(result.map((item) => item.identifier)).toEqual([
|
|
49
|
+
"favorites",
|
|
50
|
+
"share",
|
|
51
|
+
]);
|
|
52
|
+
|
|
53
|
+
expect(uiActionsRegistry.getActions).toHaveBeenCalledWith(
|
|
54
|
+
"favorites",
|
|
55
|
+
entry
|
|
56
|
+
);
|
|
57
|
+
|
|
58
|
+
expect(uiActionsRegistry.getActions).toHaveBeenCalledWith("share", entry);
|
|
59
|
+
});
|
|
60
|
+
|
|
61
|
+
it("expands entry_actions through the caller, not the registry", () => {
|
|
62
|
+
const expanded = [action("entry_action_0"), action("entry_action_1")];
|
|
63
|
+
const expandEntryActions = jest.fn(() => expanded);
|
|
64
|
+
|
|
65
|
+
const unregister = uiActionsRegistry.registerAction("share", {
|
|
66
|
+
invokeAction: jest.fn(),
|
|
67
|
+
});
|
|
68
|
+
|
|
69
|
+
try {
|
|
70
|
+
const result = resolveActionIdentifiers({
|
|
71
|
+
identifiers: "entry_actions,share",
|
|
72
|
+
entry,
|
|
73
|
+
expandEntryActions,
|
|
74
|
+
});
|
|
75
|
+
|
|
76
|
+
expect(expandEntryActions).toHaveBeenCalledWith(entry);
|
|
77
|
+
|
|
78
|
+
expect(result.map((item) => item.identifier)).toEqual([
|
|
79
|
+
"entry_action_0",
|
|
80
|
+
"entry_action_1",
|
|
81
|
+
"share",
|
|
82
|
+
]);
|
|
83
|
+
} finally {
|
|
84
|
+
unregister();
|
|
85
|
+
}
|
|
86
|
+
});
|
|
87
|
+
|
|
88
|
+
it("resolves nothing for entry_actions when the caller cannot expand it", () => {
|
|
89
|
+
expect(
|
|
90
|
+
resolveActionIdentifiers({ identifiers: "entry_actions", entry })
|
|
91
|
+
).toEqual([]);
|
|
92
|
+
});
|
|
93
|
+
});
|
|
@@ -0,0 +1,133 @@
|
|
|
1
|
+
import { isActionAvailableFor, uiActionsRegistry } from "../registry";
|
|
2
|
+
|
|
3
|
+
const value = { invokeAction: jest.fn() };
|
|
4
|
+
|
|
5
|
+
describe("uiActionsRegistry.subscribe", () => {
|
|
6
|
+
it("fires on registration and on unregistration", () => {
|
|
7
|
+
const listener = jest.fn();
|
|
8
|
+
const unsubscribe = uiActionsRegistry.subscribe(listener);
|
|
9
|
+
|
|
10
|
+
const unregister = uiActionsRegistry.registerAction("late-action", value);
|
|
11
|
+
|
|
12
|
+
expect(listener).toHaveBeenCalledTimes(1);
|
|
13
|
+
|
|
14
|
+
unregister();
|
|
15
|
+
|
|
16
|
+
expect(listener).toHaveBeenCalledTimes(2);
|
|
17
|
+
|
|
18
|
+
unsubscribe();
|
|
19
|
+
});
|
|
20
|
+
|
|
21
|
+
it("lets a listener see the action it was told about", () => {
|
|
22
|
+
let seen: string[] = [];
|
|
23
|
+
|
|
24
|
+
const unsubscribe = uiActionsRegistry.subscribe(() => {
|
|
25
|
+
seen = uiActionsRegistry
|
|
26
|
+
.getActions("late-action", { id: "e1" } as any)
|
|
27
|
+
.map((item) => item.identifier);
|
|
28
|
+
});
|
|
29
|
+
|
|
30
|
+
const unregister = uiActionsRegistry.registerAction("late-action", value);
|
|
31
|
+
|
|
32
|
+
expect(seen).toEqual(["late-action"]);
|
|
33
|
+
|
|
34
|
+
unregister();
|
|
35
|
+
unsubscribe();
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
it("stops calling a listener once unsubscribed", () => {
|
|
39
|
+
const listener = jest.fn();
|
|
40
|
+
|
|
41
|
+
uiActionsRegistry.subscribe(listener)();
|
|
42
|
+
|
|
43
|
+
uiActionsRegistry.registerAction("another-action", value)();
|
|
44
|
+
|
|
45
|
+
expect(listener).not.toHaveBeenCalled();
|
|
46
|
+
});
|
|
47
|
+
|
|
48
|
+
it("survives a listener that unsubscribes itself while being notified", () => {
|
|
49
|
+
const other = jest.fn();
|
|
50
|
+
|
|
51
|
+
const unsubscribeOther = uiActionsRegistry.subscribe(other);
|
|
52
|
+
|
|
53
|
+
const unsubscribeSelf = uiActionsRegistry.subscribe(() => {
|
|
54
|
+
unsubscribeSelf();
|
|
55
|
+
});
|
|
56
|
+
|
|
57
|
+
expect(() =>
|
|
58
|
+
uiActionsRegistry.registerAction("self-removing", value)()
|
|
59
|
+
).not.toThrow();
|
|
60
|
+
|
|
61
|
+
expect(other).toHaveBeenCalled();
|
|
62
|
+
|
|
63
|
+
unsubscribeOther();
|
|
64
|
+
});
|
|
65
|
+
});
|
|
66
|
+
|
|
67
|
+
describe("isActionAvailableFor", () => {
|
|
68
|
+
const entry = { id: "e1" } as any;
|
|
69
|
+
|
|
70
|
+
it("shows an action that states no opinion", () => {
|
|
71
|
+
expect(isActionAvailableFor({ invokeAction: jest.fn() }, entry)).toBe(true);
|
|
72
|
+
});
|
|
73
|
+
|
|
74
|
+
it.each([
|
|
75
|
+
["isSupportDownloads"],
|
|
76
|
+
["isActionSupported"],
|
|
77
|
+
["isActionAvailable"],
|
|
78
|
+
])("honours %s", (predicate) => {
|
|
79
|
+
expect(
|
|
80
|
+
isActionAvailableFor(
|
|
81
|
+
{ invokeAction: jest.fn(), [predicate]: () => false } as any,
|
|
82
|
+
entry
|
|
83
|
+
)
|
|
84
|
+
).toBe(false);
|
|
85
|
+
});
|
|
86
|
+
|
|
87
|
+
it("asks only the first predicate the action defines", () => {
|
|
88
|
+
const isActionAvailable = jest.fn(() => true);
|
|
89
|
+
|
|
90
|
+
expect(
|
|
91
|
+
isActionAvailableFor(
|
|
92
|
+
{
|
|
93
|
+
invokeAction: jest.fn(),
|
|
94
|
+
isSupportDownloads: () => false,
|
|
95
|
+
isActionAvailable,
|
|
96
|
+
} as any,
|
|
97
|
+
entry
|
|
98
|
+
)
|
|
99
|
+
).toBe(false);
|
|
100
|
+
|
|
101
|
+
expect(isActionAvailable).not.toHaveBeenCalled();
|
|
102
|
+
});
|
|
103
|
+
|
|
104
|
+
it("treats a missing action as unavailable-free", () => {
|
|
105
|
+
expect(isActionAvailableFor(undefined, entry)).toBe(true);
|
|
106
|
+
});
|
|
107
|
+
});
|
|
108
|
+
|
|
109
|
+
describe("uiActionsRegistry.notifyProviderChanged", () => {
|
|
110
|
+
it("notifies subscribers for a registered provider", () => {
|
|
111
|
+
const unregister = uiActionsRegistry.registerAction("live-action", value);
|
|
112
|
+
const listener = jest.fn();
|
|
113
|
+
const unsubscribe = uiActionsRegistry.subscribe(listener);
|
|
114
|
+
|
|
115
|
+
uiActionsRegistry.notifyProviderChanged("live-action");
|
|
116
|
+
|
|
117
|
+
expect(listener).toHaveBeenCalledTimes(1);
|
|
118
|
+
|
|
119
|
+
unsubscribe();
|
|
120
|
+
unregister();
|
|
121
|
+
});
|
|
122
|
+
|
|
123
|
+
it("ignores names that are not registered", () => {
|
|
124
|
+
const listener = jest.fn();
|
|
125
|
+
const unsubscribe = uiActionsRegistry.subscribe(listener);
|
|
126
|
+
|
|
127
|
+
uiActionsRegistry.notifyProviderChanged("unknown-action");
|
|
128
|
+
|
|
129
|
+
expect(listener).not.toHaveBeenCalled();
|
|
130
|
+
|
|
131
|
+
unsubscribe();
|
|
132
|
+
});
|
|
133
|
+
});
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import { usableActionItems } from "../usableActionItems";
|
|
2
|
+
|
|
3
|
+
const action = (identifier: string) =>
|
|
4
|
+
({ identifier, action: { invokeAction: jest.fn() } }) as any;
|
|
5
|
+
|
|
6
|
+
describe("usableActionItems", () => {
|
|
7
|
+
it("keeps a usable list untouched, in order", () => {
|
|
8
|
+
const base = [action("share"), action("favorites")];
|
|
9
|
+
|
|
10
|
+
expect(usableActionItems(base).map((item) => item.identifier)).toEqual([
|
|
11
|
+
"share",
|
|
12
|
+
"favorites",
|
|
13
|
+
]);
|
|
14
|
+
});
|
|
15
|
+
|
|
16
|
+
it("keeps the first of a repeated identifier", () => {
|
|
17
|
+
const firstShare = action("share");
|
|
18
|
+
const secondShare = action("share");
|
|
19
|
+
|
|
20
|
+
const result = usableActionItems([
|
|
21
|
+
firstShare,
|
|
22
|
+
action("favorites"),
|
|
23
|
+
secondShare,
|
|
24
|
+
]);
|
|
25
|
+
|
|
26
|
+
expect(result.map((item) => item.identifier)).toEqual([
|
|
27
|
+
"share",
|
|
28
|
+
"favorites",
|
|
29
|
+
]);
|
|
30
|
+
|
|
31
|
+
expect(result[0]).toBe(firstShare);
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
it("drops items that cannot be invoked or have no identifier", () => {
|
|
35
|
+
const result = usableActionItems([
|
|
36
|
+
action("share"),
|
|
37
|
+
{ identifier: "blank" } as any,
|
|
38
|
+
{ identifier: "no-invoke", action: {} } as any,
|
|
39
|
+
{ action: { invokeAction: jest.fn() } } as any,
|
|
40
|
+
action("entry_action_0"),
|
|
41
|
+
]);
|
|
42
|
+
|
|
43
|
+
expect(result.map((item) => item.identifier)).toEqual([
|
|
44
|
+
"share",
|
|
45
|
+
"entry_action_0",
|
|
46
|
+
]);
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
it("tolerates a missing list", () => {
|
|
50
|
+
expect(usableActionItems(undefined as any)).toEqual([]);
|
|
51
|
+
});
|
|
52
|
+
});
|