@applicaster/zapp-react-native-utils 15.0.0-alpha.1615225514 → 15.0.0-alpha.1634008915
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/README.md +0 -6
- package/actionUtils/index.ts +7 -0
- package/actionsExecutor/ActionExecutorContext.tsx +83 -6
- package/adsUtils/__tests__/createVMAP.test.ts +419 -0
- package/appDataUtils/__tests__/urlScheme.test.ts +678 -0
- package/appUtils/HooksManager/__tests__/__snapshots__/hooksManager.test.js.snap +0 -188
- package/appUtils/HooksManager/__tests__/hooksManager.test.js +16 -2
- package/appUtils/HooksManager/index.ts +35 -0
- package/appUtils/contextKeysManager/__tests__/getKeys/failure.test.ts +7 -2
- package/appUtils/contextKeysManager/__tests__/getKeys/success.test.ts +48 -0
- package/appUtils/contextKeysManager/contextResolver.ts +51 -22
- package/appUtils/contextKeysManager/index.ts +65 -10
- package/appUtils/focusManager/treeDataStructure/Tree/__tests__/Tree.test.js +46 -0
- package/appUtils/focusManager/treeDataStructure/Tree/index.js +18 -18
- package/appUtils/focusManagerAux/utils/index.ts +12 -6
- package/appUtils/focusManagerAux/utils/utils.ios.ts +6 -3
- package/appUtils/localizationsHelper.ts +4 -0
- package/appUtils/playerManager/index.ts +9 -0
- package/appUtils/playerManager/player.ts +1 -1
- package/appUtils/playerManager/playerNative.ts +2 -1
- package/appUtils/playerManager/usePlayer.tsx +5 -3
- package/cellUtils/__tests__/cellUtils.test.ts +39 -0
- package/cellUtils/index.ts +11 -1
- package/cloudEventsUtils/__tests__/index.test.ts +529 -0
- package/cloudEventsUtils/index.ts +65 -1
- package/componentsUtils/index.ts +8 -0
- package/configurationUtils/__tests__/imageSrcFromMediaItem.test.ts +38 -0
- package/configurationUtils/index.ts +17 -11
- package/dateUtils/__tests__/dayjs.test.ts +327 -0
- package/dateUtils/index.ts +2 -0
- package/enumUtils/__tests__/getEnumKeyByEnumValue.test.ts +207 -0
- package/errorUtils/__tests__/GeneralError.test.ts +97 -0
- package/errorUtils/__tests__/HttpStatusCode.test.ts +344 -0
- package/errorUtils/__tests__/MissingPluginError.test.ts +113 -0
- package/errorUtils/__tests__/NetworkError.test.ts +202 -0
- package/errorUtils/__tests__/getParsedResponse.test.ts +188 -0
- package/errorUtils/__tests__/invariant.test.ts +112 -0
- package/headersUtils/__tests__/headersUtils.test.js +11 -1
- package/headersUtils/index.ts +2 -1
- package/manifestUtils/_internals/__tests__/index.test.js +41 -0
- package/manifestUtils/_internals/index.js +33 -0
- package/manifestUtils/defaultManifestConfigurations/player.js +35 -16
- package/manifestUtils/fieldUtils/__tests__/fieldUtils.test.js +49 -0
- package/manifestUtils/fieldUtils/index.js +54 -0
- package/manifestUtils/index.js +2 -0
- package/manifestUtils/keys.js +228 -0
- package/manifestUtils/mobileAction/button/__tests__/mobileActionButton.test.js +168 -0
- package/manifestUtils/mobileAction/button/index.js +140 -0
- package/manifestUtils/mobileAction/container/__tests__/mobileActionButtonsContainer.test.js +102 -0
- package/manifestUtils/mobileAction/container/index.js +73 -0
- package/manifestUtils/mobileAction/groups/__tests__/buildMobileActionButtonGroups.test.js +127 -0
- package/manifestUtils/mobileAction/groups/defaults.js +76 -0
- package/manifestUtils/mobileAction/groups/index.js +80 -0
- package/manifestUtils/platformIsTV.js +13 -0
- package/navigationUtils/index.ts +15 -5
- package/numberUtils/__tests__/toNumber.test.ts +27 -0
- package/numberUtils/__tests__/toPositiveNumber.test.ts +193 -0
- package/numberUtils/index.ts +23 -1
- package/package.json +3 -3
- package/pluginUtils/index.ts +4 -5
- package/reactHooks/analytics/__tests__/useSendAnalyticsOnPress.test.ts +537 -0
- package/reactHooks/casting/index.ts +1 -0
- package/reactHooks/casting/useIsCasting.tsx +57 -0
- package/reactHooks/cell-click/index.ts +2 -1
- package/reactHooks/dev/__tests__/useReRenderLog.test.ts +188 -0
- package/reactHooks/device/useIsTablet.tsx +14 -19
- package/reactHooks/events/index.ts +20 -0
- package/reactHooks/feed/index.ts +0 -2
- package/reactHooks/feed/useInflatedUrl.ts +1 -1
- package/reactHooks/hookModal/hooks/useHookModalScreenData.ts +12 -8
- package/reactHooks/index.ts +2 -0
- package/reactHooks/navigation/__tests__/index.test.tsx +39 -8
- package/reactHooks/navigation/index.ts +15 -4
- package/reactHooks/navigation/useRoute.ts +3 -1
- package/reactHooks/resolvers/useComponentResolver.ts +13 -3
- package/reactHooks/screen/__tests__/useCurrentScreenIsHook.test.ts +103 -0
- package/reactHooks/screen/__tests__/useCurrentScreenIsStartupHook.test.ts +94 -0
- package/reactHooks/screen/index.ts +4 -0
- package/reactHooks/screen/useCurrentScreenIsHook.ts +9 -0
- package/reactHooks/screen/useCurrentScreenIsStartupHook.ts +8 -0
- package/reactHooks/state/__tests__/useComponentScreenState.test.ts +246 -0
- package/reactHooks/state/index.ts +2 -0
- package/reactHooks/state/useComponentScreenState.ts +45 -0
- package/reactHooks/state/useRefWithInitialValue.ts +10 -0
- package/reactHooks/ui/__tests__/useFadeOutWhenBlurred.test.ts +580 -0
- package/rectUtils/__tests__/index.test.ts +549 -0
- package/rectUtils/index.ts +2 -2
- package/refreshUtils/RefreshCoordinator/__tests__/refreshCoordinator.test.ts +206 -0
- package/refreshUtils/RefreshCoordinator/index.ts +245 -0
- package/refreshUtils/RefreshCoordinator/utils/__tests__/getDataRefreshConfig.test.ts +104 -0
- package/refreshUtils/RefreshCoordinator/utils/index.ts +29 -0
- package/screenPickerUtils/__tests__/index.test.ts +333 -0
- package/screenPickerUtils/index.ts +5 -0
- package/screenUtils/index.ts +3 -0
- package/services/storageServiceSync.web.ts +1 -1
- package/time/__tests__/BackgroundTimer.test.ts +156 -0
- package/time/__tests__/Timer.test.ts +236 -0
- package/typeGuards/__tests__/isString.test.ts +21 -0
- package/typeGuards/index.ts +4 -0
- package/utils/__tests__/clone.test.ts +158 -0
- package/utils/__tests__/path.test.ts +7 -0
- package/utils/clone.ts +7 -0
- package/utils/index.ts +2 -1
- package/reactHooks/componentsMap/index.ts +0 -55
- package/reactHooks/feed/__tests__/useFeedRefresh.test.tsx +0 -75
- package/reactHooks/feed/useFeedRefresh.tsx +0 -65
|
@@ -0,0 +1,188 @@
|
|
|
1
|
+
import { renderHook } from "@testing-library/react-native";
|
|
2
|
+
import { useReRenderLog } from "../index";
|
|
3
|
+
|
|
4
|
+
describe("useReRenderLog", () => {
|
|
5
|
+
let consoleLogSpy: jest.SpyInstance;
|
|
6
|
+
|
|
7
|
+
beforeEach(() => {
|
|
8
|
+
consoleLogSpy = jest.spyOn(console, "log").mockImplementation();
|
|
9
|
+
});
|
|
10
|
+
|
|
11
|
+
afterEach(() => {
|
|
12
|
+
consoleLogSpy.mockRestore();
|
|
13
|
+
});
|
|
14
|
+
|
|
15
|
+
it("should log on initial render", () => {
|
|
16
|
+
const message = "Test Component";
|
|
17
|
+
|
|
18
|
+
renderHook(() => useReRenderLog(message));
|
|
19
|
+
|
|
20
|
+
expect(consoleLogSpy).toHaveBeenCalledWith(
|
|
21
|
+
expect.stringContaining("<<RE-RENDERED>>")
|
|
22
|
+
);
|
|
23
|
+
|
|
24
|
+
expect(consoleLogSpy).toHaveBeenCalledWith(
|
|
25
|
+
expect.stringContaining("<<COUNT: 1>>")
|
|
26
|
+
);
|
|
27
|
+
|
|
28
|
+
expect(consoleLogSpy).toHaveBeenCalledWith(
|
|
29
|
+
expect.stringContaining(message)
|
|
30
|
+
);
|
|
31
|
+
});
|
|
32
|
+
|
|
33
|
+
it("should increment count on each re-render", () => {
|
|
34
|
+
const message = "Counter Test";
|
|
35
|
+
|
|
36
|
+
const { rerender } = renderHook(() => useReRenderLog(message));
|
|
37
|
+
|
|
38
|
+
expect(consoleLogSpy).toHaveBeenCalledWith(
|
|
39
|
+
expect.stringContaining("<<COUNT: 1>>")
|
|
40
|
+
);
|
|
41
|
+
|
|
42
|
+
rerender();
|
|
43
|
+
|
|
44
|
+
expect(consoleLogSpy).toHaveBeenCalledWith(
|
|
45
|
+
expect.stringContaining("<<COUNT: 2>>")
|
|
46
|
+
);
|
|
47
|
+
|
|
48
|
+
rerender();
|
|
49
|
+
|
|
50
|
+
expect(consoleLogSpy).toHaveBeenCalledWith(
|
|
51
|
+
expect.stringContaining("<<COUNT: 3>>")
|
|
52
|
+
);
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
it("should log correct message format", () => {
|
|
56
|
+
const message = "MyComponent";
|
|
57
|
+
|
|
58
|
+
renderHook(() => useReRenderLog(message));
|
|
59
|
+
|
|
60
|
+
expect(consoleLogSpy).toHaveBeenCalledWith(
|
|
61
|
+
"<<RE-RENDERED>><<COUNT: 1>>: MyComponent"
|
|
62
|
+
);
|
|
63
|
+
});
|
|
64
|
+
|
|
65
|
+
it("should track renders independently for different hook instances", () => {
|
|
66
|
+
const message1 = "Component1";
|
|
67
|
+
const message2 = "Component2";
|
|
68
|
+
|
|
69
|
+
const { rerender: rerender1 } = renderHook(() => useReRenderLog(message1));
|
|
70
|
+
|
|
71
|
+
const { rerender: rerender2 } = renderHook(() => useReRenderLog(message2));
|
|
72
|
+
|
|
73
|
+
consoleLogSpy.mockClear();
|
|
74
|
+
|
|
75
|
+
rerender1();
|
|
76
|
+
|
|
77
|
+
expect(consoleLogSpy).toHaveBeenLastCalledWith(
|
|
78
|
+
expect.stringContaining("Component1")
|
|
79
|
+
);
|
|
80
|
+
|
|
81
|
+
rerender2();
|
|
82
|
+
|
|
83
|
+
expect(consoleLogSpy).toHaveBeenLastCalledWith(
|
|
84
|
+
expect.stringContaining("Component2")
|
|
85
|
+
);
|
|
86
|
+
});
|
|
87
|
+
|
|
88
|
+
it("should handle empty string message", () => {
|
|
89
|
+
renderHook(() => useReRenderLog(""));
|
|
90
|
+
|
|
91
|
+
expect(consoleLogSpy).toHaveBeenCalledWith("<<RE-RENDERED>><<COUNT: 1>>: ");
|
|
92
|
+
});
|
|
93
|
+
|
|
94
|
+
it("should handle message with special characters", () => {
|
|
95
|
+
const message = "Test!@#$%^&*()";
|
|
96
|
+
|
|
97
|
+
renderHook(() => useReRenderLog(message));
|
|
98
|
+
|
|
99
|
+
expect(consoleLogSpy).toHaveBeenCalledWith(
|
|
100
|
+
expect.stringContaining(message)
|
|
101
|
+
);
|
|
102
|
+
});
|
|
103
|
+
|
|
104
|
+
it("should handle long messages", () => {
|
|
105
|
+
const message = "A".repeat(1000);
|
|
106
|
+
|
|
107
|
+
renderHook(() => useReRenderLog(message));
|
|
108
|
+
|
|
109
|
+
expect(consoleLogSpy).toHaveBeenCalledWith(
|
|
110
|
+
expect.stringContaining(message)
|
|
111
|
+
);
|
|
112
|
+
});
|
|
113
|
+
|
|
114
|
+
it("should persist count across multiple re-renders", () => {
|
|
115
|
+
const message = "Persistence Test";
|
|
116
|
+
|
|
117
|
+
const { rerender } = renderHook(() => useReRenderLog(message));
|
|
118
|
+
|
|
119
|
+
for (let i = 2; i <= 10; i++) {
|
|
120
|
+
rerender();
|
|
121
|
+
|
|
122
|
+
expect(consoleLogSpy).toHaveBeenLastCalledWith(
|
|
123
|
+
expect.stringContaining(`<<COUNT: ${i}>>`)
|
|
124
|
+
);
|
|
125
|
+
}
|
|
126
|
+
});
|
|
127
|
+
|
|
128
|
+
it("should log on every render without dependencies", () => {
|
|
129
|
+
const message = "Every Render";
|
|
130
|
+
|
|
131
|
+
const { rerender } = renderHook(() => useReRenderLog(message));
|
|
132
|
+
|
|
133
|
+
const initialCallCount = consoleLogSpy.mock.calls.length;
|
|
134
|
+
|
|
135
|
+
rerender();
|
|
136
|
+
rerender();
|
|
137
|
+
rerender();
|
|
138
|
+
|
|
139
|
+
// Should have 4 total calls (initial + 3 rerenders)
|
|
140
|
+
expect(consoleLogSpy).toHaveBeenCalledTimes(initialCallCount + 3);
|
|
141
|
+
});
|
|
142
|
+
|
|
143
|
+
it("should handle numeric messages", () => {
|
|
144
|
+
renderHook(() => useReRenderLog(123 as any));
|
|
145
|
+
|
|
146
|
+
expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining("123"));
|
|
147
|
+
});
|
|
148
|
+
|
|
149
|
+
it("should handle object messages", () => {
|
|
150
|
+
const obj = { key: "value" };
|
|
151
|
+
|
|
152
|
+
renderHook(() => useReRenderLog(obj as any));
|
|
153
|
+
|
|
154
|
+
expect(consoleLogSpy).toHaveBeenCalled();
|
|
155
|
+
});
|
|
156
|
+
|
|
157
|
+
it("should maintain separate refs for each instance", () => {
|
|
158
|
+
const { rerender: rerender1 } = renderHook(() =>
|
|
159
|
+
useReRenderLog("Instance1")
|
|
160
|
+
);
|
|
161
|
+
|
|
162
|
+
const { rerender: rerender2 } = renderHook(() =>
|
|
163
|
+
useReRenderLog("Instance2")
|
|
164
|
+
);
|
|
165
|
+
|
|
166
|
+
consoleLogSpy.mockClear();
|
|
167
|
+
|
|
168
|
+
// Render instance 1 twice more
|
|
169
|
+
rerender1();
|
|
170
|
+
rerender1();
|
|
171
|
+
|
|
172
|
+
// Render instance 2 once more
|
|
173
|
+
rerender2();
|
|
174
|
+
|
|
175
|
+
const calls = consoleLogSpy.mock.calls;
|
|
176
|
+
|
|
177
|
+
// Instance 1 should be at count 2 and 3
|
|
178
|
+
expect(calls[0][0]).toContain("Instance1");
|
|
179
|
+
expect(calls[0][0]).toContain("<<COUNT: 2>>");
|
|
180
|
+
|
|
181
|
+
expect(calls[1][0]).toContain("Instance1");
|
|
182
|
+
expect(calls[1][0]).toContain("<<COUNT: 3>>");
|
|
183
|
+
|
|
184
|
+
// Instance 2 should be at count 2
|
|
185
|
+
expect(calls[2][0]).toContain("Instance2");
|
|
186
|
+
expect(calls[2][0]).toContain("<<COUNT: 2>>");
|
|
187
|
+
});
|
|
188
|
+
});
|
|
@@ -1,28 +1,23 @@
|
|
|
1
1
|
/* eslint react-native/split-platform-components: off */
|
|
2
2
|
|
|
3
3
|
import { Platform, PlatformIOSStatic, NativeModules } from "react-native";
|
|
4
|
-
import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
|
|
5
|
-
import { F as alwaysFalse } from "ramda";
|
|
6
4
|
import { toBooleanWithDefaultFalse } from "@applicaster/zapp-react-native-utils/booleanUtils";
|
|
7
5
|
|
|
8
|
-
const
|
|
9
|
-
const
|
|
6
|
+
export const useIsTablet = (): boolean => {
|
|
7
|
+
const platform = Platform.OS;
|
|
10
8
|
|
|
11
|
-
|
|
12
|
-
};
|
|
9
|
+
if (platform === "ios") {
|
|
10
|
+
const { isPad } = Platform as PlatformIOSStatic;
|
|
13
11
|
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
return Boolean(isPad);
|
|
13
|
+
}
|
|
16
14
|
|
|
17
|
-
|
|
18
|
-
|
|
15
|
+
if (platform === "android") {
|
|
16
|
+
const initialProps =
|
|
17
|
+
NativeModules.QuickBrickCommunicationModule?.initialProps;
|
|
19
18
|
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
android_tv: alwaysFalse,
|
|
26
|
-
tvos: alwaysFalse,
|
|
27
|
-
default: alwaysFalse,
|
|
28
|
-
});
|
|
19
|
+
return toBooleanWithDefaultFalse(initialProps?.is_tablet);
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
return false;
|
|
23
|
+
};
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import * as React from "react";
|
|
2
|
+
import { scrollEndReached$ } from "@applicaster/zapp-react-native-ui-components/events";
|
|
3
|
+
import { filter } from "rxjs/operators";
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* Subscribe to scroll-end-reached and call loadNextData only when this item is last in the river.
|
|
7
|
+
* Use in Grid/List so they load next page when the user scrolls to the end (river or tabs scroll container).
|
|
8
|
+
*/
|
|
9
|
+
export function useScrollEndReachedLoadNext(
|
|
10
|
+
isLast: boolean,
|
|
11
|
+
loadNextData: () => void
|
|
12
|
+
): void {
|
|
13
|
+
React.useEffect(() => {
|
|
14
|
+
const sub = scrollEndReached$.pipe(filter(() => isLast)).subscribe(() => {
|
|
15
|
+
loadNextData();
|
|
16
|
+
});
|
|
17
|
+
|
|
18
|
+
return () => sub.unsubscribe();
|
|
19
|
+
}, [isLast, loadNextData]);
|
|
20
|
+
}
|
package/reactHooks/feed/index.ts
CHANGED
|
@@ -1,20 +1,24 @@
|
|
|
1
1
|
import { reactHooksLogger } from "../../logger";
|
|
2
|
-
import {
|
|
2
|
+
import { useZappHookModalStore } from "@applicaster/zapp-react-native-ui-components/Contexts/ZappHookModalContext";
|
|
3
3
|
|
|
4
4
|
const logger = reactHooksLogger.addSubsystem("useHookModalScreenData");
|
|
5
5
|
|
|
6
6
|
type VariousScreenData = LegacyNavigationScreenData | ZappRiver | ZappEntry;
|
|
7
7
|
|
|
8
|
-
export const useHookModalScreenData = (
|
|
9
|
-
|
|
8
|
+
export const useHookModalScreenData = (
|
|
9
|
+
skipSubscription: boolean
|
|
10
|
+
): VariousScreenData | undefined => {
|
|
11
|
+
const hookModalState = useZappHookModalStore((state) =>
|
|
12
|
+
skipSubscription ? undefined : state.state
|
|
13
|
+
);
|
|
10
14
|
|
|
11
|
-
if (!hookModalState
|
|
15
|
+
if (!hookModalState?.screenData) {
|
|
12
16
|
return;
|
|
13
17
|
}
|
|
14
18
|
|
|
15
19
|
try {
|
|
16
|
-
const screenData = hookModalState.
|
|
17
|
-
const hookPlugin = hookModalState.
|
|
20
|
+
const screenData = hookModalState.screenData?.payload;
|
|
21
|
+
const hookPlugin = hookModalState.screenData.hookPlugin;
|
|
18
22
|
|
|
19
23
|
if (hookPlugin?.screen_id) {
|
|
20
24
|
return {
|
|
@@ -23,7 +27,7 @@ export const useHookModalScreenData = (): VariousScreenData | undefined => {
|
|
|
23
27
|
};
|
|
24
28
|
}
|
|
25
29
|
|
|
26
|
-
return hookModalState.
|
|
30
|
+
return hookModalState.screenData?.payload;
|
|
27
31
|
} catch (error) {
|
|
28
32
|
logger.error({
|
|
29
33
|
message: "Hook modal screen data creation failed",
|
|
@@ -34,6 +38,6 @@ export const useHookModalScreenData = (): VariousScreenData | undefined => {
|
|
|
34
38
|
jsOnly: true,
|
|
35
39
|
});
|
|
36
40
|
|
|
37
|
-
return hookModalState.
|
|
41
|
+
return hookModalState.screenData?.payload;
|
|
38
42
|
}
|
|
39
43
|
};
|
package/reactHooks/index.ts
CHANGED
|
@@ -5,7 +5,6 @@ import { isNavBarVisible, useRoute } from "../";
|
|
|
5
5
|
import { Provider } from "react-redux";
|
|
6
6
|
import configureMockStore from "redux-mock-store";
|
|
7
7
|
import { NavigationContext } from "@applicaster/zapp-react-native-ui-components/Contexts/NavigationContext";
|
|
8
|
-
import { ZappHookModalContext } from "@applicaster/zapp-react-native-ui-components/Contexts";
|
|
9
8
|
import { ROUTE_TYPES } from "@applicaster/zapp-react-native-utils/navigationUtils/routeTypes";
|
|
10
9
|
import { ScreenDataContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenDataContext";
|
|
11
10
|
|
|
@@ -83,10 +82,44 @@ const hookModalContextState = {
|
|
|
83
82
|
},
|
|
84
83
|
setState: jest.fn(),
|
|
85
84
|
resetState: jest.fn(),
|
|
85
|
+
hookPresentationMode: null,
|
|
86
86
|
};
|
|
87
87
|
|
|
88
88
|
const hooksModalPathname = `${ROUTE_TYPES.HOOKS_MODAL}/${hookModalContextState.state.screenData.payload.id}`;
|
|
89
89
|
const videoModalPathname = `${ROUTE_TYPES.VIDEO_MODAL}/${videoModalNavigator.videoModalState.item.id}`;
|
|
90
|
+
|
|
91
|
+
jest.mock(
|
|
92
|
+
"@applicaster/zapp-react-native-ui-components/Contexts/ZappHookModalContext",
|
|
93
|
+
() => {
|
|
94
|
+
const mockState = {
|
|
95
|
+
isRunningInBackground: false,
|
|
96
|
+
setIsRunningInBackground: jest.fn(),
|
|
97
|
+
setIsPresentingFullScreen: jest.fn(),
|
|
98
|
+
isPresentationFullScreen: true,
|
|
99
|
+
isHooksExecutionInProgress: true,
|
|
100
|
+
setIsHooksExecutionInProgress: jest.fn(),
|
|
101
|
+
state: {
|
|
102
|
+
path: "/home",
|
|
103
|
+
screenData: { payload: { id: "hookExecutedInModal" } },
|
|
104
|
+
},
|
|
105
|
+
setState: jest.fn(),
|
|
106
|
+
resetState: jest.fn(),
|
|
107
|
+
hookPresentationMode: null,
|
|
108
|
+
};
|
|
109
|
+
|
|
110
|
+
const mockHook = jest.fn((selector) => {
|
|
111
|
+
return selector ? selector(mockState) : mockState;
|
|
112
|
+
}) as jest.MockedFunction<any> & { getState: () => typeof mockState };
|
|
113
|
+
|
|
114
|
+
mockHook.getState = jest.fn(() => mockState);
|
|
115
|
+
|
|
116
|
+
return {
|
|
117
|
+
useZappHookModalStore: mockHook,
|
|
118
|
+
zappHookModalStore: mockHook,
|
|
119
|
+
};
|
|
120
|
+
}
|
|
121
|
+
);
|
|
122
|
+
|
|
90
123
|
const mockStore = configureMockStore();
|
|
91
124
|
|
|
92
125
|
const store = mockStore({
|
|
@@ -125,13 +158,11 @@ const videoModalWrapper = ({ children }) => (
|
|
|
125
158
|
|
|
126
159
|
const hookModalWrapper = ({ children }) => (
|
|
127
160
|
<Provider store={store}>
|
|
128
|
-
<
|
|
129
|
-
<
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
</NavigationContext.Provider>
|
|
134
|
-
</ZappHookModalContext.ReactContext.Provider>
|
|
161
|
+
<NavigationContext.Provider value={hookModalNavigator}>
|
|
162
|
+
<PathnameContext.Provider value={hooksModalPathname}>
|
|
163
|
+
{children}
|
|
164
|
+
</PathnameContext.Provider>
|
|
165
|
+
</NavigationContext.Provider>
|
|
135
166
|
</Provider>
|
|
136
167
|
);
|
|
137
168
|
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { useEffect, useMemo, useRef } from "react";
|
|
2
2
|
import { BackHandler } from "react-native";
|
|
3
|
+
import { shallow } from "zustand/shallow";
|
|
3
4
|
|
|
4
5
|
import {
|
|
5
6
|
useContentTypes,
|
|
@@ -8,13 +9,13 @@ import {
|
|
|
8
9
|
import { HooksManager } from "@applicaster/zapp-react-native-utils/appUtils/HooksManager";
|
|
9
10
|
|
|
10
11
|
import { LONG_KEY_PRESS_TIMEOUT } from "@applicaster/quick-brick-core/const";
|
|
11
|
-
import {
|
|
12
|
-
import { HookModalContextT } from "@applicaster/zapp-react-native-ui-components/Contexts/ZappHookModalContext";
|
|
12
|
+
import { useZappHookModalStore } from "@applicaster/zapp-react-native-ui-components/Contexts/ZappHookModalContext";
|
|
13
13
|
import { HOOKS_EVENTS } from "../../appUtils/HooksManager/constants";
|
|
14
14
|
import { getRiverFromRoute, getTargetRoute } from "../../navigationUtils";
|
|
15
15
|
import { useConnectionInfo } from "../connection";
|
|
16
16
|
|
|
17
17
|
import { isTV, isWeb } from "@applicaster/zapp-react-native-utils/reactUtils";
|
|
18
|
+
import { pick } from "@applicaster/zapp-react-native-utils/utils";
|
|
18
19
|
import { useNavbarState } from "../screen";
|
|
19
20
|
import { useRivers } from "../state";
|
|
20
21
|
import { useLayoutVersion } from "../layout";
|
|
@@ -168,7 +169,17 @@ export const useZappHooksForEntry = (
|
|
|
168
169
|
setIsHooksExecutionInProgress,
|
|
169
170
|
setIsPresentingFullScreen,
|
|
170
171
|
setIsRunningInBackground,
|
|
171
|
-
}
|
|
172
|
+
} = useZappHookModalStore(
|
|
173
|
+
(state) =>
|
|
174
|
+
pick(state, [
|
|
175
|
+
"setState",
|
|
176
|
+
"resetState",
|
|
177
|
+
"setIsHooksExecutionInProgress",
|
|
178
|
+
"setIsPresentingFullScreen",
|
|
179
|
+
"setIsRunningInBackground",
|
|
180
|
+
]),
|
|
181
|
+
shallow
|
|
182
|
+
);
|
|
172
183
|
|
|
173
184
|
const plugins = usePlugins();
|
|
174
185
|
const rivers = useRivers();
|
|
@@ -54,7 +54,9 @@ export const useRoute = (
|
|
|
54
54
|
|
|
55
55
|
const modalScreenData = modalState.screen;
|
|
56
56
|
|
|
57
|
-
const hookModalScreenData = useHookModalScreenData(
|
|
57
|
+
const hookModalScreenData = useHookModalScreenData(
|
|
58
|
+
!isHookModalPathname(pathname)
|
|
59
|
+
);
|
|
58
60
|
|
|
59
61
|
const videoModalScreenData =
|
|
60
62
|
navigator?.videoModalState?.item &&
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
/// <reference types="@applicaster/applicaster-types" />
|
|
2
2
|
import * as React from "react";
|
|
3
3
|
|
|
4
|
+
import { coreLogger } from "@applicaster/zapp-react-native-utils/logger";
|
|
5
|
+
|
|
4
6
|
import { findComponentByType } from "@applicaster/zapp-react-native-utils/pluginUtils";
|
|
5
7
|
import {
|
|
6
|
-
usePlugins,
|
|
7
|
-
useAppSelector,
|
|
8
8
|
selectComponents,
|
|
9
|
+
useAppSelector,
|
|
10
|
+
usePlugins,
|
|
9
11
|
} from "@applicaster/zapp-react-native-redux";
|
|
10
12
|
|
|
11
13
|
type Decorator = (component: React.Component<any>) => React.Component<any>;
|
|
@@ -23,7 +25,7 @@ export function useComponentResolver(
|
|
|
23
25
|
|
|
24
26
|
const components = useAppSelector(selectComponents);
|
|
25
27
|
|
|
26
|
-
|
|
28
|
+
const component = React.useMemo(
|
|
27
29
|
() =>
|
|
28
30
|
findComponentByType({
|
|
29
31
|
components,
|
|
@@ -33,4 +35,12 @@ export function useComponentResolver(
|
|
|
33
35
|
}),
|
|
34
36
|
watchers
|
|
35
37
|
);
|
|
38
|
+
|
|
39
|
+
if (!component) {
|
|
40
|
+
coreLogger.warn({
|
|
41
|
+
message: `useComponentResolver: Component of type ${componentType} not found`,
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
return component;
|
|
36
46
|
}
|
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
import { renderHook } from "@testing-library/react-native";
|
|
2
|
+
import { useCurrentScreenIsHook } from "../useCurrentScreenIsHook";
|
|
3
|
+
|
|
4
|
+
import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks";
|
|
5
|
+
import { last } from "@applicaster/zapp-react-native-utils/utils";
|
|
6
|
+
import { toBooleanWithDefaultFalse } from "@applicaster/zapp-react-native-utils/booleanUtils";
|
|
7
|
+
|
|
8
|
+
jest.mock("@applicaster/zapp-react-native-utils/reactHooks");
|
|
9
|
+
jest.mock("@applicaster/zapp-react-native-utils/utils");
|
|
10
|
+
jest.mock("@applicaster/zapp-react-native-utils/booleanUtils");
|
|
11
|
+
|
|
12
|
+
const mockUseNavigation = useNavigation as jest.Mock;
|
|
13
|
+
const mockLast = last as jest.Mock;
|
|
14
|
+
const mockToBoolean = toBooleanWithDefaultFalse as jest.Mock;
|
|
15
|
+
|
|
16
|
+
describe("useCurrentScreenIsHook", () => {
|
|
17
|
+
beforeEach(() => {
|
|
18
|
+
jest.clearAllMocks();
|
|
19
|
+
|
|
20
|
+
// sensible defaults
|
|
21
|
+
mockUseNavigation.mockReturnValue({ mainStack: [] });
|
|
22
|
+
mockLast.mockReturnValue(undefined);
|
|
23
|
+
mockToBoolean.mockReturnValue(false);
|
|
24
|
+
});
|
|
25
|
+
|
|
26
|
+
it("returns true when last route includes 'hook'", () => {
|
|
27
|
+
const stack = [{ route: "some-hook-screen" }];
|
|
28
|
+
|
|
29
|
+
mockUseNavigation.mockReturnValue({ mainStack: stack });
|
|
30
|
+
mockLast.mockReturnValue(stack[0]);
|
|
31
|
+
mockToBoolean.mockReturnValue(true);
|
|
32
|
+
|
|
33
|
+
const { result } = renderHook(() => useCurrentScreenIsHook());
|
|
34
|
+
|
|
35
|
+
expect(mockLast).toHaveBeenCalledWith(stack);
|
|
36
|
+
expect(mockToBoolean).toHaveBeenCalledWith(true);
|
|
37
|
+
expect(result.current).toBe(true);
|
|
38
|
+
});
|
|
39
|
+
|
|
40
|
+
it("returns false when last route does not include 'hook'", () => {
|
|
41
|
+
const stack = [{ route: "home-screen" }];
|
|
42
|
+
|
|
43
|
+
mockUseNavigation.mockReturnValue({ mainStack: stack });
|
|
44
|
+
mockLast.mockReturnValue(stack[0]);
|
|
45
|
+
mockToBoolean.mockReturnValue(false);
|
|
46
|
+
|
|
47
|
+
const { result } = renderHook(() => useCurrentScreenIsHook());
|
|
48
|
+
|
|
49
|
+
expect(mockToBoolean).toHaveBeenCalledWith(false);
|
|
50
|
+
expect(result.current).toBe(false);
|
|
51
|
+
});
|
|
52
|
+
|
|
53
|
+
it("returns false when route is undefined", () => {
|
|
54
|
+
const stack = [{}];
|
|
55
|
+
|
|
56
|
+
mockUseNavigation.mockReturnValue({ mainStack: stack });
|
|
57
|
+
mockLast.mockReturnValue(stack[0]);
|
|
58
|
+
mockToBoolean.mockReturnValue(false);
|
|
59
|
+
|
|
60
|
+
const { result } = renderHook(() => useCurrentScreenIsHook());
|
|
61
|
+
|
|
62
|
+
expect(mockToBoolean).toHaveBeenCalledWith(undefined);
|
|
63
|
+
expect(result.current).toBe(false);
|
|
64
|
+
});
|
|
65
|
+
|
|
66
|
+
it("returns false when last(mainStack) is undefined (empty stack)", () => {
|
|
67
|
+
mockUseNavigation.mockReturnValue({ mainStack: [] });
|
|
68
|
+
mockLast.mockReturnValue(undefined);
|
|
69
|
+
mockToBoolean.mockReturnValue(false);
|
|
70
|
+
|
|
71
|
+
const { result } = renderHook(() => useCurrentScreenIsHook());
|
|
72
|
+
|
|
73
|
+
expect(mockLast).toHaveBeenCalledWith([]);
|
|
74
|
+
expect(mockToBoolean).toHaveBeenCalledWith(undefined);
|
|
75
|
+
expect(result.current).toBe(false);
|
|
76
|
+
});
|
|
77
|
+
|
|
78
|
+
it("uses default empty array when mainStack is undefined", () => {
|
|
79
|
+
mockUseNavigation.mockReturnValue({});
|
|
80
|
+
mockLast.mockReturnValue(undefined);
|
|
81
|
+
mockToBoolean.mockReturnValue(false);
|
|
82
|
+
|
|
83
|
+
const { result } = renderHook(() => useCurrentScreenIsHook());
|
|
84
|
+
|
|
85
|
+
expect(mockLast).toHaveBeenCalledWith([]);
|
|
86
|
+
expect(result.current).toBe(false);
|
|
87
|
+
});
|
|
88
|
+
|
|
89
|
+
it("passes correct boolean result from includes('hook')", () => {
|
|
90
|
+
const stack = [{ route: "hook" }];
|
|
91
|
+
|
|
92
|
+
mockUseNavigation.mockReturnValue({ mainStack: stack });
|
|
93
|
+
mockLast.mockReturnValue(stack[0]);
|
|
94
|
+
|
|
95
|
+
// simulate actual includes result flowing through
|
|
96
|
+
mockToBoolean.mockImplementation((val) => Boolean(val));
|
|
97
|
+
|
|
98
|
+
const { result } = renderHook(() => useCurrentScreenIsHook());
|
|
99
|
+
|
|
100
|
+
expect(mockToBoolean).toHaveBeenCalledWith(true);
|
|
101
|
+
expect(result.current).toBe(true);
|
|
102
|
+
});
|
|
103
|
+
});
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
import { renderHook } from "@testing-library/react-native";
|
|
2
|
+
import { useCurrentScreenIsStartupHook } from "../useCurrentScreenIsStartupHook";
|
|
3
|
+
|
|
4
|
+
import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks";
|
|
5
|
+
import { isFilledArray } from "@applicaster/zapp-react-native-utils/arrayUtils";
|
|
6
|
+
|
|
7
|
+
jest.mock("@applicaster/zapp-react-native-utils/reactHooks");
|
|
8
|
+
jest.mock("@applicaster/zapp-react-native-utils/arrayUtils");
|
|
9
|
+
|
|
10
|
+
const mockUseNavigation = useNavigation as jest.Mock;
|
|
11
|
+
const mockIsFilledArray = isFilledArray as jest.Mock;
|
|
12
|
+
|
|
13
|
+
describe("useCurrentScreenIsStartupHook", () => {
|
|
14
|
+
beforeEach(() => {
|
|
15
|
+
jest.clearAllMocks();
|
|
16
|
+
});
|
|
17
|
+
|
|
18
|
+
it("returns true when startUpHooks is a filled array", () => {
|
|
19
|
+
mockUseNavigation.mockReturnValue({
|
|
20
|
+
startUpHooks: ["hook1"],
|
|
21
|
+
});
|
|
22
|
+
|
|
23
|
+
mockIsFilledArray.mockReturnValue(true);
|
|
24
|
+
|
|
25
|
+
const { result } = renderHook(() => useCurrentScreenIsStartupHook());
|
|
26
|
+
|
|
27
|
+
expect(result.current).toBe(true);
|
|
28
|
+
expect(mockIsFilledArray).toHaveBeenCalledWith(["hook1"]);
|
|
29
|
+
});
|
|
30
|
+
|
|
31
|
+
it('returns true when startUpHooks is "in_process"', () => {
|
|
32
|
+
mockUseNavigation.mockReturnValue({
|
|
33
|
+
startUpHooks: "in_process",
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
mockIsFilledArray.mockReturnValue(false);
|
|
37
|
+
|
|
38
|
+
const { result } = renderHook(() => useCurrentScreenIsStartupHook());
|
|
39
|
+
|
|
40
|
+
expect(result.current).toBe(true);
|
|
41
|
+
expect(mockIsFilledArray).toHaveBeenCalledWith("in_process");
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
it("returns false when startUpHooks is empty array", () => {
|
|
45
|
+
mockUseNavigation.mockReturnValue({
|
|
46
|
+
startUpHooks: [],
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
mockIsFilledArray.mockReturnValue(false);
|
|
50
|
+
|
|
51
|
+
const { result } = renderHook(() => useCurrentScreenIsStartupHook());
|
|
52
|
+
|
|
53
|
+
expect(result.current).toBe(false);
|
|
54
|
+
expect(mockIsFilledArray).toHaveBeenCalledWith([]);
|
|
55
|
+
});
|
|
56
|
+
|
|
57
|
+
it("returns false when startUpHooks is undefined", () => {
|
|
58
|
+
mockUseNavigation.mockReturnValue({
|
|
59
|
+
startUpHooks: undefined,
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
mockIsFilledArray.mockReturnValue(false);
|
|
63
|
+
|
|
64
|
+
const { result } = renderHook(() => useCurrentScreenIsStartupHook());
|
|
65
|
+
|
|
66
|
+
expect(result.current).toBe(false);
|
|
67
|
+
expect(mockIsFilledArray).toHaveBeenCalledWith(undefined);
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
it("returns false when startUpHooks is null", () => {
|
|
71
|
+
mockUseNavigation.mockReturnValue({
|
|
72
|
+
startUpHooks: null,
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
mockIsFilledArray.mockReturnValue(false);
|
|
76
|
+
|
|
77
|
+
const { result } = renderHook(() => useCurrentScreenIsStartupHook());
|
|
78
|
+
|
|
79
|
+
expect(result.current).toBe(false);
|
|
80
|
+
expect(mockIsFilledArray).toHaveBeenCalledWith(null);
|
|
81
|
+
});
|
|
82
|
+
|
|
83
|
+
it("prioritizes filled array over string comparison", () => {
|
|
84
|
+
mockUseNavigation.mockReturnValue({
|
|
85
|
+
startUpHooks: ["hook1"],
|
|
86
|
+
});
|
|
87
|
+
|
|
88
|
+
mockIsFilledArray.mockReturnValue(true);
|
|
89
|
+
|
|
90
|
+
const { result } = renderHook(() => useCurrentScreenIsStartupHook());
|
|
91
|
+
|
|
92
|
+
expect(result.current).toBe(true);
|
|
93
|
+
});
|
|
94
|
+
});
|