@applicaster/zapp-react-native-utils 12.0.0-alpha.4433422595 → 12.0.0-alpha.4462655310

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.
Files changed (71) hide show
  1. package/analyticsUtils/AnalyticsEvents/index.ts +13 -0
  2. package/analyticsUtils/AnalyticsEvents/searchEvents.ts +21 -0
  3. package/analyticsUtils/AnalyticsEvents/sendShareEvent.ts +21 -0
  4. package/analyticsUtils/analyticsPlugins.ts +25 -0
  5. package/analyticsUtils/events.ts +12 -0
  6. package/analyticsUtils/index.tsx +12 -0
  7. package/appUtils/focusManager/__tests__/__snapshots__/focusManager.test.js.snap +2 -3
  8. package/appUtils/focusManager/__tests__/focusManager.test.js +4 -24
  9. package/appUtils/focusManager/__tests__/index.test.ts +2 -3
  10. package/appUtils/focusManager/index.ts +76 -77
  11. package/appUtils/focusManager/treeDataStructure/Utils/index.js +30 -15
  12. package/appUtils/focusManager/utils/index.ts +100 -0
  13. package/appUtils/focusManagerAux/index.ts +76 -0
  14. package/appUtils/focusManagerAux/utils/index.ts +100 -0
  15. package/appUtils/keyCodes/keys.web.js +8 -0
  16. package/appUtils/keyCodes/keysByPlatform.js +11 -1
  17. package/appUtils/platform/const.ts +25 -0
  18. package/appUtils/platform/index.ts +3 -0
  19. package/appUtils/platform/platformUtils.ts +223 -0
  20. package/appUtils/playerManager/index.ts +11 -5
  21. package/appUtils/playerManager/nativePlayerManager.ts +12 -0
  22. package/appUtils/playerManager/player.ts +1 -3
  23. package/appUtils/playerManager/playerNative.ts +10 -14
  24. package/appUtils/playerManager/usePlayerControllerSetup.tsx +6 -1
  25. package/arrayUtils/__tests__/isFilledArray.test.ts +63 -0
  26. package/arrayUtils/index.ts +5 -0
  27. package/booleanUtils/index.ts +4 -4
  28. package/cellUtils/__tests__/cellUtils.test.ts +9 -20
  29. package/cellUtils/index.ts +6 -12
  30. package/dateUtils/index.ts +11 -0
  31. package/headersUtils/index.ts +1 -0
  32. package/inflatedUrlUtils/index.ts +4 -4
  33. package/keyboardState/index.ts +0 -0
  34. package/localizationUtils/__tests__/localizationUtils.test.ts +72 -53
  35. package/localizationUtils/index.ts +13 -22
  36. package/manifestUtils/defaultManifestConfigurations/generalContent.js +6 -0
  37. package/manifestUtils/defaultManifestConfigurations/player.js +2 -1
  38. package/numberUtils/__tests__/isLikeNumber.test.ts +18 -0
  39. package/numberUtils/index.ts +9 -18
  40. package/package.json +2 -2
  41. package/playerUtils/configurationGenerator.ts +3 -1
  42. package/reactHooks/autoscrolling/__tests__/{useTrackedView.test.ts → useTrackedView.test.tsx} +16 -1
  43. package/reactHooks/cell-click/__tests__/index.test.js +10 -1
  44. package/reactHooks/cell-click/index.ts +12 -12
  45. package/reactHooks/feed/__tests__/useBuildPipesUrl.test.tsx +30 -70
  46. package/reactHooks/feed/__tests__/useFeedRefresh.test.tsx +6 -2
  47. package/reactHooks/feed/__tests__/useInflatedUrl.test.ts +18 -3
  48. package/reactHooks/feed/useBuildPipesUrl.ts +7 -10
  49. package/reactHooks/feed/useFeedRefresh.tsx +9 -7
  50. package/reactHooks/feed/useInflatedUrl.ts +44 -15
  51. package/reactHooks/layout/__tests__/{index.test.js → index.test.tsx} +43 -29
  52. package/reactHooks/layout/getDeviceInfo/index.ts +4 -2
  53. package/reactHooks/layout/types/index.ts +1 -0
  54. package/reactHooks/layout/useDimensions/useDimensions.ts +5 -2
  55. package/reactHooks/navigation/__mocks__/index.ts +13 -0
  56. package/reactHooks/navigation/__mocks__/useNavigation.ts +3 -0
  57. package/reactHooks/navigation/__tests__/index.test.tsx +11 -8
  58. package/reactHooks/navigation/index.ts +43 -64
  59. package/reactHooks/screen/__tests__/useCurrentScreenData.test.tsx +21 -23
  60. package/reactHooks/screen/index.ts +2 -0
  61. package/reactHooks/screen/useScreenBackgroundColor.ts +23 -0
  62. package/reactHooks/screen/useScreenContext.ts +3 -3
  63. package/reactUtils/index.ts +102 -0
  64. package/screenState/index.ts +0 -8
  65. package/stringUtils/index.ts +5 -0
  66. package/testUtils/getByTestId.ts +14 -0
  67. package/testUtils/index.tsx +24 -22
  68. package/types.ts +4 -0
  69. package/appUtils/focusManager/FocusableEvents.ts +0 -8
  70. package/appUtils/focusManager/treeDataStructure/Utils/__tests__/Utils_android.test.js +0 -1094
  71. package/appUtils/focusManager/treeDataStructure/Utils/index.android.js +0 -261
