@applicaster/quick-brick-player 14.0.0-rc.50 → 14.0.0-rc.52

package/package.json

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

package/src/Player/AudioLayer/Layout/DockedControls/index.tsx

@@ -18,12 +18,14 @@ import { PlayNextData } from "@applicaster/zapp-react-native-ui-components/Compo
 
 import { toNumberWithDefault } from "@applicaster/zapp-react-native-utils/numberUtils";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useNavigation";
 import { getTabBarHeight } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/getTabBarHeight";
 import { useTitleSummaryOverlay } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayerTitleSummaryOverlay";
 import { usePlayerState } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayerState";
 import { useConfiguration } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/utils";
 import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
 import { PROGRESS_BAR_HEIGHT } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation/utils";
+import { isMenuVisible } from "@applicaster/zapp-react-native-ui-components/Components/Screen/navigationHandler";
 
 const bottomTabBarHeight = getTabBarHeight();
 
@@ -172,6 +174,10 @@ export const DockedControls = (props: Props) => {
     playerManager.close();
   }, []);
 
+  const { currentRoute, screenData } = useNavigation();
+
+  const menuVisible = isMenuVisible(currentRoute, screenData);
+
   const { minimised_height: minimisedHeight } = useConfiguration();
 
   const configuration = useZStore("playerConfiguration")();
