@applicaster/zapp-react-native-utils 12.0.0-alpha.4400210593 → 12.0.0-alpha.4510795609
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/AnalyticsEvents/index.ts +13 -0
- package/analyticsUtils/AnalyticsEvents/searchEvents.ts +21 -0
- package/analyticsUtils/AnalyticsEvents/sendShareEvent.ts +21 -0
- package/analyticsUtils/analyticsPlugins.ts +25 -0
- package/analyticsUtils/events.ts +12 -0
- package/analyticsUtils/index.tsx +12 -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 -56
- package/appUtils/focusManager/treeDataStructure/Utils/index.js +74 -43
- 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/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 +223 -0
- package/appUtils/playerManager/index.ts +11 -5
- package/appUtils/playerManager/nativePlayerManager.ts +12 -0
- package/appUtils/playerManager/player.ts +1 -3
- package/appUtils/playerManager/playerNative.ts +10 -14
- package/appUtils/playerManager/usePlayerControllerSetup.tsx +6 -1
- 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 +6 -12
- package/dateUtils/index.ts +11 -0
- package/headersUtils/index.ts +1 -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/numberUtils/__tests__/isLikeNumber.test.ts +18 -0
- package/numberUtils/index.ts +9 -18
- package/package.json +2 -2
- package/playerUtils/configurationGenerator.ts +3 -1
- package/reactHooks/autoscrolling/__tests__/{useTrackedView.test.ts → useTrackedView.test.tsx} +16 -1
- package/reactHooks/cell-click/__tests__/index.test.js +10 -1
- package/reactHooks/cell-click/index.ts +12 -12
- 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} +43 -29
- package/reactHooks/layout/getDeviceInfo/index.ts +4 -2
- package/reactHooks/layout/types/index.ts +1 -0
- package/reactHooks/layout/useDimensions/useDimensions.ts +5 -2
- package/reactHooks/navigation/__mocks__/index.ts +13 -0
- package/reactHooks/navigation/__mocks__/useNavigation.ts +3 -0
- package/reactHooks/navigation/__tests__/index.test.tsx +11 -8
- package/reactHooks/navigation/index.ts +56 -67
- 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 +3 -3
- package/reactUtils/index.ts +102 -0
- package/screenState/index.ts +0 -8
- package/stringUtils/index.ts +5 -0
- package/testUtils/getByTestId.ts +14 -0
- package/testUtils/index.tsx +24 -22
- 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,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
|
|
|
@@ -48,19 +52,43 @@ jest.mock("../../navigation", () => ({
|
|
|
48
52
|
}));
|
|
49
53
|
|
|
50
54
|
const { Dimensions } = require("react-native");
|
|
51
|
-
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
|
+
};
|
|
52
82
|
|
|
53
83
|
describe("useDimensions", () => {
|
|
54
84
|
it("renders", () => {
|
|
55
|
-
const { result } =
|
|
56
|
-
useDimensions("window", { fullDimensions: true })
|
|
57
|
-
);
|
|
85
|
+
const { result } = testHook("window", { fullDimensions: true });
|
|
58
86
|
|
|
59
87
|
expect(result).toBeDefined();
|
|
60
88
|
});
|
|
61
89
|
|
|
62
90
|
it("sets event listener", () => {
|
|
63
|
-
|
|
91
|
+
testHook("window", { fullDimensions: true });
|
|
64
92
|
|
|
65
93
|
expect(Dimensions.addEventListener).toBeCalledWith(
|
|
66
94
|
"change",
|
|
@@ -69,16 +97,14 @@ describe("useDimensions", () => {
|
|
|
69
97
|
});
|
|
70
98
|
|
|
71
99
|
it("removes event listener", () => {
|
|
72
|
-
|
|
100
|
+
testHook("window", { fullDimensions: true });
|
|
73
101
|
cleanup();
|
|
74
102
|
|
|
75
103
|
expect(mockRemoveFn).toBeCalled();
|
|
76
104
|
});
|
|
77
105
|
|
|
78
106
|
it("Returns full dimensions object", () => {
|
|
79
|
-
const {
|
|
80
|
-
result: { current: dimensions },
|
|
81
|
-
} = renderHook(() => useDimensions("window", { fullDimensions: true }));
|
|
107
|
+
const { dimensions } = testHook("window", { fullDimensions: true });
|
|
82
108
|
|
|
83
109
|
expect(dimensions).toHaveProperty("height");
|
|
84
110
|
expect(dimensions).toHaveProperty("width");
|
|
@@ -87,20 +113,17 @@ describe("useDimensions", () => {
|
|
|
87
113
|
});
|
|
88
114
|
|
|
89
115
|
it("Returns shorthand dimensions object", () => {
|
|
90
|
-
const {
|
|
91
|
-
result: { current: dimensions },
|
|
92
|
-
} = renderHook(() => useDimensions("window"));
|
|
116
|
+
const { dimensions } = testHook("window");
|
|
93
117
|
|
|
94
118
|
expect(dimensions).toHaveProperty("height");
|
|
95
119
|
expect(dimensions).toHaveProperty("width");
|
|
96
120
|
});
|
|
97
121
|
|
|
98
122
|
it("Returns the device info object", () => {
|
|
99
|
-
const {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
);
|
|
123
|
+
const { dimensions } = testHook("window", {
|
|
124
|
+
fullDimensions: true,
|
|
125
|
+
deviceInfo: true,
|
|
126
|
+
});
|
|
104
127
|
|
|
105
128
|
expect(dimensions).toHaveProperty("height");
|
|
106
129
|
expect(dimensions).toHaveProperty("width");
|
|
@@ -113,10 +136,7 @@ describe("useDimensions", () => {
|
|
|
113
136
|
it("applies the scale on TV, and screen context", () => {
|
|
114
137
|
tv_flag = true;
|
|
115
138
|
const { screen } = mocked_return_value(tv_flag);
|
|
116
|
-
|
|
117
|
-
const {
|
|
118
|
-
result: { current: dimensions },
|
|
119
|
-
} = renderHook(() => useDimensions("screen"));
|
|
139
|
+
const { dimensions } = testHook("screen");
|
|
120
140
|
|
|
121
141
|
expect(dimensions).toHaveProperty("height", screen.height * screen.scale);
|
|
122
142
|
expect(dimensions).toHaveProperty("width", screen.width * screen.scale);
|
|
@@ -128,10 +148,7 @@ describe("useDimensions", () => {
|
|
|
128
148
|
it("doesn't apply the scale on mobile with screen context", () => {
|
|
129
149
|
tv_flag = false;
|
|
130
150
|
const { screen } = mocked_return_value(tv_flag);
|
|
131
|
-
|
|
132
|
-
const {
|
|
133
|
-
result: { current: dimensions },
|
|
134
|
-
} = renderHook(() => useDimensions("screen"));
|
|
151
|
+
const { dimensions } = testHook("screen");
|
|
135
152
|
|
|
136
153
|
expect(dimensions).toHaveProperty("height", screen.height);
|
|
137
154
|
expect(dimensions).toHaveProperty("width", screen.width);
|
|
@@ -141,10 +158,7 @@ describe("useDimensions", () => {
|
|
|
141
158
|
it("doesn't apply the scale on TV with window context", () => {
|
|
142
159
|
tv_flag = true;
|
|
143
160
|
const { window } = mocked_return_value(tv_flag);
|
|
144
|
-
|
|
145
|
-
const {
|
|
146
|
-
result: { current: dimensions },
|
|
147
|
-
} = renderHook(() => useDimensions("window"));
|
|
161
|
+
const { dimensions } = testHook("window");
|
|
148
162
|
|
|
149
163
|
expect(dimensions).toHaveProperty("height", window.height);
|
|
150
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
|
};
|
|
@@ -3,6 +3,8 @@ import { useLayoutEffect, useMemo, useRef, useState } from "react";
|
|
|
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";
|
|
@@ -36,6 +38,7 @@ export const useDimensions: UseDimensions = (
|
|
|
36
38
|
fullDimensions = { fullDimensions: false, updateForInactiveScreens: true }
|
|
37
39
|
) => {
|
|
38
40
|
const isActive = useIsScreenActive();
|
|
41
|
+
const { appData } = usePickFromState(["appData"]);
|
|
39
42
|
|
|
40
43
|
if (typeof fullDimensions === "boolean") {
|
|
41
44
|
// eslint-disable-next-line no-console
|
|
@@ -50,7 +53,7 @@ export const useDimensions: UseDimensions = (
|
|
|
50
53
|
: { ...fullDimensions };
|
|
51
54
|
|
|
52
55
|
const [dimensions, setDimensions] = useState(getInitialDimensions(context));
|
|
53
|
-
const deviceInfo = useRef(getDeviceInfo(dimensions));
|
|
56
|
+
const deviceInfo = useRef(getDeviceInfo(dimensions, appData));
|
|
54
57
|
|
|
55
58
|
const applyOptions = R.compose(
|
|
56
59
|
R.when(() => options.deviceInfo, R.assoc("deviceInfo", deviceInfo.current)),
|
|
@@ -85,7 +88,7 @@ export const useDimensions: UseDimensions = (
|
|
|
85
88
|
// eslint-disable-next-line no-console
|
|
86
89
|
console.log("change: wrong values - width equal to height, ignoring");
|
|
87
90
|
} else if (isActive || options.updateForInactiveScreens) {
|
|
88
|
-
deviceInfo.current = getDeviceInfo(newDimensions);
|
|
91
|
+
deviceInfo.current = getDeviceInfo(newDimensions, appData);
|
|
89
92
|
setDimensions(newDimensions);
|
|
90
93
|
}
|
|
91
94
|
};
|
|
@@ -15,8 +15,21 @@ 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
|
|
|
@@ -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
|
|
|
@@ -100,13 +101,15 @@ const mainStackWrapper = ({
|
|
|
100
101
|
pathname = homeStack.route,
|
|
101
102
|
}) => (
|
|
102
103
|
<Provider store={store}>
|
|
103
|
-
<
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
{
|
|
108
|
-
|
|
109
|
-
|
|
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 {
|
|
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,63 +189,30 @@ export const useRoute = (): {
|
|
|
200
189
|
// if path is hook grab screenData from screenData
|
|
201
190
|
|
|
202
191
|
if (isModalPathname(pathname)) {
|
|
203
|
-
|
|
192
|
+
const screenData = modalScreenData ?? ({} as ZappEntry);
|
|
193
|
+
|
|
194
|
+
return { screenData, pathname };
|
|
204
195
|
}
|
|
205
196
|
|
|
206
197
|
if (isVideoModalPathname(pathname)) {
|
|
207
|
-
|
|
198
|
+
const screenData = videoModalScreenData as LegacyNavigationScreenData;
|
|
199
|
+
|
|
200
|
+
return { screenData, pathname };
|
|
208
201
|
}
|
|
209
202
|
|
|
210
203
|
if (isHookModalPathname(pathname)) {
|
|
211
|
-
|
|
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
|
-
|
|
255
|
-
if (!currentStack) {
|
|
256
|
-
return composeRouteData(navigator.screenData);
|
|
257
|
-
}
|
|
213
|
+
const screenData = screenDataContext;
|
|
258
214
|
|
|
259
|
-
return
|
|
215
|
+
return { screenData, pathname };
|
|
260
216
|
};
|
|
261
217
|
|
|
262
218
|
type Callbacks = Partial<{
|
|
@@ -496,3 +452,36 @@ export const useIsScreenActive = () => {
|
|
|
496
452
|
|
|
497
453
|
return pathname === currentRoute;
|
|
498
454
|
};
|
|
455
|
+
|
|
456
|
+
type Return = (prefix: string) => string;
|
|
457
|
+
|
|
458
|
+
export const useUniqueRouteSuffix = (): Return => {
|
|
459
|
+
const pathname = usePathname();
|
|
460
|
+
const { currentRoute } = useNavigation();
|
|
461
|
+
|
|
462
|
+
const suffix = `currentRoute:${currentRoute}_pathname:${pathname}`;
|
|
463
|
+
|
|
464
|
+
const withUniqueRouteSuffix = React.useCallback((prefix: string) => {
|
|
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;
|
|
472
|
+
}, []);
|
|
473
|
+
|
|
474
|
+
return withUniqueRouteSuffix;
|
|
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
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
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
|
-
<
|
|
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",
|
|
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);
|
|
@@ -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();
|
package/reactUtils/index.ts
CHANGED
|
@@ -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
|
+
};
|