@applicaster/zapp-react-native-utils 12.0.0-alpha.4300857220 → 12.0.0-alpha.4337072244

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 (33) hide show
  1. package/analyticsUtils/AnalyticsEvents/index.ts +6 -0
  2. package/analyticsUtils/AnalyticsEvents/searchEvents.ts +21 -0
  3. package/analyticsUtils/events.ts +6 -0
  4. package/analyticsUtils/index.tsx +6 -0
  5. package/appUtils/focusManager/__tests__/__snapshots__/focusManager.test.js.snap +3 -3
  6. package/appUtils/focusManager/__tests__/focusManager.test.js +4 -24
  7. package/appUtils/focusManager/__tests__/index.test.ts +3 -3
  8. package/appUtils/focusManager/index.ts +141 -56
  9. package/appUtils/focusManager/treeDataStructure/Utils/index.js +73 -43
  10. package/appUtils/focusManager/utils/index.ts +94 -0
  11. package/arrayUtils/__tests__/isFilledArray.test.ts +63 -0
  12. package/arrayUtils/index.ts +5 -0
  13. package/cellUtils/__tests__/cellUtils.test.ts +9 -20
  14. package/cellUtils/index.ts +6 -12
  15. package/dateUtils/index.ts +11 -0
  16. package/inflatedUrlUtils/index.ts +4 -4
  17. package/localizationUtils/__tests__/localizationUtils.test.ts +72 -53
  18. package/localizationUtils/index.ts +13 -22
  19. package/numberUtils/__tests__/isLikeNumber.test.ts +18 -0
  20. package/numberUtils/index.ts +9 -18
  21. package/package.json +2 -2
  22. package/reactHooks/cell-click/__tests__/index.test.js +10 -2
  23. package/reactHooks/cell-click/index.ts +11 -11
  24. package/reactHooks/feed/__tests__/useBuildPipesUrl.test.tsx +30 -70
  25. package/reactHooks/feed/__tests__/useInflatedUrl.test.ts +18 -3
  26. package/reactHooks/feed/useBuildPipesUrl.ts +7 -10
  27. package/reactHooks/feed/useInflatedUrl.ts +44 -15
  28. package/reactHooks/navigation/index.ts +15 -0
  29. package/reactHooks/screen/__tests__/useCurrentScreenData.test.tsx +21 -23
  30. package/reactHooks/screen/index.ts +2 -0
  31. package/reactHooks/screen/useScreenBackgroundColor.ts +23 -0
  32. package/reactHooks/screen/useScreenContext.ts +3 -2
  33. package/types.ts +4 -0
@@ -1,77 +1,26 @@
1
- import React from "react";
2
1
  import { renderHook } from "@testing-library/react-hooks";
3
- import configureStore from "redux-mock-store";
4
- import thunk from "redux-thunk";
5
- import { Provider } from "react-redux";
6
-
7
2
  import { encodeParams } from "@applicaster/zapp-pipes-v2-client/src/utils";
8
3
 
9
- const mockStore = configureStore([thunk]);
10
-
11
- jest.useFakeTimers();
12
-
13
4
  const appData = {
14
5
  platform: "foo",
15
6
  version_name: "1.2.0",
16
7
  sdk_version: "2.0.0",
17
8
  };
18
9
 
19
- const pipesEndpoints = {
20
- "http://foo.com/show": {
21
- context_obj: [
22
- { type: "ctx", key: "platform" },
23
- { type: "query", mapper: "version", key: "appVersion" },
24
- { type: "header", mapper: "SDK", key: "sdkVersion" },
25
- ],
26
- },
27
- };
28
-
29
- const store_mock = { appData, pipesEndpoints };
30
-
31
- const defaultStore = mockStore({
32
- pipesEndpoints,
33
- appData,
34
- });
10
+ let INFLATED_URL;
35
11
 
