@applicaster/quick-brick-player 15.0.0-rc.5 → 15.0.0-rc.52

package/package.json

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

package/src/Player/AudioLayer/AudioPlayerWrapper.tsx

@@ -61,6 +61,7 @@ type Props = {
     inline: boolean;
     docked: boolean;
     isModal: boolean;
+    pip: boolean;
   };
   playNextData: PlayNextData;
   isTabletPortrait?: boolean;
@@ -99,11 +100,7 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
   );
 
   useEffect(() => {
-    if (player) {
-      setSpeedManager(new SpeedController(player));
-    } else {
-      setSpeedManager(null);
-    }
+    setSpeedManager(player ? new SpeedController(player) : null);
   }, [player]);
 
   useEffect(() => {
@@ -217,7 +214,7 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
         items: speedOptions,
         current_selection: playbackSpeed,
         onPress: onSpeedSelect,
-        title: configuration["playback_speed_title"],
+        title: configuration.playback_speed_title,
         itemProps: getBottomSheetModalItemProps,
         iconProps: getBottomSheetModalIconProps,
         labelProps: getBottomSheetModalLabelProps,
@@ -233,7 +230,7 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
         ],
       },
     });
-  }, [playbackSpeed, onSpeedSelect, configuration["playback_speed_title"]]);
+  }, [playbackSpeed, onSpeedSelect, configuration.playback_speed_title]);
 
   const onPlayerSeek = React.useCallback(
     (targetTime: number) => {
@@ -250,13 +247,28 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
     player?.seekTo(0);
   }, [player]);
 
