@applicaster/zapp-react-native-utils 16.0.0-alpha.1740103407 → 16.0.0-alpha.1798567344
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 +102 -315
- package/actionsExecutor/__tests__/feedDecorator.test.ts +61 -0
- package/actionsExecutor/actions/__tests__/dismissBottomSheet.test.ts +22 -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 +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/goBack.ts +60 -0
- package/actionsExecutor/actions/goHome.ts +31 -0
- package/actionsExecutor/actions/index.ts +38 -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 +25 -0
- package/actionsExecutor/feedDecorator.ts +6 -6
- package/actionsExecutor/types.ts +59 -0
- package/analyticsUtils/AnalyticsEvents/sendMenuClickEvent.ts +2 -2
- package/analyticsUtils/PlayerAnalyticsManager.ts +1 -1
- 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/appUtils/HooksManager/index.ts +9 -0
- 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/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 +1 -1
- 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 +1 -1
- 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/entryActions/__tests__/buildEntryActions.test.ts +156 -0
- package/entryActions/aliasPresentation.ts +124 -0
- package/entryActions/buildEntryActions.ts +166 -0
- package/entryActions/index.ts +17 -0
- package/entryActions/types.ts +39 -0
- package/manifestUtils/__tests__/player.audioControls.test.js +158 -0
- package/manifestUtils/_internals/index.js +14 -3
- package/manifestUtils/defaultManifestConfigurations/generalContent.js +35 -0
- package/manifestUtils/defaultManifestConfigurations/player.js +349 -20
- 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__/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/reactHooks/actions/index.ts +117 -2
- 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/riverComponetsMeasurementProvider/index.tsx +20 -4
- 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 +107 -0
- package/uiActionsRegistrator/__tests__/usableActionItems.test.ts +52 -0
- package/uiActionsRegistrator/index.ts +25 -0
- package/uiActionsRegistrator/registry.ts +335 -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/feed/__mocks__/usePipesCacheReset.ts +0 -1
- /package/reactHooks/actions/__tests__/{index.test.js → index.test.tsx} +0 -0
|
@@ -2,17 +2,19 @@ import React from "react";
|
|
|
2
2
|
|
|
3
3
|
import { getDatasourceUrl } from "@applicaster/zapp-react-native-ui-components/Decorators/RiverFeedLoader/utils/getDatasourceUrl";
|
|
4
4
|
import { usePipesContexts } from "@applicaster/zapp-react-native-ui-components/Decorators/RiverFeedLoader/utils/usePipesContexts";
|
|
5
|
-
import {
|
|
5
|
+
import { markPipesDataStale } from "@applicaster/zapp-react-native-redux/ZappPipes";
|
|
6
6
|
|
|
7
7
|
import { useRoute } from "../navigation";
|
|
8
8
|
import { useAppDispatch } from "@applicaster/zapp-react-native-redux";
|
|
9
9
|
|
|
10
10
|
/**
|
|
11
|
-
*
|
|
11
|
+
* Mark a river's `clear_cache_on_reload` feeds as stale when the screen is
|
|
12
|
+
* unmounted. The cached data is kept (so a screen sharing the same feed does
|
|
13
|
+
* not lose it mid-mount) and revalidated on next access.
|
|
12
14
|
* @param {string} riverId screen id
|
|
13
15
|
* @param {Array} riverComponents list of UI components
|
|
14
16
|
*/
|
|
15
|
-
export const
|
|
17
|
+
export const useMarkPipesDataStale = (riverId, riverComponents) => {
|
|
16
18
|
const dispatch = useAppDispatch();
|
|
17
19
|
const { screenData, pathname } = useRoute();
|
|
18
20
|
const pipesContexts = usePipesContexts(riverId, pathname);
|
|
@@ -35,10 +37,16 @@ export const usePipesCacheReset = (riverId, riverComponents) => {
|
|
|
35
37
|
);
|
|
36
38
|
|
|
37
39
|
if (url) {
|
|
38
|
-
dispatch(
|
|
40
|
+
dispatch(markPipesDataStale(url, { riverId }));
|
|
39
41
|
}
|
|
40
42
|
}
|
|
41
43
|
});
|
|
42
44
|
};
|
|
43
45
|
}, []);
|
|
44
46
|
};
|
|
47
|
+
|
|
48
|
+
/**
|
|
49
|
+
* @deprecated Renamed to `useMarkPipesDataStale`. Kept as an alias for backward
|
|
50
|
+
* compatibility with external consumers.
|
|
51
|
+
*/
|
|
52
|
+
export const usePipesCacheReset = useMarkPipesDataStale;
|
package/reactHooks/index.ts
CHANGED
|
@@ -38,3 +38,7 @@ export const useNavigationPluginData = jest.fn().mockReturnValue(mockMenu);
|
|
|
38
38
|
export const useIsNavBarVisible = jest.fn().mockReturnValue(true);
|
|
39
39
|
|
|
40
40
|
export const useIsScreenActive = jest.fn().mockReturnValue(true);
|
|
41
|
+
|
|
42
|
+
export const isScreenActiveForRoute = jest.fn(
|
|
43
|
+
(route, currentRoute) => route === currentRoute
|
|
44
|
+
);
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import { isScreenActiveForRoute } from "../useIsScreenActive";
|
|
2
|
+
|
|
3
|
+
describe("isScreenActiveForRoute", () => {
|
|
4
|
+
const route = "/river/home/river/tabs";
|
|
5
|
+
const currentRoute = "/river/home/river/tabs";
|
|
6
|
+
|
|
7
|
+
it("returns false when route does not match", () => {
|
|
8
|
+
expect(
|
|
9
|
+
isScreenActiveForRoute(route, "/river/home", { visible: false })
|
|
10
|
+
).toBe(false);
|
|
11
|
+
});
|
|
12
|
+
|
|
13
|
+
it("keeps underlying screen active when video modal is docked", () => {
|
|
14
|
+
expect(
|
|
15
|
+
isScreenActiveForRoute(route, currentRoute, {
|
|
16
|
+
visible: true,
|
|
17
|
+
mode: "MINIMIZED",
|
|
18
|
+
})
|
|
19
|
+
).toBe(true);
|
|
20
|
+
});
|
|
21
|
+
|
|
22
|
+
it.each(["FULLSCREEN", "MAXIMIZED", "PIP"])(
|
|
23
|
+
"deactivates underlying screen when video modal is visible",
|
|
24
|
+
(mode) => {
|
|
25
|
+
expect(
|
|
26
|
+
isScreenActiveForRoute(route, currentRoute, {
|
|
27
|
+
visible: true,
|
|
28
|
+
mode,
|
|
29
|
+
})
|
|
30
|
+
).toBe(false);
|
|
31
|
+
}
|
|
32
|
+
);
|
|
33
|
+
|
|
34
|
+
it("keeps video-modal route active when video modal is open", () => {
|
|
35
|
+
expect(
|
|
36
|
+
isScreenActiveForRoute("video-modal/123", currentRoute, {
|
|
37
|
+
visible: true,
|
|
38
|
+
mode: "FULLSCREEN",
|
|
39
|
+
})
|
|
40
|
+
).toBe(true);
|
|
41
|
+
});
|
|
42
|
+
});
|
|
@@ -32,7 +32,7 @@ export { useNavigationType } from "./useNavigationType";
|
|
|
32
32
|
|
|
33
33
|
export { useGetBottomTabBarHeight } from "./useGetBottomTabBarHeight";
|
|
34
34
|
|
|
35
|
-
export { useIsScreenActive } from "./useIsScreenActive";
|
|
35
|
+
export { useIsScreenActive, isScreenActiveForRoute } from "./useIsScreenActive";
|
|
36
36
|
|
|
37
37
|
export { useProfilerLogging } from "./useProfilerLogging";
|
|
38
38
|
|
|
@@ -2,20 +2,41 @@ import { ROUTE_TYPES } from "@applicaster/zapp-react-native-utils/navigationUtil
|
|
|
2
2
|
import { useNavigation } from "./useNavigation";
|
|
3
3
|
import { usePathname } from "./usePathname";
|
|
4
4
|
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
5
|
+
type VideoModalState = {
|
|
6
|
+
visible?: boolean;
|
|
7
|
+
mode?: string;
|
|
8
|
+
} | null;
|
|
9
9
|
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
/**
|
|
11
|
+
* Whether a navigation route should be treated as the active/focused screen.
|
|
12
|
+
* Docked (MINIMIZED) video modal does not deactivate the underlying screen —
|
|
13
|
+
* only FULLSCREEN / MAXIMIZED / PIP do.
|
|
14
|
+
*/
|
|
15
|
+
export function isScreenActiveForRoute(
|
|
16
|
+
route: string,
|
|
17
|
+
currentRoute: string,
|
|
18
|
+
videoModalState: VideoModalState
|
|
19
|
+
) {
|
|
20
|
+
if (videoModalState?.visible) {
|
|
21
|
+
if (route.includes(ROUTE_TYPES.VIDEO_MODAL)) {
|
|
12
22
|
return true;
|
|
13
23
|
}
|
|
14
24
|
|
|
15
|
-
if (
|
|
25
|
+
if (
|
|
26
|
+
["FULLSCREEN", "MAXIMIZED", "PIP"].includes(videoModalState.mode ?? "")
|
|
27
|
+
) {
|
|
16
28
|
return false;
|
|
17
29
|
}
|
|
30
|
+
// MINIMIZED (docked): fall through — underlying screen stays active
|
|
18
31
|
}
|
|
19
32
|
|
|
20
|
-
return
|
|
33
|
+
return route === currentRoute;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
// If current screen is active/focused (visible to the user)
|
|
37
|
+
export const useIsScreenActive = () => {
|
|
38
|
+
const pathname = usePathname();
|
|
39
|
+
const { currentRoute, videoModalState } = useNavigation();
|
|
40
|
+
|
|
41
|
+
return isScreenActiveForRoute(pathname, currentRoute, videoModalState);
|
|
21
42
|
};
|
|
@@ -24,7 +24,10 @@ export function parsePluginConfiguration(plugin, manifest) {
|
|
|
24
24
|
return populateFields(plugin, manifest.custom_configuration_fields);
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
-
export function usePluginConfiguration<T, S
|
|
27
|
+
export function usePluginConfiguration<T = any, S = Record<string, any>>(
|
|
28
|
+
identifier: string,
|
|
29
|
+
manifest?: any
|
|
30
|
+
) {
|
|
28
31
|
const plugins = usePlugins();
|
|
29
32
|
|
|
30
33
|
const plugin = useMemo(
|
|
@@ -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 {
|
|
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 = (
|
|
@@ -40,6 +50,7 @@ export const shouldDispatchData = (
|
|
|
40
50
|
) => {
|
|
41
51
|
const currentFeedHasData = feed?.data;
|
|
42
52
|
const isLocalFeed = checkIsLocalFeed(url);
|
|
53
|
+
const isFeedStale = feed?.stale;
|
|
43
54
|
|
|
44
|
-
return !currentFeedHasData || clearCache || isLocalFeed;
|
|
55
|
+
return !currentFeedHasData || clearCache || isFeedStale || isLocalFeed;
|
|
45
56
|
};
|
|
@@ -1,10 +1,20 @@
|
|
|
1
1
|
import * as React from "react";
|
|
2
|
-
import { NativeModules, View } from "react-native";
|
|
2
|
+
import { NativeModules, View, StyleSheet } from "react-native";
|
|
3
3
|
import { getXray } from "@applicaster/zapp-react-native-utils/logger";
|
|
4
4
|
|
|
5
|
-
import { isApplePlatform, isWeb } from "../reactUtils";
|
|
5
|
+
import { isApplePlatform, isWeb, isTV } from "../reactUtils";
|
|
6
6
|
import { useRivers } from "../reactHooks";
|
|
7
7
|
|
|
8
|
+
const isTVPlatform = isTV();
|
|
9
|
+
|
|
10
|
+
const styles = StyleSheet.create({
|
|
11
|
+
container: isTVPlatform
|
|
12
|
+
? {
|
|
13
|
+
flex: 1,
|
|
14
|
+
}
|
|
15
|
+
: {},
|
|
16
|
+
});
|
|
17
|
+
|
|
8
18
|
const layoutReducer = (state, { payload }) => {
|
|
9
19
|
return state.map((item, index, _state) => ({
|
|
10
20
|
height: index === payload.index ? payload.height : item.height,
|
|
@@ -133,7 +143,9 @@ export const ScreenLoadingMeasurements = ({
|
|
|
133
143
|
|
|
134
144
|
return (
|
|
135
145
|
<MeasurementsSettersContext.Provider value={contextValue}>
|
|
136
|
-
<View onLayout={onListLayout}>
|
|
146
|
+
<View style={styles.container} onLayout={onListLayout}>
|
|
147
|
+
{children}
|
|
148
|
+
</View>
|
|
137
149
|
</MeasurementsSettersContext.Provider>
|
|
138
150
|
);
|
|
139
151
|
};
|
|
@@ -144,5 +156,9 @@ export const ScreenLoadingMeasurementsListItemWrapper = ({
|
|
|
144
156
|
}: ItemProps) => {
|
|
145
157
|
const { onLayout } = React.useContext(MeasurementsSettersContext);
|
|
146
158
|
|
|
147
|
-
return
|
|
159
|
+
return (
|
|
160
|
+
<View style={styles.container} onLayout={onLayout?.(index)}>
|
|
161
|
+
{children}
|
|
162
|
+
</View>
|
|
163
|
+
);
|
|
148
164
|
};
|
|
@@ -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,107 @@
|
|
|
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
|
+
});
|
|
@@ -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
|
+
});
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
export {
|
|
2
|
+
canRenderActionIcon,
|
|
3
|
+
resolveActionAsset,
|
|
4
|
+
isActionAvailableFor,
|
|
5
|
+
observeEntryState,
|
|
6
|
+
uiActionsRegistry,
|
|
7
|
+
} from "./registry";
|
|
8
|
+
|
|
9
|
+
export type {
|
|
10
|
+
RegisteredAction,
|
|
11
|
+
RegisteredActionSource,
|
|
12
|
+
RegisteredActionValue,
|
|
13
|
+
RegistryChangeListener,
|
|
14
|
+
UIActionProvider,
|
|
15
|
+
} from "./registry";
|
|
16
|
+
|
|
17
|
+
export { usableActionItems } from "./usableActionItems";
|
|
18
|
+
|
|
19
|
+
export {
|
|
20
|
+
ENTRY_ACTIONS_IDENTIFIER,
|
|
21
|
+
parseActionIdentifiers,
|
|
22
|
+
resolveActionIdentifiers,
|
|
23
|
+
} from "./resolveActionIdentifiers";
|
|
24
|
+
|
|
25
|
+
export type { ResolveActionIdentifiersParams } from "./resolveActionIdentifiers";
|