@applicaster/quick-brick-player 15.0.0-alpha.5830601313 → 15.0.0-alpha.5833247754

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-player",
-  "version": "15.0.0-alpha.5830601313",
+  "version": "15.0.0-alpha.5833247754",
   "description": "Quick Brick Player",
   "main": "./src/index.ts",
   "types": "index.d.ts",
@@ -35,11 +35,11 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/quick-brick-mobile-transport-controls": "15.0.0-alpha.5830601313",
-    "@applicaster/quick-brick-tv-transport-controls": "15.0.0-rc.15",
-    "@applicaster/zapp-react-native-tvos-app": "15.0.0-alpha.5830601313",
-    "@applicaster/zapp-react-native-ui-components": "15.0.0-alpha.5830601313",
-    "@applicaster/zapp-react-native-utils": "15.0.0-alpha.5830601313",
+    "@applicaster/quick-brick-mobile-transport-controls": "15.0.0-rc.91",
+    "@applicaster/quick-brick-tv-transport-controls": "15.0.0-rc.91",
+    "@applicaster/zapp-react-native-tvos-app": "15.0.0-alpha.5833247754",
+    "@applicaster/zapp-react-native-ui-components": "15.0.0-alpha.5833247754",
+    "@applicaster/zapp-react-native-utils": "15.0.0-alpha.5833247754",
     "query-string": "7.1.3",
     "shaka-player": "4.3.5",
     "typeface-montserrat": "^0.0.54",

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

@@ -23,7 +23,7 @@ import { usePlayerState } from "@applicaster/zapp-react-native-utils/appUtils/pl
 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";
+import { isBottomTabVisible } from "@applicaster/zapp-react-native-ui-components/Components/Screen/navigationHandler";
 import { usePlugins } from "@applicaster/zapp-react-native-redux";
 import { partial } from "@applicaster/zapp-react-native-utils/utils";
 
