@applicaster/zapp-react-native-utils 16.0.0-alpha.7845362739 → 16.0.0-alpha.8101951023
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 +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 +133 -0
- package/actionsExecutor/actions/__tests__/openBottomSheet.customContent.test.ts +76 -0
- package/actionsExecutor/actions/__tests__/openBottomSheet.inlineItems.test.ts +212 -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 +18 -4
- package/actionsExecutor/actions/openBottomSheet.ts +329 -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__/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 +11 -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 +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__/reorderByIds.test.ts +50 -0
- package/arrayUtils/index.ts +79 -0
- package/cellUtils/index.ts +30 -3
- package/configurationUtils/__tests__/manifestKeyParser.test.ts +21 -0
- package/configurationUtils/__tests__/modalBlocksParser.test.ts +269 -0
- package/configurationUtils/manifestKeyParser.ts +50 -10
- package/configurationUtils/modalBlocksParser.ts +214 -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/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 +330 -1
- package/manifestUtils/index.js +3 -0
- 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 +211 -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 +47 -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 +160 -0
- package/modalState/useBottomSheetContent.ts +109 -0
- package/package.json +2 -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/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/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 +4 -1
- package/reactHooks/utils/__tests__/index.test.js +22 -2
- package/reactHooks/utils/index.ts +11 -1
- 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 -203
- package/uiActionsRegistrator/registry.ts +335 -0
- package/uiActionsRegistrator/resolveActionIdentifiers.ts +100 -0
- package/uiActionsRegistrator/usableActionItems.ts +66 -0
- package/zappFrameworkUtils/localStorageHelper.ts +10 -2
- 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
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/// <reference types="@applicaster/applicaster-types" />
|
|
2
|
+
import { dismissModal, modalOrchestrator } from "../../modalState";
|
|
3
|
+
import { ActionResult } from "../ActionExecutor";
|
|
4
|
+
import { ActionHandler } from "../types";
|
|
5
|
+
import { createLogger } from "../../logger";
|
|
6
|
+
|
|
7
|
+
const { log_info } = createLogger({
|
|
8
|
+
subsystem: "ActionExecutorContext",
|
|
9
|
+
category: "General",
|
|
10
|
+
});
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* Dismisses the active bottom sheet / modal.
|
|
14
|
+
*/
|
|
15
|
+
export const dismissBottomSheetAction: ActionHandler<
|
|
16
|
+
any
|
|
17
|
+
> = async (): Promise<ActionResult> => {
|
|
18
|
+
log_info("handleAction: dismissBottomSheet");
|
|
19
|
+
modalOrchestrator.close();
|
|
20
|
+
dismissModal();
|
|
21
|
+
|
|
22
|
+
return ActionResult.Success;
|
|
23
|
+
};
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
/// <reference types="@applicaster/applicaster-types" />
|
|
2
|
+
import { ActionResult } from "../ActionExecutor";
|
|
3
|
+
import { ActionHandler } from "../types";
|
|
4
|
+
import { createLogger } from "../../logger";
|
|
5
|
+
|
|
6
|
+
const { log_info } = createLogger({
|
|
7
|
+
subsystem: "ActionExecutorContext",
|
|
8
|
+
category: "General",
|
|
9
|
+
});
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* Options for the goBack action.
|
|
13
|
+
*/
|
|
14
|
+
export interface GoBackOptions {
|
|
15
|
+
/**
|
|
16
|
+
* Navigate to the home screen when there is no screen to go back to.
|
|
17
|
+
* Defaults to true.
|
|
18
|
+
*/
|
|
19
|
+
fallbackToHome?: boolean;
|
|
20
|
+
|
|
21
|
+
/**
|
|
22
|
+
* Go back to the first screen of the stack instead of the previous one.
|
|
23
|
+
* Defaults to false.
|
|
24
|
+
*/
|
|
25
|
+
backToTop?: boolean;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
/**
|
|
29
|
+
* Creates a go back action handler with the provided dependencies.
|
|
30
|
+
* This factory pattern allows the action to access navigation state at runtime.
|
|
31
|
+
*
|
|
32
|
+
* @param navigator - The app navigator performing the back navigation
|
|
33
|
+
* @returns An action handler that navigates back
|
|
34
|
+
*/
|
|
35
|
+
export function createGoBackAction(
|
|
36
|
+
navigator: QuickBrickAppNavigator
|
|
37
|
+
): ActionHandler<GoBackOptions> {
|
|
38
|
+
return async function goBackAction(action): Promise<ActionResult> {
|
|
39
|
+
const fallbackToHome = action.options?.fallbackToHome ?? true;
|
|
40
|
+
const backToTop = action.options?.backToTop ?? false;
|
|
41
|
+
|
|
42
|
+
// With fallbackToHome on, the navigator goes home on an empty stack by
|
|
43
|
+
// itself. The guard only matters when the caller opted out of that.
|
|
44
|
+
if (!fallbackToHome && !navigator.canGoBack()) {
|
|
45
|
+
log_info(
|
|
46
|
+
"goBack: no screen to go back to and fallbackToHome is disabled, ignoring"
|
|
47
|
+
);
|
|
48
|
+
|
|
49
|
+
return ActionResult.Error;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
log_info(
|
|
53
|
+
`goBack: navigating back, fallbackToHome: ${fallbackToHome}, backToTop: ${backToTop}`
|
|
54
|
+
);
|
|
55
|
+
|
|
56
|
+
navigator.goBack(fallbackToHome, false, backToTop);
|
|
57
|
+
|
|
58
|
+
return ActionResult.Success;
|
|
59
|
+
};
|
|
60
|
+
}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
/// <reference types="@applicaster/applicaster-types" />
|
|
2
|
+
import { ActionResult } from "../ActionExecutor";
|
|
3
|
+
import { ActionHandler } from "../types";
|
|
4
|
+
import { createLogger } from "../../logger";
|
|
5
|
+
|
|
6
|
+
const { log_info } = createLogger({
|
|
7
|
+
subsystem: "ActionExecutorContext",
|
|
8
|
+
category: "General",
|
|
9
|
+
});
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* Creates a go home action handler with the provided dependencies.
|
|
13
|
+
* This factory pattern allows the action to access navigation state at runtime.
|
|
14
|
+
*
|
|
15
|
+
* The navigator's `initialLaunch` flag is intentionally not exposed: it selects
|
|
16
|
+
* the offline home river during app bootstrap and is not a per-action choice.
|
|
17
|
+
*
|
|
18
|
+
* @param navigator - The app navigator performing the navigation
|
|
19
|
+
* @returns An action handler that navigates to the home screen
|
|
20
|
+
*/
|
|
21
|
+
export function createGoHomeAction(
|
|
22
|
+
navigator: QuickBrickAppNavigator
|
|
23
|
+
): ActionHandler {
|
|
24
|
+
return async function goHomeAction(): Promise<ActionResult> {
|
|
25
|
+
log_info("goHome: navigating to the home screen");
|
|
26
|
+
|
|
27
|
+
navigator.goHome();
|
|
28
|
+
|
|
29
|
+
return ActionResult.Success;
|
|
30
|
+
};
|
|
31
|
+
}
|
|
@@ -15,6 +15,8 @@ export { appRestartAction } from "./appRestart";
|
|
|
15
15
|
|
|
16
16
|
export { confirmDialogAction } from "./confirmDialog";
|
|
17
17
|
|
|
18
|
+
export { showAlertAction } from "./showAlert";
|
|
19
|
+
|
|
18
20
|
export { sendCloudEventAction } from "./sendCloudEvent";
|
|
19
21
|
|
|
20
22
|
export { sessionStorageToggleFlagAction } from "./sessionStorageToggleFlag";
|
|
@@ -27,4 +29,14 @@ export { screenToggleFlagAction } from "./screenToggleFlag";
|
|
|
27
29
|
|
|
28
30
|
export { createNavigateToScreenAction } from "./navigateToScreen";
|
|
29
31
|
|
|
32
|
+
export { createPresentScreenAction } from "./presentScreen";
|
|
33
|
+
|
|
34
|
+
export { createGoBackAction } from "./goBack";
|
|
35
|
+
|
|
36
|
+
export { createGoHomeAction } from "./goHome";
|
|
37
|
+
|
|
30
38
|
export { showToastAction } from "./showToast";
|
|
39
|
+
|
|
40
|
+
export { openBottomSheetAction } from "./openBottomSheet";
|
|
41
|
+
|
|
42
|
+
export { dismissBottomSheetAction } from "./dismissBottomSheet";
|
|
@@ -25,6 +25,19 @@ export interface NavigateToScreenOptions {
|
|
|
25
25
|
* - undefined to navigate to screen without entry
|
|
26
26
|
*/
|
|
27
27
|
entry?: "@{entry/}" | ZappEntry;
|
|
28
|
+
|
|
29
|
+
/**
|
|
30
|
+
* Arbitrary values passed through to the destination screen.
|
|
31
|
+
*
|
|
32
|
+
* They are stored on the navigation route as `NavigationScreenData.options`
|
|
33
|
+
* and read on the target screen via `useNavigation().data?.options`. Use this
|
|
34
|
+
* to hand per-navigation parameters to a screen instead of routing them
|
|
35
|
+
* through module-level state.
|
|
36
|
+
*
|
|
37
|
+
* Note: `legacyScreenData()` does not carry these values, so they are not
|
|
38
|
+
* visible through `useCurrentScreenData()` / `useRoute()`.
|
|
39
|
+
*/
|
|
40
|
+
navigationOptions?: Record<string, unknown>;
|
|
28
41
|
}
|
|
29
42
|
|
|
30
43
|
/**
|
|
@@ -55,6 +68,7 @@ export function createNavigateToScreenAction(
|
|
|
55
68
|
|
|
56
69
|
const navigationAction = action.options?.navigationAction;
|
|
57
70
|
const entrySource = action.options?.entry;
|
|
71
|
+
const navigationOptions = action.options?.navigationOptions;
|
|
58
72
|
|
|
59
73
|
const entry = entrySource
|
|
60
74
|
? entrySource === "@{entry/}"
|
|
@@ -83,10 +97,10 @@ export function createNavigateToScreenAction(
|
|
|
83
97
|
};
|
|
84
98
|
|
|
85
99
|
if (navigationAction === "push") {
|
|
86
|
-
navigator.push(overriddenEntry);
|
|
100
|
+
navigator.push(overriddenEntry, navigationOptions);
|
|
87
101
|
} else {
|
|
88
102
|
// Use replaceTop for entries since replace() only accepts ZappRiver
|
|
89
|
-
navigator.replaceTop(overriddenEntry);
|
|
103
|
+
navigator.replaceTop(overriddenEntry, navigationOptions);
|
|
90
104
|
}
|
|
91
105
|
|
|
92
106
|
return ActionResult.Success;
|
|
@@ -113,9 +127,9 @@ export function createNavigateToScreenAction(
|
|
|
113
127
|
context?.callback?.({ success: false, error: null, abort: true });
|
|
114
128
|
|
|
115
129
|
if (navigationAction === "push") {
|
|
116
|
-
navigator.push(river);
|
|
130
|
+
navigator.push(river, navigationOptions);
|
|
117
131
|
} else {
|
|
118
|
-
navigator.replace(river);
|
|
132
|
+
navigator.replace(river, navigationOptions);
|
|
119
133
|
}
|
|
120
134
|
|
|
121
135
|
return ActionResult.Success;
|
|
@@ -0,0 +1,329 @@
|
|
|
1
|
+
/// <reference types="@applicaster/applicaster-types" />
|
|
2
|
+
import {
|
|
3
|
+
PipesClientResponseHelper,
|
|
4
|
+
RequestBuilder,
|
|
5
|
+
} from "@applicaster/zapp-pipes-v2-client";
|
|
6
|
+
import uuidv4 from "uuid/v4";
|
|
7
|
+
import { modalOrchestrator } from "../../modalState/ModalOrchestrator";
|
|
8
|
+
import { openBottomSheetModal } from "../../modalState/store";
|
|
9
|
+
import {
|
|
10
|
+
DynamicCollectionOptions,
|
|
11
|
+
getMenuItemActions,
|
|
12
|
+
isPresentSubMenuAction,
|
|
13
|
+
Menu,
|
|
14
|
+
MenuItem,
|
|
15
|
+
Operation,
|
|
16
|
+
SelectionBehavior,
|
|
17
|
+
} from "../../modalState/types";
|
|
18
|
+
import { actionExecutor, ActionResult } from "../ActionExecutor";
|
|
19
|
+
import { createLogger } from "../../logger";
|
|
20
|
+
|
|
21
|
+
const { log_info, log_error } = createLogger({
|
|
22
|
+
subsystem: "ActionExecutorContext",
|
|
23
|
+
category: "General",
|
|
24
|
+
});
|
|
25
|
+
|
|
26
|
+
export type LoadedSheetContent = {
|
|
27
|
+
items: MenuItem[];
|
|
28
|
+
role?: string;
|
|
29
|
+
behavior?: SelectionBehavior;
|
|
30
|
+
dynamicCollection?: DynamicCollectionOptions;
|
|
31
|
+
};
|
|
32
|
+
|
|
33
|
+
/**
|
|
34
|
+
* Parse a raw `dynamic_collection_options` block (feed or inline content) into
|
|
35
|
+
* the typed `DynamicCollectionOptions`. `operations` accepts either a CSV
|
|
36
|
+
* string (feed) or an array (already parsed).
|
|
37
|
+
*/
|
|
38
|
+
export function parseDynamicCollectionOptions(
|
|
39
|
+
raw:
|
|
40
|
+
| {
|
|
41
|
+
operations?: string | string[];
|
|
42
|
+
postUrl?: string;
|
|
43
|
+
provider?: string;
|
|
44
|
+
events?: Record<string, any[]>;
|
|
45
|
+
}
|
|
46
|
+
| undefined
|
|
47
|
+
): DynamicCollectionOptions | undefined {
|
|
48
|
+
if (!raw) {
|
|
49
|
+
return undefined;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
const operations = Array.isArray(raw.operations)
|
|
53
|
+
? (raw.operations as Operation[])
|
|
54
|
+
: ((raw.operations || "").split(",").filter(Boolean) as Operation[]);
|
|
55
|
+
|
|
56
|
+
return {
|
|
57
|
+
operations,
|
|
58
|
+
postUrl: raw.postUrl,
|
|
59
|
+
provider: raw.provider,
|
|
60
|
+
events: raw.events,
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
/**
|
|
65
|
+
* Converts a ZappEntry from a pipes feed into a MenuItem.
|
|
66
|
+
* - Icon: first src found in the image media_group.
|
|
67
|
+
* - Primary action: taken from tap_actions.actions[0].
|
|
68
|
+
* - isSelected: true when entry.id is in currentSelection.
|
|
69
|
+
*/
|
|
70
|
+
export function entryToMenuItem(
|
|
71
|
+
entry: ZappEntry,
|
|
72
|
+
currentSelection: string[] = []
|
|
73
|
+
): MenuItem {
|
|
74
|
+
const imageGroup = entry.media_group?.find((g) => g.type === "image");
|
|
75
|
+
|
|
76
|
+
const firstImage = Array.isArray(imageGroup?.media_item)
|
|
77
|
+
? imageGroup.media_item[0]
|
|
78
|
+
: imageGroup?.media_item;
|
|
79
|
+
|
|
80
|
+
// Primary action — first tap_action on the entry
|
|
81
|
+
const tapActions = entry.extensions?.tap_actions?.actions || [];
|
|
82
|
+
const primaryAction = tapActions.length > 0 ? tapActions[0] : undefined;
|
|
83
|
+
|
|
84
|
+
const summary = entry.summary as string;
|
|
85
|
+
|
|
86
|
+
const itemId = String(entry.id ?? entry.title ?? uuidv4());
|
|
87
|
+
|
|
88
|
+
return {
|
|
89
|
+
id: itemId,
|
|
90
|
+
title: entry.title as string,
|
|
91
|
+
summary,
|
|
92
|
+
icon: firstImage?.src,
|
|
93
|
+
isSelected: currentSelection.includes(itemId),
|
|
94
|
+
action: primaryAction,
|
|
95
|
+
actions: tapActions,
|
|
96
|
+
entryActions: entry.extensions?.entry_action || [],
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
function parseCurrentSelection(rawSelection: unknown): string[] {
|
|
101
|
+
if (Array.isArray(rawSelection)) {
|
|
102
|
+
return (rawSelection as any[]).map(String);
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
if (rawSelection !== undefined && rawSelection !== null) {
|
|
106
|
+
return [String(rawSelection)];
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
return [];
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
function parseBehaviorFromFeed(
|
|
113
|
+
feed: ZappFeed | undefined,
|
|
114
|
+
currentSelection: string[]
|
|
115
|
+
): SelectionBehavior | undefined {
|
|
116
|
+
const raw = feed?.extensions?.behavior;
|
|
117
|
+
|
|
118
|
+
if (!raw && currentSelection.length === 0) {
|
|
119
|
+
return undefined;
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
return {
|
|
123
|
+
selectMode: raw?.select_mode,
|
|
124
|
+
currentSelection,
|
|
125
|
+
selector: raw?.selector,
|
|
126
|
+
};
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
function parseBehaviorFromContentOptions(
|
|
130
|
+
content: Record<string, any> | undefined
|
|
131
|
+
): SelectionBehavior | undefined {
|
|
132
|
+
const raw = content?.behavior ?? content?.extensions?.behavior;
|
|
133
|
+
|
|
134
|
+
if (!raw) {
|
|
135
|
+
return undefined;
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
return {
|
|
139
|
+
selectMode: raw.selectMode ?? raw.select_mode,
|
|
140
|
+
currentSelection: parseCurrentSelection(
|
|
141
|
+
raw.currentSelection ?? raw.current_selection
|
|
142
|
+
),
|
|
143
|
+
selector: raw.selector,
|
|
144
|
+
};
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
// Exported so MultiLevelBottomSheetContent can lazy-load sub-levels
|
|
148
|
+
export async function loadItemsFromSource(
|
|
149
|
+
source: string,
|
|
150
|
+
context?: Record<string, any>
|
|
151
|
+
): Promise<LoadedSheetContent> {
|
|
152
|
+
const requestBuilder = new RequestBuilder()
|
|
153
|
+
.setEntryContext(context?.entry || {})
|
|
154
|
+
.setScreenContext(context?.screenData || {})
|
|
155
|
+
.setUrl(source);
|
|
156
|
+
|
|
157
|
+
await requestBuilder.buildAxiosRequest();
|
|
158
|
+
|
|
159
|
+
const responseData = await requestBuilder.call<ZappFeed>();
|
|
160
|
+
|
|
161
|
+
const responseHelper = new PipesClientResponseHelper(responseData);
|
|
162
|
+
|
|
163
|
+
if (responseHelper.error) {
|
|
164
|
+
throw responseHelper.error;
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
const feed = responseData?.response as ZappFeed;
|
|
168
|
+
|
|
169
|
+
const currentSelection = parseCurrentSelection(
|
|
170
|
+
feed?.extensions?.behavior?.current_selection
|
|
171
|
+
);
|
|
172
|
+
|
|
173
|
+
const items = (feed?.entry || []).map((entry) =>
|
|
174
|
+
entryToMenuItem(entry, currentSelection)
|
|
175
|
+
);
|
|
176
|
+
|
|
177
|
+
const dynamicCollectionOptions = feed?.extensions?.dynamic_collection_options;
|
|
178
|
+
|
|
179
|
+
const dynamicCollection = parseDynamicCollectionOptions(
|
|
180
|
+
dynamicCollectionOptions
|
|
181
|
+
);
|
|
182
|
+
|
|
183
|
+
return {
|
|
184
|
+
items,
|
|
185
|
+
role: feed?.extensions?.role,
|
|
186
|
+
behavior: parseBehaviorFromFeed(feed, currentSelection),
|
|
187
|
+
dynamicCollection,
|
|
188
|
+
};
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
export async function openBottomSheetAction(
|
|
192
|
+
action: ActionType,
|
|
193
|
+
context?: Record<string, any>
|
|
194
|
+
): Promise<ActionResult> {
|
|
195
|
+
try {
|
|
196
|
+
const { content, header, themePluginId, styleOverrides } =
|
|
197
|
+
action.options || {};
|
|
198
|
+
|
|
199
|
+
// Custom body component — keep default ModalComponent so standard header
|
|
200
|
+
// (dismiss x) is used; content.component is body-only (e.g. TextInputContent).
|
|
201
|
+
if (content?.component) {
|
|
202
|
+
log_info("openBottomSheet: using custom content component");
|
|
203
|
+
|
|
204
|
+
openBottomSheetModal({
|
|
205
|
+
modalBottomSheetContentProps: {
|
|
206
|
+
title: header?.title,
|
|
207
|
+
summary: header?.subtitle,
|
|
208
|
+
items: [],
|
|
209
|
+
onPress: () => {},
|
|
210
|
+
contentComponent: content.component,
|
|
211
|
+
contentComponentProps: {
|
|
212
|
+
...(content.props || {}),
|
|
213
|
+
actionContext: context,
|
|
214
|
+
},
|
|
215
|
+
},
|
|
216
|
+
});
|
|
217
|
+
|
|
218
|
+
return ActionResult.Success;
|
|
219
|
+
}
|
|
220
|
+
|
|
221
|
+
const inlineItems: ZappEntry[] = content?.items;
|
|
222
|
+
const itemsUrl: string = content?.itemsUrl;
|
|
223
|
+
|
|
224
|
+
let items: MenuItem[];
|
|
225
|
+
let role: string | undefined;
|
|
226
|
+
let behavior: SelectionBehavior | undefined;
|
|
227
|
+
|
|
228
|
+
let dynamicCollection: DynamicCollectionOptions | undefined;
|
|
229
|
+
|
|
230
|
+
if (Array.isArray(inlineItems) && inlineItems.length > 0) {
|
|
231
|
+
log_info("openBottomSheet: using inline items from action options", {
|
|
232
|
+
count: inlineItems.length,
|
|
233
|
+
});
|
|
234
|
+
|
|
235
|
+
role = content?.role ?? content?.extensions?.role;
|
|
236
|
+
behavior = parseBehaviorFromContentOptions(content);
|
|
237
|
+
|
|
238
|
+
items = inlineItems.map((entry) =>
|
|
239
|
+
entryToMenuItem(entry, behavior?.currentSelection ?? [])
|
|
240
|
+
);
|
|
241
|
+
|
|
242
|
+
dynamicCollection = parseDynamicCollectionOptions(
|
|
243
|
+
content?.dynamicCollection ??
|
|
244
|
+
content?.extensions?.dynamic_collection_options
|
|
245
|
+
);
|
|
246
|
+
} else if (itemsUrl) {
|
|
247
|
+
log_info(`openBottomSheet: loading items from source: ${itemsUrl}`);
|
|
248
|
+
|
|
249
|
+
const loaded = await loadItemsFromSource(itemsUrl, context);
|
|
250
|
+
items = loaded.items;
|
|
251
|
+
role = loaded.role ?? content?.role ?? content?.extensions?.role;
|
|
252
|
+
behavior = loaded.behavior ?? parseBehaviorFromContentOptions(content);
|
|
253
|
+
dynamicCollection = loaded.dynamicCollection;
|
|
254
|
+
|
|
255
|
+
log_info(
|
|
256
|
+
`openBottomSheet: loaded ${items.length} items from source: ${itemsUrl}`
|
|
257
|
+
);
|
|
258
|
+
} else {
|
|
259
|
+
log_error(
|
|
260
|
+
"openBottomSheet: no itemsUrl, items, or content.component provided in action options"
|
|
261
|
+
);
|
|
262
|
+
|
|
263
|
+
return ActionResult.Error;
|
|
264
|
+
}
|
|
265
|
+
|
|
266
|
+
const menu: Menu = {
|
|
267
|
+
header: header
|
|
268
|
+
? {
|
|
269
|
+
title: header.title,
|
|
270
|
+
subtitle: header.subtitle,
|
|
271
|
+
icon: header.icon,
|
|
272
|
+
}
|
|
273
|
+
: undefined,
|
|
274
|
+
content: {
|
|
275
|
+
title: content?.title ?? "",
|
|
276
|
+
items,
|
|
277
|
+
itemsUrl, // stored so the component can reload after an action
|
|
278
|
+
role,
|
|
279
|
+
behavior,
|
|
280
|
+
dynamicCollection,
|
|
281
|
+
themePluginId,
|
|
282
|
+
styleOverrides: styleOverrides ?? content?.styleOverrides,
|
|
283
|
+
context,
|
|
284
|
+
},
|
|
285
|
+
};
|
|
286
|
+
|
|
287
|
+
/**
|
|
288
|
+
* Called when the user taps a menu item.
|
|
289
|
+
*
|
|
290
|
+
* - PresentSubMenuAction → handled by the orchestrator (pushes sub-menu)
|
|
291
|
+
* - Any other Action type → forwarded to the action executor, keeping the
|
|
292
|
+
* original execution context so screen/entry data is available to handlers.
|
|
293
|
+
* The pressed item is also added as `entry` so downstream actions can
|
|
294
|
+
* reference it.
|
|
295
|
+
*/
|
|
296
|
+
const onItemPress = async (item: MenuItem): Promise<void> => {
|
|
297
|
+
const actions = getMenuItemActions(item);
|
|
298
|
+
|
|
299
|
+
const executableActions = actions.filter(
|
|
300
|
+
(action) => !isPresentSubMenuAction(action)
|
|
301
|
+
);
|
|
302
|
+
|
|
303
|
+
if (executableActions.length > 0) {
|
|
304
|
+
await actionExecutor.handleActions(
|
|
305
|
+
executableActions as ActionType[],
|
|
306
|
+
{
|
|
307
|
+
...context,
|
|
308
|
+
entry: item as any,
|
|
309
|
+
} as any
|
|
310
|
+
);
|
|
311
|
+
}
|
|
312
|
+
};
|
|
313
|
+
|
|
314
|
+
if (action.options?.replace) {
|
|
315
|
+
modalOrchestrator.replace(menu, onItemPress);
|
|
316
|
+
} else {
|
|
317
|
+
modalOrchestrator.open(menu, onItemPress);
|
|
318
|
+
}
|
|
319
|
+
|
|
320
|
+
return ActionResult.Success;
|
|
321
|
+
} catch (error) {
|
|
322
|
+
log_error("openBottomSheet: failed to open bottom sheet", {
|
|
323
|
+
error,
|
|
324
|
+
action,
|
|
325
|
+
});
|
|
326
|
+
|
|
327
|
+
return ActionResult.Error;
|
|
328
|
+
}
|
|
329
|
+
}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
/// <reference types="@applicaster/applicaster-types" />
|
|
2
|
+
import { ActionResult } from "../ActionExecutor";
|
|
3
|
+
import { ActionHandler, ActionExecutionContext } from "../types";
|
|
4
|
+
import type { PresentScreenFn } from "../../reactHooks/navigation/usePresentScreen";
|
|
5
|
+
import { createLogger } from "../../logger";
|
|
6
|
+
|
|
7
|
+
const { log_error } = createLogger({
|
|
8
|
+
subsystem: "ActionExecutorContext",
|
|
9
|
+
category: "General",
|
|
10
|
+
});
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* Options for the presentScreen action.
|
|
14
|
+
*/
|
|
15
|
+
export interface PresentScreenOptions {
|
|
16
|
+
/** The screen type to present (from content types mapping) */
|
|
17
|
+
typeMapping: string;
|
|
18
|
+
|
|
19
|
+
/**
|
|
20
|
+
* Entry to present the screen with. Can be:
|
|
21
|
+
* - "@{entry/}" to use the context entry
|
|
22
|
+
* - A ZappEntry object
|
|
23
|
+
* - undefined to present the screen without an entry
|
|
24
|
+
*/
|
|
25
|
+
entry?: "@{entry/}" | ZappEntry;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
/**
|
|
29
|
+
* Creates a present-screen action handler with the provided dependencies.
|
|
30
|
+
*
|
|
31
|
+
* Unlike navigateToScreen, this action does not return until the presented
|
|
32
|
+
* screen reports a result, so a screen that gates the flow (a parental lock,
|
|
33
|
+
* for example) can stop the remaining actions by being cancelled.
|
|
34
|
+
*
|
|
35
|
+
* @param presentScreen - Presents a screen as a modal and resolves with its result
|
|
36
|
+
* @returns An action handler that presents a screen and awaits its outcome
|
|
37
|
+
*/
|
|
38
|
+
export function createPresentScreenAction(
|
|
39
|
+
presentScreen: PresentScreenFn
|
|
40
|
+
): ActionHandler<PresentScreenOptions> {
|
|
41
|
+
return async function presentScreenAction(
|
|
42
|
+
action,
|
|
43
|
+
context?: ActionExecutionContext
|
|
44
|
+
): Promise<ActionResult> {
|
|
45
|
+
const typeMapping = action.options?.typeMapping;
|
|
46
|
+
|
|
47
|
+
if (!typeMapping) {
|
|
48
|
+
log_error("presentScreen: typeMapping option is missing");
|
|
49
|
+
|
|
50
|
+
return ActionResult.Error;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
const entrySource = action.options?.entry;
|
|
54
|
+
|
|
55
|
+
const entry = entrySource
|
|
56
|
+
? entrySource === "@{entry/}"
|
|
57
|
+
? context?.entry
|
|
58
|
+
: entrySource
|
|
59
|
+
: undefined;
|
|
60
|
+
|
|
61
|
+
if (entry && typeof entry !== "object") {
|
|
62
|
+
log_error(
|
|
63
|
+
`presentScreen: entry option is not an object, entry: ${entry}`
|
|
64
|
+
);
|
|
65
|
+
|
|
66
|
+
return ActionResult.Error;
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
const result = await presentScreen({ typeMapping, entry });
|
|
70
|
+
|
|
71
|
+
if (result.error) {
|
|
72
|
+
return ActionResult.Error;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
// Anything short of success stops the remaining actions in the chain.
|
|
76
|
+
return result.success ? ActionResult.Success : ActionResult.Cancel;
|
|
77
|
+
};
|
|
78
|
+
}
|
|
@@ -57,6 +57,12 @@ export const refreshComponentAction: ActionHandler = async (
|
|
|
57
57
|
}) || source;
|
|
58
58
|
}
|
|
59
59
|
|
|
60
|
+
if (!dataSource) {
|
|
61
|
+
log_info("handleAction: refreshComponent skipped: no dataSource found");
|
|
62
|
+
|
|
63
|
+
return ActionResult.Success;
|
|
64
|
+
}
|
|
65
|
+
|
|
60
66
|
log_info(`handleAction: refreshComponent for dataSource:${dataSource}`, {
|
|
61
67
|
source,
|
|
62
68
|
inflatedUrl: dataSource,
|
|
@@ -62,10 +62,15 @@ export const sendCloudEventAction: ActionHandler<
|
|
|
62
62
|
subject: options.subject || String((entry as ZappEntry)?.id || ""),
|
|
63
63
|
});
|
|
64
64
|
|
|
65
|
-
log_info("handleAction: sendCloudEvent
|
|
65
|
+
log_info("handleAction: sending sendCloudEvent to URL", {
|
|
66
|
+
url: options.url,
|
|
67
|
+
cloudEvent,
|
|
68
|
+
});
|
|
66
69
|
|
|
67
70
|
const { error, code } = await sendCloudEvent(cloudEvent, options.url);
|
|
68
71
|
|
|
72
|
+
log_info("handleAction: sendCloudEvent result", { code, error });
|
|
73
|
+
|
|
69
74
|
if (error) {
|
|
70
75
|
log_error("sendCloudEvent: error sending cloud event", { error });
|
|
71
76
|
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
/// <reference types="@applicaster/applicaster-types" />
|
|
2
|
+
import { showAlertDialog } from "../../alertUtils";
|
|
3
|
+
import { ActionResult } from "../ActionExecutor";
|
|
4
|
+
import { ActionHandler } from "../types";
|
|
5
|
+
import { createLogger } from "../../logger";
|
|
6
|
+
|
|
7
|
+
const { log_info } = createLogger({
|
|
8
|
+
subsystem: "ActionExecutorContext",
|
|
9
|
+
category: "General",
|
|
10
|
+
});
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* Options for the showAlert action.
|
|
14
|
+
*/
|
|
15
|
+
export interface ShowAlertOptions {
|
|
16
|
+
/** Dialog title (required) */
|
|
17
|
+
title: string;
|
|
18
|
+
|
|
19
|
+
/** Dialog message */
|
|
20
|
+
message?: string;
|
|
21
|
+
|
|
22
|
+
/** Dismiss button text. Defaults to "OK" */
|
|
23
|
+
okButtonText?: string;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* Tells the user something and waits for them to acknowledge it.
|
|
28
|
+
*
|
|
29
|
+
* One button, because there is nothing to decide. Use `confirmDialog` when the
|
|
30
|
+
* user is choosing between going on and backing out; a `confirmDialog` without
|
|
31
|
+
* a cancel label still renders two buttons, the second one blank.
|
|
32
|
+
*
|
|
33
|
+
* Always resolves to Success: dismissing a notice is not a cancellation, so the
|
|
34
|
+
* rest of the chain runs.
|
|
35
|
+
*/
|
|
36
|
+
export const showAlertAction: ActionHandler<ShowAlertOptions> = async (
|
|
37
|
+
action
|
|
38
|
+
): Promise<ActionResult> => {
|
|
39
|
+
log_info("handleAction: showAlert event");
|
|
40
|
+
|
|
41
|
+
const options = action.options as ShowAlertOptions;
|
|
42
|
+
|
|
43
|
+
return new Promise<ActionResult>((resolve) => {
|
|
44
|
+
showAlertDialog({
|
|
45
|
+
title: options?.title,
|
|
46
|
+
message: options?.message,
|
|
47
|
+
okButtonText: options?.okButtonText || "OK",
|
|
48
|
+
completion: () => resolve(ActionResult.Success),
|
|
49
|
+
});
|
|
50
|
+
});
|
|
51
|
+
};
|