@applicaster/zapp-react-native-utils 16.0.0-rc.9 → 16.0.0-rc.90
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 +57 -12
- package/actionsExecutor/ActionExecutorContext.tsx +113 -314
- 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/appRestart.ts +24 -0
- package/actionsExecutor/actions/confirmDialog.ts +53 -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 +42 -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 +329 -0
- package/actionsExecutor/actions/presentScreen.ts +78 -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/showAlert.ts +51 -0
- package/actionsExecutor/actions/showToast.ts +87 -0
- package/actionsExecutor/actions/switchLayout.ts +40 -0
- package/actionsExecutor/consts.ts +27 -0
- package/actionsExecutor/feedDecorator.ts +6 -6
- package/actionsExecutor/types.ts +59 -0
- package/analyticsUtils/AnalyticsEvents/sendMenuClickEvent.ts +2 -2
- package/analyticsUtils/PlayerAnalyticsManager.ts +12 -2
- 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 +12 -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/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__/manifestKeyParser.test.ts +21 -0
- package/configurationUtils/__tests__/modalBlocksParser.test.ts +260 -0
- package/configurationUtils/manifestKeyParser.ts +50 -10
- package/configurationUtils/modalBlocksParser.ts +296 -0
- package/entryActions/__tests__/buildEntryActions.test.ts +195 -0
- package/entryActions/aliasPresentation.ts +124 -0
- package/entryActions/buildEntryActions.ts +167 -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 +41 -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 +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/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 +41 -18
- 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/__tests__/index.test.js +64 -0
- package/reactHooks/cell-click/index.ts +39 -24
- 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__/index.test.tsx +176 -1
- package/reactHooks/navigation/__tests__/useIsScreenActive.test.ts +42 -0
- package/reactHooks/navigation/__tests__/usePresentScreen.test.ts +154 -0
- package/reactHooks/navigation/index.ts +3 -1
- package/reactHooks/navigation/useIsScreenActive.ts +29 -8
- package/reactHooks/navigation/usePresentScreen.ts +157 -0
- package/reactHooks/navigation/useRoute.ts +22 -5
- 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/reactHooks/videoModal/hooks/useVideoModalScreenData.tsx +22 -4
- package/riverComponetsMeasurementProvider/index.tsx +12 -8
- 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
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
import { createStore, useStore } from "zustand";
|
|
2
|
+
|
|
3
|
+
export interface ModalState {
|
|
4
|
+
visible: boolean;
|
|
5
|
+
screen: any;
|
|
6
|
+
options: Record<string, unknown>;
|
|
7
|
+
props: Record<string, unknown>;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
export interface ModalStore {
|
|
11
|
+
modalState: ModalState;
|
|
12
|
+
setModalState: (newState: Partial<ModalState>) => void;
|
|
13
|
+
openModal: (
|
|
14
|
+
item: any,
|
|
15
|
+
options?: Record<string, unknown>,
|
|
16
|
+
props?: Record<string, unknown>
|
|
17
|
+
) => void;
|
|
18
|
+
dismissModal: () => void;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
const initialModalState: ModalState = {
|
|
22
|
+
visible: false,
|
|
23
|
+
screen: null,
|
|
24
|
+
options: {},
|
|
25
|
+
props: {},
|
|
26
|
+
};
|
|
27
|
+
|
|
28
|
+
export const modalStore = createStore<ModalStore>((set, get) => ({
|
|
29
|
+
modalState: initialModalState,
|
|
30
|
+
setModalState: (newState) =>
|
|
31
|
+
set((state) => ({
|
|
32
|
+
modalState: { ...state.modalState, ...newState },
|
|
33
|
+
})),
|
|
34
|
+
openModal: ({ item, options = {}, props }: OpenModalArg) => {
|
|
35
|
+
const resetStore = () => set({ modalState: initialModalState });
|
|
36
|
+
const { onDismiss, onRequestClose, ...restOptions } = options as any;
|
|
37
|
+
|
|
38
|
+
set({
|
|
39
|
+
modalState: {
|
|
40
|
+
visible: true,
|
|
41
|
+
screen: item,
|
|
42
|
+
options: {
|
|
43
|
+
animated: true,
|
|
44
|
+
animationType: "slide",
|
|
45
|
+
onShow: () => {},
|
|
46
|
+
presentationStyle: "overFullScreen",
|
|
47
|
+
transparent: true,
|
|
48
|
+
...restOptions,
|
|
49
|
+
// Compose caller-provided callbacks with the store reset so both run
|
|
50
|
+
onDismiss: () => {
|
|
51
|
+
resetStore();
|
|
52
|
+
onDismiss?.();
|
|
53
|
+
},
|
|
54
|
+
onRequestClose: () => {
|
|
55
|
+
resetStore();
|
|
56
|
+
onRequestClose?.();
|
|
57
|
+
},
|
|
58
|
+
},
|
|
59
|
+
props,
|
|
60
|
+
},
|
|
61
|
+
});
|
|
62
|
+
},
|
|
63
|
+
dismissModal: () => {
|
|
64
|
+
const onDismiss = (get().modalState?.options as any)?.onDismiss;
|
|
65
|
+
|
|
66
|
+
if (typeof onDismiss === "function") {
|
|
67
|
+
onDismiss();
|
|
68
|
+
} else {
|
|
69
|
+
set({ modalState: initialModalState });
|
|
70
|
+
}
|
|
71
|
+
},
|
|
72
|
+
}));
|
|
73
|
+
|
|
74
|
+
export const useModalStore = <T>(selector: (state: ModalStore) => T) =>
|
|
75
|
+
useStore(modalStore, selector);
|
|
76
|
+
|
|
77
|
+
export const openModal = modalStore.getInitialState().openModal;
|
|
78
|
+
|
|
79
|
+
export const dismissModal = modalStore.getInitialState().dismissModal;
|
|
80
|
+
|
|
81
|
+
export const openBottomSheetModal = ({
|
|
82
|
+
ModalBottomSheetContent,
|
|
83
|
+
modalBottomSheetContentProps,
|
|
84
|
+
props = {},
|
|
85
|
+
options = {},
|
|
86
|
+
}: OpenModalBottomSheetArgs) => {
|
|
87
|
+
openModal({
|
|
88
|
+
item: {
|
|
89
|
+
ModalBottomSheetContent,
|
|
90
|
+
modalBottomSheetContentProps,
|
|
91
|
+
},
|
|
92
|
+
props,
|
|
93
|
+
options: {
|
|
94
|
+
animationType: "none",
|
|
95
|
+
animated: false,
|
|
96
|
+
...options,
|
|
97
|
+
},
|
|
98
|
+
});
|
|
99
|
+
};
|
|
100
|
+
|
|
101
|
+
/**
|
|
102
|
+
* Pass `skipSubscription` from callers that render outside of a modal: the
|
|
103
|
+
* selector then returns the stable `initialModalState` reference, so the
|
|
104
|
+
* component is never re-rendered by modal state it does not read.
|
|
105
|
+
*/
|
|
106
|
+
export const useModalStoreState = (skipSubscription = false): ModalState =>
|
|
107
|
+
useModalStore<ModalState>((state) =>
|
|
108
|
+
skipSubscription ? initialModalState : state.modalState
|
|
109
|
+
);
|
|
@@ -0,0 +1,160 @@
|
|
|
1
|
+
export interface Header {
|
|
2
|
+
title: string;
|
|
3
|
+
subtitle?: string;
|
|
4
|
+
icon?: string;
|
|
5
|
+
}
|
|
6
|
+
|
|
7
|
+
export interface Action {
|
|
8
|
+
type: string;
|
|
9
|
+
payload?: any;
|
|
10
|
+
options?: any;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
// Represented as 3 dots icon on top menu (opens new second level menu on desktop
|
|
14
|
+
// or a new bottom sheet on mobile)
|
|
15
|
+
export interface PresentSubMenuAction extends Action {
|
|
16
|
+
menu: Menu;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
export interface SecondaryAction {
|
|
20
|
+
action: Action | PresentSubMenuAction;
|
|
21
|
+
icon?: string;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* A group of actions attached to an entry, keyed by a button alias
|
|
26
|
+
* (e.g. "remove_item", "reorder_item"). Injected by the feed decorator and
|
|
27
|
+
* dispatched by the remote EditableCollection when an operation runs.
|
|
28
|
+
*/
|
|
29
|
+
export interface EntryActionGroup {
|
|
30
|
+
button?: { alias?: string };
|
|
31
|
+
actions?: Action[];
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
export interface MenuItem {
|
|
35
|
+
id: string;
|
|
36
|
+
title: string;
|
|
37
|
+
summary?: string;
|
|
38
|
+
icon?: string;
|
|
39
|
+
isSelected?: boolean;
|
|
40
|
+
actions?: (Action | PresentSubMenuAction)[];
|
|
41
|
+
/** @deprecated Use `actions` array instead. Maintained for backwards compatibility. */
|
|
42
|
+
action?: Action | PresentSubMenuAction;
|
|
43
|
+
secondaryAction?: SecondaryAction;
|
|
44
|
+
trailingButton?: any;
|
|
45
|
+
entryActions?: EntryActionGroup[];
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
export type SelectMode = "single" | "multi" | "none";
|
|
49
|
+
|
|
50
|
+
export interface SelectionBehavior {
|
|
51
|
+
selectMode?: SelectMode;
|
|
52
|
+
currentSelection?: string[];
|
|
53
|
+
selector?: string;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/**
|
|
57
|
+
* Operations that act on a specific item in the collection.
|
|
58
|
+
* Their action payloads are looked up on the item's entryActions (e.g. "remove_item", "reorder_item").
|
|
59
|
+
*/
|
|
60
|
+
export type ItemScopedOperation = "remove" | "reorder";
|
|
61
|
+
|
|
62
|
+
/**
|
|
63
|
+
* Operations that act on the collection as a whole.
|
|
64
|
+
* Their action payloads are looked up on dynamicCollection.events (e.g. events.add, events.clearAll, events.delete).
|
|
65
|
+
*/
|
|
66
|
+
export type CollectionScopedOperation = "add" | "clearAll" | "delete";
|
|
67
|
+
|
|
68
|
+
/**
|
|
69
|
+
* UI display or behavior flags that do not require action payloads.
|
|
70
|
+
*/
|
|
71
|
+
export type UIOperation = "nowPlaying";
|
|
72
|
+
|
|
73
|
+
export const OPERATIONS = {
|
|
74
|
+
REMOVE: "remove",
|
|
75
|
+
REORDER: "reorder",
|
|
76
|
+
ADD: "add",
|
|
77
|
+
CLEAR_ALL: "clearAll",
|
|
78
|
+
DELETE: "delete",
|
|
79
|
+
NOW_PLAYING: "nowPlaying",
|
|
80
|
+
} as const;
|
|
81
|
+
|
|
82
|
+
export function hasOperation(
|
|
83
|
+
operations: string[] | undefined,
|
|
84
|
+
target: string
|
|
85
|
+
): boolean {
|
|
86
|
+
if (!Array.isArray(operations)) return false;
|
|
87
|
+
|
|
88
|
+
const targetLower = target.toLowerCase();
|
|
89
|
+
|
|
90
|
+
return operations.some(
|
|
91
|
+
(op) => typeof op === "string" && op.toLowerCase() === targetLower
|
|
92
|
+
);
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
export type Operation =
|
|
96
|
+
| ItemScopedOperation
|
|
97
|
+
| CollectionScopedOperation
|
|
98
|
+
| UIOperation;
|
|
99
|
+
|
|
100
|
+
export interface DynamicCollectionOptions {
|
|
101
|
+
operations: Operation[];
|
|
102
|
+
postUrl?: string;
|
|
103
|
+
provider?: string;
|
|
104
|
+
/**
|
|
105
|
+
* Action handlers for CollectionScopedOperations (e.g. "add", "clearAll", "delete").
|
|
106
|
+
*/
|
|
107
|
+
events?: Record<CollectionScopedOperation | string, Action[]>;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
export interface Content {
|
|
111
|
+
title: string;
|
|
112
|
+
stickyTitle?: boolean;
|
|
113
|
+
items: MenuItem[];
|
|
114
|
+
itemsUrl?: string;
|
|
115
|
+
action?: Action;
|
|
116
|
+
role?: string;
|
|
117
|
+
behavior?: SelectionBehavior;
|
|
118
|
+
dynamicCollection?: DynamicCollectionOptions;
|
|
119
|
+
themePluginId?: string;
|
|
120
|
+
styleOverrides?: Record<string, any>;
|
|
121
|
+
context?: Record<string, any>;
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
export interface Menu {
|
|
125
|
+
header?: Header;
|
|
126
|
+
content: Content;
|
|
127
|
+
closeButton?: boolean;
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
export function isPresentSubMenuAction(
|
|
131
|
+
action: any
|
|
132
|
+
): action is PresentSubMenuAction {
|
|
133
|
+
return !!action && typeof action === "object" && "menu" in action;
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
/**
|
|
137
|
+
* Normalizes an item's action/actions into an array of Action items.
|
|
138
|
+
* Supports canonical `actions: Action[]` and backwards-compatible `action: Action | Action[]`.
|
|
139
|
+
*/
|
|
140
|
+
export function getMenuItemActions(
|
|
141
|
+
item?: Partial<MenuItem> | null
|
|
142
|
+
): (Action | PresentSubMenuAction)[] {
|
|
143
|
+
if (!item) {
|
|
144
|
+
return [];
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
if (Array.isArray(item.actions) && item.actions.length > 0) {
|
|
148
|
+
return item.actions;
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
if (Array.isArray((item as any).action)) {
|
|
152
|
+
return (item as any).action;
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
if (item.action) {
|
|
156
|
+
return [item.action];
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
return [];
|
|
160
|
+
}
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
import React, { useCallback, useEffect, useState } from "react";
|
|
2
|
+
import { toBooleanWithDefaultFalse } from "@applicaster/zapp-react-native-utils/booleanUtils";
|
|
3
|
+
|
|
4
|
+
import { MenuItem, modalOrchestrator } from "./ModalOrchestrator";
|
|
5
|
+
|
|
6
|
+
import { ContentViewModel } from "./ContentViewModel";
|
|
7
|
+
import {
|
|
8
|
+
DynamicCollectionOptions,
|
|
9
|
+
getMenuItemActions,
|
|
10
|
+
isPresentSubMenuAction,
|
|
11
|
+
SelectionBehavior,
|
|
12
|
+
} from "./types";
|
|
13
|
+
import type { EditableCollection } from "./EditableCollection";
|
|
14
|
+
|
|
15
|
+
type Props = {
|
|
16
|
+
viewModel?: ContentViewModel | null;
|
|
17
|
+
onPress: (item: MenuItem) => void | Promise<void>;
|
|
18
|
+
};
|
|
19
|
+
|
|
20
|
+
type Return = {
|
|
21
|
+
items: MenuItem[];
|
|
22
|
+
isLoading: boolean;
|
|
23
|
+
error?: Error | string;
|
|
24
|
+
showCentralLoading: boolean;
|
|
25
|
+
canGoBack: boolean;
|
|
26
|
+
handleItemPress: (item: MenuItem) => Promise<void>;
|
|
27
|
+
goBackOrClose: () => void;
|
|
28
|
+
close: () => void;
|
|
29
|
+
role?: string;
|
|
30
|
+
behavior?: SelectionBehavior;
|
|
31
|
+
dynamicCollection?: DynamicCollectionOptions;
|
|
32
|
+
editableCollection: EditableCollection | null;
|
|
33
|
+
themePluginId?: string;
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
export const useBottomSheetContent = (props: Props): Return => {
|
|
37
|
+
const { onPress, viewModel } = props;
|
|
38
|
+
|
|
39
|
+
const [state, setState] = useState(viewModel?.getState());
|
|
40
|
+
|
|
41
|
+
const [editableItems, setEditableItems] = useState<MenuItem[]>(
|
|
42
|
+
() => viewModel?.getState().items || []
|
|
43
|
+
);
|
|
44
|
+
|
|
45
|
+
// Subscribe to the viewModel state changes
|
|
46
|
+
useEffect(() => {
|
|
47
|
+
return viewModel?.subscribe((nextState) => {
|
|
48
|
+
setState((state) => {
|
|
49
|
+
return state === nextState ? state : nextState;
|
|
50
|
+
});
|
|
51
|
+
});
|
|
52
|
+
}, [viewModel]);
|
|
53
|
+
|
|
54
|
+
// Subscribe to editable collection items
|
|
55
|
+
useEffect(() => {
|
|
56
|
+
if (viewModel?.editableCollection) {
|
|
57
|
+
const subscription =
|
|
58
|
+
viewModel.editableCollection.items$.subscribe(setEditableItems);
|
|
59
|
+
|
|
60
|
+
return () => subscription.unsubscribe();
|
|
61
|
+
}
|
|
62
|
+
}, [viewModel?.editableCollection]);
|
|
63
|
+
|
|
64
|
+
/**
|
|
65
|
+
* Handles an item press:
|
|
66
|
+
* - Delegates to the parent onPress (which runs the action and awaits it).
|
|
67
|
+
* - If the item was a leaf action (not a submenu), triggers viewModel.refetch()
|
|
68
|
+
* so that checkmarks (isSelected) reflect the updated server state.
|
|
69
|
+
*/
|
|
70
|
+
const handleItemPress = useCallback(
|
|
71
|
+
async (item: MenuItem) => {
|
|
72
|
+
const actions = getMenuItemActions(item);
|
|
73
|
+
const isSubMenu = actions.some(isPresentSubMenuAction);
|
|
74
|
+
|
|
75
|
+
await onPress(item);
|
|
76
|
+
|
|
77
|
+
if (!isSubMenu) {
|
|
78
|
+
await viewModel?.refetch();
|
|
79
|
+
}
|
|
80
|
+
},
|
|
81
|
+
[onPress, viewModel]
|
|
82
|
+
);
|
|
83
|
+
|
|
84
|
+
const goBackOrClose = React.useCallback(() => {
|
|
85
|
+
if (modalOrchestrator.canGoBack) {
|
|
86
|
+
modalOrchestrator.back();
|
|
87
|
+
} else {
|
|
88
|
+
modalOrchestrator.close();
|
|
89
|
+
}
|
|
90
|
+
}, []);
|
|
91
|
+
|
|
92
|
+
return {
|
|
93
|
+
items: viewModel?.editableCollection ? editableItems : state?.items,
|
|
94
|
+
isLoading: toBooleanWithDefaultFalse(state?.isLoading),
|
|
95
|
+
error: state?.error,
|
|
96
|
+
showCentralLoading: toBooleanWithDefaultFalse(
|
|
97
|
+
state?.isLoading && state?.items.length === 0
|
|
98
|
+
),
|
|
99
|
+
canGoBack: modalOrchestrator.canGoBack,
|
|
100
|
+
handleItemPress,
|
|
101
|
+
goBackOrClose,
|
|
102
|
+
close: useCallback(() => modalOrchestrator.close(), []),
|
|
103
|
+
role: state?.role,
|
|
104
|
+
behavior: state?.behavior,
|
|
105
|
+
dynamicCollection: state?.dynamicCollection,
|
|
106
|
+
editableCollection: viewModel?.editableCollection || null,
|
|
107
|
+
themePluginId: state?.themePluginId,
|
|
108
|
+
};
|
|
109
|
+
};
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { isMinusZero } from "..";
|
|
2
|
+
|
|
3
|
+
describe("isMinusZero", () => {
|
|
4
|
+
it("return true for minus zero", () => {
|
|
5
|
+
expect(isMinusZero(-0)).toBe(true);
|
|
6
|
+
});
|
|
7
|
+
|
|
8
|
+
it("return false for positive zero", () => {
|
|
9
|
+
expect(isMinusZero(0)).toBe(false);
|
|
10
|
+
});
|
|
11
|
+
|
|
12
|
+
it("return false for non-zero numbers", () => {
|
|
13
|
+
const inputs = [-1, 1, 100, 0.1, -0.1, Infinity, -Infinity];
|
|
14
|
+
expect.assertions(inputs.length);
|
|
15
|
+
|
|
16
|
+
inputs.forEach((input) => {
|
|
17
|
+
expect(isMinusZero(input)).toBe(false);
|
|
18
|
+
});
|
|
19
|
+
});
|
|
20
|
+
});
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { isZero } from "..";
|
|
2
|
+
|
|
3
|
+
describe("isZero", () => {
|
|
4
|
+
it("return true for zero and minus zero", () => {
|
|
5
|
+
expect(isZero(0)).toBe(true);
|
|
6
|
+
expect(isZero(-0)).toBe(true);
|
|
7
|
+
});
|
|
8
|
+
|
|
9
|
+
it("return false for non-zero numbers", () => {
|
|
10
|
+
const inputs = [-1, 1, 100, 0.1, -0.1, Infinity, -Infinity, NaN];
|
|
11
|
+
expect.assertions(inputs.length);
|
|
12
|
+
|
|
13
|
+
inputs.forEach((input) => {
|
|
14
|
+
expect(isZero(input)).toBe(false);
|
|
15
|
+
});
|
|
16
|
+
});
|
|
17
|
+
|
|
18
|
+
it("return false for non-number values", () => {
|
|
19
|
+
const inputs = ["0", "-0", null, undefined, "", {}, [], false, true];
|
|
20
|
+
|
|
21
|
+
expect.assertions(inputs.length);
|
|
22
|
+
|
|
23
|
+
inputs.forEach((input) => {
|
|
24
|
+
expect(isZero(input)).toBe(false);
|
|
25
|
+
});
|
|
26
|
+
});
|
|
27
|
+
});
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { requireNumber } from "..";
|
|
2
|
+
|
|
3
|
+
describe("requireNumber", () => {
|
|
4
|
+
it("return number if object key holds a number", () => {
|
|
5
|
+
const inputs = [-1, 1, 100, 0.2];
|
|
6
|
+
expect.assertions(inputs.length);
|
|
7
|
+
|
|
8
|
+
inputs.forEach((input) => {
|
|
9
|
+
const output = requireNumber({ value: input }, "value");
|
|
10
|
+
expect(output).toBe(input);
|
|
11
|
+
});
|
|
12
|
+
});
|
|
13
|
+
|
|
14
|
+
it("return number if object key holds a string as number", () => {
|
|
15
|
+
const inputs = ["-1", "1", "100", "0.2"];
|
|
16
|
+
expect.assertions(inputs.length);
|
|
17
|
+
|
|
18
|
+
inputs.forEach((input) => {
|
|
19
|
+
const output = requireNumber({ value: input }, "value");
|
|
20
|
+
expect(output).toBe(Number(input));
|
|
21
|
+
});
|
|
22
|
+
});
|
|
23
|
+
|
|
24
|
+
it("return null if object key holds zero", () => {
|
|
25
|
+
expect(requireNumber({ value: 0 }, "value")).toBeNull();
|
|
26
|
+
expect(requireNumber({ value: "0" }, "value")).toBeNull();
|
|
27
|
+
});
|
|
28
|
+
|
|
29
|
+
it("return null if object key is missing or not a number", () => {
|
|
30
|
+
const cases = [
|
|
31
|
+
[{}, "value"],
|
|
32
|
+
[{ value: null }, "value"],
|
|
33
|
+
[{ value: undefined }, "value"],
|
|
34
|
+
[{ value: NaN }, "value"],
|
|
35
|
+
[{ value: "" }, "value"],
|
|
36
|
+
[{ value: "vfdvf" }, "value"],
|
|
37
|
+
[{ value: {} }, "value"],
|
|
38
|
+
[{ value: [] }, "value"],
|
|
39
|
+
[null, "value"],
|
|
40
|
+
[undefined, "value"],
|
|
41
|
+
] as const;
|
|
42
|
+
|
|
43
|
+
expect.assertions(cases.length);
|
|
44
|
+
|
|
45
|
+
cases.forEach(([obj, key]) => {
|
|
46
|
+
const output = requireNumber(obj, key);
|
|
47
|
+
expect(output).toBeNull();
|
|
48
|
+
});
|
|
49
|
+
});
|
|
50
|
+
});
|
|
@@ -21,6 +21,33 @@ describe("toNumber", () => {
|
|
|
21
21
|
});
|
|
22
22
|
});
|
|
23
23
|
|
|
24
|
+
it("return number if input is boxed string as number", () => {
|
|
25
|
+
const inputs = [
|
|
26
|
+
new String("-1"),
|
|
27
|
+
new String("0"),
|
|
28
|
+
new String("1"),
|
|
29
|
+
Object("100"),
|
|
30
|
+
Object("0.2"),
|
|
31
|
+
];
|
|
32
|
+
|
|
33
|
+
expect.assertions(inputs.length);
|
|
34
|
+
|
|
35
|
+
inputs.forEach((input) => {
|
|
36
|
+
const output = toNumber(input);
|
|
37
|
+
expect(output).toBe(Number(input));
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
|
|
41
|
+
it("return undefined if input is invalid boxed string", () => {
|
|
42
|
+
const inputs = [new String("vfdvf"), new String("5n"), Object("")];
|
|
43
|
+
expect.assertions(inputs.length);
|
|
44
|
+
|
|
45
|
+
inputs.forEach((input) => {
|
|
46
|
+
const output = toNumber(input);
|
|
47
|
+
expect(output).toBeUndefined();
|
|
48
|
+
});
|
|
49
|
+
});
|
|
50
|
+
|
|
24
51
|
it("return undefined if input is not a number", () => {
|
|
25
52
|
const inputs = [
|
|
26
53
|
"vfdvf",
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { toNumberWithDefault } from "..";
|
|
2
|
+
|
|
3
|
+
describe("toNumberWithDefault", () => {
|
|
4
|
+
const DEFAULT = 5;
|
|
5
|
+
|
|
6
|
+
it("return number if input is number", () => {
|
|
7
|
+
const inputs = [-1, 0, 1, 100, 0.2];
|
|
8
|
+
expect.assertions(inputs.length);
|
|
9
|
+
|
|
10
|
+
inputs.forEach((input) => {
|
|
11
|
+
const output = toNumberWithDefault(DEFAULT, input);
|
|
12
|
+
expect(output).toBe(input);
|
|
13
|
+
});
|
|
14
|
+
});
|
|
15
|
+
|
|
16
|
+
it("return number if input is string as number", () => {
|
|
17
|
+
const inputs = ["-1", "0", "1", "100", "0.2"];
|
|
18
|
+
expect.assertions(inputs.length);
|
|
19
|
+
|
|
20
|
+
inputs.forEach((input) => {
|
|
21
|
+
const output = toNumberWithDefault(DEFAULT, input);
|
|
22
|
+
expect(output).toBe(Number(input));
|
|
23
|
+
});
|
|
24
|
+
});
|
|
25
|
+
|
|
26
|
+
it("return default if input is not a number", () => {
|
|
27
|
+
const inputs = [
|
|
28
|
+
"vfdvf",
|
|
29
|
+
"5n",
|
|
30
|
+
"-5n",
|
|
31
|
+
null,
|
|
32
|
+
undefined,
|
|
33
|
+
NaN,
|
|
34
|
+
"",
|
|
35
|
+
{},
|
|
36
|
+
{ test: 1 },
|
|
37
|
+
[],
|
|
38
|
+
[1],
|
|
39
|
+
];
|
|
40
|
+
|
|
41
|
+
expect.assertions(inputs.length);
|
|
42
|
+
|
|
43
|
+
inputs.forEach((input) => {
|
|
44
|
+
const output = toNumberWithDefault(DEFAULT, input);
|
|
45
|
+
expect(output).toBe(DEFAULT);
|
|
46
|
+
});
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
describe("BigInt support", () => {
|
|
50
|
+
const isBigIntSupported = typeof BigInt !== "undefined";
|
|
51
|
+
|
|
52
|
+
if (isBigIntSupported) {
|
|
53
|
+
it("converts BigInt to number when BigInt is supported", () => {
|
|
54
|
+
expect(toNumberWithDefault(DEFAULT, BigInt(5))).toBe(5);
|
|
55
|
+
expect(toNumberWithDefault(DEFAULT, BigInt(0))).toBe(0);
|
|
56
|
+
expect(toNumberWithDefault(DEFAULT, BigInt(-10))).toBe(-10);
|
|
57
|
+
});
|
|
58
|
+
} else {
|
|
59
|
+
it("skips BigInt tests when BigInt is not supported", () => {
|
|
60
|
+
expect(typeof BigInt).toBe("undefined");
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
});
|
|
64
|
+
});
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { toNumberWithDefaultZero } from "..";
|
|
2
|
+
|
|
3
|
+
const DEFAULT = 0;
|
|
4
|
+
|
|
5
|
+
describe("toNumberWithDefaultZero", () => {
|
|
6
|
+
it("return number if input is number", () => {
|
|
7
|
+
const inputs = [-1, 0, 1, 100, 0.2];
|
|
8
|
+
expect.assertions(inputs.length);
|
|
9
|
+
|
|
10
|
+
inputs.forEach((input) => {
|
|
11
|
+
const output = toNumberWithDefaultZero(input);
|
|
12
|
+
expect(output).toBe(input);
|
|
13
|
+
});
|
|
14
|
+
});
|
|
15
|
+
|
|
16
|
+
it("return number if input is string as number", () => {
|
|
17
|
+
const inputs = ["-1", "0", "1", "100", "0.2"];
|
|
18
|
+
expect.assertions(inputs.length);
|
|
19
|
+
|
|
20
|
+
inputs.forEach((input) => {
|
|
21
|
+
const output = toNumberWithDefaultZero(input);
|
|
22
|
+
expect(output).toBe(Number(input));
|
|
23
|
+
});
|
|
24
|
+
});
|
|
25
|
+
|
|
26
|
+
it("return zero if input is not a number", () => {
|
|
27
|
+
const inputs = [
|
|
28
|
+
"vfdvf",
|
|
29
|
+
"5n",
|
|
30
|
+
"-5n",
|
|
31
|
+
null,
|
|
32
|
+
undefined,
|
|
33
|
+
NaN,
|
|
34
|
+
"",
|
|
35
|
+
{},
|
|
36
|
+
{ test: 1 },
|
|
37
|
+
[],
|
|
38
|
+
[1],
|
|
39
|
+
];
|
|
40
|
+
|
|
41
|
+
expect.assertions(inputs.length);
|
|
42
|
+
|
|
43
|
+
inputs.forEach((input) => {
|
|
44
|
+
const output = toNumberWithDefaultZero(input);
|
|
45
|
+
expect(output).toBe(DEFAULT);
|
|
46
|
+
});
|
|
47
|
+
});
|
|
48
|
+
});
|
package/numberUtils/index.ts
CHANGED
|
@@ -1,18 +1,37 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { isNil } from "@applicaster/zapp-react-native-utils/utils";
|
|
2
|
+
|
|
2
3
|
import { logger } from "@applicaster/zapp-react-native-utils/logger";
|
|
3
4
|
|
|
4
5
|
const numberUtilsLogger = logger?.addSubsystem("NumberUtils");
|
|
5
6
|
|
|
7
|
+
/** Matches Ramda isEmpty: "" / [] / {} are empty; numbers and bigints are not. */
|
|
8
|
+
const isEmpty = (value: unknown): boolean => {
|
|
9
|
+
if (typeof value === "string" || Array.isArray(value)) {
|
|
10
|
+
return value.length === 0;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
if (typeof value === "object" && value !== null) {
|
|
14
|
+
return Object.keys(value).length === 0;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
return false;
|
|
18
|
+
};
|
|
19
|
+
|
|
6
20
|
export const toNumber = (value: unknown): number | undefined => {
|
|
7
|
-
if (
|
|
21
|
+
if (isNil(value) || isEmpty(value)) {
|
|
8
22
|
return undefined;
|
|
9
23
|
}
|
|
10
24
|
|
|
11
25
|
// Feature-detect BigInt support to avoid ReferenceError on older runtimes
|
|
12
26
|
const isBigIntSupported = typeof BigInt !== "undefined";
|
|
13
|
-
const isBigIntValue = isBigIntSupported &&
|
|
14
|
-
|
|
15
|
-
if (
|
|
27
|
+
const isBigIntValue = isBigIntSupported && typeof value === "bigint";
|
|
28
|
+
|
|
29
|
+
if (
|
|
30
|
+
typeof value === "number" ||
|
|
31
|
+
isBigIntValue ||
|
|
32
|
+
typeof value === "string" ||
|
|
33
|
+
value instanceof String
|
|
34
|
+
) {
|
|
16
35
|
const numberOrNan = Number(value);
|
|
17
36
|
|
|
18
37
|
return Number.isNaN(numberOrNan) ? undefined : numberOrNan;
|
|
@@ -59,7 +78,7 @@ export const toFiniteNumberWithDefault = (
|
|
|
59
78
|
export const isLikeNumber = (value: unknown): boolean => {
|
|
60
79
|
const possibleNumber = toNumber(value);
|
|
61
80
|
|
|
62
|
-
if (
|
|
81
|
+
if (isNil(possibleNumber)) {
|
|
63
82
|
return false;
|
|
64
83
|
}
|
|
65
84
|
|
|
@@ -76,7 +95,7 @@ export const isMinusZero = (value: number) => {
|
|
|
76
95
|
export const toPositiveNumber = (value: unknown): number | undefined => {
|
|
77
96
|
const possibleNumber = toNumber(value);
|
|
78
97
|
|
|
79
|
-
if (
|
|
98
|
+
if (isNil(possibleNumber)) {
|
|
80
99
|
return undefined;
|
|
81
100
|
}
|
|
82
101
|
|
|
@@ -97,7 +116,7 @@ export const toPositiveNumberWithDefault = (
|
|
|
97
116
|
): number => {
|
|
98
117
|
const possibleNumber = toNumber(value);
|
|
99
118
|
|
|
100
|
-
if (
|
|
119
|
+
if (isNil(possibleNumber)) {
|
|
101
120
|
return defaultValue;
|
|
102
121
|
}
|
|
103
122
|
|