@applicaster/zapp-react-native-ui-components 12.0.0-alpha.5895113034 → 12.0.0-alpha.5933014273

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.
Files changed (83) hide show
  1. package/Components/BaseFocusable/index.tsx +3 -3
  2. package/Components/Cell/Cell.tsx +30 -9
  3. package/Components/Cell/CellWithFocusable.tsx +23 -9
  4. package/Components/Cell/TvOSCellComponent.tsx +3 -7
  5. package/Components/Focusable/Focusable.tsx +6 -1
  6. package/Components/FocusableGroup/index.tsx +11 -2
  7. package/Components/FreezeWithCallback/Freeze.tsx +31 -0
  8. package/Components/FreezeWithCallback/LICENSE +21 -0
  9. package/Components/FreezeWithCallback/Suspender.tsx +17 -0
  10. package/Components/FreezeWithCallback/__tests__/index.test.tsx +170 -0
  11. package/Components/FreezeWithCallback/index.tsx +3 -0
  12. package/Components/HandlePlayable/HandlePlayable.tsx +3 -0
  13. package/Components/Layout/TV/ScreenContainer.tsx +79 -5
  14. package/Components/Layout/TV/ScreenLayoutContextProvider.tsx +2 -2
  15. package/Components/Layout/TV/__tests__/ScreenContainer.test.tsx +38 -28
  16. package/Components/Layout/TV/__tests__/__snapshots__/ScreenContainer.test.tsx.snap +25 -13
  17. package/Components/Layout/TV/__tests__/__snapshots__/index.test.tsx.snap +10 -50
  18. package/Components/Layout/TV/__tests__/index.test.tsx +20 -75
  19. package/Components/Layout/TV/index.tsx +11 -67
  20. package/Components/Layout/TV/index.web.tsx +33 -0
  21. package/Components/Layout/index.tsx +15 -11
  22. package/Components/MasterCell/DefaultComponents/ActionButton.tsx +2 -1
  23. package/Components/MasterCell/DefaultComponents/BorderContainerView/index.tsx +8 -9
  24. package/Components/MasterCell/DefaultComponents/FocusableView/index.tsx +17 -1
  25. package/Components/MasterCell/DefaultComponents/ImageBorderContainer/index.ts +71 -0
  26. package/Components/MasterCell/DefaultComponents/LiveImage/index.tsx +20 -0
  27. package/Components/MasterCell/DefaultComponents/index.ts +2 -0
  28. package/Components/MasterCell/DefaultComponents/tv/ButtonContainerView/index.android.tsx +4 -1
  29. package/Components/MasterCell/DefaultComponents/tv/ButtonContainerView/index.tsx +10 -2
  30. package/Components/MasterCell/SharedUI/ProgressBar/hooks/useFillInPercent.ts +7 -1
  31. package/Components/MasterCell/dataAdapter.ts +21 -7
  32. package/Components/MasterCell/index.tsx +5 -3
  33. package/Components/MasterCell/utils/__tests__/insertBetween.test.js +9 -0
  34. package/Components/MasterCell/utils/index.ts +17 -30
  35. package/Components/Navigator/StackNavigator.tsx +57 -0
  36. package/Components/Navigator/index.ts +1 -0
  37. package/Components/PlayerContainer/PlayerContainer.tsx +5 -1
  38. package/Components/River/TV/River.tsx +0 -23
  39. package/Components/Screen/TV/hooks/index.ts +1 -0
  40. package/Components/Screen/TV/hooks/useInitialFocus.ts +70 -0
  41. package/Components/Screen/TV/index.web.tsx +178 -0
  42. package/Components/Screen/__tests__/Screen.test.tsx +3 -49
  43. package/Components/Screen/index.tsx +55 -76
  44. package/Components/Screen/navigationHandler.ts +6 -3
  45. package/Components/Screen/orientationHandler.ts +18 -7
  46. package/Components/Screen/utils.ts +16 -0
  47. package/Components/ScreenResolver/index.tsx +9 -12
  48. package/Components/Transitioner/Scene.tsx +20 -12
  49. package/Components/Transitioner/Transitioner.tsx +40 -49
  50. package/Components/Transitioner/__tests__/Scene.test.js +7 -0
  51. package/Components/Transitioner/__tests__/__snapshots__/Scene.test.js.snap +8 -4
  52. package/Components/Transitioner/__tests__/__snapshots__/transitioner.test.js.snap +1 -0
  53. package/Components/VideoLive/LiveImageManager.ts +25 -1
  54. package/Components/VideoLive/PlayerLiveImageComponent.tsx +52 -24
  55. package/Components/VideoLive/__tests__/__snapshots__/PlayerLiveImageComponent.test.tsx.snap +26 -24
  56. package/Components/VideoModal/ModalAnimation/AnimatedPlayerModalWrapper.tsx +2 -14
  57. package/Components/VideoModal/ModalAnimation/AnimatedScrollModal.tsx +79 -45
  58. package/Components/VideoModal/ModalAnimation/AnimatedVideoPlayerComponent.tsx +47 -33
  59. package/Components/VideoModal/ModalAnimation/AnimationComponent.tsx +121 -86
  60. package/Components/VideoModal/ModalAnimation/ModalAnimationContext.tsx +32 -4
  61. package/Components/VideoModal/ModalAnimation/utils.ts +7 -4
  62. package/Components/VideoModal/PlayerWrapper.tsx +10 -10
  63. package/Components/VideoModal/VideoModal.tsx +4 -4
  64. package/Components/VideoModal/__tests__/__snapshots__/PlayerWrapper.test.tsx.snap +80 -14
  65. package/Components/VideoModal/hooks/useModalSize.ts +10 -12
  66. package/Components/VideoModal/utils.ts +5 -2
  67. package/Components/ZappFrameworkComponents/BarView/BarView.tsx +4 -3
  68. package/Components/default-cell-renderer/__tests__/__snapshots__/defaultCellRenderer.test.tsx.snap +4 -4
  69. package/Contexts/FocusableGroupContext/FocusableGroupContext.ts +3 -0
  70. package/Contexts/FocusableGroupContext/FocusableGroupContextProvider.tsx +16 -0
  71. package/Contexts/FocusableGroupContext/__tests__/FocusableGroupContextProvider.test.tsx +22 -0
  72. package/Contexts/FocusableGroupContext/__tests__/withFocusableContext.test.tsx +26 -0
  73. package/Contexts/FocusableGroupContext/index.ts +7 -0
  74. package/Contexts/FocusableGroupContext/withFocusableContext.tsx +17 -0
  75. package/Contexts/ScreenDataContext/index.tsx +20 -0
  76. package/Contexts/ZappPipesContext/ZappPipesEntryContext.ts +1 -1
  77. package/const.ts +6 -0
  78. package/index.js +3 -0
  79. package/package.json +5 -5
  80. package/Components/Layout/TV/TransitionOverlay.tsx +0 -64
  81. package/Contexts/ScreenDataContext/index.ts +0 -3
  82. /package/Components/FocusableGroup/{index.android.js → index.android.ts} +0 -0
  83. /package/Components/FocusableGroup/{index.ios.js → index.ios.ts} +0 -0
