@applicaster/zapp-react-native-ui-components 14.0.0-alpha.1661204539 → 14.0.0-alpha.2332850672

package/Components/AudioPlayer/Artwork.tsx

@@ -1,5 +1,16 @@
 import React from "react";
-import { View, Image } from "react-native";
+import { View, Image, StyleSheet } from "react-native";
+import { toNumberWithDefaultZero } from "@applicaster/zapp-react-native-utils/numberUtils";
+
+const styles = StyleSheet.create({
+  container: {
+    marginHorizontal: 24,
+  },
+  image: {
+    width: 400,
+    height: 400,
+  },
+});
 
 type Props = {
   srcImage: string;
@@ -9,25 +20,19 @@ type Props = {
     backgroundColor: string;
     backgroundImage: string;
     isRTL: boolean;
+    artworkBorderRadius: Option<number>;
   };
 };
 
-const containerStyles = {
-  marginHorizontal: 24,
-};
-
-const imageStyles = {
-  width: 400,
-  height: 400,
-};
+export function Artwork({ srcImage, config }: Props) {
+  const borderRadius = toNumberWithDefaultZero(config.artworkBorderRadius);
 
-export function Artwork({ srcImage }: Props) {
   return (
-    <View style={containerStyles}>
+    <View style={styles.container}>
       <Image
         fadeDuration={0}
         source={{ uri: srcImage }}
-        style={imageStyles}
+        style={[styles.image, { borderRadius }]}
         resizeMode="cover"
       />
     </View>

package/Components/AudioPlayer/AudioPlayer.tsx

@@ -1,10 +1,16 @@
 import React, { useCallback, useMemo } from "react";
 
-import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
+import {
+  platformSelect,
+  isTV,
+} from "@applicaster/zapp-react-native-utils/reactUtils";
 
 import { imageSrcFromMediaItem } from "@applicaster/zapp-react-native-utils/configurationUtils";
+import { getBackgroundImage } from "@applicaster/zapp-react-native-utils/audioPlayerUtils";
+
+import { AudioPlayerMobileLayout } from "./AudioPlayerMobileLayout";
+import { AudioPlayerTVLayout } from "./AudioPlayerTVLayout";
 
-import { AudioPlayerLayout } from "./AudioPlayerLayout";
 import { Channel } from "./Channel";
 import { Title } from "./Title";
 import { Summary } from "./Summary";
@@ -52,9 +58,20 @@ type Props = {
 };
 
 export function AudioPlayer(props: Props) {
-  const { audio_item, plugin_configuration, style } = props;
+  const { audio_item, plugin_configuration, style = {} } = props;
   const { extensions, title, summary } = audio_item;
 
+  const mobileConfig = useMemo(() => {
+    const backgroundImage = getBackgroundImage({
+      entry: audio_item,
+      plugin_configuration,
+    });
+
+    return {
+      backgroundImage,
+    };
+  }, [audio_item, plugin_configuration]);
+
   const getProp = useCallback(
     getPropertyFromEntryOrConfig({
       entry: audio_item,
@@ -63,15 +80,17 @@ export function AudioPlayer(props: Props) {
     [audio_item, plugin_configuration]
   );
 
-  const config = useMemo(() => {
+  const tvConfig = useMemo(() => {
     // 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 backgroundImageKey = getProp("audio_player_background_image_key");
     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"
@@ -144,6 +163,7 @@ export function AudioPlayer(props: Props) {
       summaryColor,
       backgroundColor,
       backgroundImage,
+      backgroundImageKey,
       isRTL,
       titleFontFamily,
       titleFontSize,
@@ -154,19 +174,36 @@ export function AudioPlayer(props: Props) {
       artworkAspectRatio,
       channelIcon,
       audioPlayerBackgroundImageDefaultColor,
+      artworkBorderRadius,
     };
   }, [getProp]);
 
   const artwork = imageSrcFromMediaItem(audio_item, [
-    config?.artworkAspectRatio,
+    tvConfig?.artworkAspectRatio,
   ]);
 
+  console.log("debug_2", "AudioPlayer", {
+    tvConfig,
+    mobileConfig,
+    audio_item,
+    plugin_configuration,
+  });
+
+  if (isTV()) {
+    return (
+      <AudioPlayerTVLayout artwork={artwork} config={tvConfig} style={style}>
+        <Channel srcImage={tvConfig?.channelIcon} config={tvConfig} />
+        <Title title={title} config={tvConfig} />
+        <Summary summary={summary} config={tvConfig} />
+        <Runtime {...extensions} config={tvConfig} />
+      </AudioPlayerTVLayout>
+    );
+  }
+
   return (
-    <AudioPlayerLayout artwork={artwork} config={config} style={style || {}}>
-      <Channel srcImage={config?.channelIcon} config={config} />
-      <Title title={title} config={config} />
-      <Summary summary={summary} config={config} />
-      <Runtime {...extensions} config={config} />
-    </AudioPlayerLayout>
+    <AudioPlayerMobileLayout
+      backgroundImage={mobileConfig.backgroundImage}
+      style={style}
+    />
   );
 }

package/Components/AudioPlayer/AudioPlayerMobileLayout.tsx

@@ -0,0 +1,61 @@
+import React, { useRef } from "react";
+import {
+  View,
+  ImageBackground,
+  Animated,
+  ViewStyle,
+  StyleSheet,
+} from "react-native";
+import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
+
+const styles = StyleSheet.create({
+  flex: {
+    flex: 1,
+  },
+});
+
+type Props = {
+  backgroundImage: string;
+  style: ViewStyle;
+};
+
+export function AudioPlayerMobileLayout({ backgroundImage, style }: Props) {
+  const fadeAnimation = useRef(new Animated.Value(0)).current;
+
+  const mainContainerStyles = platformSelect({
+    native: {
+      backgroundColor: "transparent",
+      overflow: "hidden",
+      ...style,
+    },
+  });
+
+  React.useEffect(() => {
+    Animated.timing(fadeAnimation, {
+      toValue: 1,
+      duration: 3000,
+      useNativeDriver: true,
+    }).start();
+  }, []);
+
+  return (
+    <View style={mainContainerStyles} pointerEvents="none">
+      <Animated.View
+        style={[
+          mainContainerStyles,
+          {
+            opacity: fadeAnimation,
+          },
+        ]}
+      >
+        <ImageBackground
+          source={{ uri: backgroundImage }}
+          style={styles.flex}
+          resizeMode="cover"
+        >
+          <View style={mainContainerStyles} />
+        </ImageBackground>
+      </Animated.View>
+    </View>
+  );
+}

package/Components/AudioPlayer/{AudioPlayerLayout.tsx → AudioPlayerTVLayout.tsx}

@@ -1,5 +1,5 @@
-import React, { useRef } from "react";
-import { View, ImageBackground, Animated, ViewStyle } from "react-native";
+import * as React from "react";
+import { View, ImageBackground, ViewStyle } from "react-native";
 
 import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
 
@@ -14,22 +14,18 @@ type Props = {
     backgroundColor: string;
     backgroundImage: string;
     isRTL: boolean;
+    artworkBorderRadius: Option<number>;
   };
   children: React.ReactNode;
   style: ViewStyle;
 };
 
-export function AudioPlayerLayout({ artwork, config, children, style }: Props) {
-  const fadeAnimation = useRef(new Animated.Value(0)).current;
-
-  const fadeAudioPlayerIn = () => {
-    Animated.timing(fadeAnimation, {
-      toValue: 1,
-      duration: 3000,
-      useNativeDriver: true,
-    }).start();
-  };
-
+export function AudioPlayerTVLayout({
+  artwork,
+  config,
+  children,
+  style,
+}: Props) {
   const { isRTL, backgroundColor, backgroundImage } = config;
 
   const backgroundImageSource = { uri: backgroundImage };
@@ -40,17 +36,16 @@ export function AudioPlayerLayout({ artwork, config, children, style }: Props) {
 
   const mainContainerStyles = platformSelect({
     tvos: {
-      width: 1920,
-      height: 1080,
+      width: "100%",
+      height: "100%",
       alignItems: "center",
       justifyContent: "center",
       flexDirection: directionStyles(isRTL).flexDirection,
       backgroundColor: backgroundColorStyle,
     },
     android_tv: {
-      position: "absolute",
-      width: 1920,
-      height: 1080,
+      width: "100%",
+      height: "100%",
       alignItems: "center",
       justifyContent: "center",
       flexDirection: directionStyles(isRTL).flexDirection,
@@ -97,8 +92,8 @@ export function AudioPlayerLayout({ artwork, config, children, style }: Props) {
 
   const backgroundImgStyles = platformSelect({
     tvos: {
-      width: 1920,
-      height: 1080,
+      width: "100%",
+      height: "100%",
       alignItems: "center",
       justifyContent: "center",
     },
@@ -119,9 +114,6 @@ export function AudioPlayerLayout({ artwork, config, children, style }: Props) {
       alignItems: "center",
       justifyContent: "center",
     },
-    native: {
-      flex: 1,
-    },
   });
 
   const textContainerStyles = platformSelect({
@@ -145,58 +137,25 @@ export function AudioPlayerLayout({ artwork, config, children, style }: Props) {
     },
   });
 
-  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>
-  ) : (
+  if (backgroundImageSource?.uri) {
+    return (
+      <ImageBackground
+        source={backgroundImageSource}
+        style={backgroundImgStyles}
+        resizeMode="cover"
+      >
+        <View style={mainContainerStyles}>
+          {!!artwork && <Artwork srcImage={artwork} config={config} />}
+          <View style={textContainerStyles}>{children}</View>
+        </View>
+      </ImageBackground>
+    );
+  }
+
+  return (
     <View style={mainContainerStyles}>
       {!!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/Runtime.tsx

@@ -1,5 +1,6 @@
 import React from "react";
 import { View, Text, ViewStyle, TextStyle } from "react-native";
+import { toNumberWithDefault } from "@applicaster/zapp-react-native-utils/numberUtils";
 import { directionStyles } from "./helpers";
 
 type Props = {
@@ -31,7 +32,7 @@ const textStyles = ({
 }) => ({
   color: summaryColor,
   opacity: 0.8,
-  fontSize: runTimeFontSize ? Number(runTimeFontSize) : 20,
+  fontSize: toNumberWithDefault(20, runTimeFontSize),
   fontFamily: runTimeFontFamily || null,
   ...directionStyles(isRTL),
 });

package/Components/AudioPlayer/Summary.tsx

@@ -1,5 +1,6 @@
 import React from "react";
-import { View, Text, TextStyle } from "react-native";
+import { View, Text, TextStyle, StyleSheet } from "react-native";
+import { toNumberWithDefault } from "@applicaster/zapp-react-native-utils/numberUtils";
 
 type Props = {
   config: {
@@ -14,11 +15,13 @@ type Props = {
   summary: string | number;
 };
 
-const containerStyles = {
-  width: 600,
-  height: 80,
-  marginBottom: 30,
-};
+const styles = StyleSheet.create({
+  container: {
+    width: 600,
+    height: 80,
+    marginBottom: 30,
+  },
+});
 
 const textStyles = ({
   summaryColor,
@@ -26,8 +29,8 @@ const textStyles = ({
   summaryFontFamily,
   summaryFontSize,
 }) => ({
-  textAlign: (isRTL ? "left" : "right") as TextStyle["textAlign"],
-  fontSize: summaryFontSize ? Number(summaryFontSize) : 20,
+  textAlign: (isRTL ? "right" : "left") as TextStyle["textAlign"],
+  fontSize: toNumberWithDefault(20, summaryFontSize),
   color: summaryColor,
   fontWeight: "600" as TextStyle["fontWeight"],
   opacity: 0.8,
@@ -36,7 +39,7 @@ const textStyles = ({
 
 export function Summary({ summary, config }: Props) {
   return (
-    <View style={containerStyles}>
+    <View style={styles.container}>
       <Text style={textStyles(config)} numberOfLines={2}>
         {summary}
       </Text>

package/Components/AudioPlayer/Title.tsx

@@ -1,5 +1,6 @@
 import React from "react";
-import { View, Text, TextStyle } from "react-native";
+import { View, Text, TextStyle, StyleSheet } from "react-native";
+import { toNumberWithDefault } from "@applicaster/zapp-react-native-utils/numberUtils";
 
 type Props = {
   config: {
@@ -14,15 +15,17 @@ type Props = {
   title: string | number;
 };
 
-const containerStyles = {
-  width: 600,
-  height: 100,
-  marginBottom: 12,
-};
+const styles = StyleSheet.create({
+  container: {
+    width: 600,
+    height: 100,
+    marginBottom: 12,
+  },
+});
 
 const textStyles = ({ titleColor, isRTL, titleFontFamily, titleFontSize }) => ({
-  textAlign: (isRTL ? "left" : "right") as TextStyle["textAlign"],
-  fontSize: titleFontSize ? Number(titleFontSize) : 38,
+  textAlign: (isRTL ? "right" : "left") as TextStyle["textAlign"],
+  fontSize: toNumberWithDefault(38, titleFontSize),
   fontWeight: "600" as TextStyle["fontWeight"],
   color: titleColor,
   fontFamily: titleFontFamily || null,
@@ -30,7 +33,7 @@ const textStyles = ({ titleColor, isRTL, titleFontFamily, titleFontSize }) => ({
 
 export function Title({ title, config }: Props) {
   return (
-    <View style={containerStyles}>
+    <View style={styles.container}>
       <Text style={textStyles(config)} numberOfLines={2}>
         {title}
       </Text>

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

@@ -20,7 +20,7 @@ exports[`<Runtime /> LTR renders correctly 1`] = `
         "fontSize": 20,
         "justifyContent": "flex-start",
         "opacity": 0.8,
-        "textAlign": "right",
+        "textAlign": "left",
       }
     }
   >
@@ -49,7 +49,7 @@ exports[`<Runtime /> RTL renders correctly 1`] = `
         "fontSize": 20,
         "justifyContent": "flex-end",
         "opacity": 0.8,
-        "textAlign": "left",
+        "textAlign": "right",
       }
     }
   >

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

@@ -17,10 +17,15 @@ exports[`<Artwork /> renders correctly 1`] = `
       }
     }
     style={
-      {
-        "height": 400,
-        "width": 400,
-      }
+      [
+        {
+          "height": 400,
+          "width": 400,
+        },
+        {
+          "borderRadius": 0,
+        },
+      ]
     }
   />
 </View>

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

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<AudioPlayerLayout /> renders correctly 1`] = `
+exports[`<AudioPlayerMobileLayout /> renders correctly 1`] = `
 <View
   pointerEvents="none"
   style={
@@ -32,7 +32,7 @@ exports[`<AudioPlayerLayout /> renders correctly 1`] = `
         resizeMode="cover"
         source={
           {
-            "uri": "https://example.com",
+            "uri": undefined,
           }
         }
         style={

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

@@ -19,7 +19,7 @@ exports[`<Summary /> renders correctly 1`] = `
         "fontSize": 20,
         "fontWeight": "600",
         "opacity": 0.8,
-        "textAlign": "left",
+        "textAlign": "right",
       }
     }
   >

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

@@ -18,7 +18,7 @@ exports[`<Title /> renders correctly 1`] = `
         "fontFamily": null,
         "fontSize": 38,
         "fontWeight": "600",
-        "textAlign": "left",
+        "textAlign": "right",
       }
     }
   >

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

@@ -0,0 +1,18 @@
+import React from "react";
+import { render } from "@testing-library/react-native";
+
+import { AudioPlayerMobileLayout } from "../AudioPlayerMobileLayout";
+
+const audioPlayerLayoutProps = {
+  backgroundColor: "black",
+};
+
+describe("<AudioPlayerMobileLayout />", () => {
+  it("renders correctly", () => {
+    const { toJSON } = render(
+      <AudioPlayerMobileLayout {...audioPlayerLayoutProps} />
+    );
+
+    expect(toJSON()).toMatchSnapshot();
+  });
+});

package/Components/AudioPlayer/helpers.tsx

@@ -26,14 +26,14 @@ export function getPropertyFromEntryOrConfig({ entry, plugin_configuration }) {
 const LTR = {
   flexDirection: "row",
   justifyContent: "flex-start",
-  textAlign: "right",
+  textAlign: "left",
   alignItems: "flex-end",
 };
 
 const RTL = {
   flexDirection: "row-reverse",
   justifyContent: "flex-end",
-  textAlign: "left",
+  textAlign: "right",
   alignItems: "flex-start",
 };
 

package/Components/GeneralContentScreen/GeneralContentScreen.tsx

@@ -30,7 +30,6 @@ export const GeneralContentScreen = ({
   isScreenWrappedInContainer,
   componentsMapExtraProps = {},
   focused,
-  extraOffset,
   parentFocus,
   containerHeight,
   preferredFocus = false,
@@ -122,7 +121,6 @@ export const GeneralContentScreen = ({
           isScreenWrappedInContainer={isScreenWrappedInContainer}
           parentFocus={parentFocus}
           focused={focused}
-          extraOffset={extraOffset}
           containerHeight={containerHeight}
           preferredFocus={preferredFocus}
           {...componentsMapExtraProps}

package/Components/MasterCell/DefaultComponents/Text/index.tsx

@@ -52,6 +52,7 @@ const _Text = ({
         withScaledLineHeight(withFocusedStyles({ style, otherProps })),
         { height },
       ]}
+      allowFontScaling={false}
       {...withoutLabel(otherProps)}
     >
       {dateTransformEnabled