@@ -220,7 +226,10 @@ export const DockedControls = (props: Props) => {
       style={[
         styles.container,
         {
-          height: minimisedHeight + bottomTabBarHeight + insets.bottom,
+          height:
+            minimisedHeight +
+            (menuVisible ? bottomTabBarHeight : 0) +
+            insets.bottom,
         },
       ]}
     >
@@ -295,7 +304,7 @@ export const DockedControls = (props: Props) => {
       </View>
       <View
         style={{
-          height: insets.bottom + bottomTabBarHeight,
+          height: insets.bottom + (menuVisible ? bottomTabBarHeight : 0),
           backgroundColor: dockedBackgroundColor,
         }}
       />

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

@@ -1,17 +1,19 @@
+import { useCallback, useEffect, useMemo, useRef } from "react";
+import { 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 } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/utils";
 import { getTabBarHeight } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/getTabBarHeight";
 import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useNavigation";
-import { useCallback, useEffect, useMemo, useRef } from "react";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { isMenuVisible } from "@applicaster/zapp-react-native-ui-components/Components/Screen/navigationHandler";
 import {
   ANIMATION_DURATION,
   DRAG_TO_COLLAPSE,
   DRAG_TO_EXPAND,
   SCREEN_HEIGHT,
 } from "../consts";
-import { State } from "react-native-gesture-handler";
-import { Animated } from "react-native";
 import { PROGRESS_BAR_HEIGHT } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation/utils";
 
 const bottomTabBarHeight = getTabBarHeight();
@@ -21,15 +23,25 @@ export const useVideoModalState = (
 ) => {
   const { minimised_height: minimisedHeight } = useConfiguration();
 
-  const { maximiseVideoModal, minimiseVideoModal, videoModalState } =
-    useNavigation();
+  const {
+    maximiseVideoModal,
+    minimiseVideoModal,
+    videoModalState,
+    currentRoute,
+    screenData,
+  } = useNavigation();
+
+  const menuVisible = isMenuVisible(currentRoute, screenData);
 
   const collapsed = videoModalState.mode === VideoModalMode.MINIMIZED;
 
   const { bottom } = useSafeAreaInsets();
 
   const collapsedHeight =
-    minimisedHeight + bottom + bottomTabBarHeight + PROGRESS_BAR_HEIGHT;
+    minimisedHeight +
+    bottom +
+    (menuVisible ? bottomTabBarHeight : 0) +
+    PROGRESS_BAR_HEIGHT;
 
   const translateY = translateYRef.current;
 
@@ -58,74 +70,80 @@ export const useVideoModalState = (
   const offset = useRef(SCREEN_HEIGHT - collapsedHeight);
 
   // Gesture handler for modal
-  const onGestureEvent = (event: any) => {
-    if (event.nativeEvent.state === State.ACTIVE) {
-      const y = event.nativeEvent.translationY;
-      let newY = offset.current + y;
-      if (newY < 0) newY = 0;
-
-      if (newY > SCREEN_HEIGHT - collapsedHeight) {
-        newY = SCREEN_HEIGHT - collapsedHeight;
-      }
-
-      translateY.setValue(newY);
-    }
-  };
-
-  const onHandlerStateChange = (event: any) => {
-    if (event.nativeEvent.oldState === State.ACTIVE) {
-      const { translationY } = event.nativeEvent;
-      let newY = offset.current + translationY;
-      if (newY < 0) newY = 0;
-
-      if (newY > SCREEN_HEIGHT - collapsedHeight) {
-        newY = SCREEN_HEIGHT - collapsedHeight;
+  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;
+
+        if (newY > SCREEN_HEIGHT - collapsedHeight) {
+          newY = SCREEN_HEIGHT - collapsedHeight;
+        }
+
+        translateY.setValue(newY);
       }
+    },
+    [collapsedHeight, translateY]
+  );
 
-      const shouldCollapse =
-        translationY > (SCREEN_HEIGHT - collapsedHeight) * DRAG_TO_COLLAPSE;
-
-      const shouldExpand =
-        translationY < -(SCREEN_HEIGHT - collapsedHeight) * DRAG_TO_EXPAND;
-
-      if (!collapsed && shouldCollapse) {
-        // Collapse
-        Animated.timing(translateY, {
-          toValue: SCREEN_HEIGHT - collapsedHeight,
-          duration: ANIMATION_DURATION,
-          useNativeDriver: true,
-        }).start(() => {
-          minimiseVideoModal();
-          offset.current = SCREEN_HEIGHT - collapsedHeight;
-        });
-      } 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 ? SCREEN_HEIGHT - collapsedHeight : 0,
-          useNativeDriver: true,
-        }).start(() => {
-          offset.current = collapsed ? SCREEN_HEIGHT - collapsedHeight : 0;
-          translateY.setValue(offset.current);
+  const onHandlerStateChange = useCallback(
+    (event: any) => {
+      if (event.nativeEvent.oldState === State.ACTIVE) {
+        const { translationY } = event.nativeEvent;
+        let newY = offset.current + translationY;
+        if (newY < 0) newY = 0;
+
+        if (newY > SCREEN_HEIGHT - collapsedHeight) {
+          newY = SCREEN_HEIGHT - collapsedHeight;
+        }
+
+        const shouldCollapse =
+          translationY > (SCREEN_HEIGHT - collapsedHeight) * DRAG_TO_COLLAPSE;
+
+        const shouldExpand =
+          translationY < -(SCREEN_HEIGHT - collapsedHeight) * DRAG_TO_EXPAND;
+
+        if (!collapsed && shouldCollapse) {
+          // Collapse
+          Animated.timing(translateY, {
+            toValue: SCREEN_HEIGHT - collapsedHeight,
+            duration: ANIMATION_DURATION,
+            useNativeDriver: true,
+          }).start(() => {
+            minimiseVideoModal();
+            offset.current = SCREEN_HEIGHT - collapsedHeight;
+          });
+        } 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 ? SCREEN_HEIGHT - collapsedHeight : 0,
+            useNativeDriver: true,
+          }).start(() => {
+            offset.current = collapsed ? SCREEN_HEIGHT - collapsedHeight : 0;
+            translateY.setValue(offset.current);
+          });
+        }
+      } else if (event.nativeEvent.state === State.BEGAN) {
+        // Gesture started, set offset
+        translateY.stopAnimation((value: number) => {
+          offset.current = value;
         });
       }
-    } else if (event.nativeEvent.state === State.BEGAN) {
-      // Gesture started, set offset
-      translateY.stopAnimation((value: number) => {
-        offset.current = value;
-      });
-    }
-  };
+    },
+    [collapsedHeight, translateY]
+  );
 
   const gestureHandlerProps = useMemo(() => {
     return {
@@ -148,14 +166,23 @@ export const useVideoModalState = (
         translateY.setValue(SCREEN_HEIGHT - collapsedHeight);
       });
     }
-  }, [videoModalState.visible, videoModalState.mode]);
-
-  return {
-    collapsed,
-    collapsedHeight,
-    offset,
-    gestureHandlerProps,
-    translateY,
-    expand: maximiseVideoModal,
-  };
+  }, [videoModalState.visible, videoModalState.mode, collapsedHeight]);
+
+  return useMemo(
+    () => ({
+      collapsed,
+      collapsedHeight,
+      offset,
+      gestureHandlerProps,
+      translateY,
+      expand: maximiseVideoModal,
+    }),
+    [
+      collapsed,
+      collapsedHeight,
+      gestureHandlerProps,
+      translateY,
+      maximiseVideoModal,
+    ]
+  );
 };

