@applicaster/zapp-react-native-utils 16.0.0-alpha.9183418480 → 16.0.0-alpha.9530606740
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 +8 -10
- package/actionsExecutor/ActionExecutorContext.tsx +43 -326
- package/actionsExecutor/actions/appRestart.ts +24 -0
- package/actionsExecutor/actions/confirmDialog.ts +53 -0
- package/actionsExecutor/actions/index.ts +30 -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 +123 -0
- package/actionsExecutor/actions/openBottomSheet.ts +177 -0
- package/actionsExecutor/actions/refreshComponent.ts +79 -0
- package/actionsExecutor/actions/screenSetVariable.ts +35 -0
- package/actionsExecutor/actions/screenToggleFlag.ts +38 -0
- package/actionsExecutor/actions/sendCloudEvent.ts +88 -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/switchLayout.ts +40 -0
- package/actionsExecutor/types.ts +59 -0
- package/analyticsUtils/AnalyticsEvents/sendMenuClickEvent.ts +2 -2
- package/analyticsUtils/PlayerAnalyticsManager.ts +11 -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/analyticsUtils/playerAnalyticsTracker.ts +26 -3
- package/appUtils/HooksManager/index.ts +3 -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/cellUtils/index.ts +3 -5
- package/colorUtils/__tests__/isTransparentColor.test.ts +76 -0
- package/colorUtils/__tests__/isValidColor.test.ts +70 -0
- package/colorUtils/index.ts +50 -0
- package/manifestUtils/_internals/index.js +6 -0
- package/manifestUtils/defaultManifestConfigurations/generalContent.js +35 -0
- package/manifestUtils/fieldUtils/__tests__/fieldUtils.test.js +84 -0
- package/manifestUtils/fieldUtils/index.js +125 -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/platformIsTV.js +1 -0
- package/modalState/ContentViewModel.ts +59 -0
- package/modalState/ModalOrchestrator.ts +204 -0
- package/modalState/__tests__/ContentViewModel.test.ts +107 -0
- package/modalState/components/ActionItem.tsx +155 -0
- package/modalState/components/BottomSheetHeader.tsx +245 -0
- package/modalState/components/PrimaryButton.tsx +54 -0
- package/modalState/components/TrackItem.tsx +241 -0
- package/modalState/index.ts +25 -74
- package/modalState/store.ts +102 -0
- package/modalState/types.ts +55 -0
- 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/index.ts +4 -2
- 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/index.ts +5 -1
- package/reactHooks/feed/useBatchLoading.ts +9 -1
- package/reactHooks/feed/{usePipesCacheReset.ts → useMarkPipesDataStale.ts} +12 -4
- package/reactHooks/utils/index.ts +3 -2
- package/reactHooks/videoModal/hooks/useVideoModalScreenData.tsx +22 -4
- package/riverComponetsMeasurementProvider/index.tsx +12 -8
- package/uiActionsRegistrator/index.ts +203 -0
- package/reactHooks/feed/__mocks__/usePipesCacheReset.ts +0 -1
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import React, { forwardRef, RefObject } from "react";
|
|
2
|
+
import URL from "url";
|
|
3
|
+
|
|
4
|
+
import { useBuildPipesUrl } from "@applicaster/zapp-react-native-utils/reactHooks/feed";
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Merges the query params resolved from a pipes endpoint context into the url.
|
|
8
|
+
* Returns the url unchanged when there is nothing to merge.
|
|
9
|
+
*/
|
|
10
|
+
export function buildUrlWithQuery(url: string, requestParams): string {
|
|
11
|
+
if (!url || !requestParams?.params) {
|
|
12
|
+
return url;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
const parsedURL = URL.parse(url, true);
|
|
16
|
+
|
|
17
|
+
parsedURL.query = { ...parsedURL.query, ...requestParams.params };
|
|
18
|
+
parsedURL.search = null;
|
|
19
|
+
|
|
20
|
+
return URL.format(parsedURL);
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
type Props = {
|
|
24
|
+
uri: string;
|
|
25
|
+
} & Record<string, unknown>;
|
|
26
|
+
|
|
27
|
+
/**
|
|
28
|
+
* HOC that resolves the wrapped component's `uri` against its matching Zapp
|
|
29
|
+
* Pipes endpoint. Endpoint context keys are added as query params (merged into
|
|
30
|
+
* the uri) and as request `headers`. Rendering is deferred until the context
|
|
31
|
+
* has been resolved so the component never loads without its required headers.
|
|
32
|
+
*/
|
|
33
|
+
export function withPipesEndpoint(Component) {
|
|
34
|
+
function WithPipesEndpoint(props: Props, ref: RefObject<unknown>) {
|
|
35
|
+
const { requestParams } = useBuildPipesUrl({ url: props.uri });
|
|
36
|
+
|
|
37
|
+
if (requestParams !== null) {
|
|
38
|
+
const urlWithQuery = buildUrlWithQuery(props.uri, requestParams);
|
|
39
|
+
|
|
40
|
+
return (
|
|
41
|
+
<Component
|
|
42
|
+
ref={ref}
|
|
43
|
+
{...props}
|
|
44
|
+
uri={urlWithQuery}
|
|
45
|
+
headers={requestParams.headers || {}}
|
|
46
|
+
/>
|
|
47
|
+
);
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
return null;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
return forwardRef(WithPipesEndpoint);
|
|
54
|
+
}
|
package/playerUtils/index.ts
CHANGED
|
@@ -37,7 +37,7 @@ export function isLiveLegacy(content) {
|
|
|
37
37
|
]);
|
|
38
38
|
|
|
39
39
|
const durationFromExt = R.path(["extensions", "duration"], content);
|
|
40
|
-
const durationFromMgr = playerManager.getDuration();
|
|
40
|
+
const durationFromMgr = playerManager.getInstanceController()?.getDuration();
|
|
41
41
|
const duration = Math.floor(durationFromExt || durationFromMgr);
|
|
42
42
|
|
|
43
43
|
const isLive = R.anyPass([isNotaValidNumber, R.lte(R.__, 0)])(duration);
|
|
@@ -81,7 +81,9 @@ function isLiveByManager(): boolean {
|
|
|
81
81
|
return true;
|
|
82
82
|
}
|
|
83
83
|
|
|
84
|
-
const durationFromPlayerManager = playerManager
|
|
84
|
+
const durationFromPlayerManager = playerManager
|
|
85
|
+
.getInstanceController()
|
|
86
|
+
?.getDuration();
|
|
85
87
|
|
|
86
88
|
return isLiveByDuration(durationFromPlayerManager);
|
|
87
89
|
}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
/// <reference types="@applicaster/applicaster-types" />
|
|
2
2
|
/* eslint-disable @typescript-eslint/no-unused-vars */
|
|
3
|
-
import { Context, useContext, useState } from "react";
|
|
3
|
+
import { Context, useCallback, useContext, useEffect, useState } from "react";
|
|
4
4
|
import { ActionsContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ActionsContext";
|
|
5
5
|
|
|
6
|
+
import {
|
|
7
|
+
observeEntryState,
|
|
8
|
+
RegisteredActionValue,
|
|
9
|
+
} from "../../uiActionsRegistrator";
|
|
6
10
|
import { reactHooksLogger } from "../logger";
|
|
7
11
|
|
|
8
12
|
const logger = reactHooksLogger.addSubsystem("actions");
|
|
@@ -46,3 +50,49 @@ export function useActions<T = unknown>(plugId: string): any {
|
|
|
46
50
|
|
|
47
51
|
return context;
|
|
48
52
|
}
|
|
53
|
+
|
|
54
|
+
export type UseEntryActionState = {
|
|
55
|
+
state: CellActionEntryState | undefined;
|
|
56
|
+
invokeAction: (options?: InvokeArgsOptions) => void;
|
|
57
|
+
};
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* Subscribes a component to a single action's state for a given `entry`.
|
|
61
|
+
*
|
|
62
|
+
* It observes state changes reactively via `observeEntryState` (which is backed
|
|
63
|
+
* by the action's `addListener`), seeds the initial value synchronously from
|
|
64
|
+
* `initialEntryState`, and returns a memoized `invokeAction` that forwards
|
|
65
|
+
* optimistic `updateState` updates back into local state.
|
|
66
|
+
*
|
|
67
|
+
* This is the single, unified way to drive an action button - it works the same
|
|
68
|
+
* for registry actions, legacy context-provider actions and entry actions.
|
|
69
|
+
*/
|
|
70
|
+
export function useEntryActionState(
|
|
71
|
+
action: RegisteredActionValue | undefined,
|
|
72
|
+
entry: ZappEntry | ZappFeed
|
|
73
|
+
): UseEntryActionState {
|
|
74
|
+
const [state, setState] = useState<CellActionEntryState | undefined>(() =>
|
|
75
|
+
action?.initialEntryState?.(entry)
|
|
76
|
+
);
|
|
77
|
+
|
|
78
|
+
const entryId = (entry as ZappEntry)?.id;
|
|
79
|
+
|
|
80
|
+
useEffect(() => {
|
|
81
|
+
if (!action) return undefined;
|
|
82
|
+
|
|
83
|
+
const subscription = observeEntryState(action, entry).subscribe(setState);
|
|
84
|
+
|
|
85
|
+
return () => subscription.unsubscribe();
|
|
86
|
+
// eslint-disable-next-line @wogns3623/better-exhaustive-deps/exhaustive-deps
|
|
87
|
+
}, [action, entryId]);
|
|
88
|
+
|
|
89
|
+
const invokeAction = useCallback(
|
|
90
|
+
(options: InvokeArgsOptions = {}) => {
|
|
91
|
+
action?.invokeAction?.(entry, { updateState: setState, ...options });
|
|
92
|
+
},
|
|
93
|
+
// eslint-disable-next-line @wogns3623/better-exhaustive-deps/exhaustive-deps
|
|
94
|
+
[action, entryId]
|
|
95
|
+
);
|
|
96
|
+
|
|
97
|
+
return { state, invokeAction };
|
|
98
|
+
}
|
|
@@ -4,6 +4,7 @@ import * as React from "react";
|
|
|
4
4
|
import * as R from "ramda";
|
|
5
5
|
import { handleActionSchemeUrl } from "@applicaster/quick-brick-core/App/DeepLinking/URLSchemeHandler/SchemeHandlerHooks/useUrlSchemeHandler";
|
|
6
6
|
import { CellTapContext } from "@applicaster/zapp-react-native-ui-components/Contexts/CellTapContext";
|
|
7
|
+
import { useUIComponentContext } from "@applicaster/zapp-react-native-ui-components/Contexts/UIComponentContext";
|
|
7
8
|
import {
|
|
8
9
|
useNavigation,
|
|
9
10
|
useProfilerLogging,
|
|
@@ -28,7 +29,6 @@ import { useScreenStateStore } from "../navigation/useScreenStateStore";
|
|
|
28
29
|
type Props = {
|
|
29
30
|
item?: ZappEntry;
|
|
30
31
|
index?: number;
|
|
31
|
-
component?: ZappUIComponent;
|
|
32
32
|
zappPipesData?: ZappPipesData;
|
|
33
33
|
};
|
|
34
34
|
|
|
@@ -37,24 +37,25 @@ type onPressReturnFn =
|
|
|
37
37
|
| (() => void);
|
|
38
38
|
|
|
39
39
|
export const useCellClick = ({
|
|
40
|
-
component,
|
|
41
40
|
zappPipesData,
|
|
42
41
|
item,
|
|
43
|
-
}: Props): onPressReturnFn => {
|
|
42
|
+
}: Props = {}): onPressReturnFn => {
|
|
44
43
|
const { push, currentRoute } = useNavigation();
|
|
45
44
|
const { pathname } = useRoute();
|
|
46
45
|
const screenStateStore = useScreenStateStore();
|
|
47
46
|
|
|
48
47
|
const onCellTap: Option<Function> = React.useContext(CellTapContext);
|
|
49
48
|
const actionExecutor = React.useContext(ActionExecutorContext);
|
|
49
|
+
const component = useUIComponentContext();
|
|
50
50
|
const screenData = useCurrentScreenData();
|
|
51
51
|
const screenState = useScreenContext()?.options;
|
|
52
|
+
const entry = useScreenContext()?.entry;
|
|
52
53
|
|
|
53
54
|
const cellSelectable = toBooleanWithDefaultTrue(
|
|
54
55
|
component?.rules?.component_cells_selectable
|
|
55
56
|
);
|
|
56
57
|
|
|
57
|
-
const [
|
|
58
|
+
const [_entryContext, setEntryContext] =
|
|
58
59
|
ZappPipesEntryContext.useZappPipesContext(pathname);
|
|
59
60
|
|
|
60
61
|
const logTimestamp = useProfilerLogging();
|
|
@@ -89,7 +90,8 @@ export const useCellClick = ({
|
|
|
89
90
|
screenState,
|
|
90
91
|
screenRoute: pathname,
|
|
91
92
|
screenStateStore,
|
|
92
|
-
entryContext,
|
|
93
|
+
entryContext: selectedItem,
|
|
94
|
+
screenEntry: entry,
|
|
93
95
|
});
|
|
94
96
|
}
|
|
95
97
|
|
|
@@ -117,14 +119,20 @@ export const useCellClick = ({
|
|
|
117
119
|
}
|
|
118
120
|
},
|
|
119
121
|
[
|
|
120
|
-
|
|
121
|
-
currentRoute,
|
|
122
|
+
item,
|
|
122
123
|
setEntryContext,
|
|
123
|
-
pathname,
|
|
124
|
-
push,
|
|
125
124
|
sendAnalyticsOnPress,
|
|
125
|
+
logTimestamp,
|
|
126
|
+
pathname,
|
|
127
|
+
component,
|
|
128
|
+
onCellTap,
|
|
129
|
+
entry,
|
|
130
|
+
actionExecutor,
|
|
126
131
|
screenData,
|
|
127
132
|
screenState,
|
|
133
|
+
screenStateStore,
|
|
134
|
+
currentRoute,
|
|
135
|
+
push,
|
|
128
136
|
]
|
|
129
137
|
);
|
|
130
138
|
|
|
@@ -138,5 +146,5 @@ export const useCellClick = ({
|
|
|
138
146
|
onPressRef.current = onPress;
|
|
139
147
|
}
|
|
140
148
|
|
|
141
|
-
return React.useCallback(onPressRef.current, []);
|
|
149
|
+
return React.useCallback(onPressRef.current, [item]);
|
|
142
150
|
};
|
package/reactHooks/feed/index.ts
CHANGED
|
@@ -6,7 +6,11 @@ export { useEntryScreenId } from "./useEntryScreenId";
|
|
|
6
6
|
|
|
7
7
|
export { useBuildPipesUrl } from "./useBuildPipesUrl";
|
|
8
8
|
|
|
9
|
-
export {
|
|
9
|
+
export {
|
|
10
|
+
useMarkPipesDataStale,
|
|
11
|
+
// eslint-disable-next-line @typescript-eslint/no-deprecated
|
|
12
|
+
usePipesCacheReset,
|
|
13
|
+
} from "./useMarkPipesDataStale";
|
|
10
14
|
|
|
11
15
|
export { useBatchLoading } from "./useBatchLoading";
|
|
12
16
|
|
|
@@ -159,9 +159,17 @@ export const useBatchLoading = (
|
|
|
159
159
|
options.riverId,
|
|
160
160
|
]);
|
|
161
161
|
|
|
162
|
+
// Initial preload only. Batch loading warms the first batch of component
|
|
163
|
+
// feeds and signals readiness; the feed set is frozen at mount on purpose.
|
|
164
|
+
// Per-component loads and reloads (including stale revalidation) are owned by
|
|
165
|
+
// useFeedLoader in ZappPipesDataConnector. Re-running on `feeds`/input changes
|
|
166
|
+
// would re-fire on every store update and cause redundant dispatch storms, so
|
|
167
|
+
// this intentionally runs once on mount.
|
|
168
|
+
/* eslint-disable @wogns3623/better-exhaustive-deps/exhaustive-deps */
|
|
162
169
|
React.useEffect(() => {
|
|
163
170
|
runBatchLoading();
|
|
164
|
-
}, [
|
|
171
|
+
}, []);
|
|
172
|
+
/* eslint-enable @wogns3623/better-exhaustive-deps/exhaustive-deps */
|
|
165
173
|
|
|
166
174
|
React.useEffect(() => {
|
|
167
175
|
// check if all feeds are ready and set hasEverBeenReady to true
|
|
@@ -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;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { useEffect, useRef } from "react";
|
|
2
2
|
|
|
3
3
|
/**
|
|
4
4
|
* This hook returns a previous value that was passed to it.
|
|
@@ -40,6 +40,7 @@ export const shouldDispatchData = (
|
|
|
40
40
|
) => {
|
|
41
41
|
const currentFeedHasData = feed?.data;
|
|
42
42
|
const isLocalFeed = checkIsLocalFeed(url);
|
|
43
|
+
const isFeedStale = feed?.stale;
|
|
43
44
|
|
|
44
|
-
return !currentFeedHasData || clearCache || isLocalFeed;
|
|
45
|
+
return !currentFeedHasData || clearCache || isFeedStale || isLocalFeed;
|
|
45
46
|
};
|
|
@@ -2,6 +2,12 @@ import React from "react";
|
|
|
2
2
|
import { useContentTypes } from "@applicaster/zapp-react-native-redux/hooks";
|
|
3
3
|
import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks";
|
|
4
4
|
import { useRivers } from "../../state";
|
|
5
|
+
import { createLogger } from "../../../logger";
|
|
6
|
+
|
|
7
|
+
const { log_warning } = createLogger({
|
|
8
|
+
subsystem: "zapp-react-native-utils/reactHooks/videoModal",
|
|
9
|
+
category: "useVideoModalScreenData",
|
|
10
|
+
});
|
|
5
11
|
|
|
6
12
|
export const useVideoModalScreenData = ():
|
|
7
13
|
| (ZappEntry & { targetScreen: any }) // TODO: fix ZappEntry type ( was ZappRiver but conflict )
|
|
@@ -14,10 +20,22 @@ export const useVideoModalScreenData = ():
|
|
|
14
20
|
const rivers = useRivers();
|
|
15
21
|
|
|
16
22
|
return React.useMemo(() => {
|
|
17
|
-
|
|
18
|
-
|
|
23
|
+
const itemType = item?.type?.value;
|
|
24
|
+
|
|
25
|
+
if (!itemType) {
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
19
28
|
|
|
20
|
-
|
|
29
|
+
const screenId = contentTypes[itemType]?.screen_id;
|
|
30
|
+
|
|
31
|
+
if (!screenId) {
|
|
32
|
+
log_warning(
|
|
33
|
+
`Type mapping is missing for item type: ${itemType}, title: ${item.title}`
|
|
34
|
+
);
|
|
35
|
+
|
|
36
|
+
return;
|
|
21
37
|
}
|
|
22
|
-
|
|
38
|
+
|
|
39
|
+
return { ...item, targetScreen: rivers?.[screenId] };
|
|
40
|
+
}, [contentTypes, item, rivers]);
|
|
23
41
|
};
|
|
@@ -1,10 +1,20 @@
|
|
|
1
1
|
import * as React from "react";
|
|
2
|
-
import { NativeModules,
|
|
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,
|
|
@@ -30,12 +40,6 @@ type MeasurementContext = {
|
|
|
30
40
|
onLayout: (index: number) => (event) => void;
|
|
31
41
|
};
|
|
32
42
|
|
|
33
|
-
const styles = StyleSheet.create({
|
|
34
|
-
container: {
|
|
35
|
-
flex: 1,
|
|
36
|
-
},
|
|
37
|
-
});
|
|
38
|
-
|
|
39
43
|
const { Logger } = getXray();
|
|
40
44
|
|
|
41
45
|
const logger = new Logger("general", "ui");
|
|
@@ -0,0 +1,203 @@
|
|
|
1
|
+
/* eslint-disable no-dupe-class-members */
|
|
2
|
+
import { Observable } from "rxjs";
|
|
3
|
+
import { createLogger } from "../logger";
|
|
4
|
+
|
|
5
|
+
const { log_debug, log_warning, log_verbose } = createLogger({
|
|
6
|
+
subsystem: "UIActionsRegistry",
|
|
7
|
+
category: "ActionRegistration",
|
|
8
|
+
});
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* The runtime value of a UI action.
|
|
12
|
+
*
|
|
13
|
+
* This is the object that consumers interact with (render buttons for,
|
|
14
|
+
* invoke on press, read initial state from, etc.). It intentionally keeps an
|
|
15
|
+
* open shape (`[K: string]: any`) so that both the modern registry-based
|
|
16
|
+
* actions and the legacy context-provider based actions can be represented by
|
|
17
|
+
* the same structure.
|
|
18
|
+
*/
|
|
19
|
+
export type RegisteredActionValue = {
|
|
20
|
+
state?: any;
|
|
21
|
+
getInitialState?: () => Promise<void>;
|
|
22
|
+
initialEntryState?: (item: ZappEntry | ZappFeed) => CellActionEntryState;
|
|
23
|
+
invokeAction: (
|
|
24
|
+
item: ZappEntry | ZappFeed,
|
|
25
|
+
options?: InvokeArgsOptions
|
|
26
|
+
) => void;
|
|
27
|
+
isActionAvailable?: (item: ZappEntry | ZappFeed) => boolean;
|
|
28
|
+
addListener?: (
|
|
29
|
+
entryId: string,
|
|
30
|
+
listener: CellActionStateListenerFunction
|
|
31
|
+
) => CellActionStateRemoveListenerFunction;
|
|
32
|
+
/**
|
|
33
|
+
* Optional RX stream of the action state for a given entry. When not
|
|
34
|
+
* provided, `observeEntryState` derives one from `initialEntryState` +
|
|
35
|
+
* `addListener` (see below).
|
|
36
|
+
*/
|
|
37
|
+
observeEntryState?: (
|
|
38
|
+
entry: ZappEntry | ZappFeed
|
|
39
|
+
) => Observable<CellActionEntryState>;
|
|
40
|
+
[K: string]: any;
|
|
41
|
+
};
|
|
42
|
+
|
|
43
|
+
export type RegisteredAction = {
|
|
44
|
+
identifier: string; // Plugin identifier or synthetic name
|
|
45
|
+
action: RegisteredActionValue;
|
|
46
|
+
};
|
|
47
|
+
|
|
48
|
+
/**
|
|
49
|
+
* A function that, given an optional context (currently just the `entry`),
|
|
50
|
+
* returns the list of actions it wants to contribute.
|
|
51
|
+
*
|
|
52
|
+
* Returning an array is what allows a single provider (plugin or otherwise) to
|
|
53
|
+
* expose more than one action, and to compute those actions based on the entry.
|
|
54
|
+
*/
|
|
55
|
+
export type UIActionProvider = (params: {
|
|
56
|
+
entry?: ZappEntry | ZappFeed;
|
|
57
|
+
}) => RegisteredAction[];
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* Returns an RX `Observable` that emits the action state for `entry`.
|
|
61
|
+
*
|
|
62
|
+
* If the action already exposes its own `observeEntryState`, it is used as-is.
|
|
63
|
+
* Otherwise we build the stream from the legacy imperative API:
|
|
64
|
+
* - it immediately emits `initialEntryState(entry)` (if available), and
|
|
65
|
+
* - it subscribes to further changes via `addListener(entryId, listener)`,
|
|
66
|
+
* unsubscribing automatically when the observable is torn down.
|
|
67
|
+
*
|
|
68
|
+
* This lets every action - old or new - be consumed reactively through a single
|
|
69
|
+
* mechanism, without each consumer having to wire up `addListener` manually.
|
|
70
|
+
*/
|
|
71
|
+
export function observeEntryState(
|
|
72
|
+
action: RegisteredActionValue | undefined,
|
|
73
|
+
entry: ZappEntry | ZappFeed
|
|
74
|
+
): Observable<CellActionEntryState> {
|
|
75
|
+
if (typeof action?.observeEntryState === "function") {
|
|
76
|
+
return action.observeEntryState(entry);
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
return new Observable<CellActionEntryState>((subscriber) => {
|
|
80
|
+
const initialState = action?.initialEntryState?.(entry);
|
|
81
|
+
|
|
82
|
+
if (initialState !== undefined) {
|
|
83
|
+
subscriber.next(initialState);
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
const removeListener = action?.addListener?.(
|
|
87
|
+
String((entry as ZappEntry)?.id),
|
|
88
|
+
(state: CellActionEntryState) => subscriber.next(state)
|
|
89
|
+
);
|
|
90
|
+
|
|
91
|
+
return () => removeListener?.();
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
class UIActionsRegistry {
|
|
96
|
+
private registeredActions: Record<string, UIActionProvider> = {};
|
|
97
|
+
|
|
98
|
+
/**
|
|
99
|
+
* Register a dynamic action provider under a unique `name`.
|
|
100
|
+
* The provider can return one or more actions and may use the passed `entry`.
|
|
101
|
+
* Returns an unregister function.
|
|
102
|
+
*/
|
|
103
|
+
registerActionProvider(
|
|
104
|
+
name: string,
|
|
105
|
+
actionProvider: UIActionProvider
|
|
106
|
+
): () => void {
|
|
107
|
+
const isOverride = Boolean(this.registeredActions[name]);
|
|
108
|
+
|
|
109
|
+
if (isOverride) {
|
|
110
|
+
log_warning(
|
|
111
|
+
`registerActionProvider: overriding existing provider for "${name}"`,
|
|
112
|
+
{ name }
|
|
113
|
+
);
|
|
114
|
+
} else {
|
|
115
|
+
log_debug(`registerActionProvider: registered "${name}"`, { name });
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
this.registeredActions[name] = actionProvider;
|
|
119
|
+
|
|
120
|
+
return () => {
|
|
121
|
+
// Only remove if it's still the same provider to avoid races where a
|
|
122
|
+
// newer registration replaced this one.
|
|
123
|
+
if (this.registeredActions[name] === actionProvider) {
|
|
124
|
+
delete this.registeredActions[name];
|
|
125
|
+
log_debug(`registerActionProvider: unregistered "${name}"`, { name });
|
|
126
|
+
} else {
|
|
127
|
+
log_debug(
|
|
128
|
+
`registerActionProvider: skipped unregister for "${name}" – newer provider is active`,
|
|
129
|
+
{ name }
|
|
130
|
+
);
|
|
131
|
+
}
|
|
132
|
+
};
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
/**
|
|
136
|
+
* Convenience helper to register a single, static action from anywhere in the
|
|
137
|
+
* app (it does not need to be a plugin). Returns an unregister function.
|
|
138
|
+
*/
|
|
139
|
+
registerAction(
|
|
140
|
+
identifier: string,
|
|
141
|
+
action: RegisteredActionValue
|
|
142
|
+
): () => void {
|
|
143
|
+
log_debug(`registerAction: registering single action "${identifier}"`, {
|
|
144
|
+
identifier,
|
|
145
|
+
});
|
|
146
|
+
|
|
147
|
+
return this.registerActionProvider(identifier, () => [
|
|
148
|
+
{ identifier, action },
|
|
149
|
+
]);
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
getEntryActions(entry: ZappEntry): RegisteredAction[] {
|
|
153
|
+
const results = Object.keys(this.registeredActions)
|
|
154
|
+
.map((key) => this.registeredActions[key]({ entry }))
|
|
155
|
+
.flatMap((a) => a);
|
|
156
|
+
|
|
157
|
+
log_verbose(
|
|
158
|
+
`getEntryActions: resolved ${results.length} action(s) for entry "${entry?.id}"`,
|
|
159
|
+
{ entryId: entry?.id, identifiers: results.map((r) => r.identifier) }
|
|
160
|
+
);
|
|
161
|
+
|
|
162
|
+
return results;
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
getActions(name: string, entry?: ZappEntry | ZappFeed): RegisteredAction[] {
|
|
166
|
+
if (!this.registeredActions[name]) {
|
|
167
|
+
log_warning(`getActions: no provider found for "${name}"`, { name });
|
|
168
|
+
|
|
169
|
+
return [];
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
const results = this.registeredActions[name]({ entry }) ?? [];
|
|
173
|
+
|
|
174
|
+
log_verbose(
|
|
175
|
+
`getActions: resolved ${results.length} action(s) for "${name}"`,
|
|
176
|
+
{
|
|
177
|
+
name,
|
|
178
|
+
entryId: (entry as ZappEntry)?.id,
|
|
179
|
+
identifiers: results.map((r) => r.identifier),
|
|
180
|
+
}
|
|
181
|
+
);
|
|
182
|
+
|
|
183
|
+
return results;
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
/**
|
|
187
|
+
* Returns the runtime value of the first action registered under `name`, or
|
|
188
|
+
* `undefined`. This mirrors the shape returned by the legacy `useActions`
|
|
189
|
+
* hook, easing migration of single-action consumers.
|
|
190
|
+
*/
|
|
191
|
+
getAction(
|
|
192
|
+
name: string,
|
|
193
|
+
entry?: ZappEntry | ZappFeed
|
|
194
|
+
): RegisteredActionValue | undefined {
|
|
195
|
+
return this.getActions(name, entry)[0]?.action;
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
hasAction(name: string): boolean {
|
|
199
|
+
return Boolean(this.registeredActions[name]);
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
|
|
203
|
+
export const uiActionsRegistry = new UIActionsRegistry();
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export const usePipesCacheReset = jest.fn();
|