@@ -167,7 +167,12 @@ export const DockedControls = (props: Props) => {
   const { currentRoute, screenData } = useNavigation();
 
   const plugins = usePlugins();
-  const menuVisible = isMenuVisible(currentRoute, screenData, plugins);
+
+  const bottomTabsVisible = isBottomTabVisible(
+    currentRoute,
+    screenData,
+    plugins
+  );
 
   const { minimised_height: minimisedHeight } = useConfiguration();
 
@@ -209,7 +214,7 @@ export const DockedControls = (props: Props) => {
 
   const insets = useSafeAreaInsets();
 
-  const progresBarLayoutState = React.useMemo(
+  const progressBarLayoutState = React.useMemo(
     () => ({
       inline: layoutState.inline,
       docked: true,
@@ -248,13 +253,13 @@ export const DockedControls = (props: Props) => {
   );
 
   const bottomSpacerStyle = React.useMemo(() => {
-    const tabBarHeight = menuVisible ? bottomTabBarHeight : 0;
+    const tabBarHeight = bottomTabsVisible ? bottomTabBarHeight : 0;
     const safeAreaBottomInset = insets.bottom || 0;
 
     return {
       height: safeAreaBottomInset + tabBarHeight,
     };
-  }, [menuVisible, insets.bottom]);
+  }, [bottomTabsVisible, insets.bottom]);
 
   const contentInfoContent = React.useMemo(
     () => ({ ...entry, title, summary }),
@@ -276,7 +281,7 @@ export const DockedControls = (props: Props) => {
             content={entry}
             value={value}
             visible
-            layoutState={progresBarLayoutState}
+            layoutState={progressBarLayoutState}
             onPlayerSeek={onPlayerSeek}
             playerState={playerState}
             docked

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

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { LayoutChangeEvent, View } from "react-native";
+import { Animated, LayoutChangeEvent, View } from "react-native";
 
 import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
 import { toBooleanWithDefaultTrue } from "@applicaster/zapp-react-native-utils/booleanUtils";
@@ -8,6 +8,7 @@ import { FlexImage } from "./FlexImage";
 
 import { styles } from "./styles";
 import { toNumberWithDefaultZero } from "@applicaster/zapp-react-native-utils/numberUtils";
+import { useModalAnimationContext } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
 
 type Props = {
   entry: ZappEntry;
@@ -29,15 +30,34 @@ export const PlayerImage = (props: Props) => {
     configuration.audio_player_artwork_border_radius
   );
 
+  const { yTranslate } = useModalAnimationContext();
+
+  const isModalExpanded = yTranslate.current.interpolate({
+    inputRange: [0, 1], // this should be end with `1` only when it's in initial state ( 0pos), otherwise `0`
+    outputRange: [1, 0],
+  });
+
+  // do not use styles.shadow when isModalExpanded is 0
+
+  const animatedStyle = {
+    opacity: isModalExpanded,
+  };
+
   return (
     <View style={styles.alignItemsCenter}>
+      {/* Using an Animated.View to apply shadow to the image */}
+      <Animated.View
+        style={[
+          animatedStyle,
+          shouldShowShadow ? styles.shadow : undefined,
+          { borderRadius },
+        ]}
+      />
       <View
         onLayout={onLayoutImage}
-        style={[shouldShowShadow ? styles.shadow : undefined, { borderRadius }]}
+        style={[styles.defaultImageWrapperView, { borderRadius }]}
       >
-        <View style={[styles.defaultImageWrapperView, { borderRadius }]}>
-          <FlexImage entry={entry} style={styles.backgroundImageContainer} />
-        </View>
+        <FlexImage entry={entry} style={styles.backgroundImageContainer} />
       </View>
     </View>
   );

package/src/Player/AudioLayer/Layout/PlayerImage/styles.ts

@@ -23,7 +23,12 @@ export const styles = StyleSheet.create({
     overflow: "hidden",
   },
   shadow: {
-    borderColor: "transparent",
+    zIndex: 0,
+    position: "absolute",
+    top: 0,
+    left: 0,
+    right: 0,
+    bottom: 0,
     shadowColor: SHADOW_COLOR,
     shadowOffset: { width: 0, height: 24 },
     shadowOpacity: platformSelect({

package/src/Player/PlayNextOverlay/index.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as R from "ramda";
 
-import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
+import { usePlugins } from "@applicaster/zapp-react-native-redux";
 import { PlayNextData } from "@applicaster/zapp-react-native-ui-components/Components/PlayerContainer/PlayerContainer";
 
 type Props = {
@@ -32,7 +32,7 @@ export const PlayNextOverlay = ({
   playNextData,
   setNextVideoPreloadThresholdPercentage,
 }: Props) => {
-  const { plugins } = usePickFromState(["plugins"]);
+  const plugins = usePlugins();
 
   const OverlayPlugin = getOverlayPlugin(plugins);
 

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 { getScreenHeight, getWindowHeight } from "./utils";
+import { getWindowHeight } from "./utils";
+import { useSafeAreaFrame } from "react-native-safe-area-context";
 
 type AnimatedModalProps = {
   content?: ReactElement;
@@ -17,23 +17,18 @@ 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 frame = useSafeAreaFrame();
+  const collapsedHeight = frame.height - offset.current;
 
-  const styles = useStyles({ height: collapsedHeight, type: "audio" });
+  const height = getWindowHeight();
+  const heightAboveMinimised = height - collapsedHeight;
 
-  const WINDOW_HEIGHT = getWindowHeight();
-  const heightAboveMinimised = WINDOW_HEIGHT - collapsedHeight;
-  const screenHeight = getScreenHeight();
+  const styles = useStyles({ height: collapsedHeight, type: "audio" });
 
-  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 +59,7 @@ export function AnimatedModal({
             borderTopLeftRadius: borderTopRadiusAnimated,
             borderTopRightRadius: borderTopRadiusAnimated,
             transform: [{ translateY }],
-            height: screenHeight,
+            height: height,
           },
         ]}
       >
@@ -74,7 +69,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,25 @@ 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" },
-});
+import {
+  getInsetsOffset,
+  getWindowHeight,
+  getWindowWidth,
+  directionStyles,
+  getScaledPos,
+  getExtraContentPadding,
+} from "./utils";
+import { addOrientationChangeListener } from "@applicaster/zapp-react-native-utils/appUtils/orientationHelper";
 
-const directionStyles = (isLandscape: boolean): ViewStyle => {
-  return isLandscape ? orientationStyles.landscape : orientationStyles.portrait;
-};
+const AnimatedSafeAreaView = Animated.createAnimatedComponent(SafeAreaView);
 
 type AnimatedModalProps = {
   pip?: boolean;
@@ -59,45 +62,61 @@ export function VideoPlayerModal({
   const enabled = !!modal && !fullscreen;
   const isTablet = useIsTablet();
 
-  const WINDOW_WIDTH = useMemo(() => getWindowWidth(), []); // remember initial width, ignore rotation changes
-  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;
+  // remember initial width, ignore rotation changes
+  const width = useMemo(
+    () =>
+      isTablet && !isTabletPortrait
+        ? style.tabletLandscapeWidth
+        : getWindowWidth(isTablet, !isTabletPortrait),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
 
-  let width = WINDOW_WIDTH;
+  const height = useMemo(
+    () => getWindowHeight(isTablet, !isTabletPortrait),
+    []
+  ); // remember initial height, ignore rotation changes
 
-  if (isTablet && !isTabletPortrait) {
-    width = style?.tabletLandscapeWidth || width;
-  }
+  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, gestureHandlerProps, expand, offset } =
+    useVideoModalState();
 
-  const {
-    translateY,
-    collapsed,
-    collapsedHeight,
-    gestureHandlerProps,
-    expand,
-  } = useVideoModalState(modal ? translateYRef : dummyRef);
+  const frame = useSafeAreaFrame();
+  const collapsedHeight = frame.height - offset.current;
 
   const heightAboveMinimised = height - collapsedHeight;
 
-  const isTabletLandscape = !isTV() && isTablet && !isTabletPortrait;
-
   const styles = useStyles({ height: collapsedHeight });
 
   const SCALE_FACTOR = 1 / (width / aspectRatio / minimisedHeight); // Scale factor for expanded content
 
   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));
+    });
+
+    return () => {
+      listener.remove();
+    };
+  }, [collapsed, pip]);
+
+  const isFullScreenOrPIP = isFullScreenMode;
+
+  const vidHeight = width / aspectRatio;
 
-  // Interpolated opacities for smooth cross-fade
+  // animated opacity for smooth cross-fade of collapsed content
   const collapsedOpacity = !isFullScreenOrPIP
     ? translateY.interpolate({
         inputRange: [MODAL_COLLAPSE_START, heightAboveMinimised],
@@ -106,6 +125,7 @@ export function VideoPlayerModal({
       })
     : new Animated.Value(0);
 
+  // animated opacity for extra content
   const expandedOpacity = !isFullScreenOrPIP
     ? translateY.interpolate({
         inputRange: [0, heightAboveMinimised],
@@ -114,6 +134,7 @@ export function VideoPlayerModal({
       })
     : new Animated.Value(1);
 
+  // animated x position for video content
   const xPosition = !isFullScreenOrPIP
     ? translateY.interpolate({
         inputRange: [height * VIDEO_TRANSITION_THRESHOLD, MODAL_COLLAPSE_START],
@@ -122,27 +143,23 @@ export function VideoPlayerModal({
       })
     : new Animated.Value(0);
 
-  const vidHeight = width / aspectRatio;
-
+  // animated y position for video content
   const yPosition = !isFullScreenOrPIP
     ? translateY.interpolate({
         inputRange: [height * VIDEO_TRANSITION_THRESHOLD, MODAL_COLLAPSE_START],
         outputRange: [
           0,
-          isTablet && isTabletLandscape
-            ? -((-PROGRESS_BAR_HEIGHT + height - 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
   const scalePosition = !isFullScreenOrPIP
     ? translateY.interpolate({
         inputRange: [height * VIDEO_TRANSITION_THRESHOLD, MODAL_COLLAPSE_START],
@@ -153,7 +170,7 @@ export function VideoPlayerModal({
 
   const borderTopRadiusAnimated = !isFullScreenOrPIP
     ? translateY.interpolate({
-        inputRange: [0, height - collapsedHeight],
+        inputRange: [0, heightAboveMinimised],
         outputRange: [MODAL_RADIUS, 0],
         extrapolate: "clamp",
       })
@@ -177,93 +194,96 @@ export function VideoPlayerModal({
     <PanGestureHandler
       enabled={enabled}
       waitFor={scrollViewRef}
+      activeOffsetY={[-25, 25]}
+      activeOffsetX={[-25, 25]}
       {...gestureHandlerProps}
     >
-      <Animated.View
-        pointerEvents={"auto"}
-        style={[
-          styles.modalWrapper,
-          {
-            borderTopLeftRadius: borderTopRadiusAnimated,
-            borderTopRightRadius: borderTopRadiusAnimated,
-            transform: [{ translateY: isFullScreenOrPIP ? 0 : translateY }],
-            height: screenHeight,
-          },
-        ]}
-      >
+      <AnimatedSafeAreaView 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>
+      </AnimatedSafeAreaView>
     </PanGestureHandler>
   );
 }