@applicaster/quick-brick-player 14.0.0-rc.83 → 14.0.0-rc.84

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-player",
-  "version": "14.0.0-rc.83",
+  "version": "14.0.0-rc.84",
   "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.83",
     "@applicaster/quick-brick-tv-transport-controls": "14.0.0-rc.71",
-    "@applicaster/zapp-react-native-tvos-app": "14.0.0-rc.83",
-    "@applicaster/zapp-react-native-ui-components": "14.0.0-rc.83",
-    "@applicaster/zapp-react-native-utils": "14.0.0-rc.83",
+    "@applicaster/zapp-react-native-tvos-app": "14.0.0-rc.84",
+    "@applicaster/zapp-react-native-ui-components": "14.0.0-rc.84",
+    "@applicaster/zapp-react-native-utils": "14.0.0-rc.84",
     "query-string": "7.1.3",
     "shaka-player": "4.3.5",
     "typeface-montserrat": "^0.0.54",

package/src/Player/PlayerModal/PlayerModal.tsx

@@ -6,7 +6,7 @@ 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 { getScreenHeight, getWindowHeight } from "./utils";
+import { getWindowHeight } from "./utils";
 
 type AnimatedModalProps = {
   content?: ReactElement;
@@ -29,11 +29,10 @@ export function AnimatedModal({
 
   const styles = useStyles({ height: collapsedHeight, type: "audio" });
 
-  const WINDOW_HEIGHT = getWindowHeight();
-  const heightAboveMinimised = WINDOW_HEIGHT - collapsedHeight;
-  const screenHeight = getScreenHeight();
+  const height = getWindowHeight();
+  const heightAboveMinimised = height - collapsedHeight;
 
-  const MODAL_COLLAPSE_START = WINDOW_HEIGHT * MODAL_COLLAPSE_RATIO;
+  const MODAL_COLLAPSE_START = height * MODAL_COLLAPSE_RATIO;
 
   // Interpolated opacities for smooth cross-fade
   const collapsedOpacity = translateY.interpolate({
@@ -64,7 +63,7 @@ export function AnimatedModal({
             borderTopLeftRadius: borderTopRadiusAnimated,
             borderTopRightRadius: borderTopRadiusAnimated,
             transform: [{ translateY }],
-            height: screenHeight,
+            height: height,
           },
         ]}
       >
@@ -74,7 +73,6 @@ export function AnimatedModal({
             {
               borderTopLeftRadius: borderTopRadiusAnimated,
               borderTopRightRadius: borderTopRadiusAnimated,
-              height: screenHeight,
             },
           ]}
         >

package/src/Player/PlayerModal/VideoPlayerModal.tsx

@@ -1,6 +1,6 @@
 import React, { ReactElement, useMemo, useRef } from "react";
 
-import { Animated, Pressable, StyleSheet, ViewStyle } from "react-native";
+import { Animated, Pressable } from "react-native";
 import { PanGestureHandler } from "react-native-gesture-handler";
 import { useStyles } from "./styles";
 import { useConfiguration } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/utils";
@@ -12,22 +12,23 @@ import {
   VIDEO_TRANSITION_THRESHOLD,
 } from "./consts";
 import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
-import { isTV } from "@applicaster/zapp-react-native-utils/reactUtils";
 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 { useSafeAreaInsets } from "react-native-safe-area-context";
+import {
+  SafeAreaView,
+  useSafeAreaFrame,
+  useSafeAreaInsets,
+} from "react-native-safe-area-context";
 import { GestureAnimatedScrollView } from "./GestureAnimatedScrollView";
 import { PlayerDetailsWrapperHeightContext } from "./context";
-import { getScreenHeight, getWindowHeight, getWindowWidth } from "./utils";
-
-const orientationStyles = StyleSheet.create({
-  landscape: { flexDirection: "row" },
-  portrait: { flexDirection: "column" },
-});
-
-const directionStyles = (isLandscape: boolean): ViewStyle => {
-  return isLandscape ? orientationStyles.landscape : orientationStyles.portrait;
-};
+import {
+  getInsetsOffset,
+  getWindowHeight,
+  getWindowWidth,
+  directionStyles,
+  getScaledPos,
+  getExtraContentPadding,
+} from "./utils";
 
 type AnimatedModalProps = {
   pip?: boolean;
@@ -59,17 +60,19 @@ export function VideoPlayerModal({
   const enabled = !!modal && !fullscreen;
   const isTablet = useIsTablet();
 
-  const WINDOW_WIDTH = useMemo(() => getWindowWidth(), []); // remember initial width, ignore rotation changes
+  // remember initial width, ignore rotation changes
+  const width = useMemo(
+    () =>
+      isTablet && !isTabletPortrait
+        ? style.tabletLandscapeWidth
+        : getWindowWidth(),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+
   const height = useMemo(() => getWindowHeight(), []); // remember initial height, ignore rotation changes
-  const screenHeight = useMemo(() => getScreenHeight(), []); // remember initial height, ignore rotation changes
   const MODAL_COLLAPSE_START = height * MODAL_COLLAPSE_RATIO;
 
-  let width = WINDOW_WIDTH;
-
-  if (isTablet && !isTabletPortrait) {
-    width = style?.tabletLandscapeWidth || width;
-  }
-
   const { minimised_height: minimisedHeight } = useConfiguration();
   const scrollViewRef = useRef<typeof Animated.ScrollView | null>(null);
 
@@ -85,9 +88,9 @@ export function VideoPlayerModal({
     expand,
   } = useVideoModalState(modal ? translateYRef : dummyRef);
 
-  const heightAboveMinimised = height - collapsedHeight;
+  const frame = useSafeAreaFrame();
 
-  const isTabletLandscape = !isTV() && isTablet && !isTabletPortrait;
+  const heightAboveMinimised = height - collapsedHeight;
 
   const styles = useStyles({ height: collapsedHeight });
 
@@ -114,6 +117,7 @@ export function VideoPlayerModal({
       })
     : new Animated.Value(1);
 
+  // animated position for video content during modal transition
   const xPosition = !isFullScreenOrPIP
     ? translateY.interpolate({
         inputRange: [height * VIDEO_TRANSITION_THRESHOLD, MODAL_COLLAPSE_START],
@@ -124,30 +128,23 @@ export function VideoPlayerModal({
 
   const vidHeight = width / aspectRatio;
 
+  // animated position for video content during modal transition
   const yPosition = !isFullScreenOrPIP
     ? translateY.interpolate({
         inputRange: [height * VIDEO_TRANSITION_THRESHOLD, MODAL_COLLAPSE_START],
         outputRange: [
           0,
-          isTablet && isTabletLandscape
-            ? -(
-                (-PROGRESS_BAR_HEIGHT +
-                  screenHeight -
-                  vidHeight * SCALE_FACTOR) /
-                2
-              )
-            : -(
-                PROGRESS_BAR_HEIGHT +
-                insets.top / 2 +
-                (WINDOW_WIDTH / aspectRatio -
-                  (WINDOW_WIDTH / aspectRatio) * SCALE_FACTOR) /
-                  2
-              ),
+          -(
+            PROGRESS_BAR_HEIGHT +
+            getInsetsOffset(insets, isTabletPortrait) +
+            getScaledPos(height, vidHeight, minimisedHeight, isTabletPortrait)
+          ),
         ],
         extrapolate: "clamp",
       })
     : new Animated.Value(0);
 
+  // animated position for video content during modal transition
   const scalePosition = !isFullScreenOrPIP
     ? translateY.interpolate({
         inputRange: [height * VIDEO_TRANSITION_THRESHOLD, MODAL_COLLAPSE_START],
@@ -158,7 +155,7 @@ export function VideoPlayerModal({
 
   const borderTopRadiusAnimated = !isFullScreenOrPIP
     ? translateY.interpolate({
-        inputRange: [0, height - collapsedHeight],
+        inputRange: [0, heightAboveMinimised],
         outputRange: [MODAL_RADIUS, 0],
         extrapolate: "clamp",
       })
@@ -184,91 +181,92 @@ export function VideoPlayerModal({
       waitFor={scrollViewRef}
       {...gestureHandlerProps}
     >
-      <Animated.View
-        pointerEvents={"auto"}
-        style={[
-          styles.modalWrapper,
-          {
-            borderTopLeftRadius: borderTopRadiusAnimated,
-            borderTopRightRadius: borderTopRadiusAnimated,
-            transform: [{ translateY: isFullScreenOrPIP ? 0 : translateY }],
-            height: screenHeight,
-          },
-        ]}
-      >
+      <SafeAreaView pointerEvents="box-none" edges={["bottom"]}>
         <Animated.View
           pointerEvents={"auto"}
           style={[
-            styles.modal,
-            collapsed ? styles.collapsedModalBg : null,
+            styles.modalWrapper,
             {
               borderTopLeftRadius: borderTopRadiusAnimated,
               borderTopRightRadius: borderTopRadiusAnimated,
-              height: screenHeight,
+              transform: [{ translateY: isFullScreenOrPIP ? 0 : translateY }],
+              height: frame.height,
             },
           ]}
         >
           <Animated.View
-            pointerEvents={!collapsed ? "auto" : "none"}
+            pointerEvents={"auto"}
             style={[
-              pip ? styles.modalContentPiP : styles.modalContent,
-              directionStyles(isTabletLandscape),
+              styles.modal,
+              collapsed ? styles.collapsedModalBg : null,
+              {
+                borderTopLeftRadius: borderTopRadiusAnimated,
+                borderTopRightRadius: borderTopRadiusAnimated,
+              },
             ]}
           >
             <Animated.View
+              pointerEvents={!collapsed ? "auto" : "none"}
               style={[
-                styles.expandedContentContainer,
-                {
-                  transform: [
-                    { translateX: xPosition },
-                    { translateY: yPosition },
-                    { scale: scalePosition },
-                  ],
-                },
+                pip ? styles.modalContentPiP : styles.modalContent,
+                directionStyles(isTabletPortrait),
               ]}
             >
-              {content}
+              <Animated.View
+                style={[
+                  styles.expandedContentContainer,
+                  {
+                    transform: [
+                      { translateX: xPosition },
+                      { translateY: yPosition },
+                      { scale: scalePosition },
+                    ],
+                  },
+                ]}
+              >
+                {content}
+              </Animated.View>
+              {extraContent ? (
+                <GestureAnimatedScrollView
+                  ref={scrollViewRef}
+                  contentContainerStyle={getExtraContentPadding(insets)}
+                  bounces={false}
+                  overScrollMode="never"
+                  onLayout={onScrollViewLayout}
+                  style={[
+                    styles.extraContentScrollView,
+                    { opacity: expandedOpacity },
+                  ]}
+                >
+                  <PlayerDetailsWrapperHeightContext.Provider
+                    value={playerDetailsWrapperHeight}
+                  >
+                    {extraContent}
+                  </PlayerDetailsWrapperHeightContext.Provider>
+                </GestureAnimatedScrollView>
+              ) : null}
             </Animated.View>
-            {extraContent ? (
-              <GestureAnimatedScrollView
-                ref={scrollViewRef}
-                contentContainerStyle={{
-                  paddingBottom: insets.bottom,
-                }}
-                onLayout={onScrollViewLayout}
+
+            {!isFullScreenOrPIP ? (
+              <Animated.View
+                pointerEvents={collapsed ? "box-none" : "none"}
                 style={[
-                  styles.extraContentScrollView,
-                  { opacity: expandedOpacity },
+                  styles.collapsedBarContainer,
+                  { opacity: collapsedOpacity },
                 ]}
               >
-                <PlayerDetailsWrapperHeightContext.Provider
-                  value={playerDetailsWrapperHeight}
+                <Pressable
+                  testID="collapsedBarWrapper"
+                  onPress={expand}
+                  style={styles.collapsedBarWrapper}
                 >
-                  {extraContent}
-                </PlayerDetailsWrapperHeightContext.Provider>
-              </GestureAnimatedScrollView>
+                  {collapsedContent}
+                </Pressable>
+              </Animated.View>
             ) : null}
           </Animated.View>
-
-          {!isFullScreenOrPIP ? (
-            <Animated.View
-              pointerEvents={collapsed ? "box-none" : "none"}
-              style={[
-                styles.collapsedBarContainer,
-                { opacity: collapsedOpacity },
-              ]}
-            >
-              <Pressable
-                testID="collapsedBarWrapper"
-                onPress={expand}
-                style={styles.collapsedBarWrapper}
-              >
-                {collapsedContent}
-              </Pressable>
-            </Animated.View>
-          ) : null}
         </Animated.View>
-      </Animated.View>
+      </SafeAreaView>
     </PanGestureHandler>
   );
 }

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

@@ -49,7 +49,7 @@ export const useVideoModalState = (
   const collapsedHeight =
     minimisedHeight +
     (menuVisible ? bottomTabBarHeight : 0) +
-    (isOldAndroidDevice ? 0 : insets.bottom) +
+    (isOldAndroidDevice ? 0 : insets.bottom) + // insets.bottom is added to properly display docked modal
     PROGRESS_BAR_HEIGHT;
 
   const heightAboveMinimised = frame.height - collapsedHeight;

package/src/Player/PlayerModal/styles.ts

@@ -63,6 +63,7 @@ export const useStyles = ({ height }: { height: number }) => {
           backgroundColor,
           elevation: 10,
           zIndex: 100,
+          height: "100%",
           overflow: "hidden",
         },
         modalWrapper: {

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

@@ -1,14 +1,20 @@
-import { Dimensions } from "react-native";
+import { StyleSheet, Dimensions, ViewStyle } from "react-native";
 
 import {
   isAndroidPlatform,
   isAndroidVersionAtLeast,
+  isTV,
 } from "@applicaster/zapp-react-native-utils/reactUtils";
+import {
+  isTablet,
+  useIsTablet as getIsTablet,
+} from "@applicaster/zapp-react-native-utils/reactHooks";
 
-const MIN_SUPPORTED_ANDROID_API = 34;
+const SAFE_AREA_BREAKING_API_VERSION = 35;
 
 export const isOldAndroidDevice =
-  isAndroidPlatform() && !isAndroidVersionAtLeast(MIN_SUPPORTED_ANDROID_API);
+  isAndroidPlatform() &&
+  !isAndroidVersionAtLeast(SAFE_AREA_BREAKING_API_VERSION);
 
 export const getWindowHeight = (): number => {
   const windowDimensions = Dimensions.get("window");
@@ -27,3 +33,60 @@ export const getWindowWidth = (): number => {
 
   return windowDimensions.width;
 };
+
+const getIsTabletLandscape = (isTabletPortrait: boolean): boolean => {
+  return !isTV() && isTablet() && !isTabletPortrait;
+};
+
+export const getInsetsOffset = (
+  insets: { top: number; bottom: number },
+  isTabletPortrait: boolean
+): number => {
+  const isTabletLandscape = getIsTabletLandscape(isTabletPortrait);
+
+  return isTablet() && isTabletLandscape
+    ? isOldAndroidDevice
+      ? insets.top / 2
+      : 0
+    : insets.top / 2;
+};
+
+const orientationStyles = StyleSheet.create({
+  landscape: { flexDirection: "row" },
+  portrait: { flexDirection: "column" },
+});
+
+export const directionStyles = (isTabletPortrait: boolean): ViewStyle => {
+  const isTabletLandscape = getIsTabletLandscape(isTabletPortrait);
+
+  return isTabletLandscape
+    ? orientationStyles.landscape
+    : orientationStyles.portrait;
+};
+
+export const getScaledPos = (
+  height,
+  vidHeight,
+  minimisedHeight,
+  isTabletPortrait
+) => {
+  const isTabletLandscape = getIsTabletLandscape(isTabletPortrait);
+
+  const SCALE_FACTOR = minimisedHeight / vidHeight; // Scale factor for expanded content
+
+  return (
+    ((isTabletLandscape ? height : vidHeight) - vidHeight * SCALE_FACTOR) / 2
+  );
+};
+
+export const getExtraContentPadding = (insets: {
+  top: number;
+  bottom: number;
+}): ViewStyle => {
+  const isTablet = getIsTablet(); // not a hook, just a utility function
+
+  return {
+    paddingTop: isTablet ? insets.top : 0,
+    paddingBottom: insets.bottom,
+  };
+};

package/src/Player/index.tsx

@@ -835,25 +835,25 @@ export default class VideoPlayer extends React.Component<
         : styles.playerContainerBlack;
 
   private getBackgroundImageStyle = (
-    dimensions: any,
+    dimensions: ViewStyle,
     isAudioItem: boolean
-  ): ViewStyle => ({
-    ...(isAudioItem ? styles.audio : { position: "absolute" }),
-    ...dimensions,
-  });
+  ): ViewStyle[] => [
+    isAudioItem ? styles.audio : { position: "absolute" },
+    dimensions,
+  ];
 
   /* Returns player view style based on platform and content type (audio/video) */
   private getPlayerViewStyle = (
     dimensions: ViewStyle,
     isAudioItem: boolean
-  ): ViewStyle => {
-    const generalStyles = isAudioItem ? styles.audio : {};
+  ): ViewStyle | ViewStyle[] => {
+    const generalStyles = isAudioItem ? styles.audio : undefined;
 
     if (isAndroidPlatform() && isAudioItem) {
       return generalStyles;
     }
 
-    return { ...generalStyles, ...dimensions };
+    return [generalStyles, dimensions];
   };
 
   private renderAudioPlayer = (
@@ -876,7 +876,7 @@ export default class VideoPlayer extends React.Component<
     shouldRender: boolean,
     imageKey: string,
     entry: ZappEntry,
-    style: ViewStyle
+    style: ViewStyle | ViewStyle[]
   ) => {
     if (!shouldRender) return null;
 
@@ -887,7 +887,7 @@ export default class VideoPlayer extends React.Component<
 
   private renderNativePlayer = (
     shouldRender: boolean,
-    style: ViewStyle,
+    style: ViewStyle | ViewStyle[],
     nativeEvents: ReturnType<typeof this.getNativeEvents>,
     nativeProps: ReturnType<typeof this.getNativeProps>,
     pluginConfiguration: Record<string, any>
@@ -1265,13 +1265,13 @@ export default class VideoPlayer extends React.Component<
           </View>
         }
       />
-    ) : (
+    ) : isModal ? (
       <VideoPlayerModal
         isTabletPortrait={isTabletPortrait}
         aspectRatio={aspectRatio}
         pip={piped}
         fullscreen={fullscreen}
-        modal={isModal}
+        modal
         style={{
           tabletLandscapeWidth: getTabletWidth(
             this.getPluginConfiguration().tablet_landscape_sidebar_width,
@@ -1309,6 +1309,13 @@ export default class VideoPlayer extends React.Component<
           </View>
         }
       />
+    ) : (
+      <View style={style} testID={"player-view"}>
+        <PlayerWrapper
+          {...sharedWrapperViewProps}
+          playerContent={this.renderPlayerContent}
+        />
+      </View>
     );
   };