package/src/Player/PlayerModal/styles.ts

@@ -52,50 +52,52 @@ export const useStyles = ({ height }: { height: number }) => {
   const BG_COLOR_DEFAULT_BLACK = "black";
   const BG_COLOR_DEFAULT_TRANSPARENT = "transparent";
 
-  const styles = StyleSheet.create({
-    modal: {
-      position: "absolute",
-      left: 0,
-      right: 0,
-      top: 0,
-      backgroundColor,
-      elevation: 10,
-      zIndex: 100,
-      overflow: "hidden",
-    },
-    modalWrapper: {
-      backgroundColor: BG_COLOR_DEFAULT_BLACK,
-    },
-    collapsedModalBg: {
-      backgroundColor: BG_COLOR_DEFAULT_BLACK,
-    },
-    modalContent: {
-      flex: 1,
-      alignItems: "center",
-    },
-    expandedContentContainer: {
-      justifyContent: "flex-start",
-      backgroundColor: BG_COLOR_DEFAULT_TRANSPARENT,
-      zIndex: 1,
-      flex: 0,
-    },
-    extraContentScrollView: {
-      width: "100%",
-      backgroundColor: BG_COLOR_DEFAULT_TRANSPARENT,
-    },
-    collapsedBarContainer: {
-      ...StyleSheet.absoluteFillObject,
-      height: COLLAPSED_HEIGHT,
-      justifyContent: "flex-end",
-    },
-    collapsedBarWrapper: {
-      flex: 1,
-    },
-    flexNone: {
-      ...StyleSheet.absoluteFillObject,
-      flex: -1,
-    },
-  });
-
-  return useMemo(() => styles, [styles]);
+  return useMemo(
+    () =>
+      StyleSheet.create({
+        modal: {
+          position: "absolute",
+          left: 0,
+          right: 0,
+          top: 0,
+          backgroundColor,
+          elevation: 10,
+          zIndex: 100,
+          overflow: "hidden",
+        },
+        modalWrapper: {
+          backgroundColor: BG_COLOR_DEFAULT_BLACK,
+        },
+        collapsedModalBg: {
+          backgroundColor: BG_COLOR_DEFAULT_BLACK,
+        },
+        modalContent: {
+          flex: 1,
+          alignItems: "center",
+        },
+        expandedContentContainer: {
+          justifyContent: "flex-start",
+          backgroundColor: BG_COLOR_DEFAULT_TRANSPARENT,
+          zIndex: 1,
+          flex: 0,
+        },
+        extraContentScrollView: {
+          width: "100%",
+          backgroundColor: BG_COLOR_DEFAULT_TRANSPARENT,
+        },
+        collapsedBarContainer: {
+          ...StyleSheet.absoluteFillObject,
+          height: COLLAPSED_HEIGHT,
+          justifyContent: "flex-end",
+        },
+        collapsedBarWrapper: {
+          flex: 1,
+        },
+        flexNone: {
+          ...StyleSheet.absoluteFillObject,
+          flex: -1,
+        },
+      }),
+    [backgroundColor, COLLAPSED_HEIGHT]
+  );
 };