@applicaster/zapp-react-native-ui-components 14.0.0-alpha.7900711229 → 14.0.0-alpha.9567513212

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

@@ -1,24 +1,60 @@
 import React, { useCallback, useMemo } from "react";
 
 import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
-import { useArtworkImage } 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 artwork = useArtworkImage(audio_item);
-
   const getProp = useCallback(
     getPropertyFromEntryOrConfig({
       entry: audio_item,
@@ -28,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(
@@ -111,17 +152,23 @@ export function AudioPlayerTV(props: Props) {
       summaryFontSize,
       runTimeFontFamily,
       runTimeFontSize,
+      artworkAspectRatio,
       channelIcon,
+      audioPlayerBackgroundImageDefaultColor,
       artworkBorderRadius,
     };
   }, [getProp]);
 
+  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": "background_image_url",
+            "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,11 +1,7 @@
 import React from "react";
 import { render } from "@testing-library/react-native";
 
-import { AudioPlayerTV } from "..";
-
-jest.mock("@applicaster/zapp-react-native-utils/audioPlayerUtils", () => ({
-  useArtworkImage: jest.fn(() => "artwork_url"),
-}));
+import { AudioPlayer } from "../AudioPlayer";
 
 const audioPlayerProps = {
   audio_item: {
@@ -49,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/MasterCell/utils/behaviorProvider.ts

@@ -1,58 +1,28 @@
 import { playerManager } from "@applicaster/zapp-react-native-utils/appUtils";
-import { StorageSingleValueProvider } from "@applicaster/zapp-react-native-utils/storage/StorageSingleSelectProvider";
+import { StorageSingleValueProvider } from "@applicaster/zapp-react-native-bridge/ZappStorage/StorageSingleSelectProvider";
 import { PushTopicManager } from "@applicaster/zapp-react-native-bridge/PushNotifications/PushTopicManager";
-import { StorageMultiSelectProvider } from "@applicaster/zapp-react-native-utils/storage/StorageMultiSelectProvider";
+import { StorageMultiSelectProvider } from "@applicaster/zapp-react-native-bridge/ZappStorage/StorageMultiSelectProvider";
 import React, { useEffect } from "react";
 import { usePlayer } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayer";
 import { BehaviorSubject } from "rxjs";
 import { masterCellLogger } from "../logger";
 import get from "lodash/get";
-import { ScreenMultiSelectProvider } from "@applicaster/zapp-react-native-utils/storage/ScreenStateMultiSelectProvider";
-import { ScreenSingleValueProvider } from "@applicaster/zapp-react-native-utils/storage/ScreenSingleValueProvider";
-import { useRoute } from "@applicaster/zapp-react-native-utils/reactHooks";
-import { useScreenStateStore } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useScreenStateStore";
-
-const parseContextKey = (
-  key: string,
-  context: string = "ctx"
-): string | null => {
-  if (!key?.startsWith(`@{${context}/`)) return null;
-
-  return key.substring(`@{${context}/`.length, key.length - 1);
+
+const parseContextKey = (key: string): string | null => {
+  if (!key?.startsWith("@{ctx/")) return null;
+
+  return key.substring("@{ctx/".length, key.length - 1);
 };
 
 const getDataSourceProvider = (
-  behavior: Behavior,
-  screenRoute: string,
-  screenStateStore: ScreenStateStore
+  behavior: Behavior
 ): BehaviorSubject<string[] | string> | null => {
   if (!behavior) return null;
 
   const selection = String(behavior.current_selection);
-  const screenKey = parseContextKey(selection, "screen");
-
-  if (screenKey) {
-    if (behavior.select_mode === "multi") {
-      return ScreenMultiSelectProvider.getProvider(
-        screenKey,
-        screenRoute,
-        screenStateStore
-      ).getObservable();
-    }
-
-    if (behavior.select_mode === "single") {
-      return ScreenSingleValueProvider.getProvider(
-        screenKey,
-        screenRoute,
-        screenStateStore
-      ).getObservable();
-    }
-  }
-
   const contextKey = parseContextKey(selection);
 
   if (contextKey) {
-    // TODO: Add storage scope to behavior
     if (behavior.select_mode === "multi") {
       return StorageMultiSelectProvider.getProvider(contextKey).getObservable();
     }
@@ -71,8 +41,6 @@ const getDataSourceProvider = (
 
 export const useBehaviorUpdate = (behavior: Behavior) => {
   const [lastUpdate, setLastUpdate] = React.useState<number | null>(null);
-  const screenRoute = useRoute()?.pathname || "";
-  const screenStateStore = useScreenStateStore();
   const player = usePlayer();
 
   const triggerUpdate = () => setLastUpdate(Date.now());
@@ -80,11 +48,7 @@ export const useBehaviorUpdate = (behavior: Behavior) => {
   useEffect(() => {
     if (!behavior) return;
 
-    const dataSource = getDataSourceProvider(
-      behavior,
-      screenRoute,
-      screenStateStore
-    );
+    const dataSource = getDataSourceProvider(behavior);
 
     if (dataSource) {
       const subscription = dataSource.subscribe(triggerUpdate);
@@ -108,17 +72,10 @@ export const useBehaviorUpdate = (behavior: Behavior) => {
 
 // We cant use async in this function (its inside render),
 // so we rely on useBehaviorUpdate to update current value and trigger re-render
-export const isCellSelected = ({
-  item,
-  screenRoute,
-  screenStateStore,
-  behavior,
-}: {
-  item: ZappEntry;
-  screenRoute: string;
-  screenStateStore: ScreenStateStore;
-  behavior?: Behavior;
-}): boolean => {
+export const isCellSelected = (
+  item: ZappEntry,
+  behavior?: Behavior
+): boolean => {
   if (!behavior) return false;
 
   const id = behavior.selector ? get(item, behavior.selector) : item.id;
@@ -142,32 +99,7 @@ export const isCellSelected = ({
   }
 
   const selection = String(behavior.current_selection);
-
-  const screenKey = parseContextKey(selection, "screen");
-
-  if (screenKey) {
-    if (behavior.select_mode === "single") {
-      const selectedItem = ScreenSingleValueProvider.getProvider(
-        screenKey,
-        screenRoute,
-        screenStateStore
-      ).getValue();
-
-      return selectedItem === String(id);
-    }
-
-    if (behavior.select_mode === "multi") {
-      const selectedItems = ScreenMultiSelectProvider.getProvider(
-        screenKey,
-        screenRoute,
-        screenStateStore
-      ).getSelectedItems();
-
-      return selectedItems?.includes(String(id));
-    }
-  }
-
-  const contextKey = parseContextKey(selection, "ctx");
+  const contextKey = parseContextKey(selection);
 
   if (contextKey) {
     if (behavior.select_mode === "single") {

package/Components/MasterCell/utils/index.ts

@@ -8,8 +8,6 @@ import { masterCellLogger } from "../logger";
 import { getCellState } from "../../Cell/utils";
 import { getColorFromData } from "@applicaster/zapp-react-native-utils/cellUtils";
 import { isCellSelected, useBehaviorUpdate } from "./behaviorProvider";
-import { useRoute } from "@applicaster/zapp-react-native-utils/reactHooks";
-import { useScreenStateStore } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useScreenStateStore";
 
 const hasElementSpecificViewType = (viewType) => (element) => {
   if (R.isNil(element)) {
@@ -192,18 +190,8 @@ export const getFocusedButtonId = (focusable) => {
   });
 };
 
-export const isSelected = ({
-  item,
-  screenRoute,
-  screenStateStore,
-  behavior,
-}: {
-  item: ZappEntry;
-  screenRoute: string;
-  screenStateStore: ScreenStateStore;
-  behavior?: Behavior;
-}) => {
-  return isCellSelected({ item, screenRoute, screenStateStore, behavior });
+export const isSelected = (item: ZappEntry, behavior?: Behavior) => {
+  return isCellSelected(item, behavior);
 };
 
 export const useCellState = ({
@@ -216,17 +204,9 @@ export const useCellState = ({
   focused: boolean;
 }): CellState => {
   const lastUpdate = useBehaviorUpdate(behavior);
-  const router = useRoute();
-  const screenStateStore = useScreenStateStore();
 
   const _isSelected = useMemo(
-    () =>
-      isSelected({
-        item,
-        screenRoute: router?.pathname,
-        screenStateStore,
-        behavior,
-      }),
+    () => isSelected(item, behavior),
     [behavior, item, lastUpdate]
   );