@applicaster/zapp-react-native-ui-components 14.0.0-alpha.4011674803 → 14.0.0-alpha.4077517019

package/Components/AudioPlayer/{tv/index.tsx → AudioPlayer.tsx}

@@ -1,20 +1,58 @@
 import React, { useCallback, useMemo } from "react";
 
 import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
-import { getArtworkImage } from "@applicaster/zapp-react-native-utils/audioPlayerUtils";
 
-import { AudioPlayerTVLayout } from "./Layout";
+import { imageSrcFromMediaItem } from "@applicaster/zapp-react-native-utils/configurationUtils";
 
+import { AudioPlayerLayout } from "./AudioPlayerLayout";
 import { Channel } from "./Channel";
 import { Title } from "./Title";
 import { Summary } from "./Summary";
 import { Runtime } from "./Runtime";
 import { getPropertyFromEntryOrConfig } from "./helpers";
-
-import { Props } from "../types";
-
-export function AudioPlayerTV(props: Props) {
-  const { audio_item, plugin_configuration, style = {} } = props;
+import { ViewStyle } from "react-native";
+
+type Props = {
+  audio_item: ZappEntry & {
+    extensions?: {
+      audio_player_artwork_aspect_ratio?: string;
+      audio_player_background_image?: string;
+      audio_player_background_color?: string;
+      audio_player_channel_icon?: string;
+      audio_player_title_color?: string;
+      audio_player_summary_color?: string;
+      audio_player_rtl?: boolean;
+      audio_player_background_image_default_color?: string;
+      start_time?: string;
+      end_time?: string;
+    };
+  };
+  plugin_configuration: {
+    audio_player_background_color?: string;
+    audio_player_title_color?: string;
+    audio_player_summary_color?: string;
+    audio_player_rtl?: string;
+    audio_player_background_image_default_color?: string;
+    audio_player_background_image?: string;
+    audio_player_artwork_aspect_ratio?: string;
+    lg_tv_audio_player_title_font_family?: string;
+    lg_tv_audio_player_title_font_size?: number;
+    lg_tv_audio_player_summary_font_family?: string;
+    lg_tv_audio_player_summary_font_size?: number;
+    samsung_tv_audio_player_title_font_family?: string;
+    samsung_tv_audio_player_title_font_size?: number;
+    samsung_tv_audio_player_summary_font_family?: string;
+    samsung_tv_audio_player_summary_font_size?: number;
+    tv_os_audio_player_title_font_family?: string;
+    tv_os_audio_player_title_font_size?: number;
+    tv_os_audio_player_summary_font_family?: string;
+    tv_os_audio_player_summary_font_size?: number;
+  };
+  style?: ViewStyle;
+};
+
+export function AudioPlayer(props: Props) {
+  const { audio_item, plugin_configuration } = props;
   const { extensions, title, summary } = audio_item;
 
   const getProp = useCallback(
@@ -26,15 +64,20 @@ export function AudioPlayerTV(props: Props) {
   );
 
   const config = useMemo(() => {
-    // Checking if we are receiving items from the DSP
+    // Checking if we are recieving items from the DSP
     const titleColor = getProp("audio_player_title_color");
     const summaryColor = getProp("audio_player_summary_color");
     const backgroundColor = getProp("audio_player_background_color");
     const backgroundImage = getProp("audio_player_background_image");
+    const artworkAspectRatio = getProp("audio_player_artwork_aspect_ratio");
     const channelIcon = getProp("audio_player_channel_icon");
     const rtlFlag = getProp("audio_player_rtl");
     const artworkBorderRadius = getProp("audio_player_artwork_border_radius");
 
+    const audioPlayerBackgroundImageDefaultColor = getProp(
+      "audio_player_background_image_default_color"
+    );
+
     const isRTL = rtlFlag === "1" || rtlFlag === "true" || rtlFlag === true;
 
     const titleFontFamily = getProp(
@@ -109,31 +152,23 @@ export function AudioPlayerTV(props: Props) {
       summaryFontSize,
       runTimeFontFamily,
       runTimeFontSize,
+      artworkAspectRatio,
       channelIcon,
+      audioPlayerBackgroundImageDefaultColor,
       artworkBorderRadius,
     };
   }, [getProp]);
 
-  const artwork = getArtworkImage({
-    key: "audio_player_artwork_image_key",
-    entry: audio_item,
-    plugin_configuration,
-  });
-
-  // console.log("debug_2", "AudioPlayer", {
-  //   config,
-  //   // mobileConfig,
-  //   audio_item,
-  //   plugin_configuration,
-  //   artwork,
-  // });
+  const artwork = imageSrcFromMediaItem(audio_item, [
+    config?.artworkAspectRatio,
+  ]);
 
   return (
-    <AudioPlayerTVLayout artwork={artwork} config={config} style={style}>
+    <AudioPlayerLayout artwork={artwork} config={config}>
       <Channel srcImage={config?.channelIcon} config={config} />
       <Title title={title} config={config} />
       <Summary summary={summary} config={config} />
       <Runtime {...extensions} config={config} />
-    </AudioPlayerTVLayout>
+    </AudioPlayerLayout>
   );
 }

package/Components/AudioPlayer/{tv/Layout.tsx → AudioPlayerLayout.tsx}

@@ -1,5 +1,5 @@
-import * as React from "react";
-import { View, ImageBackground, ViewStyle } from "react-native";
+import React, { useRef } from "react";
+import { View, ImageBackground, Animated } from "react-native";
 
 import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
 
@@ -7,30 +7,34 @@ import { Artwork } from "./Artwork";
 import { directionStyles } from "./helpers";
 
 type Props = {
-  artwork: string;
+  artwork?: string;
   config: {
     titleColor: string;
     summaryColor: string;
     backgroundColor: string;
-    backgroundImage: Option<string>;
+    backgroundImage: string;
     isRTL: boolean;
     artworkBorderRadius: Option<number>;
   };
   children: React.ReactNode;
-  style: ViewStyle;
 };
 
-export function AudioPlayerTVLayout({
-  artwork,
-  config,
-  children,
-  style,
-}: Props) {
+export function AudioPlayerLayout({ artwork, config, children }: Props) {
+  const fadeAnimation = useRef(new Animated.Value(0)).current;
+
+  const fadeAudioPlayerIn = () => {
+    Animated.timing(fadeAnimation, {
+      toValue: 1,
+      duration: 3000,
+      useNativeDriver: true,
+    }).start();
+  };
+
   const { isRTL, backgroundColor, backgroundImage } = config;
 
-  const backgroundImageSource = { uri: backgroundImage };
+  const backgroundImageSource = { uri: backgroundImage || artwork };
 
-  const backgroundColorStyle = backgroundImage
+  const backgroundColorStyle = backgroundImageSource.uri
     ? "transparent"
     : backgroundColor;
 
@@ -62,7 +66,8 @@ export function AudioPlayerTVLayout({
     native: {
       backgroundColor: backgroundColorStyle,
       overflow: "hidden",
-      ...style,
+      width: "100%",
+      height: "100%",
     },
     samsung_tv: {
       position: "absolute",
@@ -114,6 +119,9 @@ export function AudioPlayerTVLayout({
       alignItems: "center",
       justifyContent: "center",
     },
+    native: {
+      flex: 1,
+    },
   });
 
   const textContainerStyles = platformSelect({
@@ -137,25 +145,58 @@ export function AudioPlayerTVLayout({
     },
   });
 
-  if (backgroundImage) {
-    return (
-      <ImageBackground
-        source={backgroundImageSource}
-        style={backgroundImgStyles}
-        resizeMode="cover"
-      >
-        <View style={mainContainerStyles}>
-          <Artwork srcImage={artwork} config={config} />
-          <View style={textContainerStyles}>{children}</View>
-        </View>
-      </ImageBackground>
-    );
-  }
-
-  return (
+  const audioPlayerLayoutTV = backgroundImageSource?.uri ? (
+    <ImageBackground
+      source={backgroundImageSource}
+      style={backgroundImgStyles}
+      resizeMode="cover"
+    >
+      <View style={mainContainerStyles}>
+        {!!artwork && <Artwork srcImage={artwork} config={config} />}
+        <View style={textContainerStyles}>{children}</View>
+      </View>
+    </ImageBackground>
+  ) : (
     <View style={mainContainerStyles}>
-      <Artwork srcImage={artwork} config={config} />
+      {!!artwork && <Artwork srcImage={artwork} config={config} />}
       <View style={textContainerStyles}>{children}</View>
     </View>
   );
+
+  const audioPlayerLayoutMobile = () => {
+    fadeAudioPlayerIn();
+
+    return (
+      <View style={mainContainerStyles} pointerEvents="none">
+        <Animated.View
+          style={[
+            mainContainerStyles,
+            {
+              opacity: fadeAnimation,
+            },
+          ]}
+        >
+          <ImageBackground
+            source={backgroundImageSource}
+            style={backgroundImgStyles}
+            resizeMode="cover"
+          >
+            <View style={mainContainerStyles} />
+          </ImageBackground>
+        </Animated.View>
+      </View>
+    );
+  };
+
+  const audioPlayerLayout = platformSelect({
+    tvos: audioPlayerLayoutTV,
+    android_tv: audioPlayerLayoutTV,
+    web: audioPlayerLayoutTV,
+    samsung_tv: audioPlayerLayoutTV,
+    lg_tv: audioPlayerLayoutTV,
+    ios: audioPlayerLayoutMobile(),
+    android: audioPlayerLayoutMobile(),
+  });
+
+  return audioPlayerLayout;
 }

package/Components/AudioPlayer/{mobile/__tests__/__snapshots__/audioPlayerMobileLayout.test.js.snap → __tests__/__snapshots__/audioPlayer.test.js.snap}

@@ -1,12 +1,14 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<AudioPlayerMobileLayout /> renders correctly 1`] = `
+exports[`<AudioPlayer /> renders correctly 1`] = `
 <View
   pointerEvents="none"
   style={
     {
       "backgroundColor": "transparent",
+      "height": "100%",
       "overflow": "hidden",
+      "width": "100%",
     }
   }
 >
@@ -15,8 +17,10 @@ exports[`<AudioPlayerMobileLayout /> renders correctly 1`] = `
     style={
       {
         "backgroundColor": "transparent",
+        "height": "100%",
         "opacity": 0,
         "overflow": "hidden",
+        "width": "100%",
       }
     }
   >
@@ -32,7 +36,7 @@ exports[`<AudioPlayerMobileLayout /> renders correctly 1`] = `
         resizeMode="cover"
         source={
           {
-            "uri": undefined,
+            "uri": "https://example.com",
           }
         }
         style={
@@ -56,7 +60,9 @@ exports[`<AudioPlayerMobileLayout /> renders correctly 1`] = `
         style={
           {
             "backgroundColor": "transparent",
+            "height": "100%",
             "overflow": "hidden",
+            "width": "100%",
           }
         }
       />

package/Components/AudioPlayer/__tests__/__snapshots__/audioPlayerLayout.test.js.snap

@@ -0,0 +1,72 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<AudioPlayerLayout /> renders correctly 1`] = `
+<View
+  pointerEvents="none"
+  style={
+    {
+      "backgroundColor": "transparent",
+      "height": "100%",
+      "overflow": "hidden",
+      "width": "100%",
+    }
+  }
+>
+  <View
+    collapsable={false}
+    style={
+      {
+        "backgroundColor": "transparent",
+        "height": "100%",
+        "opacity": 0,
+        "overflow": "hidden",
+        "width": "100%",
+      }
+    }
+  >
+    <View
+      accessibilityIgnoresInvertColors={true}
+      style={
+        {
+          "flex": 1,
+        }
+      }
+    >
+      <Image
+        resizeMode="cover"
+        source={
+          {
+            "uri": "https://example.com",
+          }
+        }
+        style={
+          [
+            {
+              "bottom": 0,
+              "left": 0,
+              "position": "absolute",
+              "right": 0,
+              "top": 0,
+            },
+            {
+              "height": undefined,
+              "width": undefined,
+            },
+            undefined,
+          ]
+        }
+      />
+      <View
+        style={
+          {
+            "backgroundColor": "transparent",
+            "height": "100%",
+            "overflow": "hidden",
+            "width": "100%",
+          }
+        }
+      />
+    </View>
+  </View>
+</View>
+`;

package/Components/AudioPlayer/{tv/__tests__ → __tests__}/audioPlayer.test.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { render } from "@testing-library/react-native";
 
-import { AudioPlayerTV } from "..";
+import { AudioPlayer } from "../AudioPlayer";
 
 const audioPlayerProps = {
   audio_item: {
@@ -45,9 +45,9 @@ const audioPlayerProps = {
   styles: {},
 };
 
-describe("<AudioPlayerTV />", () => {
+describe("<AudioPlayer />", () => {
   it("renders correctly", () => {
-    const { toJSON } = render(<AudioPlayerTV {...audioPlayerProps} />);
+    const { toJSON } = render(<AudioPlayer {...audioPlayerProps} />);
     expect(toJSON()).toMatchSnapshot();
   });
 });

package/Components/AudioPlayer/__tests__/audioPlayerLayout.test.js

@@ -0,0 +1,26 @@
+import React from "react";
+import { render } from "@testing-library/react-native";
+
+import { AudioPlayerLayout } from "../AudioPlayerLayout";
+
+const audioPlayerLayoutProps = {
+  artwork: "string",
+  config: {
+    titleColor: "white",
+    summaryColor: "white",
+    backgroundColor: "black",
+    backgroundImage: "https://example.com",
+    isRTL: true,
+  },
+  children: [],
+};
+
+describe("<AudioPlayerLayout />", () => {
+  it("renders correctly", () => {
+    const { toJSON } = render(
+      <AudioPlayerLayout {...audioPlayerLayoutProps} />
+    );
+
+    expect(toJSON()).toMatchSnapshot();
+  });
+});

package/Components/AudioPlayer/{tv/helpers.tsx → helpers.tsx}

@@ -2,8 +2,9 @@ const defaults = {
   audio_player_title_color: "white",
   audio_player_summary_color: "white",
   audio_player_background_color: "black",
-  audio_player_background_image: undefined,
+  audio_player_artwork_aspect_ratio: "1:1",
   audio_player_rtl: false,
+  audio_player_background_image_default_color: "",
 };
 
 export function getPropertyFromEntryOrConfig({ entry, plugin_configuration }) {

package/Components/AudioPlayer/index.ts

@@ -0,0 +1 @@
+export { AudioPlayer } from "./AudioPlayer";

package/Components/PlayerContainer/PlayerContainer.tsx

@@ -88,7 +88,7 @@ export const VideoModalMode = {
   MAXIMIZED: "MAXIMIZED",
   MINIMIZED: "MINIMIZED",
   FULLSCREEN: "FULLSCREEN",
-};
+} as const;
 
 export type PlayNextData = {
   state: PlayNextState;
@@ -127,7 +127,7 @@ const webStyles = {
   playerScreen: {
     flex: 1,
     height: "100vh",
-    background: "black",
+    backgroundColor: "black",
   },
   playerWrapper: {
     height: "100%",
@@ -148,7 +148,6 @@ const nativeStyles = {
   },
   playerScreen: {
     flex: 1,
-    backgroundColor: "black",
     overflow: "hidden",
   },
   playerWrapper: {
@@ -568,8 +567,9 @@ const PlayerContainerComponent = (props: Props) => {
   const isInlineTV = isInlineTVUtil(screenData);
 
   const inline =
-    [VideoModalMode.MAXIMIZED, VideoModalMode.MINIMIZED].includes(mode) ||
-    isInlineTV;
+    [VideoModalMode.MAXIMIZED, VideoModalMode.MINIMIZED].includes(
+      mode as any
+    ) || isInlineTV;
 
   const value = React.useMemo(
     () => ({ playerId: state.playerId }),
@@ -590,7 +590,11 @@ const PlayerContainerComponent = (props: Props) => {
       );
     }
 
-    if (screen_background_color && mode !== VideoModalMode.FULLSCREEN) {
+    if (
+      screen_background_color &&
+      mode !== VideoModalMode.FULLSCREEN &&
+      isTV()
+    ) {
       updatedStyles.playerScreen.backgroundColor = screen_background_color;
     }
 
@@ -620,6 +624,8 @@ const PlayerContainerComponent = (props: Props) => {
     playNextData,
   };
 
+  const pointerEventsProp = mode === "MINIMIZED" ? "box-none" : "auto";
+
   return (
     <PlayerStateContext.Provider value={value}>
       <PlayerContainerContextProvider
@@ -640,14 +646,17 @@ const PlayerContainerComponent = (props: Props) => {
                 preferredFocus
                 shouldUsePreferredFocus
                 groupId={groupId}
+                pointerEvents={pointerEventsProp}
               >
                 {/* Video player and components */}
                 <View
                   style={styles.playerScreen}
                   testID={"player-screen-container"}
+                  pointerEvents={pointerEventsProp}
                 >
                   {/* Player container */}
                   <View
+                    pointerEvents={pointerEventsProp}
                     style={[
                       styles.playerWrapper,
                       // eslint-disable-next-line react-native/no-inline-styles, react-native/no-color-literals

package/Components/VideoModal/ModalAnimation/ModalAnimationContext.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect } from "react";
-import { Animated } from "react-native";
+import { Animated, Dimensions } from "react-native";
 
 import {
   useSafeAreaInsets,
@@ -23,6 +23,7 @@ export enum PlayerAnimationStateEnum {
 export type PlayerAnimationStateT = number | PlayerAnimationStateEnum | null;
 
 export type ModalAnimationContextT = {
+  yTranslate: React.MutableRefObject<Animated.Value | null>;
   isActiveGesture: boolean;
   playerAnimationState: PlayerAnimationStateT;
   setPlayerAnimationState: (value: PlayerAnimationStateT) => void;
@@ -48,6 +49,7 @@ export type ModalAnimationContextT = {
 };
 
 export const ReactContext = React.createContext<ModalAnimationContextT>({
+  yTranslate: React.createRef<Animated.Value | null>(),
   isActiveGesture: false,
   playerAnimationState: null,
   setPlayerAnimationState: () => null,
@@ -73,6 +75,10 @@ export const ReactContext = React.createContext<ModalAnimationContextT>({
 });
 
 const Provider = ({ children }: { children: React.ReactNode }) => {
+  const yTranslate = React.useRef(
+    new Animated.Value(Dimensions.get("window").height)
+  );
+
   const [playerAnimationState, setPlayerAnimationState] =
     React.useState<PlayerAnimationStateT>(null);
 
@@ -100,6 +106,7 @@ const Provider = ({ children }: { children: React.ReactNode }) => {
     // Reset player animation state when video modal is closed
     if (!visible) {
       resetPlayerAnimationState();
+      yTranslate.current?.setValue(Dimensions.get("window").height);
     }
   }, [visible, resetPlayerAnimationState]);
 
@@ -141,6 +148,7 @@ const Provider = ({ children }: { children: React.ReactNode }) => {
   return (
     <ReactContext.Provider
       value={{
+        yTranslate,
         startComponentsAnimation,
         setStartComponentsAnimation,
         isActiveGesture: playerAnimationState !== null,

package/Components/VideoModal/PlayerDetails.tsx

@@ -11,6 +11,8 @@ import { useTargetScreenData } from "@applicaster/zapp-react-native-utils/reactH
 import { ComponentsMap } from "@applicaster/zapp-react-native-ui-components/Components/River/ComponentsMap";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { isNilOrEmpty } from "@applicaster/zapp-react-native-utils/reactUtils/helpers";
+import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
+import { useDelayedPlayerDetails } from "./hooks";
 
 const { width: SCREEN_WIDTH } = Dimensions.get("screen");
 
@@ -26,6 +28,10 @@ type Props = {
   isTabletLandscape?: boolean;
   isAudioPlayer?: boolean;
   isTablet?: boolean;
+  inline?: any;
+  docked?: boolean;
+  isModal?: boolean;
+  pip?: boolean;
 };
 
 const containerStyle = ({
@@ -42,8 +48,24 @@ export const PlayerDetails = ({
   configuration,
   isTabletLandscape = false,
   isAudioPlayer,
-  isTablet = false,
+  inline,
+  docked,
+  isModal,
+  pip,
 }: Props) => {
+  const isInlineModal = inline && isModal;
+
+  // Mounting the PlayerDetails component is a resource-intensive process.
+  // Therefore, for performance reasons, we mount it with a delay to make the rotation process as smooth as possible.
+  // The flow is as follows: the rotation occurs first, and then, after a short delay, we mount the PlayerDetails component.
+  // This helps to avoid blocking the rotation and any animations related to the rotation.
+  const isShowPlayerDetails = useDelayedPlayerDetails({
+    isInline: isInlineModal,
+    isDocked: docked,
+    isPip: pip,
+  });
+
+  const isTablet = useIsTablet();
   const screenData = useTargetScreenData(entry);
   const insets = useSafeAreaInsets();
 
@@ -79,7 +101,7 @@ export const PlayerDetails = ({
     }
   }, [isAudioPlayer]);
 
-  if (isNilOrEmpty(screenData?.ui_components)) {
+  if (isNilOrEmpty(screenData?.ui_components) || !isShowPlayerDetails) {
     return null;
   }