@applicaster/zapp-react-native-utils 12.0.0-alpha.3977160850 → 12.0.0-alpha.4023252383
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/analyticsUtils/AnalyticPlayerListener.ts +141 -0
- package/analyticsUtils/AnalyticsEvents/index.ts +13 -0
- package/analyticsUtils/AnalyticsEvents/searchEvents.ts +21 -0
- package/analyticsUtils/AnalyticsEvents/sendShareEvent.ts +21 -0
- package/analyticsUtils/PlayerAnalyticsManager.ts +90 -0
- package/analyticsUtils/analyticsPlugins.ts +25 -0
- package/analyticsUtils/events.ts +12 -0
- package/analyticsUtils/index.tsx +12 -0
- package/analyticsUtils/{analyticsTracker.ts → playerAnalyticsTracker.ts} +19 -10
- package/appUtils/HooksManager/index.js +3 -1
- package/appUtils/accessibilityManager/const.ts +50 -0
- package/appUtils/accessibilityManager/hooks.ts +40 -0
- package/appUtils/accessibilityManager/index.ts +166 -0
- package/appUtils/accessibilityManager/logger.ts +5 -0
- package/appUtils/focusManager/__tests__/__snapshots__/focusManager.test.js.snap +2 -3
- package/appUtils/focusManager/__tests__/focusManager.test.js +4 -24
- package/appUtils/focusManager/__tests__/index.test.ts +2 -3
- package/appUtils/focusManager/index.ts +76 -57
- package/appUtils/focusManager/treeDataStructure/Utils/index.js +75 -35
- package/appUtils/focusManager/utils/index.ts +100 -0
- package/appUtils/focusManagerAux/index.ts +76 -0
- package/appUtils/focusManagerAux/utils/index.ts +100 -0
- package/appUtils/index.js +2 -0
- package/appUtils/keyCodes/keys.web.js +8 -0
- package/appUtils/keyCodes/keysByPlatform.js +11 -1
- package/appUtils/platform/const.ts +25 -0
- package/appUtils/platform/index.ts +3 -0
- package/appUtils/platform/platformUtils.ts +217 -0
- package/appUtils/playerManager/conts.ts +6 -0
- package/appUtils/playerManager/index.ts +20 -32
- package/appUtils/playerManager/nativePlayerManager.ts +12 -0
- package/appUtils/playerManager/player.ts +44 -3
- package/appUtils/playerManager/playerFactory.ts +13 -11
- package/appUtils/playerManager/playerHooks/usePlayerCurrentTime.tsx +57 -0
- package/appUtils/playerManager/playerNative.ts +15 -15
- package/appUtils/playerManager/usePlayerControllerSetup.tsx +8 -2
- package/appUtils/playerManager/usePlayerState.tsx +19 -34
- package/arrayUtils/__tests__/isFilledArray.test.ts +63 -0
- package/arrayUtils/index.ts +5 -0
- package/booleanUtils/index.ts +4 -4
- package/cellUtils/__tests__/cellUtils.test.ts +9 -20
- package/cellUtils/index.ts +48 -19
- package/dateUtils/index.ts +11 -0
- package/functionUtils/index.ts +38 -0
- package/headersUtils/index.ts +1 -0
- package/index.d.ts +15 -0
- package/inflatedUrlUtils/index.ts +4 -4
- package/keyboardState/index.ts +0 -0
- package/localizationUtils/__tests__/localizationUtils.test.ts +72 -53
- package/localizationUtils/index.ts +13 -22
- package/manifestUtils/defaultManifestConfigurations/generalContent.js +6 -0
- package/manifestUtils/defaultManifestConfigurations/player.js +2 -1
- package/manifestUtils/index.js +5 -1
- package/manifestUtils/secondaryImage/index.js +18 -15
- package/navigationUtils/index.ts +56 -4
- package/numberUtils/__tests__/isLikeNumber.test.ts +18 -0
- package/numberUtils/__tests__/toNumber.test.ts +2 -2
- package/numberUtils/index.ts +9 -18
- package/package.json +2 -2
- package/playerUtils/configurationGenerator.ts +3 -1
- package/playerUtils/imaScriptDom.ts +59 -0
- package/pluginUtils/index.ts +9 -0
- package/reactHooks/autoscrolling/__tests__/useTrackCurrentAutoScrollingElement.test.ts +2 -0
- package/reactHooks/autoscrolling/__tests__/{useTrackedView.test.ts → useTrackedView.test.tsx} +18 -1
- package/reactHooks/cell-click/__tests__/index.test.js +10 -1
- package/reactHooks/cell-click/index.ts +12 -12
- package/reactHooks/debugging/__tests__/index.test.js +81 -11
- package/reactHooks/feed/__tests__/useBuildPipesUrl.test.tsx +30 -70
- package/reactHooks/feed/__tests__/useFeedRefresh.test.tsx +6 -2
- package/reactHooks/feed/__tests__/useInflatedUrl.test.ts +18 -3
- package/reactHooks/feed/useBuildPipesUrl.ts +7 -10
- package/reactHooks/feed/useFeedRefresh.tsx +9 -7
- package/reactHooks/feed/useInflatedUrl.ts +44 -15
- package/reactHooks/layout/__tests__/{index.test.js → index.test.tsx} +44 -29
- package/reactHooks/layout/getDeviceInfo/index.ts +4 -2
- package/reactHooks/layout/types/index.ts +2 -0
- package/reactHooks/layout/useDimensions/useDimensions.ts +15 -7
- package/reactHooks/navigation/__mocks__/index.ts +15 -0
- package/reactHooks/navigation/__mocks__/useNavigation.ts +7 -0
- package/reactHooks/navigation/__tests__/index.test.tsx +26 -8
- package/reactHooks/navigation/index.ts +64 -21
- package/reactHooks/resolvers/__tests__/useCellResolver.test.tsx +3 -1
- package/reactHooks/resolvers/useCellResolver.ts +5 -1
- package/reactHooks/screen/__mocks__/useScreenContext.ts +3 -1
- package/reactHooks/screen/__tests__/useCurrentScreenData.test.tsx +21 -23
- package/reactHooks/screen/index.ts +2 -0
- package/reactHooks/screen/useScreenBackgroundColor.ts +23 -0
- package/reactHooks/screen/useScreenContext.ts +4 -4
- package/reactHooks/screen/useScreenData.ts +1 -1
- package/reactHooks/screen/useTargetScreenData.ts +7 -0
- package/reactHooks/useListenEventBusEvent.ts +1 -4
- package/reactHooks/videoModal/index.ts +0 -3
- package/reactUtils/index.ts +104 -0
- package/screenState/index.ts +0 -8
- package/stringUtils/index.ts +5 -0
- package/testUtils/getByTestId.ts +14 -0
- package/testUtils/index.tsx +38 -23
- package/types.ts +4 -0
- package/appUtils/focusManager/FocusableEvents.ts +0 -8
- package/appUtils/focusManager/treeDataStructure/Utils/__tests__/Utils_android.test.js +0 -1094
- package/appUtils/focusManager/treeDataStructure/Utils/index.android.js +0 -261
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
// @ts-ignore
|
|
2
1
|
import { RequestBuilder } from "@applicaster/zapp-pipes-v2-client";
|
|
3
|
-
import
|
|
4
|
-
import { useInflatedUrl } from "
|
|
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
|
|
42
|
+
requestParams, // TODO should it be: || {} ?
|
|
46
43
|
error: error || undefined,
|
|
47
44
|
};
|
|
48
45
|
}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import * as React from "react";
|
|
2
|
-
import
|
|
2
|
+
import { path, max } from "ramda";
|
|
3
3
|
import { isTrue } from "@applicaster/zapp-react-native-utils/booleanUtils";
|
|
4
4
|
import { toNumberWithDefault } from "@applicaster/zapp-react-native-utils/numberUtils";
|
|
5
|
+
import { useIsScreenActive } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
|
|
5
6
|
|
|
6
7
|
import { reactHooksLogger } from "../logger";
|
|
7
8
|
import { ReloadDataFunction } from "./useFeedLoader";
|
|
@@ -18,9 +19,8 @@ const minimumRefreshingInterval = 5;
|
|
|
18
19
|
const defaultRefreshInterval = 60;
|
|
19
20
|
|
|
20
21
|
export const useFeedRefresh = ({ reloadData, component }: Props): void => {
|
|
21
|
-
const
|
|
22
|
-
["rules", "enable_data_refreshing"],
|
|
23
|
-
component
|
|
22
|
+
const isDataRefreshingEnabled = isTrue(
|
|
23
|
+
path(["rules", "enable_data_refreshing"], component)
|
|
24
24
|
);
|
|
25
25
|
|
|
26
26
|
const refreshing_interval = toNumberWithDefault(
|
|
@@ -29,10 +29,12 @@ export const useFeedRefresh = ({ reloadData, component }: Props): void => {
|
|
|
29
29
|
);
|
|
30
30
|
|
|
31
31
|
const refreshingIntervalInMilliseconds =
|
|
32
|
-
|
|
32
|
+
max(refreshing_interval, minimumRefreshingInterval) * 1000;
|
|
33
|
+
|
|
34
|
+
const isScreenActive = useIsScreenActive();
|
|
33
35
|
|
|
34
36
|
React.useEffect(() => {
|
|
35
|
-
if (
|
|
37
|
+
if (isDataRefreshingEnabled && refreshing_interval && isScreenActive) {
|
|
36
38
|
if (refreshing_interval < minimumRefreshingInterval) {
|
|
37
39
|
feedRefreshLogger.warning({
|
|
38
40
|
message: `You set your feed refresh interval to ${refreshing_interval} when minimum value is ${minimumRefreshingInterval}seconds.Your feed will refresh after ${minimumRefreshingInterval}seconds.`,
|
|
@@ -59,5 +61,5 @@ export const useFeedRefresh = ({ reloadData, component }: Props): void => {
|
|
|
59
61
|
clearInterval(refreshInterval);
|
|
60
62
|
};
|
|
61
63
|
}
|
|
62
|
-
}, [reloadData]);
|
|
64
|
+
}, [reloadData, isScreenActive]);
|
|
63
65
|
};
|
|
@@ -9,9 +9,15 @@ import {
|
|
|
9
9
|
|
|
10
10
|
import { inflateString } from "../../stringUtils";
|
|
11
11
|
import { useRoute } from "../navigation";
|
|
12
|
-
import {
|
|
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
|
-
|
|
109
|
-
const message = "Not enough data to fully inflate url";
|
|
114
|
+
const missingValues = getMissingValues(contexts, string);
|
|
110
115
|
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
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
|
-
|
|
119
|
-
|
|
120
|
-
|
|
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 });
|
|
@@ -1,4 +1,8 @@
|
|
|
1
|
+
import React from "react";
|
|
2
|
+
|
|
1
3
|
import { cleanup, renderHook } from "@testing-library/react-hooks";
|
|
4
|
+
import { Provider } from "react-redux";
|
|
5
|
+
import configureStore from "redux-mock-store";
|
|
2
6
|
|
|
3
7
|
import * as ReactNative from "react-native";
|
|
4
8
|
|
|
@@ -44,22 +48,47 @@ jest.mock("../../../reactUtils", () => ({
|
|
|
44
48
|
|
|
45
49
|
jest.mock("../../navigation", () => ({
|
|
46
50
|
useNavigation: () => null,
|
|
51
|
+
useIsScreenActive: () => true,
|
|
47
52
|
}));
|
|
48
53
|
|
|
49
54
|
const { Dimensions } = require("react-native");
|
|
50
|
-
const { useDimensions } = require("
|
|
55
|
+
const { useDimensions } = require("..");
|
|
56
|
+
|
|
57
|
+
const mockStore = configureStore();
|
|
58
|
+
|
|
59
|
+
const getWrapper = () => {
|
|
60
|
+
const store = mockStore({ appData: {} });
|
|
61
|
+
|
|
62
|
+
const Wrapper = ({ children }: { children: React.ReactChild }) => (
|
|
63
|
+
/* @ts-ignore */
|
|
64
|
+
<Provider store={store}>{children}</Provider>
|
|
65
|
+
);
|
|
66
|
+
|
|
67
|
+
return Wrapper;
|
|
68
|
+
};
|
|
69
|
+
|
|
70
|
+
const testHook = (context, params?) => {
|
|
71
|
+
const wrapper = getWrapper();
|
|
72
|
+
|
|
73
|
+
const {
|
|
74
|
+
result,
|
|
75
|
+
result: { current: dimensions },
|
|
76
|
+
} = renderHook(() => useDimensions(context, params), {
|
|
77
|
+
wrapper,
|
|
78
|
+
});
|
|
79
|
+
|
|
80
|
+
return { result, dimensions };
|
|
81
|
+
};
|
|
51
82
|
|
|
52
83
|
describe("useDimensions", () => {
|
|
53
84
|
it("renders", () => {
|
|
54
|
-
const { result } =
|
|
55
|
-
useDimensions("window", { fullDimensions: true })
|
|
56
|
-
);
|
|
85
|
+
const { result } = testHook("window", { fullDimensions: true });
|
|
57
86
|
|
|
58
87
|
expect(result).toBeDefined();
|
|
59
88
|
});
|
|
60
89
|
|
|
61
90
|
it("sets event listener", () => {
|
|
62
|
-
|
|
91
|
+
testHook("window", { fullDimensions: true });
|
|
63
92
|
|
|
64
93
|
expect(Dimensions.addEventListener).toBeCalledWith(
|
|
65
94
|
"change",
|
|
@@ -68,16 +97,14 @@ describe("useDimensions", () => {
|
|
|
68
97
|
});
|
|
69
98
|
|
|
70
99
|
it("removes event listener", () => {
|
|
71
|
-
|
|
100
|
+
testHook("window", { fullDimensions: true });
|
|
72
101
|
cleanup();
|
|
73
102
|
|
|
74
103
|
expect(mockRemoveFn).toBeCalled();
|
|
75
104
|
});
|
|
76
105
|
|
|
77
106
|
it("Returns full dimensions object", () => {
|
|
78
|
-
const {
|
|
79
|
-
result: { current: dimensions },
|
|
80
|
-
} = renderHook(() => useDimensions("window", { fullDimensions: true }));
|
|
107
|
+
const { dimensions } = testHook("window", { fullDimensions: true });
|
|
81
108
|
|
|
82
109
|
expect(dimensions).toHaveProperty("height");
|
|
83
110
|
expect(dimensions).toHaveProperty("width");
|
|
@@ -86,20 +113,17 @@ describe("useDimensions", () => {
|
|
|
86
113
|
});
|
|
87
114
|
|
|
88
115
|
it("Returns shorthand dimensions object", () => {
|
|
89
|
-
const {
|
|
90
|
-
result: { current: dimensions },
|
|
91
|
-
} = renderHook(() => useDimensions("window"));
|
|
116
|
+
const { dimensions } = testHook("window");
|
|
92
117
|
|
|
93
118
|
expect(dimensions).toHaveProperty("height");
|
|
94
119
|
expect(dimensions).toHaveProperty("width");
|
|
95
120
|
});
|
|
96
121
|
|
|
97
122
|
it("Returns the device info object", () => {
|
|
98
|
-
const {
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
);
|
|
123
|
+
const { dimensions } = testHook("window", {
|
|
124
|
+
fullDimensions: true,
|
|
125
|
+
deviceInfo: true,
|
|
126
|
+
});
|
|
103
127
|
|
|
104
128
|
expect(dimensions).toHaveProperty("height");
|
|
105
129
|
expect(dimensions).toHaveProperty("width");
|
|
@@ -112,10 +136,7 @@ describe("useDimensions", () => {
|
|
|
112
136
|
it("applies the scale on TV, and screen context", () => {
|
|
113
137
|
tv_flag = true;
|
|
114
138
|
const { screen } = mocked_return_value(tv_flag);
|
|
115
|
-
|
|
116
|
-
const {
|
|
117
|
-
result: { current: dimensions },
|
|
118
|
-
} = renderHook(() => useDimensions("screen"));
|
|
139
|
+
const { dimensions } = testHook("screen");
|
|
119
140
|
|
|
120
141
|
expect(dimensions).toHaveProperty("height", screen.height * screen.scale);
|
|
121
142
|
expect(dimensions).toHaveProperty("width", screen.width * screen.scale);
|
|
@@ -127,10 +148,7 @@ describe("useDimensions", () => {
|
|
|
127
148
|
it("doesn't apply the scale on mobile with screen context", () => {
|
|
128
149
|
tv_flag = false;
|
|
129
150
|
const { screen } = mocked_return_value(tv_flag);
|
|
130
|
-
|
|
131
|
-
const {
|
|
132
|
-
result: { current: dimensions },
|
|
133
|
-
} = renderHook(() => useDimensions("screen"));
|
|
151
|
+
const { dimensions } = testHook("screen");
|
|
134
152
|
|
|
135
153
|
expect(dimensions).toHaveProperty("height", screen.height);
|
|
136
154
|
expect(dimensions).toHaveProperty("width", screen.width);
|
|
@@ -140,10 +158,7 @@ describe("useDimensions", () => {
|
|
|
140
158
|
it("doesn't apply the scale on TV with window context", () => {
|
|
141
159
|
tv_flag = true;
|
|
142
160
|
const { window } = mocked_return_value(tv_flag);
|
|
143
|
-
|
|
144
|
-
const {
|
|
145
|
-
result: { current: dimensions },
|
|
146
|
-
} = renderHook(() => useDimensions("window"));
|
|
161
|
+
const { dimensions } = testHook("window");
|
|
147
162
|
|
|
148
163
|
expect(dimensions).toHaveProperty("height", window.height);
|
|
149
164
|
expect(dimensions).toHaveProperty("width", window.width);
|
|
@@ -3,13 +3,15 @@ import { isTablet } from "../isTablet";
|
|
|
3
3
|
/**
|
|
4
4
|
* Returns an object with additional device info that can be used to determine if tablet
|
|
5
5
|
* @param {Number} dimensions - Dimensions object passed to the function
|
|
6
|
+
* @param {Object} appData - application data object passed to the function
|
|
6
7
|
* @returns {DeviceInfo} deviceInfo - returns an object with scale, isTablet, and orientation
|
|
7
8
|
*/
|
|
8
|
-
export const getDeviceInfo = (dimensions) => {
|
|
9
|
+
export const getDeviceInfo = (dimensions, appData) => {
|
|
9
10
|
const scale = dimensions?.scale;
|
|
10
11
|
const isLandscape = dimensions?.width > dimensions?.height;
|
|
11
12
|
const orientation = isLandscape ? "landscape" : "portrait";
|
|
12
13
|
const tablet = isTablet(dimensions, orientation) || false;
|
|
14
|
+
const isTabletLandscape = tablet && !appData?.isTabletPortrait;
|
|
13
15
|
|
|
14
|
-
return { scale, isTablet: tablet, orientation };
|
|
16
|
+
return { scale, isTablet: tablet, orientation, isTabletLandscape };
|
|
15
17
|
};
|
|
@@ -2,6 +2,7 @@ type DeviceInfo = {
|
|
|
2
2
|
isTablet: boolean;
|
|
3
3
|
scale: number;
|
|
4
4
|
orientation: string;
|
|
5
|
+
isTabletLandscape: boolean;
|
|
5
6
|
};
|
|
6
7
|
|
|
7
8
|
type RNDimensions = {
|
|
@@ -20,6 +21,7 @@ export type Options = {
|
|
|
20
21
|
excludeStatusBar?: boolean;
|
|
21
22
|
rounded?: boolean;
|
|
22
23
|
deviceInfo?: boolean;
|
|
24
|
+
updateForInactiveScreens?: boolean;
|
|
23
25
|
};
|
|
24
26
|
|
|
25
27
|
export type Context = "window" | "screen";
|
|
@@ -1,13 +1,16 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { useLayoutEffect, useMemo, useRef, useState } from "react";
|
|
2
2
|
|
|
3
3
|
import * as R from "ramda";
|
|
4
4
|
|
|
5
5
|
import { Dimensions, Platform, StatusBar } from "react-native";
|
|
6
|
+
import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
|
|
7
|
+
|
|
6
8
|
import { isTV } from "../../../reactUtils";
|
|
7
9
|
|
|
8
10
|
import { Options, UseDimensions } from "../types";
|
|
9
11
|
import { getDeviceInfo } from "../getDeviceInfo";
|
|
10
12
|
import { getInitialDimensions } from "./helpers";
|
|
13
|
+
import { useIsScreenActive } from "../../navigation";
|
|
11
14
|
|
|
12
15
|
function compensateForScaleIfNeeded(context) {
|
|
13
16
|
return function () {
|
|
@@ -32,8 +35,11 @@ const statusBarHeight = StatusBar?.currentHeight;
|
|
|
32
35
|
*/
|
|
33
36
|
export const useDimensions: UseDimensions = (
|
|
34
37
|
context = "window",
|
|
35
|
-
fullDimensions = { fullDimensions: false }
|
|
38
|
+
fullDimensions = { fullDimensions: false, updateForInactiveScreens: true }
|
|
36
39
|
) => {
|
|
40
|
+
const isActive = useIsScreenActive();
|
|
41
|
+
const { appData } = usePickFromState(["appData"]);
|
|
42
|
+
|
|
37
43
|
if (typeof fullDimensions === "boolean") {
|
|
38
44
|
// eslint-disable-next-line no-console
|
|
39
45
|
console.warn(
|
|
@@ -47,7 +53,7 @@ export const useDimensions: UseDimensions = (
|
|
|
47
53
|
: { ...fullDimensions };
|
|
48
54
|
|
|
49
55
|
const [dimensions, setDimensions] = useState(getInitialDimensions(context));
|
|
50
|
-
const deviceInfo = useRef(getDeviceInfo(dimensions));
|
|
56
|
+
const deviceInfo = useRef(getDeviceInfo(dimensions, appData));
|
|
51
57
|
|
|
52
58
|
const applyOptions = R.compose(
|
|
53
59
|
R.when(() => options.deviceInfo, R.assoc("deviceInfo", deviceInfo.current)),
|
|
@@ -73,7 +79,7 @@ export const useDimensions: UseDimensions = (
|
|
|
73
79
|
|
|
74
80
|
if (newDimensions.width === newDimensions.height) {
|
|
75
81
|
/**
|
|
76
|
-
* Ignoring case
|
|
82
|
+
* Ignoring case occurred on iOS when Dimensions.get sometimes returning
|
|
77
83
|
* wrong `window` sizes
|
|
78
84
|
* when switch background -> foreground state.
|
|
79
85
|
* ( TODO fix when 1:1 aspect ratio will be used )
|
|
@@ -81,18 +87,20 @@ export const useDimensions: UseDimensions = (
|
|
|
81
87
|
|
|
82
88
|
// eslint-disable-next-line no-console
|
|
83
89
|
console.log("change: wrong values - width equal to height, ignoring");
|
|
84
|
-
} else {
|
|
85
|
-
deviceInfo.current = getDeviceInfo(newDimensions);
|
|
90
|
+
} else if (isActive || options.updateForInactiveScreens) {
|
|
91
|
+
deviceInfo.current = getDeviceInfo(newDimensions, appData);
|
|
86
92
|
setDimensions(newDimensions);
|
|
87
93
|
}
|
|
88
94
|
};
|
|
89
95
|
|
|
90
96
|
const activeSubscription = Dimensions.addEventListener("change", handler);
|
|
91
97
|
|
|
98
|
+
handler({ [context]: Dimensions.get(context) });
|
|
99
|
+
|
|
92
100
|
return () => {
|
|
93
101
|
activeSubscription.remove();
|
|
94
102
|
};
|
|
95
|
-
}, []);
|
|
103
|
+
}, [isActive]);
|
|
96
104
|
|
|
97
105
|
const memoizedDimensions = useMemo(() => {
|
|
98
106
|
return { ...applyOptions(dimensions), statusBarHeight };
|
|
@@ -15,11 +15,26 @@ export const mockMenu: ZappNavigation = {
|
|
|
15
15
|
// preset_id?: null | unknown;
|
|
16
16
|
};
|
|
17
17
|
|
|
18
|
+
export const useRoute = jest.fn(() => ({
|
|
19
|
+
screenData: {
|
|
20
|
+
name: "someName",
|
|
21
|
+
},
|
|
22
|
+
pathname: "someRoute",
|
|
23
|
+
}));
|
|
24
|
+
|
|
18
25
|
export const useNavigation = jest.fn(() => ({
|
|
19
26
|
data: {},
|
|
27
|
+
screenData: {
|
|
28
|
+
name: "someName",
|
|
29
|
+
},
|
|
30
|
+
activeRiver: {
|
|
31
|
+
id: "someId",
|
|
32
|
+
},
|
|
20
33
|
currentRoute: "someRoute",
|
|
21
34
|
}));
|
|
22
35
|
|
|
23
36
|
export const useNavigationPluginData = jest.fn().mockReturnValue(mockMenu);
|
|
24
37
|
|
|
25
38
|
export const useIsNavBarVisible = jest.fn().mockReturnValue(true);
|
|
39
|
+
|
|
40
|
+
export const useIsScreenActive = jest.fn().mockReturnValue(true);
|
|
@@ -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 {
|
|
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
|
|
|
@@ -45,10 +46,19 @@ const videoItem = {
|
|
|
45
46
|
type: { value: "video" },
|
|
46
47
|
};
|
|
47
48
|
|
|
49
|
+
const mockGetStackForPathname = jest.fn().mockReturnValue(homeStack);
|
|
50
|
+
|
|
48
51
|
const mainStackNavigator = {
|
|
49
|
-
getStackForPathname:
|
|
52
|
+
getStackForPathname: mockGetStackForPathname,
|
|
50
53
|
getModalState: () => {},
|
|
51
54
|
videoModalState: {},
|
|
55
|
+
canGoBack: jest.fn(),
|
|
56
|
+
};
|
|
57
|
+
|
|
58
|
+
const _createWrapper = (Wrapper, props) => {
|
|
59
|
+
return function CreatedWrapper({ children }: any) {
|
|
60
|
+
return <Wrapper {...props}>{children}</Wrapper>;
|
|
61
|
+
};
|
|
52
62
|
};
|
|
53
63
|
|
|
54
64
|
const videoModalNavigator = {
|
|
@@ -85,13 +95,21 @@ const store = mockStore({
|
|
|
85
95
|
contentTypes,
|
|
86
96
|
});
|
|
87
97
|
|
|
88
|
-
const mainStackWrapper = ({
|
|
98
|
+
const mainStackWrapper = ({
|
|
99
|
+
children,
|
|
100
|
+
navigator = {},
|
|
101
|
+
pathname = homeStack.route,
|
|
102
|
+
}) => (
|
|
89
103
|
<Provider store={store}>
|
|
90
|
-
<
|
|
91
|
-
<
|
|
92
|
-
{
|
|
93
|
-
|
|
94
|
-
|
|
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>
|
|
95
113
|
</Provider>
|
|
96
114
|
);
|
|
97
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,25 +12,30 @@ 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 {
|
|
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";
|
|
19
23
|
import { HookModalContextT } from "@applicaster/zapp-react-native-ui-components/Contexts/ZappHookModalContext";
|
|
20
24
|
import { HOOKS_EVENTS } from "../../appUtils/HooksManager/constants";
|
|
21
25
|
import {
|
|
26
|
+
getNavigationProps,
|
|
22
27
|
getRiverFromRoute,
|
|
23
28
|
getTargetRoute,
|
|
24
|
-
getNavigationProps,
|
|
25
29
|
} from "../../navigationUtils";
|
|
26
30
|
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
|
|
|
@@ -73,6 +78,10 @@ export function isNavBarVisible(
|
|
|
73
78
|
return false;
|
|
74
79
|
}
|
|
75
80
|
|
|
81
|
+
if (screenData?.plugin_type === "login" && isTV()) {
|
|
82
|
+
return false;
|
|
83
|
+
}
|
|
84
|
+
|
|
76
85
|
/* Match if screen is Hook */
|
|
77
86
|
if (route.startsWith("/hooks/")) {
|
|
78
87
|
const module = screenData?.module;
|
|
@@ -147,6 +156,7 @@ export const useRoute = (): {
|
|
|
147
156
|
} => {
|
|
148
157
|
const pathname = usePathname() || "";
|
|
149
158
|
const navigator = useNavigation();
|
|
159
|
+
const screenDataContext = legacyScreenData(useContext(ScreenDataContext));
|
|
150
160
|
|
|
151
161
|
const { plugins, contentTypes, rivers } = usePickFromState([
|
|
152
162
|
"plugins",
|
|
@@ -154,7 +164,6 @@ export const useRoute = (): {
|
|
|
154
164
|
"contentTypes",
|
|
155
165
|
]);
|
|
156
166
|
|
|
157
|
-
const currentStack = navigator.getStackForPathname(pathname);
|
|
158
167
|
const { modalState } = useModalStore();
|
|
159
168
|
const hookModalState = useZappHooksModalState();
|
|
160
169
|
|
|
@@ -176,15 +185,6 @@ export const useRoute = (): {
|
|
|
176
185
|
plugins
|
|
177
186
|
);
|
|
178
187
|
|
|
179
|
-
const currentRouteScreenData = legacyScreenData(
|
|
180
|
-
{
|
|
181
|
-
screen: currentStack?.state?.screen ?? navigator.data?.screen ?? {},
|
|
182
|
-
entry: currentStack?.state?.entry ?? {},
|
|
183
|
-
} as NavigationScreenData,
|
|
184
|
-
|
|
185
|
-
plugins
|
|
186
|
-
);
|
|
187
|
-
|
|
188
188
|
// There are 4 route scenarios
|
|
189
189
|
// For regular screens take date from navigator stack.
|
|
190
190
|
// is path is model grab screenData from modal state
|
|
@@ -211,15 +211,10 @@ export const useRoute = (): {
|
|
|
211
211
|
}
|
|
212
212
|
|
|
213
213
|
if (isHookPathname(pathname)) {
|
|
214
|
-
|
|
215
|
-
"hookPlugin" in currentRouteScreenData
|
|
216
|
-
? currentRouteScreenData
|
|
217
|
-
: navigator.screenData;
|
|
218
|
-
|
|
219
|
-
return { screenData, pathname };
|
|
214
|
+
return { screenData: screenDataContext, pathname };
|
|
220
215
|
}
|
|
221
216
|
|
|
222
|
-
const screenData =
|
|
217
|
+
const screenData = screenDataContext;
|
|
223
218
|
|
|
224
219
|
return { screenData, pathname };
|
|
225
220
|
};
|
|
@@ -446,3 +441,51 @@ export const useGetBottomTabBarHeight = (): number => {
|
|
|
446
441
|
|
|
447
442
|
return !isBottomBarNavigation ? 0 : tabBarHeight + topBorderWidth;
|
|
448
443
|
};
|
|
444
|
+
|
|
445
|
+
// If current screen is active/focused (visible to the user)
|
|
446
|
+
export const useIsScreenActive = () => {
|
|
447
|
+
const pathname = usePathname();
|
|
448
|
+
const { currentRoute, videoModalState } = useNavigation();
|
|
449
|
+
|
|
450
|
+
if (
|
|
451
|
+
videoModalState.visible &&
|
|
452
|
+
["FULLSCREEN", "MAXIMIZED", "PIP"].includes(videoModalState.mode)
|
|
453
|
+
) {
|
|
454
|
+
return false;
|
|
455
|
+
}
|
|
456
|
+
|
|
457
|
+
return pathname === currentRoute;
|
|
458
|
+
};
|
|
459
|
+
|
|
460
|
+
type Return = (prefix: string) => string;
|
|
461
|
+
|
|
462
|
+
export const useUniqueRouteSuffix = (): Return => {
|
|
463
|
+
const pathname = usePathname();
|
|
464
|
+
const { currentRoute } = useNavigation();
|
|
465
|
+
|
|
466
|
+
const suffix = `currentRoute:${currentRoute}_pathname:${pathname}`;
|
|
467
|
+
|
|
468
|
+
const withUniqueRouteSuffix = React.useCallback((prefix: string) => {
|
|
469
|
+
if (isWeb()) {
|
|
470
|
+
// we should use extended route prefix only on Web, where we have stack-navigator
|
|
471
|
+
return `${prefix}___${suffix}`;
|
|
472
|
+
}
|
|
473
|
+
|
|
474
|
+
// for other platforms use previous version
|
|
475
|
+
return prefix;
|
|
476
|
+
}, []);
|
|
477
|
+
|
|
478
|
+
return withUniqueRouteSuffix;
|
|
479
|
+
};
|
|
480
|
+
|
|
481
|
+
export const useNavbarId = () => {
|
|
482
|
+
const withUniqueRouteSuffix = useUniqueRouteSuffix();
|
|
483
|
+
|
|
484
|
+
return withUniqueRouteSuffix(QUICK_BRICK_NAVBAR);
|
|
485
|
+
};
|
|
486
|
+
|
|
487
|
+
export const useContentId = () => {
|
|
488
|
+
const withUniqueRouteSuffix = useUniqueRouteSuffix();
|
|
489
|
+
|
|
490
|
+
return withUniqueRouteSuffix(QUICK_BRICK_CONTENT);
|
|
491
|
+
};
|