@applicaster/zapp-react-native-ui-components 15.0.0-alpha.5830601313 → 15.0.0-alpha.5833247754
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/Components/BaseFocusable/index.ios.ts +12 -2
- package/Components/Cell/Cell.tsx +14 -3
- package/Components/Cell/CellWithFocusable.tsx +9 -0
- package/Components/Cell/FocusableWrapper.tsx +3 -0
- package/Components/Cell/TvOSCellComponent.tsx +26 -5
- package/Components/Focusable/Focusable.tsx +4 -2
- package/Components/Focusable/FocusableTvOS.tsx +18 -1
- package/Components/Focusable/__tests__/__snapshots__/FocusableTvOS.test.tsx.snap +1 -0
- package/Components/FocusableGroup/FocusableTvOS.tsx +32 -1
- package/Components/GeneralContentScreen/utils/__tests__/useCurationAPI.test.js +1 -1
- package/Components/GeneralContentScreen/utils/useCurationAPI.ts +22 -6
- package/Components/HandlePlayable/HandlePlayable.tsx +10 -7
- package/Components/HandlePlayable/utils.ts +31 -0
- package/Components/Layout/TV/LayoutBackground.tsx +5 -2
- package/Components/Layout/TV/ScreenContainer.tsx +2 -6
- package/Components/Layout/TV/index.tsx +3 -4
- package/Components/Layout/TV/index.web.tsx +3 -4
- package/Components/LinkHandler/LinkHandler.tsx +2 -2
- package/Components/MasterCell/DefaultComponents/BorderContainerView/__tests__/index.test.tsx +16 -1
- package/Components/MasterCell/DefaultComponents/BorderContainerView/index.tsx +30 -2
- package/Components/MasterCell/DefaultComponents/Image/Image.android.tsx +5 -1
- package/Components/MasterCell/DefaultComponents/Image/Image.ios.tsx +11 -3
- package/Components/MasterCell/DefaultComponents/Image/Image.web.tsx +9 -1
- package/Components/MasterCell/DefaultComponents/Image/hooks/useImage.ts +15 -14
- package/Components/MasterCell/DefaultComponents/LiveImage/index.tsx +10 -6
- package/Components/MasterCell/DefaultComponents/SecondaryImage/Image.tsx +40 -39
- package/Components/MasterCell/DefaultComponents/SecondaryImage/__tests__/Image.test.tsx +95 -0
- package/Components/MasterCell/DefaultComponents/SecondaryImage/__tests__/__snapshots__/Image.test.tsx.snap +86 -0
- package/Components/MasterCell/DefaultComponents/SecondaryImage/__tests__/index.test.ts +141 -0
- package/Components/MasterCell/DefaultComponents/SecondaryImage/hooks/__tests__/useGetImageDimensions.test.ts +7 -6
- package/Components/MasterCell/DefaultComponents/SecondaryImage/index.ts +1 -1
- package/Components/MasterCell/DefaultComponents/Text/index.tsx +8 -8
- package/Components/MasterCell/DefaultComponents/tv/TvActionButtons/index.ts +6 -2
- package/Components/MasterCell/DefaultComponents/tv/TvActionButtons/utils/__tests__/getPluginIdentifier.test.ts +233 -11
- package/Components/MasterCell/DefaultComponents/tv/TvActionButtons/utils/index.ts +19 -15
- package/Components/MasterCell/hoc/__tests__/withAsyncRender.test.tsx +219 -0
- package/Components/MasterCell/hoc/withAsyncRender.tsx +9 -7
- package/Components/MasterCell/index.tsx +2 -0
- package/Components/MasterCell/utils/__tests__/resolveColor.test.js +82 -3
- package/Components/MasterCell/utils/index.ts +61 -31
- package/Components/MeasurmentsPortal/MeasurementsPortal.tsx +102 -87
- package/Components/MeasurmentsPortal/__tests__/MeasurementsPortal.test.tsx +355 -0
- package/Components/OfflineHandler/NotificationView/NotificationView.lg.tsx +17 -9
- package/Components/OfflineHandler/NotificationView/NotificationView.samsung.tsx +16 -8
- package/Components/OfflineHandler/NotificationView/NotificationView.tsx +2 -2
- package/Components/OfflineHandler/NotificationView/__tests__/index.test.tsx +17 -18
- package/Components/OfflineHandler/NotificationView/utils.ts +34 -0
- package/Components/OfflineHandler/__tests__/index.test.tsx +27 -18
- package/Components/PlayerContainer/PlayerContainer.tsx +50 -40
- package/Components/PlayerContainer/useRestrictMobilePlayback.tsx +131 -0
- package/Components/PlayerImageBackground/index.tsx +2 -11
- package/Components/River/ComponentsMap/ComponentsMap.tsx +16 -0
- package/Components/River/ComponentsMap/hooks/__tests__/useLoadingState.test.ts +1 -1
- package/Components/River/TV/River.tsx +31 -14
- package/Components/River/TV/index.tsx +8 -4
- package/Components/River/TV/utils/__tests__/toStringOrEmpty.test.ts +30 -0
- package/Components/River/TV/utils/index.ts +4 -0
- package/Components/River/TV/withFocusableGroupForContent.tsx +71 -0
- package/Components/River/__tests__/__snapshots__/componentsMap.test.js.snap +2 -0
- package/Components/River/__tests__/componentsMap.test.js +38 -0
- package/Components/Screen/TV/index.web.tsx +4 -2
- package/Components/Screen/__tests__/Screen.test.tsx +65 -42
- package/Components/Screen/__tests__/__snapshots__/Screen.test.tsx.snap +68 -44
- package/Components/Screen/hooks.ts +2 -3
- package/Components/Screen/index.tsx +2 -3
- package/Components/Screen/navigationHandler.ts +49 -24
- package/Components/Screen/orientationHandler.ts +10 -13
- package/Components/ScreenResolver/index.tsx +13 -7
- package/Components/ScreenRevealManager/ScreenRevealManager.ts +40 -8
- package/Components/ScreenRevealManager/__tests__/ScreenRevealManager.test.ts +86 -69
- package/Components/Tabs/TV/Tabs.tsx +20 -3
- package/Components/Tabs/TabContent.tsx +7 -4
- package/Components/Transitioner/Scene.tsx +15 -2
- package/Components/Transitioner/index.js +3 -3
- package/Components/VideoModal/ModalAnimation/ModalAnimationContext.tsx +124 -27
- package/Components/VideoModal/ModalAnimation/index.ts +1 -3
- package/Components/VideoModal/ModalAnimation/utils.ts +1 -12
- package/Components/VideoModal/PlayerWrapper.tsx +15 -61
- package/Components/VideoModal/VideoModal.tsx +1 -5
- package/Components/VideoModal/__tests__/PlayerWrapper.test.tsx +1 -0
- package/Components/VideoModal/hooks/__tests__/useDelayedPlayerDetails.test.ts +15 -7
- package/Components/VideoModal/hooks/useModalSize.ts +5 -1
- package/Components/VideoModal/playerWrapperStyle.ts +70 -0
- package/Components/VideoModal/playerWrapperUtils.ts +20 -21
- package/Components/VideoModal/utils.ts +19 -9
- package/Components/Viewport/ViewportAware/index.tsx +16 -7
- package/Components/Viewport/ViewportEvents/__tests__/viewportEvents.test.js +1 -1
- package/Contexts/ScreenContext/index.tsx +25 -18
- package/Contexts/ScreenTrackedViewPositionsContext/__tests__/index.test.tsx +1 -1
- package/Contexts/ZappHookModalContext/index.tsx +37 -61
- package/Contexts/index.ts +0 -2
- package/Decorators/Analytics/index.tsx +6 -5
- package/Decorators/ConfigurationWrapper/__tests__/__snapshots__/withConfigurationProvider.test.tsx.snap +1 -0
- package/Decorators/ConfigurationWrapper/const.ts +1 -0
- package/Decorators/ZappPipesDataConnector/__tests__/zappPipesDataConnector.test.js +1 -1
- package/Decorators/ZappPipesDataConnector/index.tsx +2 -2
- package/Decorators/ZappPipesDataConnector/resolvers/StaticFeedResolver.tsx +1 -1
- package/Helpers/DataSourceHelper/__tests__/itemLimitForData.test.ts +80 -0
- package/Helpers/DataSourceHelper/index.ts +19 -0
- package/events/index.ts +3 -0
- package/events/scrollEndReached.ts +15 -0
- package/index.d.ts +7 -0
- package/package.json +6 -5
- package/Components/River/TV/withTVEventHandler.tsx +0 -27
- package/Components/VideoModal/ModalAnimation/AnimationComponent.tsx +0 -17
- package/Helpers/DataSourceHelper/index.js +0 -19
|
@@ -11,12 +11,19 @@ import { LinkHandler } from "../LinkHandler";
|
|
|
11
11
|
import { Favorites } from "../Favorites";
|
|
12
12
|
import { ZappPipesScreenContext } from "../../Contexts";
|
|
13
13
|
import { componentsLogger } from "../../Helpers/logger";
|
|
14
|
-
import {
|
|
15
|
-
|
|
14
|
+
import {
|
|
15
|
+
useAppSelector,
|
|
16
|
+
usePlugins,
|
|
17
|
+
} from "@applicaster/zapp-react-native-redux/hooks";
|
|
18
|
+
import {
|
|
19
|
+
useNavigation,
|
|
20
|
+
useRivers,
|
|
21
|
+
} from "@applicaster/zapp-react-native-utils/reactHooks";
|
|
16
22
|
import { useScreenAnalytics } from "@applicaster/zapp-react-native-utils/analyticsUtils/helpers/hooks";
|
|
17
23
|
|
|
18
24
|
import { useCallbackActions } from "@applicaster/zapp-react-native-utils/zappFrameworkUtils/HookCallback/useCallbackActions";
|
|
19
25
|
import { ScreenResultCallback } from "@applicaster/zapp-react-native-utils/zappFrameworkUtils/HookCallback/callbackNavigationAction";
|
|
26
|
+
import { selectComponents } from "@applicaster/zapp-react-native-redux";
|
|
20
27
|
|
|
21
28
|
const logger = componentsLogger.addSubsystem("ScreenResolver");
|
|
22
29
|
|
|
@@ -49,11 +56,10 @@ export function ScreenResolverComponent(props: Props) {
|
|
|
49
56
|
|
|
50
57
|
const { hookPlugin } = screenData || {};
|
|
51
58
|
|
|
52
|
-
const
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
]);
|
|
59
|
+
const plugins = usePlugins();
|
|
60
|
+
const rivers = useRivers();
|
|
61
|
+
|
|
62
|
+
const components = useAppSelector(selectComponents);
|
|
57
63
|
|
|
58
64
|
const {
|
|
59
65
|
videoModalState: { mode },
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import { makeListOf } from "@applicaster/zapp-react-native-utils/arrayUtils";
|
|
2
2
|
import { isFirstComponentGallery } from "@applicaster/zapp-react-native-utils/componentsUtils";
|
|
3
|
-
import {
|
|
3
|
+
import { race, Subject, Subscription } from "rxjs";
|
|
4
|
+
import { first } from "rxjs/operators";
|
|
5
|
+
|
|
6
|
+
import { withTimeout$ } from "@applicaster/zapp-react-native-utils/idleUtils";
|
|
7
|
+
|
|
8
|
+
const MAX_TIMEOUT_TO_WAIT_COMPONENTS_TO_LOAD = 2000; // 2 seconds
|
|
4
9
|
|
|
5
10
|
const INITIAL_NUMBER_TO_LOAD = 3;
|
|
6
11
|
|
|
@@ -34,7 +39,8 @@ const getNumberOfComponentsWaitToLoadBeforePresent = (
|
|
|
34
39
|
export class ScreenRevealManager {
|
|
35
40
|
public numberOfComponentsWaitToLoadBeforePresent: number;
|
|
36
41
|
private renderingState: Array<ComponentLoadingState>;
|
|
37
|
-
private
|
|
42
|
+
private subject$ = new Subject<void>();
|
|
43
|
+
private subscription: Subscription;
|
|
38
44
|
|
|
39
45
|
constructor(componentsToRender: ZappUIComponent[], callback: Callback) {
|
|
40
46
|
this.numberOfComponentsWaitToLoadBeforePresent =
|
|
@@ -45,32 +51,58 @@ export class ScreenRevealManager {
|
|
|
45
51
|
this.numberOfComponentsWaitToLoadBeforePresent
|
|
46
52
|
);
|
|
47
53
|
|
|
48
|
-
this.
|
|
54
|
+
this.subscription = race(
|
|
55
|
+
withTimeout$(MAX_TIMEOUT_TO_WAIT_COMPONENTS_TO_LOAD),
|
|
56
|
+
this.subject$
|
|
57
|
+
)
|
|
58
|
+
.pipe(first())
|
|
59
|
+
.subscribe(callback);
|
|
49
60
|
}
|
|
50
61
|
|
|
51
62
|
onLoadFinished = (index: number): void => {
|
|
63
|
+
const currentState = this.renderingState[index];
|
|
64
|
+
|
|
65
|
+
if (
|
|
66
|
+
COMPONENT_LOADING_STATE.LOADED_WITH_SUCCESS === currentState ||
|
|
67
|
+
COMPONENT_LOADING_STATE.LOADED_WITH_FAILURE === currentState
|
|
68
|
+
) {
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
|
|
52
72
|
this.renderingState[index] = COMPONENT_LOADING_STATE.LOADED_WITH_SUCCESS;
|
|
53
73
|
|
|
54
74
|
if (
|
|
55
75
|
getNumberOfLoaded(this.renderingState) >=
|
|
56
76
|
this.numberOfComponentsWaitToLoadBeforePresent
|
|
57
77
|
) {
|
|
58
|
-
this.
|
|
78
|
+
this.subject$.next();
|
|
79
|
+
this.subject$.complete();
|
|
59
80
|
}
|
|
60
81
|
};
|
|
61
82
|
|
|
62
83
|
onLoadFailed = (index: number): void => {
|
|
84
|
+
const currentState = this.renderingState[index];
|
|
85
|
+
|
|
86
|
+
if (
|
|
87
|
+
COMPONENT_LOADING_STATE.LOADED_WITH_SUCCESS === currentState ||
|
|
88
|
+
COMPONENT_LOADING_STATE.LOADED_WITH_FAILURE === currentState
|
|
89
|
+
) {
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
92
|
+
|
|
63
93
|
this.renderingState[index] = COMPONENT_LOADING_STATE.LOADED_WITH_FAILURE;
|
|
64
94
|
|
|
65
95
|
if (
|
|
66
96
|
getNumberOfLoaded(this.renderingState) >=
|
|
67
97
|
this.numberOfComponentsWaitToLoadBeforePresent
|
|
68
98
|
) {
|
|
69
|
-
this.
|
|
99
|
+
this.subject$.next();
|
|
100
|
+
this.subject$.complete();
|
|
70
101
|
}
|
|
71
102
|
};
|
|
72
103
|
|
|
73
|
-
|
|
74
|
-
this.
|
|
75
|
-
|
|
104
|
+
dispose(): void {
|
|
105
|
+
this.subscription?.unsubscribe();
|
|
106
|
+
this.subject$.complete();
|
|
107
|
+
}
|
|
76
108
|
}
|
|
@@ -2,106 +2,123 @@ import {
|
|
|
2
2
|
ScreenRevealManager,
|
|
3
3
|
COMPONENT_LOADING_STATE,
|
|
4
4
|
} from "../ScreenRevealManager";
|
|
5
|
+
import { Subject } from "rxjs";
|
|
6
|
+
|
|
7
|
+
jest.mock("@applicaster/zapp-react-native-utils/arrayUtils", () => ({
|
|
8
|
+
makeListOf: jest.fn((value: any, length: number) =>
|
|
9
|
+
Array(length).fill(value)
|
|
10
|
+
),
|
|
11
|
+
}));
|
|
12
|
+
|
|
13
|
+
jest.mock("@applicaster/zapp-react-native-utils/componentsUtils", () => ({
|
|
14
|
+
isFirstComponentGallery: jest.fn(),
|
|
15
|
+
}));
|
|
16
|
+
|
|
17
|
+
jest.mock("@applicaster/zapp-react-native-utils/idleUtils", () => ({
|
|
18
|
+
withTimeout$: jest.fn(),
|
|
19
|
+
}));
|
|
20
|
+
|
|
21
|
+
import { makeListOf } from "@applicaster/zapp-react-native-utils/arrayUtils";
|
|
22
|
+
import { isFirstComponentGallery } from "@applicaster/zapp-react-native-utils/componentsUtils";
|
|
23
|
+
import { withTimeout$ } from "@applicaster/zapp-react-native-utils/idleUtils";
|
|
5
24
|
|
|
6
25
|
describe("ScreenRevealManager", () => {
|
|
7
|
-
|
|
26
|
+
let mockCallback: jest.Mock;
|
|
27
|
+
let timeout$: Subject<void>;
|
|
8
28
|
|
|
9
29
|
beforeEach(() => {
|
|
10
|
-
jest.
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
it("should initialize with the correct number of components to wait for", () => {
|
|
14
|
-
const componentsToRender: ZappUIComponent[] = [
|
|
15
|
-
{ component_type: "component1" },
|
|
16
|
-
{ component_type: "component2" },
|
|
17
|
-
{ component_type: "component3" },
|
|
18
|
-
];
|
|
30
|
+
jest.useFakeTimers();
|
|
31
|
+
mockCallback = jest.fn();
|
|
32
|
+
timeout$ = new Subject();
|
|
19
33
|
|
|
20
|
-
|
|
34
|
+
(withTimeout$ as jest.Mock).mockReturnValue(timeout$);
|
|
35
|
+
(isFirstComponentGallery as jest.Mock).mockReturnValue(false);
|
|
21
36
|
|
|
22
|
-
|
|
37
|
+
(makeListOf as jest.Mock).mockImplementation((value, length) =>
|
|
38
|
+
Array(length).fill(value)
|
|
39
|
+
);
|
|
40
|
+
});
|
|
23
41
|
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
]);
|
|
42
|
+
afterEach(() => {
|
|
43
|
+
jest.clearAllTimers();
|
|
44
|
+
jest.useRealTimers();
|
|
45
|
+
jest.resetAllMocks();
|
|
29
46
|
});
|
|
30
47
|
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
{ component_type: "component3" },
|
|
36
|
-
];
|
|
48
|
+
// ────────────────────────────────────────────────
|
|
49
|
+
it("should initialize with correct number of components and UNKNOWN state", () => {
|
|
50
|
+
const components = new Array(5).fill({});
|
|
51
|
+
const mgr = new ScreenRevealManager(components, mockCallback);
|
|
37
52
|
|
|
38
|
-
|
|
53
|
+
expect(mgr.numberOfComponentsWaitToLoadBeforePresent).toBe(3);
|
|
54
|
+
expect(makeListOf).toHaveBeenCalledWith(COMPONENT_LOADING_STATE.UNKNOWN, 3);
|
|
55
|
+
});
|
|
39
56
|
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
57
|
+
// ────────────────────────────────────────────────
|
|
58
|
+
it("should set numberOfComponentsWaitToLoadBeforePresent to 1 if first component is gallery", () => {
|
|
59
|
+
(isFirstComponentGallery as jest.Mock).mockReturnValue(true);
|
|
43
60
|
|
|
44
|
-
|
|
61
|
+
const components = new Array(5).fill({});
|
|
62
|
+
const mgr = new ScreenRevealManager(components, mockCallback);
|
|
63
|
+
|
|
64
|
+
expect(mgr.numberOfComponentsWaitToLoadBeforePresent).toBe(1);
|
|
45
65
|
});
|
|
46
66
|
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
{ component_type: "component3" },
|
|
52
|
-
];
|
|
67
|
+
// ────────────────────────────────────────────────
|
|
68
|
+
it("should trigger callback after all components load successfully", () => {
|
|
69
|
+
const components = new Array(3).fill({});
|
|
70
|
+
const mgr = new ScreenRevealManager(components, mockCallback);
|
|
53
71
|
|
|
54
|
-
|
|
72
|
+
mgr.onLoadFinished(0);
|
|
73
|
+
expect(mockCallback).not.toHaveBeenCalled();
|
|
55
74
|
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
manager.onLoadFailed(2);
|
|
75
|
+
mgr.onLoadFinished(1);
|
|
76
|
+
expect(mockCallback).not.toHaveBeenCalled();
|
|
59
77
|
|
|
78
|
+
mgr.onLoadFinished(2);
|
|
60
79
|
expect(mockCallback).toHaveBeenCalledTimes(1);
|
|
61
80
|
});
|
|
62
81
|
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
{ component_type: "component3" },
|
|
68
|
-
];
|
|
69
|
-
|
|
70
|
-
const manager = new ScreenRevealManager(componentsToRender, mockCallback);
|
|
82
|
+
// ────────────────────────────────────────────────
|
|
83
|
+
it("should trigger callback after some components fail to load but all finished", () => {
|
|
84
|
+
const components = new Array(3).fill({});
|
|
85
|
+
const mgr = new ScreenRevealManager(components, mockCallback);
|
|
71
86
|
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
87
|
+
mgr.onLoadFinished(0);
|
|
88
|
+
mgr.onLoadFailed(1);
|
|
89
|
+
mgr.onLoadFailed(2);
|
|
75
90
|
|
|
76
91
|
expect(mockCallback).toHaveBeenCalledTimes(1);
|
|
77
92
|
});
|
|
78
93
|
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
{ component_type: "component3" },
|
|
84
|
-
];
|
|
85
|
-
|
|
86
|
-
const manager = new ScreenRevealManager(componentsToRender, mockCallback);
|
|
94
|
+
// ────────────────────────────────────────────────
|
|
95
|
+
it("should not trigger callback twice when same component finishes twice", () => {
|
|
96
|
+
const components = new Array(3).fill({});
|
|
97
|
+
const mgr = new ScreenRevealManager(components, mockCallback);
|
|
87
98
|
|
|
88
|
-
|
|
89
|
-
|
|
99
|
+
mgr.onLoadFinished(0);
|
|
100
|
+
mgr.onLoadFinished(0); // duplicate
|
|
101
|
+
mgr.onLoadFinished(1);
|
|
102
|
+
mgr.onLoadFinished(2);
|
|
90
103
|
|
|
91
|
-
expect(mockCallback).
|
|
104
|
+
expect(mockCallback).toHaveBeenCalledTimes(1);
|
|
92
105
|
});
|
|
93
106
|
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
{ component_type: "component3" },
|
|
99
|
-
];
|
|
107
|
+
// ────────────────────────────────────────────────
|
|
108
|
+
it("should trigger callback when timeout$ emits before all loaded", () => {
|
|
109
|
+
const components = new Array(3).fill({});
|
|
110
|
+
new ScreenRevealManager(components, mockCallback);
|
|
100
111
|
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
manager.onLoadFinished(0);
|
|
112
|
+
timeout$.next(); // simulate timeout event from withTimeout$
|
|
104
113
|
|
|
105
114
|
expect(mockCallback).toHaveBeenCalledTimes(1);
|
|
106
115
|
});
|
|
116
|
+
|
|
117
|
+
// ────────────────────────────────────────────────
|
|
118
|
+
it("should not call callback if nothing loads and no timeout emitted", () => {
|
|
119
|
+
const components = new Array(3).fill({});
|
|
120
|
+
new ScreenRevealManager(components, mockCallback);
|
|
121
|
+
|
|
122
|
+
expect(mockCallback).not.toHaveBeenCalled();
|
|
123
|
+
});
|
|
107
124
|
});
|
|
@@ -8,6 +8,7 @@ import { isEmptyOrNil } from "@applicaster/zapp-react-native-utils/cellUtils";
|
|
|
8
8
|
import { focusManager } from "@applicaster/zapp-react-native-utils/appUtils/focusManager";
|
|
9
9
|
import { FocusableGroup } from "@applicaster/zapp-react-native-ui-components/Components/FocusableGroup";
|
|
10
10
|
import { Focusable } from "@applicaster/zapp-react-native-ui-components/Components/Focusable";
|
|
11
|
+
import { useAccessibilityManager } from "@applicaster/zapp-react-native-utils/appUtils/accessibilityManager/hooks";
|
|
11
12
|
import { Gutter } from "../Gutter";
|
|
12
13
|
import Tab from "./Tab";
|
|
13
14
|
import { getStyles } from "./styles";
|
|
@@ -28,11 +29,14 @@ const TabsComponent = ({
|
|
|
28
29
|
style,
|
|
29
30
|
selectedEntryIndex,
|
|
30
31
|
setSelectedEntry,
|
|
32
|
+
accessibility,
|
|
31
33
|
}: TabsProps & Partial<TabsSelectionContextType>) => {
|
|
32
34
|
const configuration = useConfiguration();
|
|
33
35
|
const config = applyFontConfig(configuration);
|
|
34
36
|
const styles = useMemo(() => getStyles(config), [config]);
|
|
35
37
|
|
|
38
|
+
const accessibilityManager = useAccessibilityManager({});
|
|
39
|
+
|
|
36
40
|
const {
|
|
37
41
|
tab_bar_gutter: horizontalGutter,
|
|
38
42
|
tab_bar_background_image: bgImage,
|
|
@@ -60,10 +64,20 @@ const TabsComponent = ({
|
|
|
60
64
|
);
|
|
61
65
|
|
|
62
66
|
const onListElementFocus = useCallback(
|
|
63
|
-
(index) => {
|
|
67
|
+
(index, isSelected: boolean, item: ZappEntry) => {
|
|
68
|
+
if (isSelected) {
|
|
69
|
+
accessibilityManager.readText({
|
|
70
|
+
text: `${accessibility?.selectedHint} ${item.title}`,
|
|
71
|
+
});
|
|
72
|
+
} else {
|
|
73
|
+
accessibilityManager.readText({
|
|
74
|
+
text: `${accessibility?.hint} ${item.title}`,
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
|
|
64
78
|
scrollToSelectedIndex(index, VIEW_POSITION);
|
|
65
79
|
},
|
|
66
|
-
[scrollToSelectedIndex]
|
|
80
|
+
[scrollToSelectedIndex, accessibility]
|
|
67
81
|
);
|
|
68
82
|
|
|
69
83
|
const renderItem = useCallback(
|
|
@@ -94,7 +108,7 @@ const TabsComponent = ({
|
|
|
94
108
|
id={itemId}
|
|
95
109
|
testID={itemId}
|
|
96
110
|
preferredFocus={isSelected}
|
|
97
|
-
onFocus={() => onListElementFocus(index)}
|
|
111
|
+
onFocus={() => onListElementFocus(index, isSelected, item)}
|
|
98
112
|
onPress={() => setSelectedEntry && setSelectedEntry(item)}
|
|
99
113
|
style={style}
|
|
100
114
|
>
|
|
@@ -149,6 +163,9 @@ const TabsComponent = ({
|
|
|
149
163
|
shouldUsePreferredFocus
|
|
150
164
|
isWithMemory={false}
|
|
151
165
|
nextFocusDown={parentFocus?.nextFocusDown}
|
|
166
|
+
onFocus={() => {
|
|
167
|
+
accessibilityManager.addHeading(accessibility?.announcement);
|
|
168
|
+
}}
|
|
152
169
|
>
|
|
153
170
|
<View style={tabs}>
|
|
154
171
|
<ImageBackground
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import React from "react";
|
|
2
|
-
import { View,
|
|
2
|
+
import { View, StyleSheet } from "react-native";
|
|
3
3
|
|
|
4
4
|
import { River } from "@applicaster/zapp-react-native-ui-components/Components";
|
|
5
5
|
import { withNestedNavigationContextProvider } from "@applicaster/zapp-react-native-ui-components/Contexts/NestedNavigationContext";
|
|
6
6
|
|
|
7
7
|
type Props = {
|
|
8
|
-
styles: Record<string, ViewStyle>;
|
|
9
8
|
minHeight: number;
|
|
10
9
|
changingTab: boolean;
|
|
11
10
|
feedUrl: string;
|
|
@@ -14,9 +13,14 @@ type Props = {
|
|
|
14
13
|
backgroundColor: string;
|
|
15
14
|
};
|
|
16
15
|
|
|
16
|
+
const styles = StyleSheet.create({
|
|
17
|
+
riverWrapper: {
|
|
18
|
+
flex: 1,
|
|
19
|
+
},
|
|
20
|
+
});
|
|
21
|
+
|
|
17
22
|
function TabContentComponent(props: Props) {
|
|
18
23
|
const {
|
|
19
|
-
styles,
|
|
20
24
|
minHeight,
|
|
21
25
|
backgroundColor,
|
|
22
26
|
changingTab,
|
|
@@ -29,7 +33,6 @@ function TabContentComponent(props: Props) {
|
|
|
29
33
|
<View
|
|
30
34
|
style={[
|
|
31
35
|
styles.riverWrapper,
|
|
32
|
-
|
|
33
36
|
{
|
|
34
37
|
backgroundColor,
|
|
35
38
|
minHeight,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React from "react";
|
|
1
|
+
import React, { useEffect } from "react";
|
|
2
2
|
import { equals } from "ramda";
|
|
3
3
|
import { Animated, ViewProps, ViewStyle } from "react-native";
|
|
4
4
|
import { useSafeAreaFrame } from "react-native-safe-area-context";
|
|
@@ -95,9 +95,22 @@ function SceneComponent({
|
|
|
95
95
|
});
|
|
96
96
|
|
|
97
97
|
const frame = useSafeAreaFrame();
|
|
98
|
+
|
|
99
|
+
const [memoFrame, setMemoFrame] = React.useState(frame);
|
|
100
|
+
|
|
101
|
+
useEffect(() => {
|
|
102
|
+
if (isActive) {
|
|
103
|
+
setMemoFrame((oldFrame) =>
|
|
104
|
+
oldFrame.width === frame.width && oldFrame.height === frame.height
|
|
105
|
+
? oldFrame
|
|
106
|
+
: frame
|
|
107
|
+
);
|
|
108
|
+
}
|
|
109
|
+
}, [isActive, frame.width, frame.height]);
|
|
110
|
+
|
|
98
111
|
const isAnimating = animating && overlayStyle;
|
|
99
112
|
|
|
100
|
-
const dimensions = isAnimating ? fullWidthDimensions :
|
|
113
|
+
const dimensions = isAnimating ? fullWidthDimensions : memoFrame;
|
|
101
114
|
|
|
102
115
|
return (
|
|
103
116
|
<Animated.View
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import * as React from "react";
|
|
2
2
|
import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
|
|
3
3
|
import { useDimensions } from "@applicaster/zapp-react-native-utils/reactHooks/layout";
|
|
4
|
-
import {
|
|
4
|
+
import { useAppData } from "@applicaster/zapp-react-native-redux";
|
|
5
|
+
|
|
5
6
|
import { TransitionerComponent } from "./Transitioner";
|
|
6
7
|
|
|
7
8
|
export const Transitioner = (props) => {
|
|
@@ -16,8 +17,7 @@ export const Transitioner = (props) => {
|
|
|
16
17
|
deviceInfo: true,
|
|
17
18
|
});
|
|
18
19
|
|
|
19
|
-
const {
|
|
20
|
-
const isTabletPortrait = appData?.isTabletPortrait;
|
|
20
|
+
const { isTabletPortrait } = useAppData();
|
|
21
21
|
|
|
22
22
|
return (
|
|
23
23
|
<TransitionerComponent
|
|
@@ -1,62 +1,159 @@
|
|
|
1
|
-
import React, {
|
|
1
|
+
import React, { useMemo } from "react";
|
|
2
2
|
import { Animated, Dimensions } from "react-native";
|
|
3
3
|
|
|
4
4
|
import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useNavigation";
|
|
5
5
|
|
|
6
6
|
import { useConfiguration } from "../utils";
|
|
7
|
-
import {
|
|
7
|
+
import {
|
|
8
|
+
useAppData,
|
|
9
|
+
usePlugins,
|
|
10
|
+
} from "@applicaster/zapp-react-native-redux/hooks";
|
|
11
|
+
import { isBottomTabVisible } from "../../Screen/navigationHandler";
|
|
12
|
+
|
|
13
|
+
import {
|
|
14
|
+
useSafeAreaFrame,
|
|
15
|
+
useSafeAreaInsets,
|
|
16
|
+
} from "react-native-safe-area-context";
|
|
17
|
+
import {
|
|
18
|
+
isAndroidPlatform,
|
|
19
|
+
isAndroidVersionAtLeast,
|
|
20
|
+
} from "@applicaster/zapp-react-native-utils/reactUtils";
|
|
21
|
+
import { getTabBarHeight } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/getTabBarHeight";
|
|
22
|
+
import { PROGRESS_BAR_HEIGHT } from "./utils";
|
|
23
|
+
import { useIsTablet as getIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
|
|
8
24
|
|
|
9
25
|
export type ModalAnimationContextT = {
|
|
10
|
-
yTranslate: React.MutableRefObject<Animated.
|
|
26
|
+
yTranslate: React.MutableRefObject<Animated.AnimatedInterpolation<number>>;
|
|
27
|
+
offsetAnimatedValueRef: React.MutableRefObject<Animated.Value>;
|
|
28
|
+
offset: React.MutableRefObject<number>;
|
|
29
|
+
heightAboveMinimised: number;
|
|
30
|
+
gestureTranslationRef: React.MutableRefObject<Animated.Value>;
|
|
11
31
|
minimisedHeight: number;
|
|
12
32
|
};
|
|
13
33
|
|
|
14
34
|
export const ReactContext = React.createContext<ModalAnimationContextT>({
|
|
15
35
|
yTranslate: React.createRef<Animated.Value | null>(),
|
|
36
|
+
offsetAnimatedValueRef: React.createRef<Animated.Value>(),
|
|
37
|
+
offset: React.createRef<number>(),
|
|
38
|
+
heightAboveMinimised: 0,
|
|
39
|
+
gestureTranslationRef: React.createRef<Animated.Value>(),
|
|
16
40
|
minimisedHeight: 60,
|
|
17
41
|
});
|
|
18
42
|
|
|
43
|
+
const SAFE_AREA_BREAKING_API_VERSION = 35;
|
|
44
|
+
|
|
45
|
+
export const isOldAndroidDevice =
|
|
46
|
+
isAndroidPlatform() &&
|
|
47
|
+
!isAndroidVersionAtLeast(SAFE_AREA_BREAKING_API_VERSION);
|
|
48
|
+
|
|
49
|
+
const bottomTabBarHeight = getTabBarHeight();
|
|
50
|
+
|
|
19
51
|
const Provider = ({ children }: { children: React.ReactNode }) => {
|
|
52
|
+
const { height } = Dimensions.get("window");
|
|
53
|
+
|
|
20
54
|
const yTranslate = React.useRef(
|
|
21
|
-
new Animated.Value(
|
|
55
|
+
new Animated.Value(height).interpolate<number>({
|
|
56
|
+
inputRange: [0, height],
|
|
57
|
+
outputRange: [0, height],
|
|
58
|
+
})
|
|
22
59
|
);
|
|
23
60
|
|
|
61
|
+
const { minimised_height: minimisedHeight } = useConfiguration();
|
|
62
|
+
|
|
24
63
|
const {
|
|
25
|
-
videoModalState: { visible },
|
|
64
|
+
videoModalState: { visible, mode },
|
|
65
|
+
currentRoute,
|
|
66
|
+
screenData,
|
|
26
67
|
} = useNavigation();
|
|
27
68
|
|
|
28
|
-
const {
|
|
69
|
+
const { isTabletPortrait } = useAppData();
|
|
70
|
+
|
|
71
|
+
const plugins = usePlugins();
|
|
72
|
+
|
|
73
|
+
const bottomTabsVisible = isBottomTabVisible(
|
|
74
|
+
currentRoute,
|
|
75
|
+
screenData,
|
|
76
|
+
plugins
|
|
77
|
+
);
|
|
78
|
+
|
|
79
|
+
const frame = useSafeAreaFrame();
|
|
80
|
+
const insets = useSafeAreaInsets();
|
|
81
|
+
|
|
82
|
+
const [heightAboveMinimised, setHeightAboveMinimised] = React.useState(0);
|
|
83
|
+
|
|
84
|
+
// memoizing heightAboveMinimised value
|
|
85
|
+
const offset = React.useRef(heightAboveMinimised);
|
|
86
|
+
|
|
87
|
+
// Used for memoizing modal y position after start/end of transition
|
|
88
|
+
const offsetAnimatedValueRef = React.useRef(
|
|
89
|
+
new Animated.Value(-offset.current)
|
|
90
|
+
);
|
|
91
|
+
|
|
92
|
+
// Used for gesture handling
|
|
93
|
+
const gestureTranslationRef = React.useRef(new Animated.Value(0));
|
|
94
|
+
|
|
95
|
+
const videoModalStateRef = React.useRef({ visible, mode });
|
|
96
|
+
|
|
97
|
+
React.useEffect(() => {
|
|
98
|
+
videoModalStateRef.current = { visible, mode };
|
|
99
|
+
}, [visible, mode]);
|
|
100
|
+
|
|
101
|
+
const translateY = useMemo(() => {
|
|
102
|
+
const maxRange = heightAboveMinimised;
|
|
103
|
+
|
|
104
|
+
const combined: Animated.AnimatedAddition<number> = Animated.add(
|
|
105
|
+
offsetAnimatedValueRef.current,
|
|
106
|
+
gestureTranslationRef.current
|
|
107
|
+
);
|
|
108
|
+
|
|
109
|
+
return combined.interpolate({
|
|
110
|
+
inputRange: [0, maxRange],
|
|
111
|
+
outputRange: [0, maxRange],
|
|
112
|
+
extrapolate: "clamp",
|
|
113
|
+
});
|
|
114
|
+
}, [visible, heightAboveMinimised]);
|
|
115
|
+
|
|
116
|
+
offset.current = heightAboveMinimised;
|
|
117
|
+
yTranslate.current = translateY;
|
|
118
|
+
|
|
119
|
+
React.useEffect(() => {
|
|
120
|
+
const collapsedHeight =
|
|
121
|
+
minimisedHeight +
|
|
122
|
+
(bottomTabsVisible ? bottomTabBarHeight : 0) +
|
|
123
|
+
(isOldAndroidDevice ? 0 : insets.bottom) + // insets.bottom is added to properly display docked modal
|
|
124
|
+
PROGRESS_BAR_HEIGHT;
|
|
125
|
+
|
|
126
|
+
const heightAboveMinimised = frame.height - collapsedHeight;
|
|
127
|
+
|
|
128
|
+
const isLandscape = frame.width > frame.height;
|
|
129
|
+
|
|
130
|
+
const isTablet = getIsTablet();
|
|
131
|
+
|
|
132
|
+
const shouldIgnoreLandscape = isTablet ? isTabletPortrait : true;
|
|
29
133
|
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
if (windowDimensions.height > windowDimensions.width) {
|
|
39
|
-
yTranslate.current?.setValue(windowDimensions.height);
|
|
40
|
-
}
|
|
41
|
-
} else {
|
|
42
|
-
yTranslate.current?.setValue(windowDimensions.height);
|
|
43
|
-
}
|
|
134
|
+
if (
|
|
135
|
+
heightAboveMinimised !== offset.current &&
|
|
136
|
+
videoModalStateRef.current.mode !== "PIP" &&
|
|
137
|
+
videoModalStateRef.current.mode !== "FULLSCREEN"
|
|
138
|
+
) {
|
|
139
|
+
if (isLandscape && shouldIgnoreLandscape) return;
|
|
140
|
+
setHeightAboveMinimised(heightAboveMinimised);
|
|
141
|
+
offset.current = heightAboveMinimised;
|
|
44
142
|
}
|
|
45
|
-
}, [
|
|
46
|
-
visible,
|
|
47
|
-
windowDimensions.height,
|
|
48
|
-
isTabletLandscape,
|
|
49
|
-
windowDimensions.width,
|
|
50
|
-
]);
|
|
143
|
+
}, [frame.height, insets.bottom, bottomTabsVisible, minimisedHeight]);
|
|
51
144
|
|
|
52
145
|
return (
|
|
53
146
|
<ReactContext.Provider
|
|
54
147
|
value={useMemo(
|
|
55
148
|
() => ({
|
|
56
149
|
yTranslate,
|
|
150
|
+
offsetAnimatedValueRef,
|
|
151
|
+
offset,
|
|
152
|
+
heightAboveMinimised,
|
|
57
153
|
minimisedHeight,
|
|
154
|
+
gestureTranslationRef,
|
|
58
155
|
}),
|
|
59
|
-
[minimisedHeight]
|
|
156
|
+
[minimisedHeight, heightAboveMinimised]
|
|
60
157
|
)}
|
|
61
158
|
>
|
|
62
159
|
{children}
|
|
@@ -2,8 +2,6 @@ export { withModalAnimationProvider } from "./ModalAnimationContext";
|
|
|
2
2
|
|
|
3
3
|
export { useModalAnimationContext } from "./useModalAnimationContext";
|
|
4
4
|
|
|
5
|
-
export {
|
|
6
|
-
|
|
7
|
-
export { ComponentAnimationType, defaultAspectRatioWidth } from "./utils";
|
|
5
|
+
export { defaultAspectRatioWidth } from "./utils";
|
|
8
6
|
|
|
9
7
|
export { DURATION_TO_MINIMIZE, DURATION_TO_MAXIMIZE } from "./const";
|