36
- const wrapper: React.FC<any> = ({ children, store }) => (
37
- <Provider store={store}>{children}</Provider>
12
+ jest.mock(
13
+ "@applicaster/zapp-react-native-utils/reactHooks/feed/useInflatedUrl",
14
+ () => ({
15
+ useInflatedUrl: () => INFLATED_URL,
16
+ })
38
17
  );
39
18
 
40
- const navigator = {
41
- currentRoute: "/river/A1234",
42
- };
43
-
44
- jest.mock("../../navigation", () => ({
45
- useNavigation: jest.fn(() => navigator),
46
- useRoute: jest.fn(() => ({})),
47
- }));
48
-
49
- const contexts = {
50
- entry: { id: "show-1" },
51
- search: {},
52
- screen: {},
53
- };
54
-
55
- const contextMock = (type) => ({
56
- useZappPipesContext: () => [contexts[type] || {}],
57
- });
58
-
59
- jest.mock("@applicaster/zapp-react-native-ui-components/Contexts", () => ({
60
- ZappPipesEntryContext: contextMock("entry"),
61
- ZappPipesSearchContext: contextMock("search"),
62
- ZappPipesScreenContext: contextMock("screen"),
63
- }));
64
-
65
- jest.mock("@applicaster/zapp-react-native-redux/AppStore", () => ({
66
- appStore: {
67
- get: jest.fn((prop) => store_mock[prop]),
68
- },
69
- }));
70
-
71
19
  const { useBuildPipesUrl } = require("../useBuildPipesUrl");
72
20
 
73
21
  describe("useBuildPipesUrl", () => {
74
22
  it("returns the proper url", async () => {
23
+ INFLATED_URL = "http://foo.com/show/show-1";
75
24
  const url = "http://foo.com/show/{{showId}}";
76
25
 
77
26
  const mapping = {
@@ -81,12 +30,20 @@ describe("useBuildPipesUrl", () => {
81
30
  },
82
31
  };
83
32
 
84
- const { result, waitForNextUpdate } = renderHook(
85
- () => useBuildPipesUrl({ url, mapping }),
86
- {
87
- wrapper,
88
- initialProps: { store: defaultStore },
89
- }
33
+ const buildResult = {
34
+ params: {
35
+ ctx: encodeParams({ platform: appData.platform }),
36
+ version: appData.version_name,
37
+ },
38
+ headers: { SDK: appData.sdk_version },
39
+ };
40
+
41
+ const mockedRequestBuilder = {
42
+ build: jest.fn(() => Promise.resolve(buildResult)),
43
+ };
44
+
45
+ const { result, waitForNextUpdate } = renderHook(() =>
46
+ useBuildPipesUrl({ url, mapping, requestBuilder: mockedRequestBuilder })
90
47
  );
91
48
 
92
49
  expect(result.current.url).toBe("http://foo.com/show/show-1");
@@ -108,6 +65,7 @@ describe("useBuildPipesUrl", () => {
108
65
  });
109
66
 
110
67
  it("returns empty object if url is not in endpoints", async () => {
68
+ INFLATED_URL = "http://foobar.com/show-1";
111
69
  const url = "http://foobar.com/{{showId}}";
112
70
 
113
71
  const mapping = {
@@ -117,12 +75,14 @@ describe("useBuildPipesUrl", () => {
117
75
  },
118
76
  };
119
77
 
120
- const { result, waitForNextUpdate } = renderHook(
121
- () => useBuildPipesUrl({ url, mapping }),
122
- {
123
- wrapper,
124
- initialProps: { store: defaultStore },
125
- }
78
+ const buildResult = {};
79
+
80
+ const mockedRequestBuilder = {
81
+ build: jest.fn(() => Promise.resolve(buildResult)),
82
+ };
83
+
84
+ const { result, waitForNextUpdate } = renderHook(() =>
85
+ useBuildPipesUrl({ url, mapping, requestBuilder: mockedRequestBuilder })
126
86
  );
127
87
 
128
88
  expect(result.current.url).toBe("http://foobar.com/show-1");
@@ -12,9 +12,21 @@ const {
12
12
 
13
13
  const { reactHooksLogger } = require("../../logger");
14
14
 
15
+ let mockStore;
16
+
15
17
  describe("getInflatedDataSourceUrl", () => {
16
18
  beforeEach(() => {
17
19
  reactHooksLogger.warning.mockClear();
20
+
21
+ const {
22
+ appStore,
23
+ } = require("@applicaster/zapp-react-native-redux/AppStore");
24
+
25
+ mockStore = {
26
+ getState: jest.fn().mockReturnValue({ pipesEndpoints: {} }),
27
+ };
28
+
29
+ appStore.set(mockStore);
18
30
  });
19
31
 
20
32
  it("returns the url inflated with the right params", () => {
@@ -72,7 +84,8 @@ describe("getInflatedDataSourceUrl", () => {
72
84
  expect(reactHooksLogger.warning).toHaveBeenCalledTimes(1);
73
85
 
74
86
  expect(reactHooksLogger.warning).toHaveBeenCalledWith({
75
- message: "Not enough data to fully inflate url",
87
+ message:
88
+ "Not enough data to fully inflate url: {{entry.id}} source: http://foo.com/show/seriesId={{seriesId}}",
76
89
  data: { source, contexts, mapping },
77
90
  });
78
91
  });
@@ -107,7 +120,8 @@ describe("getInflatedDataSourceUrl", () => {
107
120
  expect(reactHooksLogger.warning).toHaveBeenCalledTimes(1);
108
121
 
109
122
  expect(reactHooksLogger.warning).toHaveBeenCalledWith({
110
- message: "Not enough data to fully inflate url",
123
+ message:
124
+ "Not enough data to fully inflate url: {{entry.extensions.groupName}} source: https://zapp-1689-emmys.web.app/emmys/group-categories/{{groupName}}",
111
125
  data: { source, contexts, mapping },
112
126
  });
113
127
  });
@@ -148,7 +162,8 @@ describe("getInflatedDataSourceUrl", () => {
148
162
  expect(reactHooksLogger.warning).toHaveBeenCalledTimes(1);
149
163
 
150
164
  expect(reactHooksLogger.warning).toHaveBeenCalledWith({
151
- message: "Not enough data to fully inflate url",
165
+ message:
166
+ "Not enough data to fully inflate url: {{entry.extensions.groupName2}} source: https://zapp-1689-emmys.web.app/emmys/group-categories/{{groupName1}}?test={{groupName2}}",
152
167
  data: { source, contexts, mapping },
153
168
  });
154
169
  });
@@ -1,7 +1,6 @@
1
- // @ts-ignore
2
1
  import { RequestBuilder } from "@applicaster/zapp-pipes-v2-client";
3
- import { useEffect, useState } from "react";
4
- import { useInflatedUrl } from "./useInflatedUrl";
2
+ import * as React from "react";
3
+ import { useInflatedUrl } from "@applicaster/zapp-react-native-utils/reactHooks/feed/useInflatedUrl";
5
4
  import { reactHooksLogger } from "../logger";
6
5
 
7
6
  export const logger = reactHooksLogger.addSubsystem("build-pipes-url");
@@ -15,18 +14,16 @@ type PipesBuildRequestObject = {
15
14
  export function useBuildPipesUrl({
16
15
  url,
17
16
  mapping = {},
17
+ requestBuilder = new RequestBuilder(),
18
18
  }): PipesBuildRequestObject {
19
- const [requestParams, setRequestParams] = useState<object | null>(null);
20
- const [error, setError] = useState(null);
19
+ const [requestParams, setRequestParams] = React.useState<object | null>(null);
21
20
 
21
+ const [error, setError] = React.useState(null);
22
22
  const inflatedUrl = useInflatedUrl({ feedUrl: url, mapping });
23
23
 
24
- const requestBuilder = new RequestBuilder();
25
-
26
24
  const buildRequest = async (_url) => {
27
25
  try {
28
26
  const result = await requestBuilder.build(_url);
29
-
30
27
  setRequestParams(result);
31
28
  } catch (e) {
32
29
  setError(e);
@@ -34,7 +31,7 @@ export function useBuildPipesUrl({
34
31
  }
35
32
  };
36
33
 
37
- useEffect(() => {
34
+ React.useEffect(() => {
38
35
  if (inflatedUrl && !requestParams) {
39
36
  buildRequest(inflatedUrl);
40
37
  }
@@ -42,7 +39,7 @@ export function useBuildPipesUrl({
42
39
 
43
40
  return {
44
41
  url: inflatedUrl || "",
45
- requestParams: requestParams, // TODO should it be: || {} ?
42
+ requestParams, // TODO should it be: || {} ?
46
43
  error: error || undefined,
47
44
  };
48
45
  }
@@ -9,9 +9,15 @@ import {
9
9
 
10
10
  import { inflateString } from "../../stringUtils";
11
11
  import { useRoute } from "../navigation";
12
- import { isEnoughDataToInflateString } from "../../inflatedUrlUtils";
12
+ import { getMissingValues } from "../../inflatedUrlUtils";
13
13
  import { reactHooksLogger as logger } from "../logger";
14
14
  import { isTV } from "../../reactUtils";
15
+ import {
16
+ findEndpointForURL,
17
+ HTTP_METHODS,
18
+ } from "@applicaster/zapp-pipes-v2-client";
19
+ import { appStore } from "@applicaster/zapp-react-native-redux/AppStore";
20
+ import { ENDPOINT_TAGS } from "../../types";
15
21
 
16
22
  /**
17
23
  * will match any occurrence in a string of one or more word characters
@@ -105,24 +111,47 @@ export const getInflatedDataSourceUrl: GetInflatedDataSourceUrl = ({
105
111
  R.keys(mapping)
106
112
  );
107
113
 
108
- if (!isEnoughDataToInflateString(contexts, string)) {
109
- const message = "Not enough data to fully inflate url";
114
+ const missingValues = getMissingValues(contexts, string);
110
115
 
111
- // todo: add js only payload instead
112
- if (__DEV__) {
113
- logger.warning({
114
- message,
115
- data: { source, contexts, mapping },
116
- });
116
+ if (missingValues && missingValues.length > 0) {
117
+ const pipesEndpoints = appStore.get("pipesEndpoints");
118
+
119
+ const endpointURL = findEndpointForURL(
120
+ source,
121
+ pipesEndpoints,
122
+ HTTP_METHODS.GET
123
+ );
124
+
125
+ const tags = pipesEndpoints?.[endpointURL]?.tags;
126
+ const allowMissingKeys = tags?.includes(ENDPOINT_TAGS.allow_missing_keys);
127
+
128
+ if (!allowMissingKeys) {
129
+ const message = `Not enough data to fully inflate url: ${missingValues.join(
130
+ ","
131
+ )} source: ${source}`;
132
+
133
+ // todo: add js only payload instead
134
+ if (__DEV__) {
135
+ logger.warning({
136
+ message,
137
+ data: { source, contexts, mapping },
138
+ });
139
+ } else {
140
+ // todo: log values we've failed to resolve
141
+ logger.warning({
142
+ message,
143
+ });
144
+ }
145
+
146
+ // return null in order to prevent start fetching data with invalid url
147
+ return null;
117
148
  } else {
118
- // todo: log values we've failed to resolve
119
- logger.warning({
120
- message,
149
+ logger.debug({
150
+ message: `Ignoring missing values in url because ${
151
+ ENDPOINT_TAGS.allow_missing_keys
152
+ } endpoint tag, keys: ${missingValues.join(",")}`,
121
153
  });
122
154
  }
123
-
124
- // return null in order to prevent start fetching data with invalid url
125
- return null;
126
155
  }
127
156
 
128
157
  return inflateString({ string, data: contexts });
@@ -496,3 +496,18 @@ export const useIsScreenActive = () => {
496
496
 
497
497
  return pathname === currentRoute;
498
498
  };
499
+
500
+ type Return = (prefix: string) => string;
501
+
502
+ export const useUniqueRouteSuffix = (): Return => {
503
+ const pathname = usePathname();
504
+ const { currentRoute } = useNavigation();
505
+
506
+ const suffix = `currentRoute:${currentRoute}_pathname:${pathname}`;
507
+
508
+ const withUniqueRouteSuffix = React.useCallback((prefix: string) => {
509
+ return `${prefix}___${suffix}`;
510
+ }, []);
511
+
512
+ return withUniqueRouteSuffix;
513
+ };
@@ -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,6 +5,7 @@ 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/Components/Layout/TV";
8
9
 
9
10
  export function useScreenContextV2() {
10
11
  return useContext(ScreenContext);
@@ -45,8 +46,8 @@ export function useSetNavbarState() {
45
46
  export function useScreenContext(): NavigationScreenData {
46
47
  const navigator = useNavigation();
47
48
 
48
- const screenKey = useMemo(() => navigator?.key, [navigator]);
49
- const screenData = useMemo(() => navigator?.data, [screenKey]);
49
+ const screenData = useContext(ScreenDataContext);
50
+
50
51
  const modalScreenData = navigator?.modalData;
51
52
 
52
53
  const isModal = useModalNavigationContext();
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
+ }