@applicaster/zapp-react-native-ui-components 12.0.0-alpha.4408649484 → 12.0.0-alpha.4440903139
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/Cell/Cell.tsx +21 -5
- package/Components/Focusable/__tests__/index.android.test.tsx +72 -0
- package/Components/Focusable/index.android.tsx +15 -9
- package/Components/FocusableList/FocusableChild.ts +2 -4
- package/Components/FocusableList/index.tsx +11 -12
- package/Components/FocusableScrollView/index.tsx +1 -1
- package/Components/FreezeWithCallback/Freeze.tsx +31 -0
- package/Components/FreezeWithCallback/LICENSE +21 -0
- package/Components/FreezeWithCallback/Suspender.tsx +17 -0
- package/Components/FreezeWithCallback/__tests__/index.test.tsx +170 -0
- package/Components/FreezeWithCallback/index.tsx +3 -0
- package/Components/Image/Image.android.tsx +1 -1
- package/Components/Layout/TV/ScreenContainer.tsx +3 -8
- package/Components/Layout/TV/__tests__/ScreenContainer.test.tsx +1 -1
- package/Components/MasterCell/DefaultComponents/ActionButton.tsx +2 -1
- package/Components/MasterCell/DefaultComponents/BorderContainerView/index.tsx +1 -7
- package/Components/MasterCell/DefaultComponents/FocusableView/index.tsx +12 -0
- package/Components/MasterCell/DefaultComponents/Image/Image.ios.tsx +6 -5
- package/Components/MasterCell/DefaultComponents/Image/Image.web.tsx +2 -2
- package/Components/MasterCell/DefaultComponents/ImageBorderContainer/index.ts +71 -0
- package/Components/MasterCell/DefaultComponents/LiveImage/index.tsx +20 -0
- package/Components/MasterCell/DefaultComponents/__tests__/image.test.js +1 -1
- package/Components/MasterCell/DefaultComponents/index.ts +2 -0
- package/Components/MasterCell/SharedUI/ProgressBar/hooks/useFillInPercent.ts +7 -1
- package/Components/MasterCell/dataAdapter.ts +21 -7
- package/Components/MasterCell/index.tsx +5 -3
- package/Components/PlayerContainer/PlayerContainer.tsx +16 -13
- package/Components/Screen/TV/hooks/index.ts +0 -2
- package/Components/Screen/TV/index.web.tsx +34 -25
- package/Components/Screen/__tests__/Screen.test.tsx +0 -49
- package/Components/Screen/index.tsx +27 -76
- package/Components/Screen/navigationHandler.ts +6 -3
- package/Components/Screen/orientationHandler.ts +18 -7
- package/Components/Screen/utils.ts +16 -0
- package/Components/ScreenResolver/index.tsx +6 -11
- package/Components/Transitioner/Scene.tsx +20 -12
- package/Components/Transitioner/Transitioner.tsx +38 -23
- package/Components/Transitioner/__tests__/Scene.test.js +7 -0
- package/Components/Transitioner/__tests__/__snapshots__/Scene.test.js.snap +8 -4
- package/Components/Transitioner/__tests__/__snapshots__/transitioner.test.js.snap +1 -0
- package/Components/VideoLive/PlayerLiveImageComponent.tsx +52 -24
- package/Components/VideoLive/__tests__/__snapshots__/PlayerLiveImageComponent.test.tsx.snap +31 -24
- package/Components/VideoModal/ModalAnimation/AnimatedPlayerModalWrapper.tsx +2 -14
- package/Components/VideoModal/ModalAnimation/AnimatedScrollModal.tsx +33 -8
- package/Components/VideoModal/ModalAnimation/AnimatedVideoPlayerComponent.tsx +9 -2
- package/Components/VideoModal/ModalAnimation/AnimationComponent.tsx +34 -8
- package/Components/VideoModal/ModalAnimation/ModalAnimationContext.tsx +28 -8
- package/Components/VideoModal/ModalAnimation/utils.ts +1 -0
- package/Components/VideoModal/PlayerDetails.tsx +16 -2
- package/Components/VideoModal/PlayerWrapper.tsx +40 -10
- package/Components/VideoModal/VideoModal.tsx +33 -27
- package/Components/VideoModal/__tests__/PlayerDetails.test.tsx +7 -0
- package/Components/VideoModal/__tests__/__snapshots__/PlayerDetails.test.tsx.snap +2 -0
- package/Components/VideoModal/__tests__/__snapshots__/PlayerWrapper.test.tsx.snap +102 -10
- package/Components/VideoModal/hooks/useModalSize.ts +10 -12
- package/Components/ZappFrameworkComponents/BarView/BarView.tsx +7 -3
- package/Components/ZappFrameworkComponents/BarView/Buttons/BackButton.tsx +7 -2
- package/Components/ZappFrameworkComponents/BarView/Buttons/CloseButton.tsx +7 -2
- package/Components/ZappFrameworkComponents/BarView/__tests__/BarView.test.tsx +87 -0
- package/Components/ZappFrameworkComponents/Buttons/ActionButton.tsx +9 -4
- package/Components/default-cell-renderer/__tests__/__snapshots__/defaultCellRenderer.test.tsx.snap +4 -4
- package/Contexts/CachedDimensionsContext/index.ts +13 -9
- package/Contexts/ConfirmDialogState/index.ts +1 -1
- package/Contexts/ScreenContext/index.tsx +6 -1
- package/const.ts +6 -0
- package/index.js +3 -0
- package/package.json +5 -5
- package/Components/Screen/TV/hooks/useRestoreFocus.ts +0 -22
|
@@ -34,6 +34,7 @@ export const AnimatedVideoPlayer = ({ children }: Props) => {
|
|
|
34
34
|
lastSnap,
|
|
35
35
|
setLastSnap,
|
|
36
36
|
resetPlayerAnimationState,
|
|
37
|
+
setStartComponentsAnimation,
|
|
37
38
|
} = useModalAnimationContext();
|
|
38
39
|
|
|
39
40
|
const { videoModalState } = useNavigation();
|
|
@@ -121,8 +122,10 @@ export const AnimatedVideoPlayer = ({ children }: Props) => {
|
|
|
121
122
|
preparedValue > 0 &&
|
|
122
123
|
playerAnimationState !== PlayerAnimationStateEnum.drag_scroll
|
|
123
124
|
) {
|
|
124
|
-
playerAnimationState !== PlayerAnimationStateEnum.drag_player
|
|
125
|
+
if (playerAnimationState !== PlayerAnimationStateEnum.drag_player) {
|
|
126
|
+
isMinimizedModal && setStartComponentsAnimation(true);
|
|
125
127
|
setPlayerAnimationState(PlayerAnimationStateEnum.drag_player);
|
|
128
|
+
}
|
|
126
129
|
|
|
127
130
|
translateYOffset.setValue(
|
|
128
131
|
isMaximazedModal
|
|
@@ -152,7 +155,11 @@ export const AnimatedVideoPlayer = ({ children }: Props) => {
|
|
|
152
155
|
};
|
|
153
156
|
|
|
154
157
|
export const AnimatedVideoPlayerComponent = ({ children }: Props) => {
|
|
155
|
-
const
|
|
158
|
+
const {
|
|
159
|
+
videoModalState: { visible },
|
|
160
|
+
} = useNavigation();
|
|
161
|
+
|
|
162
|
+
const Component = !isTV() && visible ? AnimatedVideoPlayer : React.Fragment;
|
|
156
163
|
|
|
157
164
|
return <Component>{children}</Component>;
|
|
158
165
|
};
|
|
@@ -51,6 +51,7 @@ export const AnimationView = ({
|
|
|
51
51
|
setTabletLandscapePlayerTopPosition,
|
|
52
52
|
modalSnapPoints,
|
|
53
53
|
startComponentsAnimationDistance,
|
|
54
|
+
progressBarHeight,
|
|
54
55
|
} = useModalAnimationContext();
|
|
55
56
|
|
|
56
57
|
const isRTL = useIsRTL();
|
|
@@ -59,12 +60,15 @@ export const AnimationView = ({
|
|
|
59
60
|
const {
|
|
60
61
|
width: screenWidth,
|
|
61
62
|
deviceInfo: { isTablet, isTabletLandscape },
|
|
62
|
-
} = useDimensions("window", {
|
|
63
|
+
} = useDimensions("window", {
|
|
64
|
+
deviceInfo: true,
|
|
65
|
+
updateForInactiveScreens: true,
|
|
66
|
+
});
|
|
63
67
|
|
|
64
68
|
const { videoModalState } = useNavigation();
|
|
65
|
-
const bottomTabBarHeight = useGetBottomTabBarHeight();
|
|
66
|
-
const minimisedWidth = defaultAspectRatioWidth(minimisedHeight);
|
|
67
69
|
const insets = useSafeAreaInsets();
|
|
70
|
+
const bottomTabBarHeight = useGetBottomTabBarHeight() + (insets.bottom || 0);
|
|
71
|
+
const minimisedWidth = defaultAspectRatioWidth(minimisedHeight);
|
|
68
72
|
const animationComponentRef = useRef(null);
|
|
69
73
|
|
|
70
74
|
// retrieving top position of the player for tablet landscape mode
|
|
@@ -92,12 +96,12 @@ export const AnimationView = ({
|
|
|
92
96
|
const inlineAudioPlayer = additionalData.inlineAudioPlayer;
|
|
93
97
|
|
|
94
98
|
const moveUpValue = additionalData.saveArea
|
|
95
|
-
? -insets.top
|
|
99
|
+
? -insets.top + (isAudioItem ? 0 : progressBarHeight)
|
|
96
100
|
: isTablet
|
|
97
101
|
? isTabletLandscape && (!isAudioItem || (isAudioItem && inlineAudioPlayer))
|
|
98
|
-
? -tabletLandscapePlayerTopPosition
|
|
102
|
+
? -tabletLandscapePlayerTopPosition + progressBarHeight
|
|
99
103
|
: -130
|
|
100
|
-
: -50;
|
|
104
|
+
: -50 + progressBarHeight;
|
|
101
105
|
|
|
102
106
|
const moveComponentHorizontalValue = additionalData.moveValue
|
|
103
107
|
? isRTL
|
|
@@ -300,13 +304,35 @@ export const AnimationView = ({
|
|
|
300
304
|
typeof additionalData.height === "number" && additionalData.height;
|
|
301
305
|
}
|
|
302
306
|
|
|
303
|
-
if (
|
|
307
|
+
if (
|
|
308
|
+
videoModalState.mode === "MAXIMIZED" &&
|
|
309
|
+
defaultValue.x !== screenWidth &&
|
|
310
|
+
width &&
|
|
311
|
+
height
|
|
312
|
+
) {
|
|
304
313
|
const value = { x: width, y: height };
|
|
305
314
|
setDefaultValue(value);
|
|
306
315
|
animatedValue.setValue(value);
|
|
307
316
|
}
|
|
308
317
|
}
|
|
309
|
-
}, [
|
|
318
|
+
}, [screenWidth]);
|
|
319
|
+
|
|
320
|
+
React.useEffect(() => {
|
|
321
|
+
if (
|
|
322
|
+
videoModalState.mode === "MINIMIZED" &&
|
|
323
|
+
videoModalState.previousMode === "MAXIMIZED"
|
|
324
|
+
) {
|
|
325
|
+
// set animation to the minimize values if moving from the player to another screen
|
|
326
|
+
if (playerAnimationState === null) {
|
|
327
|
+
const value = getAnimationValue(
|
|
328
|
+
animationType,
|
|
329
|
+
PlayerAnimationStateEnum.minimize
|
|
330
|
+
).toValue;
|
|
331
|
+
|
|
332
|
+
animatedValue.setValue(value);
|
|
333
|
+
}
|
|
334
|
+
}
|
|
335
|
+
}, [videoModalState]);
|
|
310
336
|
|
|
311
337
|
React.useEffect(() => {
|
|
312
338
|
if (
|
|
@@ -1,12 +1,17 @@
|
|
|
1
1
|
import React, { useContext } from "react";
|
|
2
2
|
import { Animated } from "react-native";
|
|
3
3
|
|
|
4
|
-
import {
|
|
4
|
+
import {
|
|
5
|
+
useSafeAreaInsets,
|
|
6
|
+
useSafeAreaFrame,
|
|
7
|
+
} from "react-native-safe-area-context";
|
|
5
8
|
import {
|
|
6
9
|
useGetBottomTabBarHeight,
|
|
7
|
-
|
|
10
|
+
useNavigation,
|
|
8
11
|
} from "@applicaster/zapp-react-native-utils/reactHooks";
|
|
12
|
+
import { isLive } from "@applicaster/zapp-react-native-utils/playerUtils";
|
|
9
13
|
|
|
14
|
+
import { PROGRESS_BAR_HEIGHT } from "./utils";
|
|
10
15
|
import { useConfiguration } from "../utils";
|
|
11
16
|
|
|
12
17
|
export enum PlayerAnimationStateEnum {
|
|
@@ -40,6 +45,7 @@ export type ModalAnimationContextT = {
|
|
|
40
45
|
tabletLandscapePlayerTopPosition: number;
|
|
41
46
|
setTabletLandscapePlayerTopPosition: (value: number) => void;
|
|
42
47
|
startComponentsAnimationDistance: number;
|
|
48
|
+
progressBarHeight: number;
|
|
43
49
|
};
|
|
44
50
|
|
|
45
51
|
const ReactContext = React.createContext<ModalAnimationContextT>({
|
|
@@ -64,6 +70,7 @@ const ReactContext = React.createContext<ModalAnimationContextT>({
|
|
|
64
70
|
tabletLandscapePlayerTopPosition: 0,
|
|
65
71
|
setTabletLandscapePlayerTopPosition: () => null,
|
|
66
72
|
startComponentsAnimationDistance: 0,
|
|
73
|
+
progressBarHeight: 0,
|
|
67
74
|
});
|
|
68
75
|
|
|
69
76
|
export function useModalAnimationContext() {
|
|
@@ -82,6 +89,11 @@ const Provider = ({ children }: { children: React.ReactNode }) => {
|
|
|
82
89
|
const [startComponentsAnimation, setStartComponentsAnimation] =
|
|
83
90
|
React.useState<boolean>(false);
|
|
84
91
|
|
|
92
|
+
const {
|
|
93
|
+
videoModalState: { mode, visible, item },
|
|
94
|
+
} = useNavigation();
|
|
95
|
+
|
|
96
|
+
const isLiveItem = isLive(item);
|
|
85
97
|
const { minimised_height: minimisedHeight } = useConfiguration();
|
|
86
98
|
|
|
87
99
|
const resetPlayerAnimationState = React.useCallback(() => {
|
|
@@ -95,21 +107,28 @@ const Provider = ({ children }: { children: React.ReactNode }) => {
|
|
|
95
107
|
const translateYOffset = React.useRef(new Animated.Value(0)).current;
|
|
96
108
|
const dragVideoPlayerY = React.useRef(new Animated.Value(0)).current;
|
|
97
109
|
|
|
98
|
-
const { height } =
|
|
110
|
+
const { height: safeAreaFrameHeight } = useSafeAreaFrame();
|
|
111
|
+
const [height, setHeight] = React.useState<number>(safeAreaFrameHeight);
|
|
112
|
+
const progressBarHeight = isLiveItem ? 0 : PROGRESS_BAR_HEIGHT;
|
|
99
113
|
const { bottom: bottomSafeArea } = useSafeAreaInsets();
|
|
100
114
|
const bottomTabBarHeight = useGetBottomTabBarHeight();
|
|
115
|
+
const startComponentsAnimationDistance = Math.round((height * 60) / 100);
|
|
101
116
|
|
|
102
|
-
|
|
103
|
-
(
|
|
104
|
-
|
|
105
|
-
|
|
117
|
+
React.useEffect(() => {
|
|
118
|
+
if (visible && mode === "MAXIMIZED" && height !== safeAreaFrameHeight) {
|
|
119
|
+
setHeight(safeAreaFrameHeight);
|
|
120
|
+
}
|
|
121
|
+
}, [height, safeAreaFrameHeight, mode, visible]);
|
|
106
122
|
|
|
107
123
|
/*
|
|
108
124
|
If bottomTabBarHeight is equal 0 it means an app does not use bottomTabBar.
|
|
109
125
|
Because of this we need to minus bottom SafeArea offset.
|
|
110
126
|
*/
|
|
111
127
|
const minValue =
|
|
112
|
-
height -
|
|
128
|
+
height -
|
|
129
|
+
minimisedHeight -
|
|
130
|
+
(bottomTabBarHeight || bottomSafeArea) -
|
|
131
|
+
progressBarHeight;
|
|
113
132
|
|
|
114
133
|
const modalSnapPoints = React.useMemo(() => [0, minValue], [minValue]);
|
|
115
134
|
// Last snap state which will helps us to make smooth responder to scrollview animation
|
|
@@ -142,6 +161,7 @@ const Provider = ({ children }: { children: React.ReactNode }) => {
|
|
|
142
161
|
tabletLandscapePlayerTopPosition,
|
|
143
162
|
setTabletLandscapePlayerTopPosition,
|
|
144
163
|
startComponentsAnimationDistance,
|
|
164
|
+
progressBarHeight,
|
|
145
165
|
}}
|
|
146
166
|
>
|
|
147
167
|
{children}
|
|
@@ -1,9 +1,17 @@
|
|
|
1
1
|
import React, { useEffect, useRef } from "react";
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
StyleProp,
|
|
4
|
+
ViewStyle,
|
|
5
|
+
Animated,
|
|
6
|
+
Easing,
|
|
7
|
+
Dimensions,
|
|
8
|
+
} from "react-native";
|
|
3
9
|
import { useTargetScreenData } from "@applicaster/zapp-react-native-utils/reactHooks/screen";
|
|
4
10
|
import { ComponentsMap } from "@applicaster/zapp-react-native-ui-components/Components/River/ComponentsMap";
|
|
5
11
|
import { useSafeAreaInsets } from "react-native-safe-area-context";
|
|
6
12
|
|
|
13
|
+
const { width: SCREEN_WIDTH } = Dimensions.get("screen");
|
|
14
|
+
|
|
7
15
|
type Configuration = {
|
|
8
16
|
[key: string]: any;
|
|
9
17
|
modal_background_color?: string;
|
|
@@ -15,6 +23,7 @@ type Props = {
|
|
|
15
23
|
configuration: Configuration;
|
|
16
24
|
isTabletLandscape: boolean;
|
|
17
25
|
isAudioPlayer?: boolean;
|
|
26
|
+
isTablet: boolean;
|
|
18
27
|
};
|
|
19
28
|
|
|
20
29
|
const containerStyle = ({
|
|
@@ -31,6 +40,7 @@ export const PlayerDetails = ({
|
|
|
31
40
|
configuration,
|
|
32
41
|
isTabletLandscape,
|
|
33
42
|
isAudioPlayer,
|
|
43
|
+
isTablet,
|
|
34
44
|
}: Props) => {
|
|
35
45
|
const screenData = useTargetScreenData(entry);
|
|
36
46
|
const insets = useSafeAreaInsets();
|
|
@@ -77,7 +87,11 @@ export const PlayerDetails = ({
|
|
|
77
87
|
transform: [{ translateY }],
|
|
78
88
|
opacity,
|
|
79
89
|
},
|
|
80
|
-
|
|
90
|
+
{
|
|
91
|
+
// workaround for avoid wrong text-height after going back to portrait rotation
|
|
92
|
+
// we don't see this view in landscape mode, so we are able to use fixed width from portrait mode
|
|
93
|
+
width: isTablet ? undefined : SCREEN_WIDTH,
|
|
94
|
+
},
|
|
81
95
|
]}
|
|
82
96
|
>
|
|
83
97
|
{screenData && (
|
|
@@ -7,7 +7,6 @@ import {
|
|
|
7
7
|
ViewStyle,
|
|
8
8
|
} from "react-native";
|
|
9
9
|
import { Edge, SafeAreaView } from "react-native-safe-area-context";
|
|
10
|
-
|
|
11
10
|
import { isTV } from "@applicaster/zapp-react-native-utils/reactUtils";
|
|
12
11
|
import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
|
|
13
12
|
import { PlayerDetails } from "./PlayerDetails";
|
|
@@ -23,6 +22,8 @@ import {
|
|
|
23
22
|
ComponentAnimationType,
|
|
24
23
|
} from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
|
|
25
24
|
|
|
25
|
+
const { width: SCREEN_WIDTH, height: SCREEN_HEIGHT } = Dimensions.get("screen");
|
|
26
|
+
|
|
26
27
|
type DimensionsT = {
|
|
27
28
|
width: number | string;
|
|
28
29
|
height: number | string | undefined;
|
|
@@ -69,10 +70,8 @@ const directionStyles = (isTabletLandscape: boolean): ViewStyle => {
|
|
|
69
70
|
};
|
|
70
71
|
|
|
71
72
|
const getScreenAspectRatio = () => {
|
|
72
|
-
const
|
|
73
|
-
|
|
74
|
-
const longEdge = Math.max(width, height);
|
|
75
|
-
const shortEdge = Math.min(width, height);
|
|
73
|
+
const longEdge = Math.max(SCREEN_WIDTH, SCREEN_HEIGHT);
|
|
74
|
+
const shortEdge = Math.min(SCREEN_WIDTH, SCREEN_HEIGHT);
|
|
76
75
|
|
|
77
76
|
return longEdge / shortEdge;
|
|
78
77
|
};
|
|
@@ -125,10 +124,37 @@ const getTabletWidth = (
|
|
|
125
124
|
return Number(width) - sidebarWidth;
|
|
126
125
|
};
|
|
127
126
|
|
|
128
|
-
|
|
127
|
+
const getStyles = (baseStyle, isMobile, isPortrait) => {
|
|
128
|
+
if (isMobile && isPortrait) {
|
|
129
|
+
return { width: SCREEN_WIDTH, height: SCREEN_HEIGHT };
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
if (isMobile && !isPortrait) {
|
|
133
|
+
return { width: SCREEN_HEIGHT, height: SCREEN_WIDTH };
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
return baseStyle;
|
|
137
|
+
};
|
|
138
|
+
|
|
139
|
+
const showDetails = (isMobile: boolean, docked: boolean): boolean => {
|
|
140
|
+
// for mobile we always show details. Mounting of it very heavy operation.
|
|
141
|
+
if (isMobile) {
|
|
142
|
+
return true;
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
// workaround for tablets we need to mount/unmount in order to avoid PlayerDetails content dissappearing
|
|
146
|
+
// FIXME - find out the reason of dissapearing of content
|
|
147
|
+
if (docked) {
|
|
148
|
+
return false;
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
return true;
|
|
152
|
+
};
|
|
153
|
+
|
|
154
|
+
const PlayerWrapperComponent = (props: Props) => {
|
|
129
155
|
const {
|
|
130
156
|
entry,
|
|
131
|
-
style,
|
|
157
|
+
style: baseStyle,
|
|
132
158
|
containerStyle,
|
|
133
159
|
inline,
|
|
134
160
|
docked,
|
|
@@ -143,6 +169,8 @@ export const PlayerWrapper = (props: Props) => {
|
|
|
143
169
|
|
|
144
170
|
const isInlineModal = inline && isModal;
|
|
145
171
|
|
|
172
|
+
const style = getStyles(baseStyle, !isTablet, isInlineModal);
|
|
173
|
+
|
|
146
174
|
const isTabletLandscape = !isTV() && isTablet && !isTabletPortrait;
|
|
147
175
|
|
|
148
176
|
const tabletWidth = getTabletWidth(configuration, style);
|
|
@@ -224,8 +252,9 @@ export const PlayerWrapper = (props: Props) => {
|
|
|
224
252
|
</AnimatedVideoPlayerComponent>
|
|
225
253
|
</AnimationComponent>
|
|
226
254
|
</View>
|
|
255
|
+
|
|
227
256
|
<AnimatedScrollModal>
|
|
228
|
-
{
|
|
257
|
+
{showDetails(!isTablet, docked) && (
|
|
229
258
|
<AnimationComponent
|
|
230
259
|
animationType={ComponentAnimationType.componentFade}
|
|
231
260
|
style={defaultStyles.flex}
|
|
@@ -235,10 +264,9 @@ export const PlayerWrapper = (props: Props) => {
|
|
|
235
264
|
style={defaultStyles.playerDetails}
|
|
236
265
|
entry={entry}
|
|
237
266
|
isTabletLandscape={isTabletLandscape}
|
|
267
|
+
isTablet={isTablet}
|
|
238
268
|
/>
|
|
239
269
|
</AnimationComponent>
|
|
240
|
-
) : (
|
|
241
|
-
<View style={defaultStyles.playerDetails} />
|
|
242
270
|
)}
|
|
243
271
|
</AnimatedScrollModal>
|
|
244
272
|
</ScreenContextProvider>
|
|
@@ -249,3 +277,5 @@ export const PlayerWrapper = (props: Props) => {
|
|
|
249
277
|
</PathnameContext.Provider>
|
|
250
278
|
);
|
|
251
279
|
};
|
|
280
|
+
|
|
281
|
+
export const PlayerWrapper = PlayerWrapperComponent;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import * as R from "ramda";
|
|
3
|
-
import { StyleSheet, View } from "react-native";
|
|
3
|
+
import { StyleSheet, View, StatusBar } from "react-native";
|
|
4
4
|
|
|
5
5
|
import { HandlePlayable } from "@applicaster/zapp-react-native-ui-components/Components/HandlePlayable";
|
|
6
6
|
import {
|
|
@@ -129,32 +129,38 @@ const VideoModalComponent = () => {
|
|
|
129
129
|
const pathname = `${ROUTE_TYPES.VIDEO_MODAL}/${item?.id}`;
|
|
130
130
|
|
|
131
131
|
return (
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
132
|
+
<>
|
|
133
|
+
{/* TODO: Workaround to avoid unnecessary UI effect when switching from portrait to fullscreen */}
|
|
134
|
+
<StatusBar hidden={false} />
|
|
135
|
+
{/* TODO: Workaround to avoid unnecessary UI effect when switching from portrait to fullscreen */}
|
|
136
|
+
|
|
137
|
+
<PathnameContext.Provider value={pathname}>
|
|
138
|
+
<ScreenContextProvider pathname={pathname}>
|
|
139
|
+
{itemIdHooksFinished === item?.id ? (
|
|
140
|
+
<AnimatedPlayerModalWrapper
|
|
141
|
+
style={[
|
|
142
|
+
styles.container,
|
|
143
|
+
{
|
|
144
|
+
backgroundColor,
|
|
145
|
+
},
|
|
146
|
+
]}
|
|
147
|
+
>
|
|
148
|
+
<HandlePlayable
|
|
149
|
+
item={item}
|
|
150
|
+
isModal={mode !== "PIP"}
|
|
151
|
+
modalHeight={modalSize.height}
|
|
152
|
+
modalWidth={modalSize.width}
|
|
153
|
+
mode={mode}
|
|
154
|
+
/>
|
|
155
|
+
</AnimatedPlayerModalWrapper>
|
|
156
|
+
) : (
|
|
157
|
+
<View style={styles.loaderContainer}>
|
|
158
|
+
<Spinner />
|
|
159
|
+
</View>
|
|
160
|
+
)}
|
|
161
|
+
</ScreenContextProvider>
|
|
162
|
+
</PathnameContext.Provider>
|
|
163
|
+
</>
|
|
158
164
|
);
|
|
159
165
|
};
|
|
160
166
|
|
|
@@ -8,6 +8,13 @@ const props = {
|
|
|
8
8
|
configuration: { modal_background_color: "transparent" },
|
|
9
9
|
};
|
|
10
10
|
|
|
11
|
+
jest.mock("@applicaster/zapp-react-native-utils/reactHooks/layout", () => ({
|
|
12
|
+
useDimensions: jest.fn(() => ({
|
|
13
|
+
width: 20,
|
|
14
|
+
height: 30,
|
|
15
|
+
})),
|
|
16
|
+
}));
|
|
17
|
+
|
|
11
18
|
jest.mock("react-native-safe-area-context", () => ({
|
|
12
19
|
useSafeAreaInsets: jest.fn(() => ({
|
|
13
20
|
top: 20,
|
|
@@ -9,6 +9,7 @@ exports[`PlayerDetails renders properly 1`] = `
|
|
|
9
9
|
"flex": 1,
|
|
10
10
|
"marginTop": -8,
|
|
11
11
|
"paddingTop": -8,
|
|
12
|
+
"width": 750,
|
|
12
13
|
}
|
|
13
14
|
}
|
|
14
15
|
>
|
|
@@ -29,6 +30,7 @@ exports[`PlayerDetails renders properly on tablet in landscape orientation 1`] =
|
|
|
29
30
|
"flex": 1,
|
|
30
31
|
"marginTop": -20,
|
|
31
32
|
"paddingTop": 40,
|
|
33
|
+
"width": 750,
|
|
32
34
|
}
|
|
33
35
|
}
|
|
34
36
|
>
|
|
@@ -27,8 +27,8 @@ exports[`PlayerWrapper renders inline 1`] = `
|
|
|
27
27
|
"backgroundColor": "transparent",
|
|
28
28
|
},
|
|
29
29
|
Object {
|
|
30
|
-
"height":
|
|
31
|
-
"width":
|
|
30
|
+
"height": 1334,
|
|
31
|
+
"width": 750,
|
|
32
32
|
},
|
|
33
33
|
Object {},
|
|
34
34
|
]
|
|
@@ -72,12 +72,35 @@ exports[`PlayerWrapper renders inline 1`] = `
|
|
|
72
72
|
testID="test-player-container"
|
|
73
73
|
/>
|
|
74
74
|
<View
|
|
75
|
+
animationType="componentFade"
|
|
75
76
|
style={
|
|
76
77
|
Object {
|
|
77
78
|
"flex": 1,
|
|
78
79
|
}
|
|
79
80
|
}
|
|
80
|
-
|
|
81
|
+
>
|
|
82
|
+
<View
|
|
83
|
+
configuration={
|
|
84
|
+
Object {
|
|
85
|
+
"tablet_landscape_player_container_background_color": "red",
|
|
86
|
+
"tablet_landscape_sidebar_width": "35%",
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
entry={
|
|
90
|
+
Object {
|
|
91
|
+
"id": "test",
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
isTablet={false}
|
|
95
|
+
isTabletLandscape={false}
|
|
96
|
+
style={
|
|
97
|
+
Object {
|
|
98
|
+
"flex": 1,
|
|
99
|
+
"paddingTop": 20,
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
/>
|
|
103
|
+
</View>
|
|
81
104
|
</View>
|
|
82
105
|
</RNCSafeAreaView>
|
|
83
106
|
</RNCSafeAreaProvider>
|
|
@@ -110,8 +133,8 @@ exports[`PlayerWrapper renders inline and docked 1`] = `
|
|
|
110
133
|
"backgroundColor": "transparent",
|
|
111
134
|
},
|
|
112
135
|
Object {
|
|
113
|
-
"height":
|
|
114
|
-
"width":
|
|
136
|
+
"height": 1334,
|
|
137
|
+
"width": 750,
|
|
115
138
|
},
|
|
116
139
|
Object {},
|
|
117
140
|
]
|
|
@@ -155,12 +178,35 @@ exports[`PlayerWrapper renders inline and docked 1`] = `
|
|
|
155
178
|
testID="test-player-container"
|
|
156
179
|
/>
|
|
157
180
|
<View
|
|
181
|
+
animationType="componentFade"
|
|
158
182
|
style={
|
|
159
183
|
Object {
|
|
160
184
|
"flex": 1,
|
|
161
185
|
}
|
|
162
186
|
}
|
|
163
|
-
|
|
187
|
+
>
|
|
188
|
+
<View
|
|
189
|
+
configuration={
|
|
190
|
+
Object {
|
|
191
|
+
"tablet_landscape_player_container_background_color": "red",
|
|
192
|
+
"tablet_landscape_sidebar_width": "35%",
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
entry={
|
|
196
|
+
Object {
|
|
197
|
+
"id": "test",
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
isTablet={false}
|
|
201
|
+
isTabletLandscape={false}
|
|
202
|
+
style={
|
|
203
|
+
Object {
|
|
204
|
+
"flex": 1,
|
|
205
|
+
"paddingTop": 20,
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
/>
|
|
209
|
+
</View>
|
|
164
210
|
</View>
|
|
165
211
|
</RNCSafeAreaView>
|
|
166
212
|
</RNCSafeAreaProvider>
|
|
@@ -254,12 +300,35 @@ exports[`PlayerWrapper renders inline on tablet in landscape orientation 1`] = `
|
|
|
254
300
|
/>
|
|
255
301
|
</View>
|
|
256
302
|
<View
|
|
303
|
+
animationType="componentFade"
|
|
257
304
|
style={
|
|
258
305
|
Object {
|
|
259
306
|
"flex": 1,
|
|
260
307
|
}
|
|
261
308
|
}
|
|
262
|
-
|
|
309
|
+
>
|
|
310
|
+
<View
|
|
311
|
+
configuration={
|
|
312
|
+
Object {
|
|
313
|
+
"tablet_landscape_player_container_background_color": "red",
|
|
314
|
+
"tablet_landscape_sidebar_width": "35%",
|
|
315
|
+
}
|
|
316
|
+
}
|
|
317
|
+
entry={
|
|
318
|
+
Object {
|
|
319
|
+
"id": "test",
|
|
320
|
+
}
|
|
321
|
+
}
|
|
322
|
+
isTablet={true}
|
|
323
|
+
isTabletLandscape={true}
|
|
324
|
+
style={
|
|
325
|
+
Object {
|
|
326
|
+
"flex": 1,
|
|
327
|
+
"paddingTop": 20,
|
|
328
|
+
}
|
|
329
|
+
}
|
|
330
|
+
/>
|
|
331
|
+
</View>
|
|
263
332
|
</View>
|
|
264
333
|
</RNCSafeAreaView>
|
|
265
334
|
</RNCSafeAreaProvider>
|
|
@@ -292,8 +361,8 @@ exports[`PlayerWrapper renders properly 1`] = `
|
|
|
292
361
|
"backgroundColor": "transparent",
|
|
293
362
|
},
|
|
294
363
|
Object {
|
|
295
|
-
"height":
|
|
296
|
-
"width":
|
|
364
|
+
"height": 750,
|
|
365
|
+
"width": 1334,
|
|
297
366
|
},
|
|
298
367
|
Object {},
|
|
299
368
|
]
|
|
@@ -337,12 +406,35 @@ exports[`PlayerWrapper renders properly 1`] = `
|
|
|
337
406
|
testID="test-player-container"
|
|
338
407
|
/>
|
|
339
408
|
<View
|
|
409
|
+
animationType="componentFade"
|
|
340
410
|
style={
|
|
341
411
|
Object {
|
|
342
412
|
"flex": 1,
|
|
343
413
|
}
|
|
344
414
|
}
|
|
345
|
-
|
|
415
|
+
>
|
|
416
|
+
<View
|
|
417
|
+
configuration={
|
|
418
|
+
Object {
|
|
419
|
+
"tablet_landscape_player_container_background_color": "red",
|
|
420
|
+
"tablet_landscape_sidebar_width": "35%",
|
|
421
|
+
}
|
|
422
|
+
}
|
|
423
|
+
entry={
|
|
424
|
+
Object {
|
|
425
|
+
"id": "test",
|
|
426
|
+
}
|
|
427
|
+
}
|
|
428
|
+
isTablet={false}
|
|
429
|
+
isTabletLandscape={false}
|
|
430
|
+
style={
|
|
431
|
+
Object {
|
|
432
|
+
"flex": 1,
|
|
433
|
+
"paddingTop": 20,
|
|
434
|
+
}
|
|
435
|
+
}
|
|
436
|
+
/>
|
|
437
|
+
</View>
|
|
346
438
|
</View>
|
|
347
439
|
</RNCSafeAreaView>
|
|
348
440
|
</RNCSafeAreaProvider>
|