@@ -1,13 +1,10 @@
1
1
  import * as React from "react";
2
2
  import { View } from "react-native";
3
- import * as R from "ramda";
3
+ import { update, compose, tail, append, take, identity } from "ramda";
4
4
 
5
5
  import { AnimationManager } from "./AnimationManager";
6
6
  import { Scene } from "./Scene";
7
- import {
8
- getScreenOrientation,
9
- isOrientationCompatible,
10
- } from "@applicaster/zapp-react-native-utils/appUtils/orientationHelper";
7
+
11
8
  import {
12
9
  getSceneByRoute,
13
10
  shouldSkipAnimationForPreviousWebViewScene,
@@ -49,7 +46,7 @@ function prepareScene(children) {
49
46
  */
50
47
  function scenesForBackTransition(props: SceneProps, { scenes }) {
51
48
  return scenes.length > 1
52
- ? R.identity(scenes)
49
+ ? identity(scenes)
53
50
  : [prepareScene(props.children), scenes[0]];
54
51
  }
55
52
 
@@ -113,7 +110,7 @@ export class TransitionerComponent extends React.PureComponent<Props, State> {
113
110
  pushTransitionStart() {
114
111
  this.setState(
115
112
  {
116
- scenes: R.append(prepareScene(this.props.children), this.state.scenes),
113
+ scenes: append(prepareScene(this.props.children), this.state.scenes),
117
114
  ...this.animationManager.stateForAction(this.state, NAV_ACTION_PUSH),
118
115
  },
119
116
  () => {
@@ -169,21 +166,23 @@ export class TransitionerComponent extends React.PureComponent<Props, State> {
169
166
 
170
167
  transitionWithoutAnimation(resetState) {
171
168
  const { scenes } = this.state;
172
-
173
- const newState = resetState
174
- ? {
175
- scenes: [prepareScene(this.props.children)],
176
- to: {
177
- index: 0,
178
- },
179
- }
180
- : {
181
- scenes: R.update(
182
- scenes.length - 1,
183
- prepareScene(this.props.children),
184
- scenes
185
- ),
186
- };
169
+ const newScene = prepareScene(this.props.children);
170
+ const isLastSceneHook = scenes[scenes.length - 1].key.startsWith("/hook");
171
+
172
+ let newState;
173
+
174
+ if (resetState) {
175
+ newState = {
176
+ scenes: [newScene],
177
+ to: { index: 0 },
178
+ };
179
+ } else if (isLastSceneHook || scenes.length === 1) {
180
+ newState = { scenes: update(scenes.length - 1, newScene, scenes) };
181
+ } else {
182
+ newState = {
183
+ scenes: compose(tail, append(newScene))(scenes),
184
+ };
185
+ }
187
186
 
188
187
  this.setState(newState);
189
188
  }
@@ -226,7 +225,10 @@ export class TransitionerComponent extends React.PureComponent<Props, State> {
226
225
  this.shouldSkipAnimationForRoute(previousRoute) ||
227
226
  this.shouldSkipAnimationForRoute(currentRoute)
228
227
  ) {
229
- return this.transitionWithoutAnimation();
228
+ // we are going back, in this case we need to have only one scene using resetState
229
+ const resetState = isGoingBack ? true : undefined;
230
+
231
+ return this.transitionWithoutAnimation(resetState);
230
232
  }
231
233
 
232
234
  switch (this.props.navigator.previousAction) {
@@ -269,7 +271,7 @@ export class TransitionerComponent extends React.PureComponent<Props, State> {
269
271
  backTransitionEnd(stepsBack) {
270
272
  this.setState({
271
273
  animating: false,
272
- scenes: R.take(this.state.scenes.length - stepsBack, this.state.scenes),
274
+ scenes: take(this.state.scenes.length - stepsBack, this.state.scenes),
273
275
  });
274
276
  }
275
277
 
@@ -277,36 +279,25 @@ export class TransitionerComponent extends React.PureComponent<Props, State> {
277
279
  // so only a single scene should be rendered,
278
280
  // instead of dangerous nulls or duplicates.
279
281
  renderSingleScene({ scenes, to }) {
280
- const { contentStyle, layoutData } = this.props;
282
+ const { contentStyle } = this.props;
281
283
  const screenData = this.props.children.props.screenData;
282
284
  const pathname = scenes[to.index].key;
283
285
 
284
- const orientation = getScreenOrientation({
285
- screenData,
286
- layoutData,
287
- });
288
-
289
- // We prevent rendering of the screen until UI is actually rotated to screen desired orientation.
290
- // This saves unnecessary re-renders and user will not see distorted aspect screen.
291
286
  return (
292
287
  <View style={styles.container}>
293
- {scenes[to.index] &&
294
- isOrientationCompatible({
295
- orientation,
296
- layoutData,
297
- }) && (
298
- <Scene
299
- {...{ style: to.style }}
300
- pathname={pathname}
301
- isActive={pathname === this.props.navigator.currentRoute}
302
- contentStyle={contentStyle}
303
- key={scenes[to.index].key}
304
- screenUniqueId={scenes[to.index].screenUniqueId}
305
- screenData={screenData}
306
- >
307
- {scenes[to.index].children}
308
- </Scene>
309
- )}
288
+ {scenes[to.index] && (
289
+ <Scene
290
+ {...{ style: to?.style || {} }}
291
+ pathname={pathname}
292
+ isActive={pathname === this.props.navigator.currentRoute}
293
+ contentStyle={contentStyle}
294
+ key={scenes[to.index].key}
295
+ screenUniqueId={scenes[to.index].screenUniqueId}
296
+ screenData={screenData}
297
+ >
298
+ {scenes[to.index].children}
299
+ </Scene>
300
+ )}
310
301
  </View>
311
302
  );
312
303
  }
@@ -16,6 +16,13 @@ jest.mock("react-native-safe-area-context", () => ({
16
16
  })),
17
17
  }));
18
18
 
19
+ jest.mock(
20
+ "@applicaster/zapp-react-native-ui-components/Components/Screen/orientationHandler",
21
+ () => ({
22
+ useScreenOrientationHandler: jest.fn(),
23
+ })
24
+ );
25
+
19
26
  const { Scene } = require("../Scene");
20
27
 
21
28
  const wrapper = shallow(
@@ -22,7 +22,9 @@ exports[`<Scene /> renders correctly 1`] = `
22
22
  }
23
23
  >
24
24
  <ContextProvider>
25
- <ContextProvider />
25
+ <ContextProvider>
26
+ <ScreenContextProvider />
27
+ </ContextProvider>
26
28
  </ContextProvider>
27
29
  </ForwardRef(AnimatedComponentWrapper)>
28
30
  `;
@@ -39,14 +41,16 @@ exports[`<Scene /> renders the overlay while animating 1`] = `
39
41
  "paddingBottom": 49,
40
42
  },
41
43
  Object {
42
- "height": 1334,
43
- "width": 750,
44
+ "height": "100%",
45
+ "width": "100%",
44
46
  },
45
47
  ]
46
48
  }
47
49
  >
48
50
  <ContextProvider>
49
- <ContextProvider />
51
+ <ContextProvider>
52
+ <ScreenContextProvider />
53
+ </ContextProvider>
50
54
  </ContextProvider>
51
55
  <ForwardRef(AnimatedComponentWrapper)
52
56
  style={
@@ -12,6 +12,7 @@ exports[`<TransitionerComponent /> renders correctly 1`] = `
12
12
  <Scene
13
13
  isActive={true}
14
14
  screenUniqueId="mocked-uuid"
15
+ style={Object {}}
15
16
  >
16
17
  <View
17
18
  foo="bar"
@@ -10,7 +10,11 @@ import { Component } from "react";
10
10
 
11
11
  const { log_debug, log_info, log_error } = loggerLiveImageManager;
12
12
 
13
- export type LiveImageManagerEvent = "onEnd" | "onStart" | "onError";
13
+ export type LiveImageManagerEvent =
14
+ | "onEnd"
15
+ | "onStart"
16
+ | "onError"
17
+ | "onDestroy";
14
18
 
15
19
  export type LiveImageManagerListenerData = {
16
20
  id: string;
@@ -102,6 +106,16 @@ export class LiveImageManager implements PlayerLifecycleListener {
102
106
  }
103
107
 
104
108
  this.items = this.items.filter((i) => i !== item);
109
+
110
+ this.invokeListenersUpdate({
111
+ callbackName: "onDestroy",
112
+ event: {
113
+ item,
114
+ playerId: this.currentlyPlaying?.playerId,
115
+ primaryPlayerId: this.primaryPlayer?.playerId,
116
+ entry: item.getPlayer().getEntry(),
117
+ },
118
+ });
105
119
  };
106
120
 
107
121
  public onViewportEnter = (item: LiveImage) => {
@@ -511,6 +525,16 @@ export class LiveImage implements QuickBrickPlayer.SharedPlayerCallBacks {
511
525
  LiveImageManager.instance.onLiveImageError(this, error);
512
526
  };
513
527
 
528
+ onVideoError = (error: Error) => {
529
+ log_error(
530
+ `onVideoError: live-image, fail to play, switching back to image. error: ${
531
+ error?.message
532
+ }, ${playerInfo(this.player)}`
533
+ );
534
+
535
+ LiveImageManager.instance.onLiveImageError(this, error);
536
+ };
537
+
514
538
  onVideoEnd = (_event) => {
515
539
  log_info(
516
540
  `onVideoEnd: live-image, video completed, switching back to image, ${playerInfo(
@@ -2,7 +2,7 @@
2
2
  //
3
3
  import * as React from "react";
4
4
 
5
- import { AppState, AppStateStatus } from "react-native";
5
+ import { AppState, AppStateStatus, View } from "react-native";
6
6
  import { TrackedView } from "../TrackedView";
7
7
  import { useDimensions } from "@applicaster/zapp-react-native-utils/reactHooks/layout";
8
8
 
@@ -25,8 +25,9 @@ import { PlayerRole } from "@applicaster/zapp-react-native-utils/appUtils/player
25
25
  import { getAutoplaySettings } from "./utils";
26
26
  import { isString } from "@applicaster/zapp-react-native-utils/stringUtils";
27
27
  import { BufferAnimation } from "../PlayerContainer/BufferAnimation";
28
+ import { useEffect } from "react";
28
29
 
29
- const { log_error } = loggerLiveImageComponent;
30
+ const { log_error, log_debug } = loggerLiveImageComponent;
30
31
 
31
32
  const isMeasurement = (item: ZappEntry) =>
32
33
  isString(item.id) && item.id.startsWith("pre-measurement-");
@@ -56,6 +57,7 @@ const PlayerLiveImageComponent = (props: Props) => {
56
57
  );
57
58
 
58
59
  const ref = React.useRef(null);
60
+ const trackViewRef = React.useRef(null);
59
61
 
60
62
  /**
61
63
  * Debounced setMode function.
@@ -86,6 +88,30 @@ const PlayerLiveImageComponent = (props: Props) => {
86
88
  [mode]
87
89
  );
88
90
 
91
+ const entryToViewIdMapping = React.useRef({});
92
+
93
+ useEffect(() => {
94
+ const nativeTag = trackViewRef.current?._nativeTag?.toString();
95
+
96
+ if (!nativeTag) {
97
+ return;
98
+ }
99
+
100
+ const prevValue = entryToViewIdMapping.current[nativeTag];
101
+
102
+ if (prevValue && prevValue.itemId !== item.id) {
103
+ if (mode === LiveImageType.Video) {
104
+ log_debug(
105
+ "Entry to view association changed, stopping current live image"
106
+ );
107
+
108
+ setMode(LiveImageType.Image);
109
+ }
110
+ }
111
+
112
+ entryToViewIdMapping.current[nativeTag] = { itemId: item.id };
113
+ }, [trackViewRef.current, item.id, mode]);
114
+
89
115
  const { screenConfig, playerPluginId } = props;
90
116
 
91
117
  const liveImageItem: LiveImage = React.useMemo(() => {
@@ -295,28 +321,30 @@ const PlayerLiveImageComponent = (props: Props) => {
295
321
  testId={`tracked-view-${playerId}-${item.title}`}
296
322
  onPositionUpdated={onPositionUpdated}
297
323
  >
298
- {isVideoMode && (
299
- <Player
300
- autoplay={false}
301
- ref={_assignRoot}
302
- entry={item} // Must be passed first in list
303
- style={videoStyles}
304
- playerId={playerId}
305
- muted={muted}
306
- listener={controller?.getListener()}
307
- resizeMode={"cover"}
308
- {...platformSpecificProps}
309
- />
310
- )}
311
- {
312
- <AnimatedInOut
313
- visible={isBackgroundImageVisible}
314
- animationConfig={overlayFadeIn}
315
- staticStyles={style}
316
- >
317
- <Image {...props} resizeMode="cover" style={style} applyMaxSize />
318
- </AnimatedInOut>
319
- }
324
+ <View ref={trackViewRef}>
325
+ {isVideoMode && (
326
+ <Player
327
+ autoplay={false}
328
+ ref={_assignRoot}
329
+ entry={item} // Must be passed first in list
330
+ style={videoStyles}
331
+ playerId={playerId}
332
+ muted={muted}
333
+ listener={controller?.getListener()}
334
+ resizeMode={"cover"}
335
+ {...platformSpecificProps}
336
+ />
337
+ )}
338
+ {
339
+ <AnimatedInOut
340
+ visible={isBackgroundImageVisible}
341
+ animationConfig={overlayFadeIn}
342
+ staticStyles={style}
343
+ >
344
+ <Image {...props} resizeMode="cover" style={style} applyMaxSize />
345
+ </AnimatedInOut>
346
+ }
347
+ </View>
320
348
  </TrackedView>
321
349
  );
322
350
  };
@@ -5,33 +5,35 @@ exports[`PlayerLiveImageComponent should render correctly with default props 1`]
5
5
  onPositionUpdated={[Function]}
6
6
  testId="tracked-view-player1-Test"
7
7
  >
8
- <View
9
- collapsable={false}
10
- style={
11
- Object {
12
- "opacity": 1,
13
- }
14
- }
15
- >
16
- <Image
17
- applyMaxSize={true}
18
- audioMutedByDefault={false}
19
- imageKey="image1"
20
- item={
8
+ <View>
9
+ <View
10
+ collapsable={false}
11
+ style={
21
12
  Object {
22
- "id": "1",
23
- "title": "Test",
24
- "type": Object {
25
- "value": "",
26
- },
13
+ "opacity": 1,
27
14
  }
28
15
  }
29
- onError={[Function]}
30
- playerId="player1"
31
- resizeMode="cover"
32
- screenConfig={Object {}}
33
- style={Object {}}
34
- />
16
+ >
17
+ <Image
18
+ applyMaxSize={true}
19
+ audioMutedByDefault={false}
20
+ imageKey="image1"
21
+ item={
22
+ Object {
23
+ "id": "1",
24
+ "title": "Test",
25
+ "type": Object {
26
+ "value": "",
27
+ },
28
+ }
29
+ }
30
+ onError={[Function]}
31
+ playerId="player1"
32
+ resizeMode="cover"
33
+ screenConfig={Object {}}
34
+ style={Object {}}
35
+ />
36
+ </View>
35
37
  </View>
36
38
  </TrackedView>
37
39
  `;
@@ -5,7 +5,6 @@ import {
5
5
  useModalAnimationContext,
6
6
  PlayerAnimationStateEnum,
7
7
  } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
8
- import { useDimensions } from "@applicaster/zapp-react-native-utils/reactHooks";
9
8
 
10
9
  type Props = {
11
10
  style: ViewStyle[];
@@ -18,13 +17,8 @@ export const AnimatedPlayerModalWrapper = (props: Props) => {
18
17
  animatedValues: { lastScrollY, dragScrollY, translateYOffset },
19
18
  modalSnapPoints,
20
19
  setStartComponentsAnimation,
21
- lastScrollYValue,
22
20
  } = useModalAnimationContext();
23
21
 
24
- const { height: screenHeight } = useDimensions("screen", {
25
- deviceInfo: true,
26
- });
27
-
28
22
  const interpolateConfig: Animated.InterpolationConfigType = React.useMemo(
29
23
  () => ({
30
24
  inputRange: modalSnapPoints,
@@ -51,16 +45,10 @@ export const AnimatedPlayerModalWrapper = (props: Props) => {
51
45
  }
52
46
 
53
47
  React.useEffect(() => {
54
- const translateYListener = translateY.addListener(({ value }) => {
55
- const preparedValue = Math.round(
56
- Math.abs(value) - lastScrollYValue.current
57
- );
58
-
48
+ const translateYListener = translateY.addListener(() => {
59
49
  (playerAnimationState === PlayerAnimationStateEnum.minimize ||
60
50
  playerAnimationState === PlayerAnimationStateEnum.maximaze) &&
61
- setStartComponentsAnimation(
62
- preparedValue >= Math.round((screenHeight * 10) / 100)
63
- );
51
+ setStartComponentsAnimation(true);
64
52
  });
65
53
 
66
54
  return () => {
@@ -58,6 +58,7 @@ export const AnimatedScrollModalComponent = ({ children }: Props) => {
58
58
  modalSnapPoints,
59
59
  lastSnap,
60
60
  setLastSnap,
61
+ setStartComponentsAnimation,
61
62
  } = useModalAnimationContext();
62
63
 
63
64
  const { isLanguageOverlayVisible } = React.useContext(PlayerContainerContext);
@@ -100,58 +101,68 @@ export const AnimatedScrollModalComponent = ({ children }: Props) => {
100
101
  { useNativeDriver: true }
101
102
  );
102
103
 
103
- const onHandlerStateChange = ({ nativeEvent }) => {
104
- if (nativeEvent.oldState === State.ACTIVE && scrollPosition.current === 0) {
105
- // eslint-disable-next-line prefer-const
106
- const { velocityY, translationY } = nativeEvent;
107
- const dragToss = 0.05;
104
+ const onHandlerStateChange = React.useCallback(
105
+ ({ nativeEvent }) => {
106
+ if (
107
+ nativeEvent.oldState === State.ACTIVE &&
108
+ scrollPosition.current === 0
109
+ ) {
110
+ // eslint-disable-next-line prefer-const
111
+ const { velocityY, translationY } = nativeEvent;
112
+ const dragToss = 0.05;
108
113
 
109
- const preparedTranslationY =
110
- Math.abs(translationY) - lastScrollYValue.current;
114
+ const preparedTranslationY =
115
+ Math.abs(translationY) - lastScrollYValue.current;
111
116
 
112
- if (videoModalState.mode === "MAXIMIZED") {
113
- const endOffsetY =
114
- lastSnap + preparedTranslationY + dragToss * velocityY + 150;
117
+ if (videoModalState.mode === "MAXIMIZED") {
118
+ const endOffsetY =
119
+ lastSnap + preparedTranslationY + dragToss * velocityY + 150;
115
120
 
116
- let destSnapPoint = modalSnapPoints[0];
121
+ let destSnapPoint = modalSnapPoints[0];
117
122
 
118
- for (const snapPoint of modalSnapPoints) {
119
- const distFromSnap = Math.abs(snapPoint - endOffsetY);
123
+ for (const snapPoint of modalSnapPoints) {
124
+ const distFromSnap = Math.abs(snapPoint - endOffsetY);
120
125
 
121
- if (distFromSnap < Math.abs(destSnapPoint - endOffsetY)) {
122
- destSnapPoint = snapPoint;
126
+ if (distFromSnap < Math.abs(destSnapPoint - endOffsetY)) {
127
+ destSnapPoint = snapPoint;
128
+ }
123
129
  }
124
- }
125
130
 
126
- setLastSnap(destSnapPoint);
131
+ setLastSnap(destSnapPoint);
127
132
 
128
- if (destSnapPoint === modalSnapPoints[0]) {
129
- translateYOffset.extractOffset();
130
- translateYOffset.setValue(preparedTranslationY);
131
- translateYOffset.flattenOffset();
132
- dragScrollY.setValue(0);
133
+ if (destSnapPoint === modalSnapPoints[0]) {
134
+ translateYOffset.extractOffset();
135
+ translateYOffset.setValue(preparedTranslationY);
136
+ translateYOffset.flattenOffset();
137
+ dragScrollY.setValue(0);
133
138
 
134
- setPlayerAnimationState(PlayerAnimationStateEnum.maximaze);
139
+ setPlayerAnimationState(PlayerAnimationStateEnum.maximaze);
140
+ } else {
141
+ setPlayerAnimationState(PlayerAnimationStateEnum.minimize);
142
+ }
135
143
  } else {
136
- setPlayerAnimationState(PlayerAnimationStateEnum.minimize);
144
+ if (translationY < 0) {
145
+ // from mini to full
146
+ setLastSnap(modalSnapPoints[0]);
147
+
148
+ translateYOffset.setValue(
149
+ modalSnapPoints[1] - preparedTranslationY
150
+ );
151
+
152
+ dragScrollY.setValue(0);
153
+
154
+ setPlayerAnimationState(PlayerAnimationStateEnum.maximaze);
155
+ } else {
156
+ resetPlayerAnimationState();
157
+ }
137
158
  }
138
159
  } else {
139
- if (translationY < 0) {
140
- // from mini to full
141
- setLastSnap(modalSnapPoints[0]);
142
- translateYOffset.setValue(modalSnapPoints[1] - preparedTranslationY);
143
- dragScrollY.setValue(0);
144
-
145
- setPlayerAnimationState(PlayerAnimationStateEnum.maximaze);
146
- } else {
160
+ playerAnimationState === PlayerAnimationStateEnum.drag_scroll &&
147
161
  resetPlayerAnimationState();
148
- }
149
162
  }
150
- } else {
151
- playerAnimationState === PlayerAnimationStateEnum.drag_scroll &&
152
- resetPlayerAnimationState();
153
- }
154
- };
163
+ },
164
+ [lastSnap, modalSnapPoints, playerAnimationState, videoModalState.mode]
165
+ );
155
166
 
156
167
  const onScroll = React.useCallback(({ nativeEvent }) => {
157
168
  scrollPosition.current = nativeEvent.contentOffset.y;
@@ -189,12 +200,29 @@ export const AnimatedScrollModalComponent = ({ children }: Props) => {
189
200
  videoModalState.mode === "MINIMIZED" &&
190
201
  videoModalState.previousMode === "MAXIMIZED"
191
202
  ) {
192
- resetPlayerAnimationState();
203
+ // set animation to the minimize values if moving from the player to another screen
204
+ if (playerAnimationState === null) {
205
+ setScrollModalAnimatedValue(
206
+ translateYOffset,
207
+ modalSnapPoints[1],
208
+ setLastSnap
209
+ );
210
+
211
+ resetScrollAnimatedValues(
212
+ lastScrollY,
213
+ lastScrollYValue,
214
+ dragScrollY,
215
+ dragVideoPlayerY
216
+ );
217
+ } else {
218
+ resetPlayerAnimationState();
219
+ }
193
220
  }
194
221
 
195
222
  if (
196
223
  (videoModalState.mode === "MAXIMIZED" &&
197
- videoModalState.previousMode === "MAXIMIZED") ||
224
+ videoModalState.previousMode === "MINIMIZED" &&
225
+ previousItemId === videoModalState.item?.id) ||
198
226
  previousItemId !== videoModalState.item?.id
199
227
  ) {
200
228
  setPlayerAnimationState(PlayerAnimationStateEnum.maximaze);
@@ -271,10 +299,11 @@ export const AnimatedScrollModalComponent = ({ children }: Props) => {
271
299
  if (
272
300
  preparedValue > 0 &&
273
301
  scrollPosition.current === 0 &&
274
- playerAnimationState !== PlayerAnimationStateEnum.drag_player
302
+ playerAnimationState !== PlayerAnimationStateEnum.drag_player &&
303
+ playerAnimationState !== PlayerAnimationStateEnum.drag_scroll
275
304
  ) {
276
- playerAnimationState !== PlayerAnimationStateEnum.drag_scroll &&
277
- setPlayerAnimationState(PlayerAnimationStateEnum.drag_scroll);
305
+ isMinimizedModal && setStartComponentsAnimation(true);
306
+ setPlayerAnimationState(PlayerAnimationStateEnum.drag_scroll);
278
307
  }
279
308
  });
280
309
 
@@ -282,7 +311,7 @@ export const AnimatedScrollModalComponent = ({ children }: Props) => {
282
311
  lastScrollY.removeListener(lastScrollYListenerId);
283
312
  dragScrollY.removeListener(dragListenerId);
284
313
  };
285
- }, [playerAnimationState, isAudioItem, modalSnapPoints]);
314
+ }, [playerAnimationState, isAudioItem, modalSnapPoints, isMinimizedModal]);
286
315
 
287
316
  const Wrapper = React.useMemo(
288
317
  () => (Platform.OS === "android" ? GestureHandlerRootView : View),
@@ -336,7 +365,12 @@ export const AnimatedScrollModalComponent = ({ children }: Props) => {
336
365
  };
337
366
 
338
367
  export const AnimatedScrollModal = ({ children }: Props) => {
339
- const Component = !isTV() ? AnimatedScrollModalComponent : React.Fragment;
368
+ const {
369
+ videoModalState: { visible },
370
+ } = useNavigation();
371
+
372
+ const Component =
373
+ !isTV() && visible ? AnimatedScrollModalComponent : React.Fragment;
340
374
 
341
375
  return <Component>{children}</Component>;
342
376
  };