@applicaster/zapp-react-native-utils 12.0.0-alpha.5251355865 → 12.0.0-alpha.5347482137
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/helpers/hooks.ts +1 -1
- package/analyticsUtils/index.tsx +12 -0
- package/appUtils/HooksManager/index.js +3 -1
- 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 +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/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/conts.ts +6 -0
- package/appUtils/playerManager/index.ts +11 -5
- package/appUtils/playerManager/nativePlayerManager.ts +12 -0
- package/appUtils/playerManager/player.ts +43 -3
- package/appUtils/playerManager/playerFactory.ts +12 -10
- package/appUtils/playerManager/playerNative.ts +14 -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 +10 -14
- package/dateUtils/index.ts +11 -0
- package/focusManager/index.ts +1 -1
- 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 -19
- package/logger/index.ts +1 -1
- 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/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__/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/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/flatList/useLoadNextPageIfNeeded.ts +16 -9
- 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 +13 -7
- package/reactHooks/navigation/__mocks__/index.ts +15 -0
- package/reactHooks/navigation/__mocks__/useNavigation.ts +3 -0
- package/reactHooks/navigation/__tests__/index.test.tsx +11 -8
- package/reactHooks/navigation/index.ts +60 -21
- package/reactHooks/resolvers/__tests__/useCellResolver.test.tsx +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 +3 -3
- package/reactHooks/screen/useScreenData.ts +1 -1
- package/reactHooks/screen/useTargetScreenData.ts +7 -0
- package/reactHooks/state/useRivers.ts +3 -1
- package/reactHooks/videoModal/hooks/useVideoModalScreenData.tsx +10 -9
- package/reactUtils/index.ts +102 -0
- package/riverComponetsMeasurementProvider/index.tsx +2 -2
- 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
|
@@ -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
|
|
|
@@ -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,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
|
|
|
@@ -147,6 +152,7 @@ export const useRoute = (): {
|
|
|
147
152
|
} => {
|
|
148
153
|
const pathname = usePathname() || "";
|
|
149
154
|
const navigator = useNavigation();
|
|
155
|
+
const screenDataContext = legacyScreenData(useContext(ScreenDataContext));
|
|
150
156
|
|
|
151
157
|
const { plugins, contentTypes, rivers } = usePickFromState([
|
|
152
158
|
"plugins",
|
|
@@ -154,7 +160,6 @@ export const useRoute = (): {
|
|
|
154
160
|
"contentTypes",
|
|
155
161
|
]);
|
|
156
162
|
|
|
157
|
-
const currentStack = navigator.getStackForPathname(pathname);
|
|
158
163
|
const { modalState } = useModalStore();
|
|
159
164
|
const hookModalState = useZappHooksModalState();
|
|
160
165
|
|
|
@@ -176,15 +181,6 @@ export const useRoute = (): {
|
|
|
176
181
|
plugins
|
|
177
182
|
);
|
|
178
183
|
|
|
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
184
|
// There are 4 route scenarios
|
|
189
185
|
// For regular screens take date from navigator stack.
|
|
190
186
|
// is path is model grab screenData from modal state
|
|
@@ -211,15 +207,10 @@ export const useRoute = (): {
|
|
|
211
207
|
}
|
|
212
208
|
|
|
213
209
|
if (isHookPathname(pathname)) {
|
|
214
|
-
|
|
215
|
-
"hookPlugin" in currentRouteScreenData
|
|
216
|
-
? currentRouteScreenData
|
|
217
|
-
: navigator.screenData;
|
|
218
|
-
|
|
219
|
-
return { screenData, pathname };
|
|
210
|
+
return { screenData: screenDataContext, pathname };
|
|
220
211
|
}
|
|
221
212
|
|
|
222
|
-
const screenData =
|
|
213
|
+
const screenData = screenDataContext;
|
|
223
214
|
|
|
224
215
|
return { screenData, pathname };
|
|
225
216
|
};
|
|
@@ -446,3 +437,51 @@ export const useGetBottomTabBarHeight = (): number => {
|
|
|
446
437
|
|
|
447
438
|
return !isBottomBarNavigation ? 0 : tabBarHeight + topBorderWidth;
|
|
448
439
|
};
|
|
440
|
+
|
|
441
|
+
// If current screen is active/focused (visible to the user)
|
|
442
|
+
export const useIsScreenActive = () => {
|
|
443
|
+
const pathname = usePathname();
|
|
444
|
+
const { currentRoute, videoModalState } = useNavigation();
|
|
445
|
+
|
|
446
|
+
if (
|
|
447
|
+
videoModalState.visible &&
|
|
448
|
+
["FULLSCREEN", "MAXIMIZED", "PIP"].includes(videoModalState.mode)
|
|
449
|
+
) {
|
|
450
|
+
return false;
|
|
451
|
+
}
|
|
452
|
+
|
|
453
|
+
return pathname === currentRoute;
|
|
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
|
+
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as React from "react";
|
|
2
2
|
import { View } from "react-native";
|
|
3
|
-
import {
|
|
3
|
+
import { cleanup, renderHook } from "@testing-library/react-hooks";
|
|
4
4
|
import configureStore from "redux-mock-store";
|
|
5
5
|
import { Provider } from "react-redux";
|
|
6
6
|
|
|
@@ -12,6 +12,8 @@ jest.mock("@applicaster/zapp-react-native-utils/localizationUtils", () => ({
|
|
|
12
12
|
useIsRTL: jest.fn(() => mock_rtl_flag),
|
|
13
13
|
}));
|
|
14
14
|
|
|
15
|
+
jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation");
|
|
16
|
+
|
|
15
17
|
const { useCellResolver } = require("../useCellResolver");
|
|
16
18
|
|
|
17
19
|
describe("cellResolver", () => {
|
|
@@ -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();
|
|
@@ -4,7 +4,7 @@ import { useRivers } from "../state";
|
|
|
4
4
|
|
|
5
5
|
const logger = utilsLogger.addSubsystem("useScreenData");
|
|
6
6
|
|
|
7
|
-
export const useScreenData = (screenId
|
|
7
|
+
export const useScreenData = (screenId: string): ZappRiver => {
|
|
8
8
|
const rivers = useRivers();
|
|
9
9
|
|
|
10
10
|
React.useEffect(() => {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
|
|
3
3
|
import * as R from "ramda";
|
|
4
|
+
import { appStore } from "@applicaster/zapp-react-native-redux/AppStore";
|
|
4
5
|
|
|
5
6
|
export function getTargetScreenData(
|
|
6
7
|
entry: ZappEntry,
|
|
@@ -35,6 +36,12 @@ export function getTargetScreenData(
|
|
|
35
36
|
return rivers?.[screenId];
|
|
36
37
|
}
|
|
37
38
|
|
|
39
|
+
export function getTargetScreenDataFromEntry(entry: ZappEntry): ZappRiver {
|
|
40
|
+
const { rivers, contentTypes } = appStore.get(["rivers", "contentTypes"]);
|
|
41
|
+
|
|
42
|
+
return getTargetScreenData(entry, rivers, contentTypes);
|
|
43
|
+
}
|
|
44
|
+
|
|
38
45
|
export const useTargetScreenData = (entry: ZappEntry) => {
|
|
39
46
|
const { rivers, contentTypes } = usePickFromState(["rivers", "contentTypes"]);
|
|
40
47
|
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
|
|
2
2
|
|
|
3
|
+
const riversSelector = ["rivers"];
|
|
4
|
+
|
|
3
5
|
export const useRivers = () => {
|
|
4
|
-
const { rivers } = usePickFromState(
|
|
6
|
+
const { rivers } = usePickFromState(riversSelector as any);
|
|
5
7
|
|
|
6
8
|
return rivers;
|
|
7
9
|
};
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
3
|
-
usePickFromState,
|
|
4
|
-
} from "@applicaster/zapp-react-native-redux/hooks";
|
|
1
|
+
import React from "react";
|
|
2
|
+
import { useContentTypes } from "@applicaster/zapp-react-native-redux/hooks";
|
|
5
3
|
import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks";
|
|
4
|
+
import { useRivers } from "../../state";
|
|
6
5
|
|
|
7
6
|
export const useVideoModalScreenData = ():
|
|
8
7
|
| (ZappEntry & { targetScreen: any }) // TODO: fix ZappEntry type ( was ZappRiver but conflict )
|
|
@@ -12,11 +11,13 @@ export const useVideoModalScreenData = ():
|
|
|
12
11
|
} = useNavigation();
|
|
13
12
|
|
|
14
13
|
const contentTypes = useContentTypes();
|
|
15
|
-
const
|
|
14
|
+
const rivers = useRivers();
|
|
16
15
|
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
return React.useMemo(() => {
|
|
17
|
+
if (item?.type?.value) {
|
|
18
|
+
const screenId = contentTypes[item?.type?.value].screen_id;
|
|
19
19
|
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
return { ...item, targetScreen: rivers?.[screenId] };
|
|
21
|
+
}
|
|
22
|
+
}, [item]);
|
|
22
23
|
};
|
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
|
+
};
|
|
@@ -3,7 +3,7 @@ import { NativeModules, StyleSheet, View } from "react-native";
|
|
|
3
3
|
import { getXray } from "@applicaster/zapp-react-native-utils/logger";
|
|
4
4
|
|
|
5
5
|
import { isApplePlatform, isWeb } from "../reactUtils";
|
|
6
|
-
import {
|
|
6
|
+
import { useRivers } from "../reactHooks/state";
|
|
7
7
|
|
|
8
8
|
const layoutReducer = (state, { payload }) => {
|
|
9
9
|
return state.map((item, index, _state) => ({
|
|
@@ -58,7 +58,7 @@ export const ScreenLoadingMeasurements = ({
|
|
|
58
58
|
numberOfComponents,
|
|
59
59
|
riverId,
|
|
60
60
|
}: Props) => {
|
|
61
|
-
const
|
|
61
|
+
const rivers = useRivers();
|
|
62
62
|
const screenData = rivers?.[riverId];
|
|
63
63
|
|
|
64
64
|
const [itemsLayout, dispatchItemLayout] = React.useReducer(
|
package/screenState/index.ts
CHANGED
|
@@ -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
|
-
}));
|
package/stringUtils/index.ts
CHANGED
|
@@ -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
|
+
};
|