@applicaster/zapp-react-native-ui-components 13.0.0-alpha.3322736490 → 13.0.0-alpha.3332871333

package/Components/CellRendererResolver/index.ts

@@ -1,4 +1,5 @@
 import { findPluginByIdentifier } from "@applicaster/zapp-react-native-utils/pluginUtils";
+import { isGroup } from "@applicaster/zapp-react-native-utils/componentsUtils";
 
 import { componentsLogger } from "../../Helpers/logger";
 import defaultCellRenderer from "../default-cell-renderer";
@@ -80,7 +81,7 @@ export function CellRendererResolver({
 }: Props) {
   const cellRendererPlugin = getRendererPlugin(component, plugins, cellStyles);
 
-  if (!cellRendererPlugin && component.component_type !== "group-qb") {
+  if (!cellRendererPlugin && !isGroup(component)) {
     logger.warning({
       message: "Could not resolve cell builder plugin",
       data: { component },

package/Components/Layout/TV/LayoutBackground.tsx

@@ -0,0 +1,28 @@
+import React from "react";
+import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks/usePickFromState";
+import { getBackgroundImageUrl } from "../utils";
+import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
+
+export const LayoutBackground = ({
+  Background,
+  children,
+}: {
+  Background: React.ComponentType<any>;
+  children: React.ReactNode;
+}) => {
+  const theme = useTheme();
+
+  const { remoteConfigurations } = usePickFromState(["remoteConfigurations"]);
+
+  const backgroundColor = theme.app_background_color;
+  const backgroundImageUrl = getBackgroundImageUrl(remoteConfigurations);
+
+  return (
+    <Background
+      backgroundColor={backgroundColor}
+      backgroundImageUrl={backgroundImageUrl}
+    >
+      {children}
+    </Background>
+  );
+};

package/Components/Layout/TV/ScreenContainer.tsx

@@ -22,7 +22,6 @@ import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
 import { NavBarContainer } from "./NavBarContainer";
 
 type ComponentsExtraProps = {
-  Background?: Record<string, any>;
   NavBar?: Record<string, any>;
 };
 

package/Components/Layout/TV/__tests__/__snapshots__/index.test.tsx.snap

@@ -2,18 +2,23 @@
 
 exports[`Layout TV renders 1`] = `
 <View
-  excludeFromFocusSearching={true}
-  id="/river/A1234"
-  preferredFocus={true}
+  backgroundColor="#000000"
+  testID="background-component"
 >
   <View
-    Components={
-      {
-        "Background": [Function],
-        "NavBar": [Function],
+    excludeFromFocusSearching={true}
+    id="/river/A1234"
+    preferredFocus={true}
+  >
+    <View
+      Components={
+        {
+          "Background": [Function],
+          "NavBar": [Function],
+        }
       }
-    }
-    route="/river/A1234"
-  />
+      route="/river/A1234"
+    />
+  </View>
 </View>
 `;

package/Components/Layout/TV/__tests__/index.test.tsx

@@ -5,6 +5,14 @@ import { render } from "@testing-library/react-native";
 import { Provider } from "react-redux";
 import { NavigationContext } from "@applicaster/zapp-react-native-ui-components/Contexts/NavigationContext";
 import configureStore from "redux-mock-store";
+import Layout from "../index.web";
+
+// mock useTheme to provide app_background_color
+jest.mock("@applicaster/zapp-react-native-utils/theme", () => ({
+  useTheme: () => ({
+    app_background_color: "#000000",
+  }),
+}));
 
 const withoutChildren = omit(["children"]);
 
@@ -16,8 +24,6 @@ jest.mock("../../../Screen/TV/index.web", () => {
   };
 });
 
-const Layout = require("../index.web").default;
-
 const mockStore = configureStore()({
   appState: { appReady: true },
 });

package/Components/Layout/TV/index.tsx

@@ -1,10 +1,7 @@
 import * as React from "react";
-import * as R from "ramda";
 import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
 import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
-import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
 
-import { getBackgroundImageUrl } from "../utils";
 import { LayoutContainer } from "./LayoutContainer";
 import { ScreenContainer } from "./ScreenContainer";
 
@@ -12,6 +9,7 @@ import { ScreenLayoutContextProvider } from "./ScreenLayoutContextProvider";
 import { PathnameContext } from "../../../Contexts/PathnameContext";
 import { ScreenDataContext } from "../../../Contexts/ScreenDataContext";
 import { ScreenContextProvider } from "../../../Contexts/ScreenContext";
+import { LayoutBackground } from "./LayoutBackground";
 
 type Components = {
   NavBar: React.ComponentType<any>;
@@ -19,7 +17,6 @@ type Components = {
 };
 
 type ComponentsExtraProps = {
-  Background?: Record<string, any>;
   NavBar?: Record<string, any>;
 };
 
@@ -31,17 +28,10 @@ type Props = {
 
 const Layout = ({ Components, ComponentsExtraProps, children }: Props) => {
   const navigator = useNavigation();
-  const theme = useTheme();
 
-  const { appState: { appReady = false } = {}, remoteConfigurations } =
-    usePickFromState(["appState", "remoteConfigurations", "plugins"]);
-
-  const backgroundColor = React.useMemo(() => theme.app_background_color, []);
-
-  const backgroundImageUrl = React.useMemo(
-    () => getBackgroundImageUrl(remoteConfigurations),
-    [remoteConfigurations]
-  );
+  const { appState: { appReady = false } = {} } = usePickFromState([
+    "appState",
+  ]);
 
   if (!appReady) {
     return null;
@@ -50,11 +40,7 @@ const Layout = ({ Components, ComponentsExtraProps, children }: Props) => {
   return (
     <LayoutContainer>
       <ScreenLayoutContextProvider>
-        <Components.Background
-          backgroundColor={backgroundColor}
-          backgroundImageUrl={backgroundImageUrl}
-          {...R.omit(["ref"])(ComponentsExtraProps?.Background)}
-        >
+        <LayoutBackground Background={Components.Background}>
           <ScreenDataContext.Provider value={navigator.data}>
             <PathnameContext.Provider value={navigator.currentRoute}>
               <ScreenContextProvider pathname={navigator.currentRoute}>
@@ -67,7 +53,7 @@ const Layout = ({ Components, ComponentsExtraProps, children }: Props) => {
               </ScreenContextProvider>
             </PathnameContext.Provider>
           </ScreenDataContext.Provider>
-        </Components.Background>
+        </LayoutBackground>
       </ScreenLayoutContextProvider>
     </LayoutContainer>
   );

package/Components/Layout/TV/index.web.tsx

@@ -5,6 +5,7 @@ import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
 
 import { ScreenLayoutContextProvider } from "./ScreenLayoutContextProvider";
 import { StackNavigator } from "../../Navigator";
+import { LayoutBackground } from "./LayoutBackground";
 
 type Components = {
   NavBar: React.ComponentType<any>;
@@ -25,7 +26,9 @@ const Layout = ({ Components }: Props) => {
 
   return (
     <ScreenLayoutContextProvider>
-      <StackNavigator Components={Components} />
+      <LayoutBackground Background={Components.Background}>
+        <StackNavigator Components={Components} />
+      </LayoutBackground>
     </ScreenLayoutContextProvider>
   );
 };

package/Components/ModalComponent/BottomSheetModalContent.tsx

@@ -10,13 +10,11 @@ import { Button } from "./Button";
 import { ItemIconProps } from "./Button/ItemIcon";
 import { ItemProps } from "./Button/Item";
 import { ItemLabelProps } from "./Button/ItemLabel";
-import {
-  defaultItemIconProps,
-  defaultItemLabelProps,
-  defaultItemProps,
-} from "./utils";
+import { getItemIconProps, getItemLabelProps, getItemProps } from "./utils";
 import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
 
+import type { PluginConfiguration } from "./";
+
 import { ModalHeader } from "./Header";
 
 type ModalComponentProps = {
@@ -30,6 +28,20 @@ type ModalComponentProps = {
   maxHeight?: number;
   dismiss: () => void;
   buttonComponent?: React.ComponentType;
+  iconProps?: ItemIconProps | ((theme: PluginConfiguration) => ItemIconProps);
+  itemProps?:
+    | ItemProps
+    | ((theme: PluginConfiguration, width: number) => ItemProps);
+  labelProps?:
+    | ItemLabelProps
+    | ((theme: PluginConfiguration, width: number) => ItemLabelProps);
+  getSelectedItemIcon: (
+    theme: PluginConfiguration
+  ) => ItemIconProps["asset"] | null;
+  getDefaultItemIcon: (
+    theme: PluginConfiguration
+  ) => ItemIconProps["asset"] | null;
+  iconPlacement?: "left" | "right";
 };
 
 export function BottomSheetModalContent(props: ModalComponentProps) {
@@ -43,14 +55,20 @@ export function BottomSheetModalContent(props: ModalComponentProps) {
     summary,
     title,
     buttonComponent: ButtonComponent = Button,
+    getSelectedItemIcon = (theme) =>
+      theme.modal_bottom_sheet_item_selected_icon,
+    getDefaultItemIcon = () => null,
+    iconPlacement,
   } = props;
 
   const [headerHeight, setHeaderHeight] = useState(0);
   const route = useRef(currentRoute);
   const theme = useTheme<BaseThemePropertiesMobile>();
+  const paddingTop = Number(theme.modal_bottom_sheet_padding_top);
+  const paddingBottom = Number(theme.modal_bottom_sheet_padding_bottom);
 
   const maxContentHeight = maxHeight
-    ? maxHeight - headerHeight - Number(theme.modal_bottom_sheet_padding_top)
+    ? maxHeight - headerHeight - paddingTop
     : undefined;
 
   const onHeaderLayout = useCallback((event: LayoutChangeEvent) => {
@@ -64,26 +82,30 @@ export function BottomSheetModalContent(props: ModalComponentProps) {
   }, [currentRoute]);
 
   const iconBaseProps = useMemo<ItemIconProps>(() => {
-    return defaultItemIconProps(theme);
-  }, [theme]);
+    return getItemIconProps(theme, props.iconProps);
+  }, [theme, props.iconProps]);
 
   const itemBaseProps = useMemo<ItemProps>(() => {
-    return defaultItemProps(theme, props.width);
-  }, [theme, props.width]);
+    return getItemProps(theme, props.width, props.itemProps);
+  }, [theme, props.width, props.itemProps]);
 
   const labelBaseProps = useMemo<ItemLabelProps>(() => {
-    return defaultItemLabelProps(theme, props.width);
-  }, [theme, props.width]);
+    return getItemLabelProps(theme, props.width, props.labelProps);
+  }, [theme, props.width, props.labelProps]);
 
-  const handlePress = (item: any) => {
-    onPress(item);
-    dismiss();
-  };
+  const handlePress = useCallback(
+    (item: any) => {
+      onPress(item);
+      dismiss();
+    },
+    [onPress, dismiss]
+  );
 
   return (
     <View
       style={{
-        paddingTop: Number(theme.modal_bottom_sheet_padding_top),
+        maxWidth: props.width,
+        paddingTop,
       }}
     >
       <ModalHeader
@@ -98,8 +120,8 @@ export function BottomSheetModalContent(props: ModalComponentProps) {
         bounces={false}
         style={{ maxHeight: maxContentHeight }}
         contentContainerStyle={{
-          paddingBottom: Number(theme.modal_bottom_sheet_padding_bottom),
-          paddingTop: Number(theme.modal_bottom_sheet_padding_top),
+          paddingBottom,
+          paddingTop,
         }}
       >
         {items.map((item, index) => (
@@ -110,9 +132,13 @@ export function BottomSheetModalContent(props: ModalComponentProps) {
             selectedItem={current_selection}
             item={item}
             onPress={handlePress}
+            label={theme[item?.label] ?? item?.label}
             iconBaseProps={iconBaseProps}
             itemBaseProps={itemBaseProps}
             labelBaseProps={labelBaseProps}
+            selectedItemIcon={getSelectedItemIcon(theme)}
+            defaultItemIcon={getDefaultItemIcon(theme)}
+            iconPlacement={iconPlacement}
           />
         ))}
       </ScrollView>

package/Components/ModalComponent/Button/Item.tsx

@@ -5,7 +5,7 @@ export type ItemProps = {
   backgroundColor: string;
   focusedBackgroundColor: string;
   selectedBackgroundColor?: string;
-  focusectedBackgroundColor?: string;
+  focusedSelectedBackgroundColor?: string;
   borderRadius: number;
   marginBottom: number;
   marginLeft: number;
@@ -15,6 +15,7 @@ export type ItemProps = {
   paddingBottom: number;
   paddingRight: number;
   paddingLeft: number;
+  maxWidth: number;
   focused?: boolean;
   selected?: boolean;
   children?: ReactChild[];
@@ -33,11 +34,11 @@ function getBackgroundColor({
   backgroundColor,
   focusedBackgroundColor,
   selectedBackgroundColor,
-  focusectedBackgroundColor,
+  focusedSelectedBackgroundColor,
 }) {
   switch (true) {
     case selected && focused:
-      return focusectedBackgroundColor;
+      return focusedSelectedBackgroundColor;
     case selected && !focused:
       return selectedBackgroundColor;
     case !selected && focused:
@@ -51,7 +52,7 @@ export function Item(props: ItemProps) {
   const {
     backgroundColor,
     focusedBackgroundColor,
-    focusectedBackgroundColor,
+    focusedSelectedBackgroundColor,
     selectedBackgroundColor,
     children,
     focused,
@@ -68,7 +69,7 @@ export function Item(props: ItemProps) {
           backgroundColor: getBackgroundColor({
             selected,
             focused,
-            focusectedBackgroundColor,
+            focusedSelectedBackgroundColor,
             focusedBackgroundColor,
             selectedBackgroundColor,
             backgroundColor,

package/Components/ModalComponent/Button/index.tsx

@@ -3,7 +3,6 @@ import { StyleSheet, TouchableOpacity, View } from "react-native";
 import { Item, ItemProps } from "./Item";
 import { ItemIcon, ItemIconProps } from "./ItemIcon";
 import { ItemLabel, ItemLabelProps } from "./ItemLabel";
-import * as assets from "./assets";
 import { defaultSelectedAsset } from "./assets";
 
 type ButtonProps = {
@@ -17,6 +16,9 @@ type ButtonProps = {
   labelBaseProps?: ItemLabelProps;
   disabled?: boolean;
   label?: string | Record<string, string>;
+  iconPlacement?: "left" | "right";
+  selectedItemIcon?: ItemIconProps["asset"];
+  defaultItemIcon?: ItemIconProps["asset"];
 };
 
 const styles = StyleSheet.create({
@@ -33,52 +35,32 @@ export function Button({
   configuration,
   width,
   iconBaseProps,
-  itemBaseProps,
+  itemBaseProps: itemProps,
   labelBaseProps,
   label,
+  iconPlacement = "left",
+  defaultItemIcon,
+  selectedItemIcon,
   disabled = false,
 }: ButtonProps) {
   const [focused, setFocused] = useState(false);
 
-  const selected = useMemo(
-    () => selectedItem && item.value === selectedItem?.value,
-    [selectedItem, selectedItem]
-  );
-
-  const itemProps = useMemo<ItemProps>(
-    () => ({
-      ...itemBaseProps,
-      width,
-    }),
-    [configuration, width]
-  );
+  const selected = selectedItem && item.value === selectedItem?.value;
 
-  const itemIconProps = useMemo<ItemIconProps>(
-    () => ({
-      ...iconBaseProps,
-      asset: configuration[item.asset] ?? assets[item.asset] ?? item.asset,
-    }),
-    [configuration, item.asset]
+  const itemIconPropsAssets = useMemo<ItemIconProps["asset"]>(
+    () => configuration[item.asset] ?? item.asset ?? defaultItemIcon,
+    [item.asset, defaultItemIcon]
   );
 
-  const selectedItemIconProps = useMemo<ItemIconProps>(
-    () => ({
-      ...iconBaseProps,
-      asset:
-        configuration["modal_bottom_sheet_item_selected_icon"] ||
-        defaultSelectedAsset,
-      marginRight: 10,
-    }),
-    [configuration]
+  const selectedItemIconPropsAssets = useMemo<ItemIconProps["asset"]>(
+    () => selectedItemIcon || defaultSelectedAsset,
+    [selectedItemIcon]
   );
 
-  const itemLabelProps = useMemo<ItemLabelProps>(
-    () => ({
-      ...labelBaseProps,
-      label: label ?? configuration[item?.label] ?? item?.label ?? null,
-    }),
-    [configuration, item?.label]
-  );
+  const renderItemIcon =
+    itemIconPropsAssets && itemIconPropsAssets.length > 0 ? (
+      <ItemIcon {...iconBaseProps} asset={itemIconPropsAssets} />
+    ) : null;
 
   if (disabled) return null;
 
@@ -92,18 +74,23 @@ export function Button({
       >
         <Item {...itemProps} focused={focused} selected={selected}>
           <View style={styles.label_icon_container}>
-            {itemIconProps.asset && itemIconProps.asset.length > 0 ? (
-              <ItemIcon {...itemIconProps} />
-            ) : null}
-            {itemLabelProps.label ? (
+            {iconPlacement === "left" && renderItemIcon}
+
+            {label ? (
               <ItemLabel
-                {...itemLabelProps}
+                {...labelBaseProps}
+                label={label ?? null}
                 focused={focused}
                 selected={selected}
               />
             ) : null}
           </View>
-          {selected ? <ItemIcon {...selectedItemIconProps} /> : null}
+
+          {selected ? (
+            <ItemIcon {...iconBaseProps} asset={selectedItemIconPropsAssets} />
+          ) : (
+            iconPlacement === "right" && renderItemIcon
+          )}
         </Item>
       </TouchableOpacity>
     </View>

package/Components/ModalComponent/utils.ts

@@ -1,15 +1,18 @@
 import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
-import { PluginConfiguration } from "./index";
+import { PluginConfiguration } from "./";
+import { ItemIconProps } from "./Button/ItemIcon";
+import { ItemLabelProps } from "./Button/ItemLabel";
+import { ItemProps } from "./Button/Item";
 
 export function defaultItemProps(
   config: PluginConfiguration,
   maxWidth: number
-) {
+): ItemProps {
   const {
     modal_bottom_sheet_item_background_color,
     modal_bottom_sheet_item_focus_background_color,
     modal_bottom_sheet_item_selected_background_color,
-    modal_bottom_sheet_item_focusected_background_color,
+    modal_bottom_sheet_item_focused_selected_background_color,
     modal_bottom_sheet_item_corner_radius,
     modal_bottom_sheet_item_margin_bottom,
     modal_bottom_sheet_item_margin_left,
@@ -25,8 +28,8 @@ export function defaultItemProps(
     backgroundColor: modal_bottom_sheet_item_background_color,
     focusedBackgroundColor: modal_bottom_sheet_item_focus_background_color,
     selectedBackgroundColor: modal_bottom_sheet_item_selected_background_color,
-    focusectedBackgroundColor:
-      modal_bottom_sheet_item_focusected_background_color,
+    focusedSelectedBackgroundColor:
+      modal_bottom_sheet_item_focused_selected_background_color,
     borderRadius: modal_bottom_sheet_item_corner_radius,
     marginBottom: modal_bottom_sheet_item_margin_bottom,
     marginTop: modal_bottom_sheet_item_margin_top,
@@ -43,7 +46,7 @@ export function defaultItemProps(
 export function defaultItemLabelProps(
   config: PluginConfiguration,
   sheetWidth: number
-) {
+): ItemLabelProps {
   const {
     modal_bottom_sheet_item_label_android_letter_spacing,
     modal_bottom_sheet_item_label_ios_letter_spacing,
@@ -103,7 +106,9 @@ export function defaultItemLabelProps(
   };
 }
 
-export function defaultItemIconProps(config: PluginConfiguration) {
+export function defaultItemIconProps(
+  config: PluginConfiguration
+): ItemIconProps {
   const {
     modal_bottom_sheet_item_icon_height,
     modal_bottom_sheet_item_icon_width,
@@ -124,3 +129,46 @@ export function defaultItemIconProps(config: PluginConfiguration) {
     marginRight: modal_bottom_sheet_item_icon_margin_right,
   };
 }
+
+export function getItemIconProps(
+  theme: PluginConfiguration,
+  iconProps?: ((theme: PluginConfiguration) => ItemIconProps) | ItemIconProps
+) {
+  if (iconProps) {
+    return typeof iconProps === "function" ? iconProps(theme) : iconProps;
+  }
+
+  return defaultItemIconProps(theme);
+}
+
+export function getItemLabelProps(
+  theme: PluginConfiguration,
+  width: number,
+  labelProps?:
+    | ((theme: PluginConfiguration, width: number) => ItemLabelProps)
+    | ItemLabelProps
+) {
+  if (labelProps) {
+    return typeof labelProps === "function"
+      ? labelProps(theme, width)
+      : labelProps;
+  }
+
+  return defaultItemLabelProps(theme, width);
+}
+
+export function getItemProps(
+  theme: PluginConfiguration,
+  width: number,
+  itemProps?:
+    | ((theme: PluginConfiguration, width: number) => ItemProps)
+    | ItemProps
+) {
+  if (itemProps) {
+    return typeof itemProps === "function"
+      ? itemProps(theme, width)
+      : itemProps;
+  }
+
+  return defaultItemProps(theme, width);
+}

package/Components/River/RiverItem.tsx

@@ -1,5 +1,6 @@
 import React, { useEffect } from "react";
 import * as R from "ramda";
+import { isGroup } from "@applicaster/zapp-react-native-utils/componentsUtils";
 
 import { applyDecorators } from "../../Decorators";
 
@@ -112,7 +113,7 @@ function RiverItemComponent(props: RiverItemType) {
       jsOnly: true,
     });
 
-    if (!CellRenderer && item.component_type !== "group-qb") {
+    if (!CellRenderer && !isGroup(item)) {
       riverLogger.warning({
         message: "Cell Renderer is null - will fallback to default cell",
         data: { item, CellRenderer },

package/Components/TopMarginApplicator/TopMarginApplicator.tsx

@@ -2,6 +2,7 @@ import React from "react";
 import { View, ViewProps, ViewStyle } from "react-native";
 import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
 import { useCurrentScreenData } from "@applicaster/zapp-react-native-utils/reactHooks";
+import { isFirstComponentScreenPicker } from "@applicaster/zapp-react-native-utils/componentsUtils";
 
 interface IProps {
   targetScreenId?: string;
@@ -31,11 +32,9 @@ export const useMarginTop = (targetScreenId: string): number => {
    * ScreenPicker is a component but should really be a screen.
    * We need to skip margin top for it as it's already applied to the target screen
    **/
-  const isScreenPicker =
-    screenData?.ui_components?.[0]?.component_type === "screen-picker-qb-tv";
 
   // ignore margin on screenPicker
-  if (isScreenPicker) {
+  if (isFirstComponentScreenPicker(screenData?.ui_components)) {
     return 0;
   }
 

package/Components/VideoModal/ModalAnimation/AnimatedScrollModal.tsx

@@ -144,7 +144,7 @@ export const AnimatedScrollModalComponent = ({ children }: Props) => {
 
           setLastSnap(destSnapPoint);
 
-          if (destSnapPoint === modalSnapPoints[0] && isMinimizedModal) {
+          if (destSnapPoint === modalSnapPoints[0]) {
             translateYOffset.extractOffset();
             translateYOffset.setValue(preparedTranslationY);
             translateYOffset.flattenOffset();

package/Components/VideoModal/ModalAnimation/ModalAnimationContext.tsx

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useEffect } from "react";
 import { Animated } from "react-native";
 
 import {
@@ -95,6 +95,13 @@ const Provider = ({ children }: { children: React.ReactNode }) => {
     setStartComponentsAnimation(false);
   }, []);
 
+  useEffect(() => {
+    // Reset player animation state when video modal is closed
+    if (!visible) {
+      resetPlayerAnimationState();
+    }
+  }, [visible, resetPlayerAnimationState]);
+
   // Animated values
   const lastScrollY = React.useRef(new Animated.Value(0)).current;
   const dragScrollY = React.useRef(new Animated.Value(0)).current;

package/Components/VideoModal/PlayerDetails.tsx

@@ -10,6 +10,7 @@ import {
 import { useTargetScreenData } from "@applicaster/zapp-react-native-utils/reactHooks/screen";
 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";
 
 const { width: SCREEN_WIDTH } = Dimensions.get("screen");
 
@@ -22,9 +23,9 @@ type Props = {
   entry: ZappEntry;
   style: StyleProp<ViewStyle>;
   configuration: Configuration;
-  isTabletLandscape: boolean;
+  isTabletLandscape?: boolean;
   isAudioPlayer?: boolean;
-  isTablet: boolean;
+  isTablet?: boolean;
 };
 
 const containerStyle = ({
@@ -39,9 +40,9 @@ export const PlayerDetails = ({
   entry,
   style,
   configuration,
-  isTabletLandscape,
+  isTabletLandscape = false,
   isAudioPlayer,
-  isTablet,
+  isTablet = false,
 }: Props) => {
   const screenData = useTargetScreenData(entry);
   const insets = useSafeAreaInsets();
@@ -78,6 +79,10 @@ export const PlayerDetails = ({
     }
   }, [isAudioPlayer]);
 
+  if (isNilOrEmpty(screenData?.ui_components)) {
+    return null;
+  }
+
   return (
     <Animated.View
       style={[

package/Components/VideoModal/__tests__/__snapshots__/PlayerDetails.test.tsx.snap

@@ -1,43 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`PlayerDetails renders properly 1`] = `
-<View
-  collapsable={false}
-  style={
-    {
-      "backgroundColor": "transparent",
-      "flex": 1,
-      "marginTop": -8,
-      "paddingTop": -8,
-      "width": 750,
-    }
-  }
->
-  <View
-    feed="test-source"
-    riverComponents={[]}
-    riverId="test-id"
-  />
-</View>
-`;
+exports[`PlayerDetails renders properly 1`] = `null`;
 
-exports[`PlayerDetails renders properly on tablet in landscape orientation 1`] = `
-<View
-  collapsable={false}
-  style={
-    {
-      "backgroundColor": "transparent",
-      "flex": 1,
-      "marginTop": -20,
-      "paddingTop": 40,
-      "width": 750,
-    }
-  }
->
-  <View
-    feed="test-source"
-    riverComponents={[]}
-    riverId="test-id"
-  />
-</View>
-`;
+exports[`PlayerDetails renders properly on tablet in landscape orientation 1`] = `null`;

package/Components/VideoModal/utils.ts

@@ -1,5 +1,4 @@
-import * as R from "ramda";
-
+import { mergeRight } from "ramda";
 import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
 import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
 import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useNavigation";
@@ -25,10 +24,10 @@ export const useConfiguration = () => {
 
   const playerPluginConfig = playerManager.getPluginConfiguration();
 
-  const config = R.mergeRight(playerPluginConfig, {
+  const config = mergeRight(playerPluginConfig, {
+    ...pluginConfiguration,
     ...targetScreenConfiguration?.general,
     ...targetScreenConfiguration?.styles,
-    ...pluginConfiguration,
   });
 
   const {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "13.0.0-alpha.3322736490",
+  "version": "13.0.0-alpha.3332871333",
   "description": "Applicaster Zapp React Native ui components for the Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -31,10 +31,10 @@
     "redux-mock-store": "^1.5.3"
   },
   "dependencies": {
-    "@applicaster/applicaster-types": "13.0.0-alpha.3322736490",
-    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.3322736490",
-    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.3322736490",
-    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.3322736490",
+    "@applicaster/applicaster-types": "13.0.0-alpha.3332871333",
+    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.3332871333",
+    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.3332871333",
+    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.3332871333",
     "promise": "^8.3.0",
     "react-router-native": "^5.1.2",
     "url": "^0.11.0",