@applicaster/zapp-react-native-utils 16.0.0-rc.7 → 16.0.0-rc.71
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/actionsExecutor/ActionExecutor.ts +47 -11
- package/actionsExecutor/ActionExecutorContext.tsx +87 -316
- package/actionsExecutor/__tests__/feedDecorator.test.ts +61 -0
- package/actionsExecutor/actions/__tests__/dismissBottomSheet.test.ts +22 -0
- package/actionsExecutor/actions/__tests__/loadItemsFromSource.test.ts +88 -0
- package/actionsExecutor/actions/__tests__/navigateToScreen.test.ts +133 -0
- package/actionsExecutor/actions/__tests__/openBottomSheet.customContent.test.ts +76 -0
- package/actionsExecutor/actions/__tests__/openBottomSheet.inlineItems.test.ts +100 -0
- package/actionsExecutor/actions/__tests__/showToast.test.ts +88 -0
- package/actionsExecutor/actions/appRestart.ts +24 -0
- package/actionsExecutor/actions/confirmDialog.ts +53 -0
- package/actionsExecutor/actions/dismissBottomSheet.ts +22 -0
- package/actionsExecutor/actions/index.ts +34 -0
- package/actionsExecutor/actions/localStorageRemove.ts +27 -0
- package/actionsExecutor/actions/localStorageSet.ts +28 -0
- package/actionsExecutor/actions/localStorageToggleFlag.ts +28 -0
- package/actionsExecutor/actions/navigateToScreen.ts +137 -0
- package/actionsExecutor/actions/openBottomSheet.ts +320 -0
- package/actionsExecutor/actions/refreshComponent.ts +85 -0
- package/actionsExecutor/actions/screenSetVariable.ts +35 -0
- package/actionsExecutor/actions/screenToggleFlag.ts +38 -0
- package/actionsExecutor/actions/sendCloudEvent.ts +93 -0
- package/actionsExecutor/actions/sessionStorageRemove.ts +19 -0
- package/actionsExecutor/actions/sessionStorageSet.ts +20 -0
- package/actionsExecutor/actions/sessionStorageToggleFlag.ts +15 -0
- package/actionsExecutor/actions/showToast.ts +87 -0
- package/actionsExecutor/actions/switchLayout.ts +40 -0
- package/actionsExecutor/consts.ts +23 -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 +150 -0
- 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 +18 -35
- package/appUtils/playerManager/playerNative.ts +6 -4
- package/appUtils/playerManager/usePlayerContent.tsx +43 -0
- package/appUtils/playerManager/usePlayerControllerSetup.tsx +1 -1
- package/appUtils/playerManager/userLanguagePreference.ts +1 -1
- package/arrayUtils/__tests__/{anyThruthy.test.ts → anyTruthy.test.ts} +8 -0
- package/arrayUtils/__tests__/arrayUtils.test.ts +165 -108
- package/arrayUtils/__tests__/isEmptyArray.test.ts +11 -0
- package/arrayUtils/__tests__/isFilledArray.test.ts +12 -0
- package/arrayUtils/__tests__/isFirst.test.ts +17 -0
- package/arrayUtils/__tests__/isIndexInRange.test.ts +14 -0
- package/arrayUtils/__tests__/isLast.test.ts +31 -0
- package/arrayUtils/__tests__/makeListOf.test.ts +31 -0
- package/arrayUtils/__tests__/makeListOfIndexes.test.ts +20 -0
- package/arrayUtils/__tests__/reorderByIds.test.ts +50 -0
- package/arrayUtils/__tests__/sample.test.ts +61 -0
- package/arrayUtils/index.ts +136 -20
- package/bottomSheet/__tests__/scrollContext.test.tsx +35 -0
- package/bottomSheet/index.ts +17 -0
- package/cellUtils/index.ts +33 -8
- package/colorUtils/__tests__/isTransparentColor.test.ts +76 -0
- package/colorUtils/__tests__/isValidColor.test.ts +70 -0
- package/colorUtils/index.ts +50 -0
- package/configurationUtils/__tests__/modalBlocksParser.test.ts +107 -0
- package/configurationUtils/manifestKeyParser.ts +38 -9
- package/configurationUtils/modalBlocksParser.ts +178 -0
- package/manifestUtils/__tests__/player.audioControls.test.js +158 -0
- package/manifestUtils/_internals/index.js +6 -0
- package/manifestUtils/defaultManifestConfigurations/generalContent.js +35 -0
- package/manifestUtils/defaultManifestConfigurations/player.js +327 -19
- package/manifestUtils/fieldUtils/__tests__/fieldUtils.test.js +84 -0
- package/manifestUtils/fieldUtils/index.js +125 -0
- package/manifestUtils/index.js +3 -0
- package/manifestUtils/keys.js +9 -0
- package/manifestUtils/mobileAction/button/index.js +16 -0
- package/manifestUtils/mobileAction/container/index.js +3 -1
- package/manifestUtils/mobileAction/groups/defaults.js +3 -1
- package/manifestUtils/modalBlocks.js +304 -0
- package/manifestUtils/platformIsTV.js +1 -0
- package/modalState/ContentViewModel.ts +113 -0
- package/modalState/EditableCollection.ts +17 -0
- package/modalState/EditableCollectionRegistry.ts +51 -0
- package/modalState/ModalOrchestrator.ts +199 -0
- package/modalState/RemoteEditableCollection.ts +227 -0
- package/modalState/__tests__/ContentViewModel.editable.test.ts +69 -0
- package/modalState/__tests__/ContentViewModel.test.ts +165 -0
- package/modalState/__tests__/EditableCollectionRegistry.test.ts +112 -0
- package/modalState/__tests__/ModalOrchestrator.phase3.test.ts +47 -0
- package/modalState/__tests__/RemoteEditableCollection.test.ts +326 -0
- package/modalState/__tests__/useBottomSheetContent.test.ts +349 -0
- package/modalState/index.ts +30 -83
- package/modalState/store.ts +102 -0
- package/modalState/types.ts +133 -0
- package/modalState/useBottomSheetContent.ts +102 -0
- package/numberUtils/__tests__/isMinusZero.test.ts +20 -0
- package/numberUtils/__tests__/isZero.test.ts +27 -0
- package/numberUtils/__tests__/requireNumber.test.ts +50 -0
- package/numberUtils/__tests__/toNumber.test.ts +27 -0
- package/numberUtils/__tests__/toNumberWithDefault.test.ts +64 -0
- package/numberUtils/__tests__/toNumberWithDefaultZero.test.ts +48 -0
- package/numberUtils/index.ts +27 -8
- package/package.json +2 -2
- package/pipesUtils/__tests__/buildUrlWithQuery.test.ts +33 -0
- package/pipesUtils/__tests__/withPipesEndpoint.test.tsx +56 -0
- package/pipesUtils/index.ts +1 -0
- package/pipesUtils/withPipesEndpoint.tsx +54 -0
- package/playerUtils/__tests__/contentDataKeys.test.ts +297 -0
- package/playerUtils/__tests__/resolvePlayerTitleSubtitle.test.ts +180 -0
- package/playerUtils/contentDataKeys.ts +134 -0
- package/playerUtils/index.ts +41 -14
- package/playerUtils/isAudioItem.ts +26 -0
- package/playerUtils/resolvePlayerTitleSubtitle.ts +76 -0
- 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/__tests__/useInflatedUrl.test.tsx +25 -0
- package/reactHooks/feed/index.ts +5 -1
- package/reactHooks/feed/useBatchLoading.ts +9 -1
- package/reactHooks/feed/{usePipesCacheReset.ts → useMarkPipesDataStale.ts} +12 -4
- package/reactHooks/index.ts +2 -0
- package/reactHooks/layout/index.ts +1 -1
- package/reactHooks/navigation/__mocks__/index.ts +4 -0
- package/reactHooks/navigation/__tests__/useIsScreenActive.test.ts +42 -0
- package/reactHooks/navigation/index.ts +1 -1
- package/reactHooks/navigation/useIsScreenActive.ts +29 -8
- package/reactHooks/state/useComponentScreenState.ts +1 -1
- package/reactHooks/usePluginConfiguration.ts +4 -1
- package/reactHooks/utils/__tests__/index.test.js +22 -2
- package/reactHooks/utils/index.ts +13 -2
- package/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/index.ts +203 -0
- package/zappFrameworkUtils/__tests__/localStorageHelper.test.ts +146 -0
- package/zappFrameworkUtils/localStorageHelper.ts +19 -15
- package/appUtils/playerManager/usePlayerTitleSummaryOverlay.tsx +0 -56
- package/reactHooks/feed/__mocks__/usePipesCacheReset.ts +0 -1
- /package/reactHooks/actions/__tests__/{index.test.js → index.test.tsx} +0 -0
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
import React, { useEffect, useState } from "react";
|
|
2
|
+
import { toBooleanWithDefaultFalse } from "@applicaster/zapp-react-native-utils/booleanUtils";
|
|
3
|
+
|
|
4
|
+
import {
|
|
5
|
+
isPresentSubMenuAction,
|
|
6
|
+
MenuItem,
|
|
7
|
+
modalOrchestrator,
|
|
8
|
+
} from "./ModalOrchestrator";
|
|
9
|
+
|
|
10
|
+
import { ContentViewModel } from "./ContentViewModel";
|
|
11
|
+
import type { DynamicCollectionOptions, SelectionBehavior } from "./types";
|
|
12
|
+
import type { EditableCollection } from "./EditableCollection";
|
|
13
|
+
|
|
14
|
+
type Props = {
|
|
15
|
+
viewModel?: ContentViewModel | null;
|
|
16
|
+
onPress: (item: MenuItem) => void | Promise<void>;
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
type Return = {
|
|
20
|
+
items: MenuItem[];
|
|
21
|
+
isLoading: boolean;
|
|
22
|
+
error?: Error | string;
|
|
23
|
+
showCentralLoading: boolean;
|
|
24
|
+
canGoBack: boolean;
|
|
25
|
+
handleItemPress: (item: MenuItem) => Promise<void>;
|
|
26
|
+
goBackOrClose: () => void;
|
|
27
|
+
close: () => void;
|
|
28
|
+
role?: string;
|
|
29
|
+
behavior?: SelectionBehavior;
|
|
30
|
+
dynamicCollection?: DynamicCollectionOptions;
|
|
31
|
+
editableCollection: EditableCollection | null;
|
|
32
|
+
themePluginId?: string;
|
|
33
|
+
};
|
|
34
|
+
|
|
35
|
+
export const useBottomSheetContent = (props: Props): Return => {
|
|
36
|
+
const { onPress, viewModel } = props;
|
|
37
|
+
|
|
38
|
+
const [state, setState] = useState(viewModel?.getState());
|
|
39
|
+
|
|
40
|
+
const [editableItems, setEditableItems] = useState<MenuItem[]>(
|
|
41
|
+
() => viewModel?.getState().items || []
|
|
42
|
+
);
|
|
43
|
+
|
|
44
|
+
// Subscribe to the viewModel state changes
|
|
45
|
+
useEffect(() => {
|
|
46
|
+
return viewModel?.subscribe((nextState) => {
|
|
47
|
+
setState(nextState);
|
|
48
|
+
});
|
|
49
|
+
}, [viewModel]);
|
|
50
|
+
|
|
51
|
+
// Subscribe to editable collection items
|
|
52
|
+
useEffect(() => {
|
|
53
|
+
if (viewModel?.editableCollection) {
|
|
54
|
+
const subscription =
|
|
55
|
+
viewModel.editableCollection.items$.subscribe(setEditableItems);
|
|
56
|
+
|
|
57
|
+
return () => subscription.unsubscribe();
|
|
58
|
+
}
|
|
59
|
+
}, [viewModel?.editableCollection]);
|
|
60
|
+
|
|
61
|
+
/**
|
|
62
|
+
* Handles an item press:
|
|
63
|
+
* - Delegates to the parent onPress (which runs the action and awaits it).
|
|
64
|
+
* - If the item was a leaf action (not a submenu), triggers viewModel.refetch()
|
|
65
|
+
* so that checkmarks (isSelected) reflect the updated server state.
|
|
66
|
+
*/
|
|
67
|
+
const handleItemPress = async (item: MenuItem) => {
|
|
68
|
+
const isSubMenu = item.action && isPresentSubMenuAction(item.action);
|
|
69
|
+
|
|
70
|
+
await onPress(item);
|
|
71
|
+
|
|
72
|
+
if (!isSubMenu) {
|
|
73
|
+
await viewModel?.refetch();
|
|
74
|
+
}
|
|
75
|
+
};
|
|
76
|
+
|
|
77
|
+
const goBackOrClose = React.useCallback(() => {
|
|
78
|
+
if (modalOrchestrator.canGoBack) {
|
|
79
|
+
modalOrchestrator.back();
|
|
80
|
+
} else {
|
|
81
|
+
modalOrchestrator.close();
|
|
82
|
+
}
|
|
83
|
+
}, [modalOrchestrator.canGoBack]);
|
|
84
|
+
|
|
85
|
+
return {
|
|
86
|
+
items: viewModel?.editableCollection ? editableItems : state?.items,
|
|
87
|
+
isLoading: toBooleanWithDefaultFalse(state?.isLoading),
|
|
88
|
+
error: state?.error,
|
|
89
|
+
showCentralLoading: toBooleanWithDefaultFalse(
|
|
90
|
+
state?.isLoading && state?.items.length === 0
|
|
91
|
+
),
|
|
92
|
+
canGoBack: modalOrchestrator.canGoBack,
|
|
93
|
+
handleItemPress,
|
|
94
|
+
goBackOrClose,
|
|
95
|
+
close: () => modalOrchestrator.close(),
|
|
96
|
+
role: state?.role,
|
|
97
|
+
behavior: state?.behavior,
|
|
98
|
+
dynamicCollection: state?.dynamicCollection,
|
|
99
|
+
editableCollection: viewModel?.editableCollection || null,
|
|
100
|
+
themePluginId: state?.themePluginId,
|
|
101
|
+
};
|
|
102
|
+
};
|
|
@@ -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
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@applicaster/zapp-react-native-utils",
|
|
3
|
-
"version": "16.0.0-rc.
|
|
3
|
+
"version": "16.0.0-rc.71",
|
|
4
4
|
"description": "Applicaster Zapp React Native utilities package",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"types": "index.d.ts",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
},
|
|
28
28
|
"homepage": "https://github.com/applicaster/quickbrick#readme",
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@applicaster/applicaster-types": "16.0.0-rc.
|
|
30
|
+
"@applicaster/applicaster-types": "16.0.0-rc.71",
|
|
31
31
|
"buffer": "^5.2.1",
|
|
32
32
|
"camelize": "^1.0.0",
|
|
33
33
|
"dayjs": "^1.11.10",
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { buildUrlWithQuery } from "../withPipesEndpoint";
|
|
2
|
+
|
|
3
|
+
describe("buildUrlWithQuery", () => {
|
|
4
|
+
it("returns the url unchanged when requestParams is null", () => {
|
|
5
|
+
expect(buildUrlWithQuery("https://foo.com/path", null)).toBe(
|
|
6
|
+
"https://foo.com/path"
|
|
7
|
+
);
|
|
8
|
+
});
|
|
9
|
+
|
|
10
|
+
it("returns the url unchanged when requestParams has no params", () => {
|
|
11
|
+
expect(buildUrlWithQuery("https://foo.com/path", { headers: {} })).toBe(
|
|
12
|
+
"https://foo.com/path"
|
|
13
|
+
);
|
|
14
|
+
});
|
|
15
|
+
|
|
16
|
+
it("returns the url unchanged when url is empty", () => {
|
|
17
|
+
expect(buildUrlWithQuery("", { params: { a: "1" } })).toBe("");
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
it("appends params to a url with no existing query", () => {
|
|
21
|
+
expect(
|
|
22
|
+
buildUrlWithQuery("https://foo.com/path", { params: { token: "abc" } })
|
|
23
|
+
).toBe("https://foo.com/path?token=abc");
|
|
24
|
+
});
|
|
25
|
+
|
|
26
|
+
it("merges params with an existing query string", () => {
|
|
27
|
+
expect(
|
|
28
|
+
buildUrlWithQuery("https://foo.com/path?existing=1", {
|
|
29
|
+
params: { token: "abc" },
|
|
30
|
+
})
|
|
31
|
+
).toBe("https://foo.com/path?existing=1&token=abc");
|
|
32
|
+
});
|
|
33
|
+
});
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import * as React from "react";
|
|
2
|
+
import { render } from "@testing-library/react-native";
|
|
3
|
+
import { Text } from "react-native";
|
|
4
|
+
|
|
5
|
+
const mockedUseBuildPipesUrl = jest.fn();
|
|
6
|
+
|
|
7
|
+
jest.mock("@applicaster/zapp-react-native-utils/reactHooks/feed", () => ({
|
|
8
|
+
useBuildPipesUrl: (args) => mockedUseBuildPipesUrl(args),
|
|
9
|
+
}));
|
|
10
|
+
|
|
11
|
+
const { withPipesEndpoint } = require("../withPipesEndpoint");
|
|
12
|
+
|
|
13
|
+
// eslint-disable-next-line react/display-name
|
|
14
|
+
const Wrapped = React.forwardRef((props: any, _ref) => (
|
|
15
|
+
<Text testID="wrapped">{`${props.uri}|${JSON.stringify(props.headers)}`}</Text>
|
|
16
|
+
));
|
|
17
|
+
|
|
18
|
+
describe("withPipesEndpoint", () => {
|
|
19
|
+
afterEach(() => jest.clearAllMocks());
|
|
20
|
+
|
|
21
|
+
it("renders nothing while the endpoint context is resolving", () => {
|
|
22
|
+
mockedUseBuildPipesUrl.mockReturnValue({ requestParams: null });
|
|
23
|
+
|
|
24
|
+
const Decorated = withPipesEndpoint(Wrapped);
|
|
25
|
+
const { queryByTestId } = render(<Decorated uri="https://foo.com" />);
|
|
26
|
+
|
|
27
|
+
expect(queryByTestId("wrapped")).toBeNull();
|
|
28
|
+
});
|
|
29
|
+
|
|
30
|
+
it("passes the uri through unchanged when there are no params", () => {
|
|
31
|
+
mockedUseBuildPipesUrl.mockReturnValue({ requestParams: {} });
|
|
32
|
+
|
|
33
|
+
const Decorated = withPipesEndpoint(Wrapped);
|
|
34
|
+
const { getByTestId } = render(<Decorated uri="https://foo.com/path" />);
|
|
35
|
+
|
|
36
|
+
expect(getByTestId("wrapped").props.children).toBe(
|
|
37
|
+
"https://foo.com/path|{}"
|
|
38
|
+
);
|
|
39
|
+
});
|
|
40
|
+
|
|
41
|
+
it("merges resolved params into the uri and forwards headers", () => {
|
|
42
|
+
mockedUseBuildPipesUrl.mockReturnValue({
|
|
43
|
+
requestParams: {
|
|
44
|
+
params: { token: "abc" },
|
|
45
|
+
headers: { Authorization: "Bearer xyz" },
|
|
46
|
+
},
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
const Decorated = withPipesEndpoint(Wrapped);
|
|
50
|
+
const { getByTestId } = render(<Decorated uri="https://foo.com/path" />);
|
|
51
|
+
|
|
52
|
+
expect(getByTestId("wrapped").props.children).toBe(
|
|
53
|
+
'https://foo.com/path?token=abc|{"Authorization":"Bearer xyz"}'
|
|
54
|
+
);
|
|
55
|
+
});
|
|
56
|
+
});
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { withPipesEndpoint, buildUrlWithQuery } from "./withPipesEndpoint";
|
|
@@ -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
|
+
}
|