@applicaster/quick-brick-player 15.0.0-rc.34 → 15.0.0-rc.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-player",
-  "version": "15.0.0-rc.34",
+  "version": "15.0.0-rc.35",
   "description": "Quick Brick Player",
   "main": "./src/index.ts",
   "types": "index.d.ts",
@@ -37,9 +37,9 @@
   "dependencies": {
     "@applicaster/quick-brick-mobile-transport-controls": "15.0.0-rc.34",
     "@applicaster/quick-brick-tv-transport-controls": "15.0.0-rc.15",
-    "@applicaster/zapp-react-native-tvos-app": "15.0.0-rc.34",
-    "@applicaster/zapp-react-native-ui-components": "15.0.0-rc.34",
-    "@applicaster/zapp-react-native-utils": "15.0.0-rc.34",
+    "@applicaster/zapp-react-native-tvos-app": "15.0.0-rc.35",
+    "@applicaster/zapp-react-native-ui-components": "15.0.0-rc.35",
+    "@applicaster/zapp-react-native-utils": "15.0.0-rc.35",
     "query-string": "7.1.3",
     "shaka-player": "4.3.5",
     "typeface-montserrat": "^0.0.54",

package/src/Player/PlayerModal/PlayerModal.tsx

@@ -5,8 +5,8 @@ import { PanGestureHandler } from "react-native-gesture-handler";
 import { useStyles } from "./styles";
 import { useVideoModalState } from "./hooks";
 import { MODAL_COLLAPSE_RATIO, MODAL_RADIUS } from "./consts";
-import { useModalAnimationContext } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
 import { getWindowHeight } from "./utils";
+import { useSafeAreaFrame } from "react-native-safe-area-context";
 
 type AnimatedModalProps = {
   content?: ReactElement;
@@ -17,21 +17,17 @@ export function AnimatedModal({
   content,
   collapsedContent,
 }: AnimatedModalProps) {
-  const translateYRef = useModalAnimationContext().yTranslate;
+  const { translateY, collapsed, gestureHandlerProps, expand, offset } =
+    useVideoModalState();
 
-  const {
-    translateY,
-    collapsed,
-    collapsedHeight,
-    gestureHandlerProps,
-    expand,
-  } = useVideoModalState(translateYRef);
-
-  const styles = useStyles({ height: collapsedHeight, type: "audio" });
+  const frame = useSafeAreaFrame();
+  const collapsedHeight = frame.height - offset.current;
 
   const height = getWindowHeight();
   const heightAboveMinimised = height - collapsedHeight;
 
+  const styles = useStyles({ height: collapsedHeight, type: "audio" });
+
   const MODAL_COLLAPSE_START = height * MODAL_COLLAPSE_RATIO;
 
   // Interpolated opacities for smooth cross-fade

package/src/Player/PlayerModal/VideoPlayerModal.tsx

@@ -12,7 +12,6 @@ import {
   VIDEO_TRANSITION_THRESHOLD,
 } from "./consts";
 import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
-import { useModalAnimationContext } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation/useModalAnimationContext";
 import { PROGRESS_BAR_HEIGHT } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation/utils";
 import {
   SafeAreaView,
@@ -29,6 +28,9 @@ import {
   getScaledPos,
   getExtraContentPadding,
 } from "./utils";
+import { addOrientationChangeListener } from "@applicaster/zapp-react-native-utils/appUtils/orientationHelper";
+
+const AnimatedSafeAreaView = Animated.createAnimatedComponent(SafeAreaView);
 
 type AnimatedModalProps = {
   pip?: boolean;
@@ -65,30 +67,26 @@ export function VideoPlayerModal({
     () =>
       isTablet && !isTabletPortrait
         ? style.tabletLandscapeWidth
-        : getWindowWidth(),
+        : getWindowWidth(isTablet, !isTabletPortrait),
     // eslint-disable-next-line react-hooks/exhaustive-deps
     []
   );
 
-  const height = useMemo(() => getWindowHeight(), []); // remember initial height, ignore rotation changes
+  const height = useMemo(
+    () => getWindowHeight(isTablet, !isTabletPortrait),
+    []
+  ); // remember initial height, ignore rotation changes
+
   const MODAL_COLLAPSE_START = height * MODAL_COLLAPSE_RATIO;
 
   const { minimised_height: minimisedHeight } = useConfiguration();
   const scrollViewRef = useRef<typeof Animated.ScrollView | null>(null);
 
-  const translateYRef = useModalAnimationContext().yTranslate;
-  // used when modal is false, should not be used in animation
-  const dummyRef = useRef(new Animated.Value(0));
-
-  const {
-    translateY,
-    collapsed,
-    collapsedHeight,
-    gestureHandlerProps,
-    expand,
-  } = useVideoModalState(modal ? translateYRef : dummyRef);
+  const { translateY, collapsed, gestureHandlerProps, expand, offset } =
+    useVideoModalState();
 
   const frame = useSafeAreaFrame();
+  const collapsedHeight = frame.height - offset.current;
 
   const heightAboveMinimised = height - collapsedHeight;
 
@@ -98,9 +96,27 @@ export function VideoPlayerModal({
 
   const insets = useSafeAreaInsets();
 
-  const isFullScreenOrPIP = fullscreen || pip;
+  const [isFullScreenMode, setFullScreenMode] = React.useState(
+    fullscreen || pip
+  );
+
+  React.useEffect(() => {
+    const listener = addOrientationChangeListener(({ toOrientation }) => {
+      /* ignored in collapsed mode non-PiP player */
+      if (collapsed && !pip) return;
+      setFullScreenMode(!(toOrientation === 1));
+    });
 
-  // Interpolated opacities for smooth cross-fade
+    return () => {
+      listener.remove();
+    };
+  }, [collapsed, pip]);
+
+  const isFullScreenOrPIP = isFullScreenMode;
+
+  const vidHeight = width / aspectRatio;
+
+  // animated opacity for smooth cross-fade of collapsed content
   const collapsedOpacity = !isFullScreenOrPIP
     ? translateY.interpolate({
         inputRange: [MODAL_COLLAPSE_START, heightAboveMinimised],
@@ -109,6 +125,7 @@ export function VideoPlayerModal({
       })
     : new Animated.Value(0);
 
+  // animated opacity for extra content
   const expandedOpacity = !isFullScreenOrPIP
     ? translateY.interpolate({
         inputRange: [0, heightAboveMinimised],
@@ -117,7 +134,7 @@ export function VideoPlayerModal({
       })
     : new Animated.Value(1);
 
-  // animated position for video content during modal transition
+  // animated x position for video content
   const xPosition = !isFullScreenOrPIP
     ? translateY.interpolate({
         inputRange: [height * VIDEO_TRANSITION_THRESHOLD, MODAL_COLLAPSE_START],
@@ -126,9 +143,7 @@ export function VideoPlayerModal({
       })
     : new Animated.Value(0);
 
-  const vidHeight = width / aspectRatio;
-
-  // animated position for video content during modal transition
+  // animated y position for video content
   const yPosition = !isFullScreenOrPIP
     ? translateY.interpolate({
         inputRange: [height * VIDEO_TRANSITION_THRESHOLD, MODAL_COLLAPSE_START],
@@ -144,7 +159,7 @@ export function VideoPlayerModal({
       })
     : new Animated.Value(0);
 
-  // animated position for video content during modal transition
+  // animated position for video content
   const scalePosition = !isFullScreenOrPIP
     ? translateY.interpolate({
         inputRange: [height * VIDEO_TRANSITION_THRESHOLD, MODAL_COLLAPSE_START],
@@ -179,9 +194,11 @@ export function VideoPlayerModal({
     <PanGestureHandler
       enabled={enabled}
       waitFor={scrollViewRef}
+      activeOffsetY={[-25, 25]}
+      activeOffsetX={[-25, 25]}
       {...gestureHandlerProps}
     >
-      <SafeAreaView pointerEvents="box-none" edges={["bottom"]}>
+      <AnimatedSafeAreaView pointerEvents="box-none" edges={["bottom"]}>
         <Animated.View
           pointerEvents={"auto"}
           style={[
@@ -266,7 +283,7 @@ export function VideoPlayerModal({
             ) : null}
           </Animated.View>
         </Animated.View>
-      </SafeAreaView>
+      </AnimatedSafeAreaView>
     </PanGestureHandler>
   );
 }

package/src/Player/PlayerModal/hooks/index.ts

@@ -1,171 +1,132 @@
 import { useCallback, useEffect, useMemo, useRef } from "react";
-import {
-  useSafeAreaFrame,
-  useSafeAreaInsets,
-} from "react-native-safe-area-context";
+
 import { State } from "react-native-gesture-handler";
-import { Animated } from "react-native";
 
 import { VideoModalMode } from "@applicaster/zapp-react-native-ui-components/Components/PlayerContainer/PlayerContainer";
-import {
-  useConfiguration,
-  useAnimationStateStore,
-} from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/utils";
-import { getTabBarHeight } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/getTabBarHeight";
+import { useAnimationStateStore } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/utils";
 import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useNavigation";
-import { isMenuVisible } from "@applicaster/zapp-react-native-ui-components/Components/Screen/navigationHandler";
 import {
   ANIMATION_DURATION,
   DRAG_TO_COLLAPSE,
   DRAG_TO_EXPAND,
 } from "../consts";
-import { PROGRESS_BAR_HEIGHT } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation/utils";
-import { usePlugins } from "@applicaster/zapp-react-native-redux";
-import { isOldAndroidDevice } from "../utils";
-
-const bottomTabBarHeight = getTabBarHeight();
+import { Animated } from "react-native";
+import { useModalAnimationContext } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
 
-export const useVideoModalState = (
-  translateYRef: React.MutableRefObject<Animated.Value>
-) => {
-  const { minimised_height: minimisedHeight } = useConfiguration();
+const getAnimatedValue = (animatedValue: Animated.Value): number => {
+  return (animatedValue as any).__getValue() as number;
+};
 
+export const useVideoModalState = () => {
   const {
-    maximiseVideoModal,
-    minimiseVideoModal,
-    videoModalState,
-    currentRoute,
-    screenData,
-  } = useNavigation();
-
-  const plugins = usePlugins();
-
-  const menuVisible = isMenuVisible(currentRoute, screenData, plugins);
-
-  const collapsed =
-    videoModalState.visible &&
-    videoModalState.mode === VideoModalMode.MINIMIZED;
-
-  const frame = useSafeAreaFrame();
-  const insets = useSafeAreaInsets();
-
-  const collapsedHeight =
-    minimisedHeight +
-    (menuVisible ? bottomTabBarHeight : 0) +
-    (isOldAndroidDevice ? 0 : insets.bottom) + // insets.bottom is added to properly display docked modal
-    PROGRESS_BAR_HEIGHT;
-
-  const heightAboveMinimised = frame.height - collapsedHeight;
+    yTranslate,
+    offset,
+    heightAboveMinimised,
+    gestureTranslationRef,
+    offsetAnimatedValueRef,
+  } = useModalAnimationContext();
 
-  const translateY = translateYRef.current;
+  const modalAnimatedValue = offsetAnimatedValueRef.current;
+  const gestureTranslation = gestureTranslationRef.current;
 
-  const handleExpand = useCallback(
-    (toValue: number) => {
-      return Animated.timing(translateYRef.current, {
+  const updateModalTranslation = useCallback(
+    (toValue: number, duration: number = ANIMATION_DURATION) =>
+      Animated.timing(modalAnimatedValue, {
         toValue,
-        duration: ANIMATION_DURATION,
+        duration,
         useNativeDriver: true,
-      });
-    },
-    [translateYRef]
+      }),
+    [modalAnimatedValue]
   );
 
-  const handleCollapse = useCallback(
-    (toValue: number) => {
-      return Animated.timing(translateYRef.current, {
-        toValue,
-        duration: ANIMATION_DURATION,
-        useNativeDriver: true,
-      });
-    },
-    [translateYRef]
-  );
+  const translateY = yTranslate.current;
 
-  const offset = useRef(heightAboveMinimised);
+  const { maximiseVideoModal, minimiseVideoModal, videoModalState } =
+    useNavigation();
 
-  // Gesture handler for modal
-  const onGestureEvent = useCallback(
-    (event: any) => {
-      if (event.nativeEvent.state === State.ACTIVE) {
-        const y = event.nativeEvent.translationY;
-        let newY = offset.current + y;
-        if (newY < 0) newY = 0;
+  const videoModalMode = videoModalState.mode;
 
-        if (newY > heightAboveMinimised) {
-          newY = heightAboveMinimised;
-        }
+  const prevModeStateRef = useRef(videoModalMode); // keep track of last non-PIP mode
+  const gestureStateRef = useRef<any>(State.UNDETERMINED); // keep track of gesture state
 
-        translateY.setValue(newY);
-      }
-    },
-    [collapsedHeight, translateY]
+  // Track last non-PIP mode
+  if (videoModalMode !== prevModeStateRef.current) {
+    if (["MAXIMIZED", "MINIMIZED"].includes(videoModalMode)) {
+      prevModeStateRef.current = videoModalMode;
+    }
+  }
+
+  const collapsed =
+    videoModalState.visible &&
+    ((prevModeStateRef.current === "MINIMIZED" &&
+      videoModalState.mode === "PIP") || // If STILL in PIP mode, check if last non-PIP mode was MINIMIZED
+      videoModalState.mode === VideoModalMode.MINIMIZED); // Or if currently in MINIMIZED mode
+
+  // Gesture handler for modal
+  const onGestureEvent = useMemo(
+    () =>
+      Animated.event([{ nativeEvent: { translationY: gestureTranslation } }], {
+        useNativeDriver: true,
+      }),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
   );
 
   const onHandlerStateChange = useCallback(
     (event: any) => {
-      if (
-        event.nativeEvent.state === State.ACTIVE ||
-        event.nativeEvent.oldState === State.ACTIVE
-      ) {
+      const { state: newState, oldState, translationY } = event.nativeEvent;
+
+      if (newState === State.ACTIVE || oldState === State.ACTIVE) {
         useAnimationStateStore.setState({
-          isAnimationInProgress: event.nativeEvent.state === State.ACTIVE,
+          isAnimationInProgress: newState === State.ACTIVE,
         });
       }
 
-      if (event.nativeEvent.oldState === State.ACTIVE) {
-        const { translationY } = event.nativeEvent;
-        let newY = offset.current + translationY;
-        if (newY < 0) newY = 0;
-
-        if (newY > heightAboveMinimised) {
-          newY = heightAboveMinimised;
+      // Update gesture state tracking
+      gestureStateRef.current = newState;
+
+      if (translationY !== 0) {
+        if (newState === State.BEGAN) {
+          // clean up gesture translation
+          gestureTranslation.setValue(0);
+        } else if (
+          newState === State.END ||
+          newState === State.FAILED ||
+          newState === State.CANCELLED
+        ) {
+          const newY = getAnimatedValue(gestureTranslation);
+
+          // clean up gesture translation
+          gestureTranslation.setValue(0);
+
+          const v = getAnimatedValue(modalAnimatedValue);
+
+          // store current offset
+          modalAnimatedValue.setValue(v + newY);
+
+          const shouldCollapse = newY > offset.current * DRAG_TO_COLLAPSE;
+
+          const shouldExpand = newY < offset.current * DRAG_TO_EXPAND;
+
+          if (!collapsed && shouldCollapse) {
+            // Collapse
+            updateModalTranslation(offset.current).start(() => {
+              minimiseVideoModal();
+            });
+          } else if (collapsed && shouldExpand) {
+            // Expand
+            updateModalTranslation(0).start(() => {
+              maximiseVideoModal();
+            });
+          } else {
+            // Snap back to current state
+            updateModalTranslation(collapsed ? offset.current : 0).start();
+          }
         }
-
-        const shouldCollapse =
-          translationY > heightAboveMinimised * DRAG_TO_COLLAPSE;
-
-        const shouldExpand =
-          translationY < -heightAboveMinimised * DRAG_TO_EXPAND;
-
-        if (!collapsed && shouldCollapse) {
-          // Collapse
-          Animated.timing(translateY, {
-            toValue: heightAboveMinimised,
-            duration: ANIMATION_DURATION,
-            useNativeDriver: true,
-          }).start(() => {
-            minimiseVideoModal();
-            offset.current = heightAboveMinimised;
-          });
-        } else if (collapsed && shouldExpand) {
-          // Expand
-          Animated.timing(translateY, {
-            toValue: 0,
-            duration: ANIMATION_DURATION,
-            useNativeDriver: true,
-          }).start(() => {
-            maximiseVideoModal();
-            offset.current = 0;
-            translateY.setValue(0);
-          });
-        } else {
-          // Snap back to current state
-          Animated.spring(translateY, {
-            toValue: collapsed ? heightAboveMinimised : 0,
-            useNativeDriver: true,
-          }).start(() => {
-            offset.current = collapsed ? heightAboveMinimised : 0;
-            translateY.setValue(offset.current);
-          });
-        }
-      } else if (event.nativeEvent.state === State.BEGAN) {
-        // Gesture started, set offset
-        translateY.stopAnimation((value: number) => {
-          offset.current = value;
-        });
       }
     },
-    [collapsedHeight, translateY, collapsed, videoModalState]
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [collapsed]
   );
 
   const gestureHandlerProps = useMemo(() => {
@@ -175,44 +136,34 @@ export const useVideoModalState = (
     };
   }, [onGestureEvent, onHandlerStateChange]);
 
+  // Track video modal state changes & calling updateAnimatedPosition
   useEffect(() => {
     if (videoModalState.visible) {
-      if (videoModalState.mode === VideoModalMode.MAXIMIZED) {
-        handleExpand(0).start(() => {
-          maximiseVideoModal();
-          offset.current = 0;
-          translateY.setValue(0);
-        });
-      } else if (videoModalState.mode === VideoModalMode.MINIMIZED) {
-        handleCollapse(heightAboveMinimised).start(() => {
-          minimiseVideoModal();
-          offset.current = heightAboveMinimised;
-          translateY.setValue(heightAboveMinimised);
-        });
+      const mode =
+        videoModalMode === "PIP" ? prevModeStateRef.current : videoModalMode;
+
+      // Prevent changes during active gesture states to avoid interference
+      if ([State.ACTIVE].includes(gestureStateRef.current)) {
+        return;
+      }
+
+      if (mode === VideoModalMode.MAXIMIZED) {
+        updateModalTranslation(0).start();
+      } else if (mode === VideoModalMode.MINIMIZED) {
+        updateModalTranslation(heightAboveMinimised).start();
       }
     }
-  }, [
-    videoModalState.visible,
-    videoModalState.mode,
-    collapsedHeight,
-    heightAboveMinimised,
-  ]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [videoModalState.visible, videoModalState.mode, heightAboveMinimised]);
 
   return useMemo(
     () => ({
       collapsed,
-      collapsedHeight,
       offset,
       gestureHandlerProps,
       translateY,
       expand: maximiseVideoModal,
     }),
-    [
-      collapsed,
-      collapsedHeight,
-      gestureHandlerProps,
-      translateY,
-      maximiseVideoModal,
-    ]
+    [collapsed, offset, gestureHandlerProps, translateY, maximiseVideoModal]
   );
 };

package/src/Player/PlayerModal/utils/index.ts

@@ -5,10 +5,7 @@ import {
   isAndroidVersionAtLeast,
   isTV,
 } from "@applicaster/zapp-react-native-utils/reactUtils";
-import {
-  isTablet,
-  useIsTablet as getIsTablet,
-} from "@applicaster/zapp-react-native-utils/reactHooks";
+import { useIsTablet as getIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
 
 const SAFE_AREA_BREAKING_API_VERSION = 35;
 
@@ -16,9 +13,20 @@ export const isOldAndroidDevice =
   isAndroidPlatform() &&
   !isAndroidVersionAtLeast(SAFE_AREA_BREAKING_API_VERSION);
 
-export const getWindowHeight = (): number => {
+export const getWindowHeight = (
+  isTablet: boolean,
+  landscape: boolean
+): number => {
   const windowDimensions = Dimensions.get("window");
 
+  if (isTablet && landscape) {
+    return windowDimensions.height;
+  }
+
+  if (windowDimensions.width > windowDimensions.height) {
+    return windowDimensions.width;
+  }
+
   return windowDimensions.height;
 };
 
@@ -28,14 +36,25 @@ export const getScreenHeight = (): number => {
   return screenDimensions.height;
 };
 
-export const getWindowWidth = (): number => {
+export const getWindowWidth = (
+  isTablet: boolean,
+  landscape: boolean
+): number => {
   const windowDimensions = Dimensions.get("window");
 
+  if (isTablet && landscape) {
+    return windowDimensions.width;
+  }
+
+  if (windowDimensions.width > windowDimensions.height) {
+    return windowDimensions.height;
+  }
+
   return windowDimensions.width;
 };
 
 const getIsTabletLandscape = (isTabletPortrait: boolean): boolean => {
-  return !isTV() && isTablet() && !isTabletPortrait;
+  return !isTV() && getIsTablet() && !isTabletPortrait;
 };
 
 export const getInsetsOffset = (
@@ -44,7 +63,7 @@ export const getInsetsOffset = (
 ): number => {
   const isTabletLandscape = getIsTabletLandscape(isTabletPortrait);
 
-  return isTablet() && isTabletLandscape
+  return getIsTablet() && isTabletLandscape
     ? isOldAndroidDevice
       ? insets.top / 2
       : 0