+  const layoutStateMemo = React.useMemo(
+    () => ({
+      inline: layoutState.inline,
+      docked: layoutState.docked,
+      isModal: layoutState.isModal,
+      pip: layoutState.pip,
+    }),
+    [
+      layoutState.inline,
+      layoutState.docked,
+      layoutState.isModal,
+      layoutState.pip,
+    ]
+  );
+
   return (
     <SafeAreaView style={[style, Styles.playerContainer]} edges={edges}>
       <View style={Styles.playerContainer} onLayout={onLayout}>
         <Layout
           entry={entry}
           playerState={playerState}
-          layoutState={layoutState}
+          layoutState={layoutStateMemo}
           value={value}
           onPlaybackButtonPress={onPlaybackButtonPress}
           onRewindButtonPress={onRewindButtonPress}

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

@@ -1,6 +1,5 @@
 import * as React from "react";
-import { StyleSheet, View, ViewStyle } from "react-native";
-import * as R from "ramda";
+import { StyleSheet, View } from "react-native";
 import {
   useIsTablet,
   useZStore,
@@ -16,7 +15,6 @@ import {
 
 import { PlayNextData } from "@applicaster/zapp-react-native-ui-components/Components/PlayerContainer/PlayerContainer";
 
-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";
@@ -25,24 +23,19 @@ 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";
 
 const bottomTabBarHeight = getTabBarHeight();
 
 type Props = {
   entry: ZappEntry;
   layoutState: QuickBrickPlayer.LayoutState;
-  playerState: QuickBrickPlayer.PlayerState;
-  value: GetValue;
-  onCloseVideoModal: () => void;
-  onPlayerSeek: (targetTime: number) => void;
+  onPlayerSeek?: (targetTime: number) => void;
   playNextData: PlayNextData;
-  title: string | number;
-  summary: string | number;
   ImageComponent?: React.ReactNode;
   isActiveGesture?: boolean;
-  minimisedHeight: number;
   aspectRatio?: number;
 };
 
@@ -51,7 +44,6 @@ const styles = StyleSheet.create({
     flex: 1,
     flexDirection: "column",
     alignItems: "stretch",
-    marginTop: PROGRESS_BAR_HEIGHT,
   },
   content: {
     flex: 1,
@@ -94,14 +86,12 @@ const styles = StyleSheet.create({
   buttons: {
     marginVertical: 10,
   },
+  liveMarginTop: { marginTop: 0 },
+  marginTop: { marginTop: PROGRESS_BAR_HEIGHT },
 });
 
-const playerDimensionsStyle = (
-  minimisedHeight: number,
-  addPadding: boolean
-): ViewStyle => ({
-  width: addPadding ? toNumberWithDefault(100, minimisedHeight) : 0,
-});
+const getValue = (key: string, stylesObj: Record<string, any>) =>
+  stylesObj?.[key] ?? null;
 
 const controlButtons = (
   live: boolean,
@@ -167,7 +157,6 @@ export const DockedControls = (props: Props) => {
     onPlayerSeek = noop,
     playNextData,
     ImageComponent,
-    isActiveGesture = true,
     aspectRatio,
   } = props;
 
@@ -178,18 +167,18 @@ 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();
 
   const configuration = useZStore("playerConfiguration")();
   const playerState = usePlayerState("shared-player-wrapper-docked");
 
-  const getValue = React.useCallback(
-    (key: string, stylesObj: {}) => R.propOr(null, key, stylesObj),
-    []
-  );
-
   const value = React.useCallback(
     (key: string) => {
       const retVal = getValue(key, configuration);
@@ -208,7 +197,7 @@ export const DockedControls = (props: Props) => {
 
       return retVal;
     },
-    [...Object.values(configuration), playerState.seekableDuration, getValue]
+    [...Object.values(configuration), playerState.seekableDuration]
   );
 
   const { title, summary } = useTitleSummaryOverlay(
@@ -225,15 +214,65 @@ export const DockedControls = (props: Props) => {
 
   const insets = useSafeAreaInsets();
 
+  const progressBarLayoutState = React.useMemo(
+    () => ({
+      inline: layoutState.inline,
+      docked: true,
+      isModal: layoutState.isModal,
+      pip: layoutState.pip,
+    }),
+    [layoutState.inline, layoutState.isModal, layoutState.pip]
+  );
+
+  const _controlButtons = React.useMemo(
+    () => partial(controlButtons, playerState.isLive && liveButton),
+    [playerState.isLive, liveButton]
+  );
+
+  const containerStyles = React.useMemo(
+    () => ({
+      height: minimisedHeight,
+      maxHeight: minimisedHeight,
+    }),
+    [minimisedHeight]
+  );
+
+  const imageComponentWrapperStyles = React.useMemo(
+    () => ({
+      aspectRatio: aspectRatio,
+      height: minimisedHeight,
+    }),
+    [aspectRatio, minimisedHeight]
+  );
+
+  const backgroundColorStyle = React.useMemo(
+    () => ({
+      backgroundColor: dockedBackgroundColor,
+    }),
+    [dockedBackgroundColor]
+  );
+
+  const bottomSpacerStyle = React.useMemo(() => {
+    const tabBarHeight = bottomTabsVisible ? bottomTabBarHeight : 0;
+    const safeAreaBottomInset = insets.bottom || 0;
+
+    return {
+      height: safeAreaBottomInset + tabBarHeight,
+    };
+  }, [bottomTabsVisible, insets.bottom]);
+
+  const contentInfoContent = React.useMemo(
+    () => ({ ...entry, title, summary }),
+    [title, summary, entry]
+  );
+
   return (
     <>
       <View
         style={[
           styles.container,
-          {
-            height: minimisedHeight,
-            maxHeight: minimisedHeight,
-          },
+          containerStyles,
+          playerState.isLive ? styles.liveMarginTop : styles.marginTop,
         ]}
       >
         {!playerState.isLive ? (
@@ -242,42 +281,23 @@ export const DockedControls = (props: Props) => {
             content={entry}
             value={value}
             visible
-            layoutState={layoutState}
+            layoutState={progressBarLayoutState}
             onPlayerSeek={onPlayerSeek}
             playerState={playerState}
-            startComponentsAnimation={noop}
             docked
           />
         ) : null}
 
         <View style={styles.content}>
           <View style={styles.touchableArea}>
-            {isActiveGesture || layoutState.docked ? (
-              <View
-                style={{ aspectRatio: aspectRatio, height: minimisedHeight }}
-              >
-                {ImageComponent || null}
-              </View>
-            ) : (
-              <View
-                style={playerDimensionsStyle(
-                  minimisedHeight,
-                  isActiveGesture || layoutState.docked
-                )}
-              />
-            )}
+            <View style={imageComponentWrapperStyles}>
+              {ImageComponent || null}
+            </View>
             <View
               testID="content-info"
-              style={[
-                styles.contentInfo,
-                { backgroundColor: dockedBackgroundColor },
-              ]}
+              style={[styles.contentInfo, backgroundColorStyle]}
             >
-              <ContentInfo
-                content={{ ...entry, title, summary }}
-                value={value}
-                docked
-              />
+              <ContentInfo content={contentInfoContent} value={value} docked />
             </View>
           </View>
           <View
@@ -285,15 +305,13 @@ export const DockedControls = (props: Props) => {
               isTablet
                 ? styles.controlsContainerForTablet
                 : styles.controlsContainerForMobile,
-              { backgroundColor: dockedBackgroundColor },
+              backgroundColorStyle,
             ]}
           >
             <Controls
               value={value}
               visible
-              buttons={R.partial(controlButtons, [
-                playerState.isLive && liveButton,
-              ])}
+              buttons={_controlButtons}
               style={styles.playPauseButton}
               playNextData={playNextData}
               playerState={playerState}
@@ -308,12 +326,7 @@ export const DockedControls = (props: Props) => {
           </View>
         </View>
       </View>
-      <View
-        style={{
-          height: insets.bottom + (menuVisible ? bottomTabBarHeight : 0),
-          backgroundColor: dockedBackgroundColor,
-        }}
-      />
+      <View style={[bottomSpacerStyle, backgroundColorStyle]} />
     </>
   );
 };

package/src/Player/AudioLayer/Layout/MobileLayout.tsx

@@ -151,12 +151,7 @@ export function MobileLayout({
             },
           ]}
         >
-          <PlayerImage
-            entry={entry}
-            docked={false}
-            imageWidth={imageSize}
-            configuration={configuration}
-          />
+          <PlayerImage entry={entry} configuration={configuration} />
         </View>
         {/* PlayerImage */}
 

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

@@ -1,31 +1,24 @@
 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";
 
-import { AnimatedImage } from "./AnimatedImage";
 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;
   configuration: QuickBrickPlayer.AudioPlayerProps["configuration"];
-  docked: boolean;
-  imageWidth?: Option<number>;
+  docked?: boolean;
   onLayoutImage?: (event: LayoutChangeEvent) => void;
 };
 
 export const PlayerImage = (props: Props) => {
-  const {
-    entry,
-    docked,
-    imageWidth,
-    configuration,
-    onLayoutImage = noop,
-  } = props;
+  const { entry, docked = false, configuration, onLayoutImage = noop } = props;
 
   const isShadowEnabled = toBooleanWithDefaultTrue(
     configuration?.audio_player_artwork_shadow_enabled
@@ -37,25 +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 }]}
       >
-        {!imageWidth ? (
-          <View style={[styles.defaultImageWrapperView, { borderRadius }]}>
-            <FlexImage entry={entry} style={styles.backgroundImageContainer} />
-          </View>
-        ) : (
-          // we have imageSize here and now we could animate resizing of this image
-          <AnimatedImage
-            entry={entry}
-            style={[styles.backgroundImageContainer, { borderRadius }]}
-            imageWidth={imageWidth}
-            docked={docked}
-          />
-        )}
+        <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/AudioLayer/Layout/TabletLandscapeLayout.tsx

@@ -117,14 +117,11 @@ export function TabletLandscapeLayout({
         <View style={[styles.flex, styles.audioPlayerContainerHeightLimit]}>
           {/* PlayerImage non-docked */}
           <View style={[styles.flex, withDebug(styles.debugYellow)]}>
-            {!docked ? (
-              <PlayerImage
-                docked={false}
-                entry={entry}
-                configuration={configuration}
-                onLayoutImage={onLayoutImage}
-              />
-            ) : null}
+            <PlayerImage
+              entry={entry}
+              configuration={configuration}
+              onLayoutImage={onLayoutImage}
+            />
           </View>
           {/* PlayerImage */}
 

package/src/Player/AudioLayer/Layout/TabletPortraitLayout.tsx

@@ -144,12 +144,7 @@ export function TabletPortraitLayout({
             ]}
             onLayout={onLayout}
           >
-            <PlayerImage
-              entry={entry}
-              configuration={configuration}
-              docked={docked}
-              imageWidth={imageSize}
-            />
+            <PlayerImage entry={entry} configuration={configuration} />
           </View>
 
           <View

package/src/Player/AudioLayer/utils.ts

@@ -1,10 +1,6 @@
 import { localStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage";
-import {
-  PlayerAnimationStateEnum,
-  PlayerAnimationStateT,
-} from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation/ModalAnimationContext";
+
 import { parseJsonIfNeeded } from "@applicaster/zapp-react-native-utils/functionUtils";
-import { toNumberWithDefaultZero } from "@applicaster/zapp-react-native-utils/numberUtils";
 
 export const NAMESPACE = "audio-player";
 
@@ -36,25 +32,3 @@ export const formatSpeed = (value: number) => {
   // Return the formatted string with "speed_" prefix
   return `speed_${formattedValue}`;
 };
-
-export const calculateBorderRadius = (
-  docked: boolean,
-  startComponentsAnimation: boolean,
-  isActiveGesture: boolean,
-  playerAnimationState: PlayerAnimationStateT,
-  configuration: Record<string, any>
-): number => {
-  const shouldRemoveBorderRadius =
-    (startComponentsAnimation &&
-      isActiveGesture &&
-      playerAnimationState !== PlayerAnimationStateEnum.maximize) ||
-    docked;
-
-  if (shouldRemoveBorderRadius) {
-    return 0;
-  }
-
-  return toNumberWithDefaultZero(
-    configuration.audio_player_artwork_border_radius
-  );
-};

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

@@ -4,8 +4,9 @@ import { Animated, Pressable } from "react-native";
 import { PanGestureHandler } from "react-native-gesture-handler";
 import { useStyles } from "./styles";
 import { useVideoModalState } from "./hooks";
-import { MODAL_COLLAPSE_START, MODAL_RADIUS, SCREEN_HEIGHT } from "./consts";
-import { useModalAnimationContext } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
+import { MODAL_COLLAPSE_RATIO, MODAL_RADIUS } from "./consts";
+import { getWindowHeight } from "./utils";
+import { useSafeAreaFrame } from "react-native-safe-area-context";
 
 type AnimatedModalProps = {
   content?: ReactElement;
@@ -16,33 +17,34 @@ 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 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
   const collapsedOpacity = translateY.interpolate({
-    inputRange: [MODAL_COLLAPSE_START, SCREEN_HEIGHT - collapsedHeight],
+    inputRange: [MODAL_COLLAPSE_START, heightAboveMinimised],
     outputRange: [0, 1],
     extrapolate: "clamp",
   });
 
   const expandedOpacity = translateY.interpolate({
-    inputRange: [0, SCREEN_HEIGHT - collapsedHeight],
+    inputRange: [0, heightAboveMinimised],
     outputRange: [1, 0],
     extrapolate: "clamp",
   });
 
   const borderTopRadiusAnimated = translateY.interpolate({
-    inputRange: [0, SCREEN_HEIGHT - collapsedHeight],
+    inputRange: [0, heightAboveMinimised],
     outputRange: [MODAL_RADIUS, 0],
     extrapolate: "clamp",
   });
@@ -57,7 +59,7 @@ export function AnimatedModal({
             borderTopLeftRadius: borderTopRadiusAnimated,
             borderTopRightRadius: borderTopRadiusAnimated,
             transform: [{ translateY }],
-            height: SCREEN_HEIGHT,
+            height: height,
           },
         ]}
       >
@@ -67,7 +69,6 @@ export function AnimatedModal({
             {
               borderTopLeftRadius: borderTopRadiusAnimated,
               borderTopRightRadius: borderTopRadiusAnimated,
-              height: SCREEN_HEIGHT,
             },
           ]}
         >