@@ -1,12 +1,13 @@
1
1
  import React from "react";
2
2
  import { PathnameContext } from "@applicaster/zapp-react-native-ui-components/Contexts/PathnameContext";
3
3
  import { renderHook } from "@testing-library/react-hooks";
4
- import { useRoute, isNavBarVisible } from "../";
4
+ 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
8
  import { ZappHookModalContext } from "@applicaster/zapp-react-native-ui-components/Contexts";
9
9
  import { ROUTE_TYPES } from "@applicaster/zapp-react-native-utils/navigationUtils/routeTypes";
10
+ import { ScreenDataContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenDataContext";
10
11
 
11
12
  const plugins = [];
12
13
 
@@ -100,13 +101,15 @@ const mainStackWrapper = ({
100
101
  pathname = homeStack.route,
101
102
  }) => (
102
103
  <Provider store={store}>
103
- <NavigationContext.Provider
104
- value={{ ...mainStackNavigator, ...navigator, currentRoute: pathname }}
105
- >
106
- <PathnameContext.Provider value={pathname}>
107
- {children}
108
- </PathnameContext.Provider>
109
- </NavigationContext.Provider>
104
+ <ScreenDataContext.Provider value={homeStack.state}>
105
+ <NavigationContext.Provider
106
+ value={{ ...mainStackNavigator, ...navigator, currentRoute: pathname }}
107
+ >
108
+ <PathnameContext.Provider value={pathname}>
109
+ {children}
110
+ </PathnameContext.Provider>
111
+ </NavigationContext.Provider>
112
+ </ScreenDataContext.Provider>
110
113
  </Provider>
111
114
  );
112
115
 
@@ -1,7 +1,7 @@
1
1
  /* eslint-disable @typescript-eslint/no-use-before-define */
2
2
  /* eslint max-len: off */
3
3
 
4
- import React, { useEffect, useMemo } from "react";
4
+ import React, { useContext, useEffect, useMemo } from "react";
5
5
  import { BackHandler, InteractionManager, NativeModules } from "react-native";
6
6
  import { useSafeAreaInsets } from "react-native-safe-area-context";
7
7
 
@@ -12,7 +12,11 @@ import {
12
12
  import { HooksManager } from "@applicaster/zapp-react-native-utils/appUtils/HooksManager";
13
13
 
14
14
  import { legacyScreenData } from "@applicaster/quick-brick-core/App/NavigationProvider/utils";
15
- import { LONG_KEY_PRESS_TIMEOUT } from "@applicaster/quick-brick-core/const";
15
+ import {
16
+ LONG_KEY_PRESS_TIMEOUT,
17
+ QUICK_BRICK_NAVBAR,
18
+ QUICK_BRICK_CONTENT,
19
+ } from "@applicaster/quick-brick-core/const";
16
20
  import { useZappHooksModalState } from "@applicaster/zapp-react-dom-ui-components/Components/ZappHooksModal/ZappHooksModal";
17
21
  import { ZappHookModalContext } from "@applicaster/zapp-react-native-ui-components/Contexts";
18
22
  import { PathnameContext } from "@applicaster/zapp-react-native-ui-components/Contexts/PathnameContext";
@@ -27,10 +31,11 @@ import { platformSelect } from "../../reactUtils";
27
31
  import { useConnectionInfo } from "../connection";
28
32
  import { getTargetScreenData } from "../screen/useTargetScreenData";
29
33
 
30
- import { isTV } from "@applicaster/zapp-react-native-utils/reactUtils";
34
+ import { isTV, isWeb } from "@applicaster/zapp-react-native-utils/reactUtils";
31
35
  import { useNavbarState } from "../screen";
32
36
  import { useNavigation } from "./useNavigation";
33
37
  import { useModalStore } from "../../modalState";
38
+ import { ScreenDataContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenDataContext";
34
39
 
35
40
  export { useNavigation } from "./useNavigation";
36
41
 
@@ -146,16 +151,8 @@ export const useRoute = (): {
146
151
  pathname: string;
147
152
  } => {
148
153
  const pathname = usePathname() || "";
149
-
150
- /**
151
- * compose `useRoute()` output data
152
- */
153
- const composeRouteData = (screenData: VariousScreenData) => ({
154
- screenData,
155
- pathname,
156
- });
157
-
158
154
  const navigator = useNavigation();
155
+ const screenDataContext = legacyScreenData(useContext(ScreenDataContext));
159
156
 
160
157
  const { plugins, contentTypes, rivers } = usePickFromState([
161
158
  "plugins",
@@ -163,10 +160,11 @@ export const useRoute = (): {
163
160
  "contentTypes",
164
161
  ]);
165
162
 
166
- const currentStack = navigator.getStackForPathname(pathname);
167
163
  const { modalState } = useModalStore();
168
164
  const hookModalState = useZappHooksModalState();
165
+
169
166
  const modalScreenData = modalState.screen;
167
+
170
168
  const hookModalScreenData = hookModalState.state.screenData?.payload;
171
169
 
172
170
  const videoModalScreenData =
@@ -183,15 +181,6 @@ export const useRoute = (): {
183
181
  plugins
184
182
  );
185
183
 
186
- const currentRouteScreenData = legacyScreenData(
187
- {
188
- screen: currentStack?.state?.screen ?? navigator.data?.screen ?? {},
189
- entry: currentStack?.state?.entry ?? {},
190
- } as NavigationScreenData,
191
-
192
- plugins
193
- );
194
-
195
184
  // There are 4 route scenarios
196
185
  // For regular screens take date from navigator stack.
197
186
  // is path is model grab screenData from modal state
@@ -200,58 +189,30 @@ export const useRoute = (): {
200
189
  // if path is hook grab screenData from screenData
201
190
 
202
191
  if (isModalPathname(pathname)) {
203
- return composeRouteData(modalScreenData ?? ({} as ZappEntry));
192
+ const screenData = modalScreenData ?? ({} as ZappEntry);
193
+
194
+ return { screenData, pathname };
204
195
  }
205
196
 
206
197
  if (isVideoModalPathname(pathname)) {
207
- return composeRouteData(videoModalScreenData as LegacyNavigationScreenData);
198
+ const screenData = videoModalScreenData as LegacyNavigationScreenData;
199
+
200
+ return { screenData, pathname };
208
201
  }
209
202
 
210
203
  if (isHookModalPathname(pathname)) {
211
- return composeRouteData(hookModalScreenData);
204
+ const screenData = hookModalScreenData;
205
+
206
+ return { screenData, pathname };
212
207
  }
213
208
 
214
209
  if (isHookPathname(pathname)) {
215
- /**
216
- * HACK
217
- *
218
- * This condition relies on hacky approach to get the current hook screen data
219
- * using navigator.screenData for some cases.
220
- * This is used when hook is in sequence.
221
- */
222
-
223
- // case 1: stack not yet updated in navigator context, but navigator.screenData is updated already.
224
- if (!currentStack) {
225
- return composeRouteData(navigator.screenData);
226
- }
227
-
228
- const isValidHookInCurrentRouteScreenData =
229
- "hookPlugin" in currentRouteScreenData &&
230
- !!currentRouteScreenData.hookPlugin?.module;
231
-
232
- let screenData;
233
-
234
- // case 2: stack has valid hook data
235
- if (isValidHookInCurrentRouteScreenData) {
236
- screenData = currentRouteScreenData;
237
- }
238
-
239
- const navigatorScreenData = navigator.screenData as NavigatorEntry;
240
-
241
- // case 3: current hookPlugin is missing weight, but navigator.screenData has weight, use navigator.screenData
242
- if (
243
- screenData.hookPlugin.identifier ===
244
- navigatorScreenData?.hookPlugin?.identifier &&
245
- !screenData.hookPlugin?.weight &&
246
- navigatorScreenData?.hookPlugin?.weight
247
- ) {
248
- screenData = navigator.screenData;
249
- }
250
-
251
- return composeRouteData(screenData);
210
+ return { screenData: screenDataContext, pathname };
252
211
  }
253
212
 
254
- return composeRouteData(currentRouteScreenData);
213
+ const screenData = screenDataContext;
214
+
215
+ return { screenData, pathname };
255
216
  };
256
217
 
257
218
  type Callbacks = Partial<{
@@ -501,8 +462,26 @@ export const useUniqueRouteSuffix = (): Return => {
501
462
  const suffix = `currentRoute:${currentRoute}_pathname:${pathname}`;
502
463
 
503
464
  const withUniqueRouteSuffix = React.useCallback((prefix: string) => {
504
- return `${prefix}___${suffix}`;
465
+ if (isWeb()) {
466
+ // we should use extended route prefix only on Web, where we have stack-navigator
467
+ return `${prefix}___${suffix}`;
468
+ }
469
+
470
+ // for other platforms use previous version
471
+ return prefix;
505
472
  }, []);
506
473
 
507
474
  return withUniqueRouteSuffix;
508
475
  };
476
+
477
+ export const useNavbarId = () => {
478
+ const withUniqueRouteSuffix = useUniqueRouteSuffix();
479
+
480
+ return withUniqueRouteSuffix(QUICK_BRICK_NAVBAR);
481
+ };
482
+
483
+ export const useContentId = () => {
484
+ const withUniqueRouteSuffix = useUniqueRouteSuffix();
485
+
486
+ return withUniqueRouteSuffix(QUICK_BRICK_CONTENT);
487
+ };
@@ -3,23 +3,28 @@ import { Provider } from "react-redux";
3
3
  import { renderHook } from "@testing-library/react-hooks";
4
4
  import configureStore from "redux-mock-store";
5
5
  import thunk from "redux-thunk";
6
- import { NavigationContext } from "@applicaster/zapp-react-native-ui-components/Contexts/NavigationContext";
7
6
 
8
7
  const mockStore = configureStore([thunk]);
9
8
 
10
- import { useCurrentScreenData } from "../useCurrentScreenData";
11
-
12
- describe("useScreenData", function () {
13
- const river_id_2: ZappRiver = {
14
- name: "River 2",
15
- id: "A1234",
16
- home: false,
17
- home_offline: false,
18
- supports_offline: false,
19
- navigations: [],
20
- hooks: { preload_plugins: [] },
21
- };
22
-
9
+ const river_id_2: ZappRiver = {
10
+ name: "River 2",
11
+ id: "A1234",
12
+ home: false,
13
+ home_offline: false,
14
+ supports_offline: false,
15
+ navigations: [],
16
+ hooks: { preload_plugins: [] },
17
+ };
18
+
19
+ jest.mock("../useScreenContext", () => ({
20
+ useScreenContext: () => ({
21
+ screen: river_id_2,
22
+ }),
23
+ }));
24
+
25
+ const { useCurrentScreenData } = require("../useCurrentScreenData");
26
+
27
+ describe("useScreenData", () => {
23
28
  const river_id_1 = { id: "B5678" };
24
29
 
25
30
  const store = mockStore({
@@ -27,17 +32,10 @@ describe("useScreenData", function () {
27
32
  });
28
33
 
29
34
  const wrapper: React.FC<any> = ({ children }) => (
30
- <NavigationContext.Provider
31
- value={{
32
- currentRoute: "/river/river_id_1/river/river_id_2",
33
- data: { screen: river_id_2 },
34
- }}
35
- >
36
- <Provider store={store}>{children}</Provider>
37
- </NavigationContext.Provider>
35
+ <Provider store={store}>{children}</Provider>
38
36
  );
39
37
 
40
- it("should return river data for the current screen/route", function () {
38
+ it("should return river data for the current screen/route", () => {
41
39
  const { result } = renderHook(() => useCurrentScreenData(), { wrapper });
42
40
 
43
41
  expect(result.current).toBe(river_id_2);
@@ -10,3 +10,5 @@ export {
10
10
  useNavbarState,
11
11
  useSetNavbarState,
12
12
  } from "./useScreenContext";
13
+
14
+ export { useScreenBackgroundColor } from "./useScreenBackgroundColor";
@@ -0,0 +1,23 @@
1
+ import * as React from "react";
2
+ import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
3
+ import { useScreenConfiguration } from "@applicaster/zapp-react-native-ui-components/Components/River/useScreenConfiguration";
4
+ import { ifEmptyUseFallback } from "@applicaster/zapp-react-native-utils/cellUtils";
5
+
6
+ export const useScreenBackgroundColor = (screenId: string): string => {
7
+ const { backgroundColor: screenBackgroundColor } =
8
+ useScreenConfiguration(screenId);
9
+
10
+ const theme = useTheme();
11
+
12
+ const themeBackgroundColor = React.useMemo(
13
+ () => theme.app_background_color,
14
+ [theme.app_background_color]
15
+ );
16
+
17
+ const backgroundColor = ifEmptyUseFallback(
18
+ screenBackgroundColor,
19
+ themeBackgroundColor
20
+ );
21
+
22
+ return backgroundColor;
23
+ };
@@ -5,8 +5,9 @@ import { useNestedNavigationContext } from "@applicaster/zapp-react-native-ui-co
5
5
  import { useNavigation } from "../navigation/useNavigation";
6
6
 
7
7
  import { ScreenContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenContext";
8
+ import { ScreenDataContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenDataContext";
8
9
 
9
- function useScreenContextV2() {
10
+ export function useScreenContextV2() {
10
11
  return useContext(ScreenContext);
11
12
  }
12
13
 
@@ -44,9 +45,8 @@ export function useSetNavbarState() {
44
45
 
45
46
  export function useScreenContext(): NavigationScreenData {
46
47
  const navigator = useNavigation();
48
+ const screenData = useContext(ScreenDataContext);
47
49
 
48
- const screenKey = useMemo(() => navigator?.key, [navigator]);
49
- const screenData = useMemo(() => navigator?.data, [screenKey]);
50
50
  const modalScreenData = navigator?.modalData;
51
51
 
52
52
  const isModal = useModalNavigationContext();
@@ -108,3 +108,105 @@ export const isAndroidPlatform = () => Platform.OS === "android";
108
108
  export const isTvOSPlatform = () => getPlatform() === "tvos";
109
109
 
110
110
  export const isAndroidTVPlatform = () => getPlatform() === "android_tv";
111
+
112
+ declare global {
113
+ interface Window {
114
+ VIZIO?: {
115
+ exitApplication: () => void;
116
+ setClosedCaptionHandler: (
117
+ callback: (isCCEnabled: boolean) => void
118
+ ) => void;
119
+ };
120
+ }
121
+ }
122
+
123
+ /**
124
+ * Platforms found in userAgent string, please note that simulators
125
+ * might not have the same agents that the devices have
126
+ */
127
+ export const PLATFORMS = {
128
+ webos: "Web0S",
129
+ tizen: "Tizen",
130
+ samsung: "SMART-TV",
131
+ mac: "Mac",
132
+ win: "Win",
133
+ linux: "Linux",
134
+ iphone: "iPhone",
135
+ android: "Android",
136
+ mobile: "Mobile",
137
+ vizio: "VIZIO",
138
+ smartcast: "SmartCast",
139
+ conjure: "Conjure",
140
+ };
141
+
142
+ /**
143
+ * Simple way of identifying if we have access to the tizen APIs
144
+ */
145
+ export const hasTizen = typeof window?.tizen !== "undefined";
146
+
147
+ /**
148
+ * Simple way of identifying if we have access to the webOS APIs
149
+ */
150
+ export const hasWebOS = typeof window?.webOS !== "undefined";
151
+
152
+ export const getUserAgent = () =>
153
+ window?.navigator?.userAgent || global?.navigator?.userAgent;
154
+
155
+ export const isLgPlatform = () => {
156
+ const userAgent = getUserAgent();
157
+
158
+ if (!userAgent) {
159
+ return false;
160
+ }
161
+
162
+ // Note: LG uses the number 0 in their userAgent, possibly because of Palm WebOS
163
+ return hasWebOS || userAgent.includes(PLATFORMS.webos);
164
+ };
165
+
166
+ export const isSamsungPlatform = () => {
167
+ const userAgent = getUserAgent();
168
+
169
+ if (!userAgent) {
170
+ return false;
171
+ }
172
+
173
+ return (
174
+ hasTizen ||
175
+ userAgent.includes(PLATFORMS.samsung) ||
176
+ userAgent.includes(PLATFORMS.tizen)
177
+ );
178
+ };
179
+
180
+ /**
181
+ * Checks if we are on the Vizio platform by using the userAgent string
182
+ *
183
+ * Use this method when you need to identify the platform on runtime
184
+ * before the VIZIO Companion Library has loaded
185
+ */
186
+ export const isVizioPlatform = () => {
187
+ const userAgent = getUserAgent();
188
+
189
+ if (!userAgent) {
190
+ return false;
191
+ }
192
+
193
+ const isVizioAgent =
194
+ userAgent.includes(PLATFORMS.vizio) ||
195
+ userAgent.includes(PLATFORMS.smartcast) ||
196
+ userAgent.includes(PLATFORMS.conjure);
197
+
198
+ return isVizioAgent;
199
+ };
200
+
201
+ /**
202
+ * Checks if we are on the Vizio platform by checking for the global VIZIO object
203
+ * and the VIZIO Companion Library. This method does not use the userAgent string,
204
+ * because it mainly checks whether we have access to apis, which may not be available yet
205
+ */
206
+ export const hasVizioAPIs = () => {
207
+ const hasAPIs =
208
+ typeof window.VIZIO !== "undefined" &&
209
+ window?.applicaster?.vizioLibraryDidLoad;
210
+
211
+ return hasAPIs;
212
+ };
@@ -49,11 +49,3 @@ export function useScreenState(
49
49
  setSelectedEntry: (entryId) => setSelectedEntry(screenId, entryId),
50
50
  };
51
51
  }
52
-
53
- export const useScreenScrollStore = create<{
54
- scrollPosition: number;
55
- scrollingVelocity: number;
56
- }>(() => ({
57
- scrollPosition: 0,
58
- scrollingVelocity: 0,
59
- }));
@@ -152,3 +152,8 @@ export function objectToCamelCase(obj) {
152
152
  export function isString(value: unknown): value is string {
153
153
  return typeof value === "string" || value instanceof String;
154
154
  }
155
+
156
+ /** Checks if a value is a non-empty string */
157
+ export function isNotEmptyString(value: unknown): value is string {
158
+ return isString(value) && value.length > 0;
159
+ }
@@ -0,0 +1,14 @@
1
+ export const getByTestId = (wrapper, testId) => {
2
+ try {
3
+ if (wrapper?.getByTestId) {
4
+ return wrapper?.queryAllByTestId(testId)?.[0] ?? undefined;
5
+ } else if (wrapper?.root?.findByProps) {
6
+ return wrapper.root.findAllByProps({ testID: testId })?.[0] ?? undefined;
7
+ }
8
+ } catch (e) {
9
+ // eslint-disable-next-line no-console
10
+ console.log("getByTestId E:", e);
11
+
12
+ return undefined;
13
+ }
14
+ };
@@ -1,6 +1,6 @@
1
1
  import * as R from "ramda";
2
2
 
3
- import React from "react";
3
+ import React, { PropsWithChildren } from "react";
4
4
  import { View } from "react-native";
5
5
 
6
6
  import { Provider } from "react-redux";
@@ -11,6 +11,8 @@ import { SafeAreaProvider } from "react-native-safe-area-context";
11
11
  import { render } from "@testing-library/react-native";
12
12
  import { AnalyticsProvider } from "../analyticsUtils";
13
13
 
14
+ export { getByTestId } from "./getByTestId";
15
+
14
16
  /**
15
17
  * Function to be used in tandem with enzyme findWhere(node => node.prop('testID') === 'yourID')
16
18
  * Example:
@@ -21,17 +23,6 @@ import { AnalyticsProvider } from "../analyticsUtils";
21
23
  export const testIDEquals = (testId: any): boolean =>
22
24
  R.compose(R.equals(testId), R.invoker(1, "prop")("testID"));
23
25
 
24
- export const getByTestId = (wrapper, testId) => {
25
- try {
26
- return wrapper?.queryAllByTestId(testId)?.[0] ?? undefined;
27
- } catch (e) {
28
- // eslint-disable-next-line no-console
29
- console.log("getByTestId E:", e);
30
-
31
- return undefined;
32
- }
33
- };
34
-
35
26
  /** Helper function for react-test-renderer, accepts type and renderer
36
27
  * * @param {*} type React Component type instance or name of component
37
28
  * * @param {*} renderer renderer instance
@@ -47,11 +38,11 @@ export const findByType = (type, renderer) => {
47
38
  export function createComponentMock(mockName, hasChildren = false) {
48
39
  return hasChildren
49
40
  ? jest.fn(({ children }) => (
50
- <View comp={mockName} testID={mockName}>
41
+ <View testID={mockName}>
51
42
  {typeof children === "function" ? children() : children}
52
43
  </View>
53
44
  ))
54
- : jest.fn(() => <View comp={mockName} testID={mockName} />);
45
+ : jest.fn(() => <View testID={mockName} />);
55
46
  }
56
47
 
57
48
  const initialState = {
@@ -64,14 +55,21 @@ const initialState = {
64
55
  AppContainer: createComponentMock("appContainer", true),
65
56
  DisplayError: createComponentMock("displayError"),
66
57
  },
67
- rivers: [{ id: "A1234", home: true }],
58
+ rivers: { id: "A1234", home: true },
68
59
  appSettings: {},
69
60
  plugins: [],
70
- appState: { appReady: true },
61
+ appState: { appReady: true, appLaunched: true },
62
+ appData: { layoutVersion: "v1" },
63
+ contentTypes: null,
71
64
  };
72
65
 
73
- export const WrappedWithProviders = ({ children, store = {} }: any) => {
74
- const _store = configureStore([thunk])({ ...initialState, ...store });
66
+ export const WrappedWithProviders = ({
67
+ children,
68
+ store: storeObj = {},
69
+ }: any) => {
70
+ const _store = configureStore([thunk])(
71
+ R.mergeDeepWith(R.concat, { ...initialState }, storeObj)
72
+ );
75
73
 
76
74
  return (
77
75
  <SafeAreaProvider
@@ -93,8 +91,12 @@ export const WrappedWithProviders = ({ children, store = {} }: any) => {
93
91
  * @param store optional store to pass to the provider
94
92
  * @returns
95
93
  */
96
- export const renderWithProviders = (component, store?: unknown) => {
97
- return render(
98
- <WrappedWithProviders store={store}>{component}</WrappedWithProviders>
99
- );
94
+ export const renderWithProviders = (component, storeObj?: unknown) => {
95
+ return render(component, {
96
+ wrapper: function TestWrapper({ children }: PropsWithChildren<any>) {
97
+ return (
98
+ <WrappedWithProviders store={storeObj}>{children}</WrappedWithProviders>
99
+ );
100
+ },
101
+ });
100
102
  };
package/types.ts CHANGED
@@ -5,3 +5,7 @@ export type ManifestField<T> = {
5
5
  group?: boolean;
6
6
  fields?: ManifestField<any>[];
7
7
  };
8
+
9
+ export enum ENDPOINT_TAGS {
10
+ allow_missing_keys = "allow_missing_keys",
11
+ }
@@ -1,8 +0,0 @@
1
- export const FOCUSABLE_EVENTS = {
2
- IS_REGISTERED: "isRegistered",
3
- WILL_RECEIVE_FOCUS: "willReceiveFocus",
4
- HAS_RECEIVED_FOCUS: "hasReceivedFocus",
5
- WILL_LOSE_FOCUS: "willLoseFocus",
6
- HAS_LOST_FOCUS: "hasLostFocus",
7
- WILL_UNREGISTER: "willUnregister",
8
- };