@applicaster/zapp-react-native-ui-components 13.0.0-alpha.6234681660 → 13.0.0-alpha.6372000108

package/Components/Cell/CellWithFocusable.tsx

@@ -23,6 +23,8 @@ type Props = {
   focused?: boolean;
 };
 
+const addPrefix = (id: string) => `focusable-cell-wrapper-${id}`;
+
 export function CellWithFocusable(props: Props) {
   const {
     index,
@@ -81,7 +83,7 @@ export function CellWithFocusable(props: Props) {
 
   return (
     <FocusableGroup
-      id={`focusable-cell-wrapper-${id}`}
+      id={addPrefix(id)}
       testID={"cell-with-focusable-cell-renderer-focusable-group"}
       groupId={groupId}
       preferredFocus={preferredFocus}
@@ -94,7 +96,7 @@ export function CellWithFocusable(props: Props) {
         <CellRenderer
           testID={"cell-with-focusable-cell-renderer"}
           item={item}
-          groupId={`focusable-cell-wrapper-${id}`}
+          groupId={addPrefix(id)}
           onToggleFocus={handleToggleFocus}
           state={state}
           prefixId={id}

package/Components/Cell/CellWrapper.tsx

@@ -0,0 +1,18 @@
+import * as React from "react";
+import { View, ViewStyle } from "react-native";
+import { isTvOSPlatform } from "@applicaster/zapp-react-native-utils/reactUtils";
+
+const isTvOS = isTvOSPlatform();
+
+type Props = {
+  style: ViewStyle;
+  children: React.ReactNode;
+};
+
+export const CellWrapper = ({ style, children }: Props) => {
+  if (isTvOS) {
+    return <View style={style}>{children}</View>;
+  }
+
+  return <>{children}</>;
+};

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/GeneralContentScreen/GeneralContentScreen.tsx

@@ -11,6 +11,7 @@ import { allSettled } from "promise";
 import { createLogger } from "@applicaster/zapp-react-native-utils/logger";
 import { isNilOrEmpty } from "@applicaster/zapp-react-native-utils/reactUtils/helpers";
 import { ScreenTrackedViewPositionsContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenTrackedViewPositionsContext";
+import { useEventAlerts } from "./utils/useEventAlerts";
 
 const { log_info } = createLogger({
   category: "ScreenContainer",
@@ -103,6 +104,8 @@ export const GeneralContentScreen = ({
     [typeof cellTapAction === "function" ? cellTapAction : onCellTapAction]
   );
 
+  useEventAlerts(screenData);
+
   if (!isReady || isNilOrEmpty(components || uiComponents)) return null;
 
   return (

package/Components/GeneralContentScreen/utils/useEventAlerts.ts

@@ -0,0 +1,30 @@
+import React from "react";
+import { showAlertDialog } from "@applicaster/zapp-react-native-utils/alertUtils";
+import { TOGGLE_FLAG_MAX_ITEMS_REACHED_EVENT } from "@applicaster/zapp-react-native-utils/actionsExecutor/consts";
+import { useLocalizedStrings } from "@applicaster/zapp-react-native-utils/localizationUtils";
+import { useIsScreenActive } from "@applicaster/zapp-react-native-utils/reactHooks";
+import { useSubscriberFor } from "@applicaster/zapp-react-native-utils/reactHooks/useSubscriberFor";
+
+export const useEventAlerts = (screenData: ZappRiver) => {
+  const localizations = useLocalizedStrings({
+    localizations: screenData?.localizations || {},
+  });
+
+  const isActive = useIsScreenActive();
+
+  const onMaxTagsReached = React.useCallback(() => {
+    // We can't skip subscribe hook call, so we have to check.
+    if (!isActive || !localizations?.msg_maximum_selection_reached_message) {
+      return;
+    }
+
+    showAlertDialog({
+      title: "",
+      message: localizations.msg_maximum_selection_reached_message,
+      okButtonText:
+        localizations.msg_maximum_selection_reached_message_ok_button || "OK",
+    });
+  }, [localizations, isActive]);
+
+  useSubscriberFor(TOGGLE_FLAG_MAX_ITEMS_REACHED_EVENT, onMaxTagsReached);
+};

package/Components/HandlePlayable/HandlePlayable.tsx

@@ -12,6 +12,7 @@ import {
 
 import { BufferAnimation } from "../PlayerContainer/BufferAnimation";
 import { PlayerContainer } from "../PlayerContainer";
+import { useModalSize } from "../VideoModal/hooks";
 
 type Props = {
   item: ZappEntry;
@@ -136,12 +137,18 @@ export function HandlePlayable({
 
   const { width: screenWidth, height: screenHeight } = useDimensions("window");
 
+  const modalSize = useModalSize();
+
   const style = React.useMemo(
     () => ({
-      width: isModal ? "100%" : mode === "PIP" ? "100%" : screenWidth,
-      height: isModal ? "100%" : mode === "PIP" ? "100%" : screenHeight,
+      width: isModal ? modalSize.width : mode === "PIP" ? "100%" : screenWidth,
+      height: isModal
+        ? modalSize.height
+        : mode === "PIP"
+          ? "100%"
+          : screenHeight,
     }),
-    [screenWidth, screenHeight, isModal, mode]
+    [screenWidth, screenHeight, modalSize, isModal, mode]
   );
 
   const Component = playable?.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/MasterCell/DefaultComponents/tv/TvActionButtons/const.ts

@@ -0,0 +1,3 @@
+export const PREFIX = "tv_buttons";
+
+export const BUTTON_PREFIX = `${PREFIX}_button`;

package/Components/MasterCell/DefaultComponents/tv/TvActionButtons/index.ts

@@ -1,4 +1,4 @@
-import * as R from "ramda";
+import { times } from "@applicaster/zapp-react-native-utils/utils";
 import { toNumberWithDefaultZero } from "@applicaster/zapp-react-native-utils/numberUtils";
 
 import { Button } from "./Button";
@@ -9,13 +9,14 @@ import {
 } from "./utils";
 
 import { compact } from "@applicaster/zapp-react-native-utils/cellUtils";
+import { PREFIX, BUTTON_PREFIX } from "./const";
 
 export {
   insertButtonsBetweenLabels,
   insertButtonsBetweenLabelContainers,
 } from "./utils";
 
-const PREFIX = "tv_buttons";
+const buttonId = (index: number) => `${BUTTON_PREFIX}_${index}`;
 
 type Props = {
   value: Function;
@@ -42,7 +43,6 @@ export const TvActionButtons = ({
     return null;
   }
 
-  const prefix1Button = `${PREFIX}_button_1`;
   const independentStyles = value(`${PREFIX}_container_independent_styles`);
 
   return {
@@ -73,11 +73,11 @@ export const TvActionButtons = ({
       buttonsCount,
     },
     elements: compact(
-      R.times((index) => {
-        const prefixSpecificButton = `${PREFIX}_button_${index + 1}`;
+      times((index) => {
+        const prefixSpecificButton = buttonId(index + 1);
 
         return Button({
-          prefix: independentStyles ? prefixSpecificButton : prefix1Button,
+          prefix: independentStyles ? prefixSpecificButton : buttonId(1),
           value,
           platformValue,
           pluginIdentifier: getPluginIdentifier(configuration, PREFIX, index),

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/PlayerContainer/PlayerContainer.tsx

@@ -9,6 +9,7 @@ import {
   isApplePlatform,
   isTV,
   platformSelect,
+  isAndroidTVPlatform,
 } from "@applicaster/zapp-react-native-utils/reactUtils";
 
 import { TVEventHandlerComponent } from "@applicaster/zapp-react-native-tvos-ui-components/Components/TVEventHandlerComponent";
@@ -93,6 +94,20 @@ export type PlayNextData = {
 
 const focusableBottomContainerId = "player-container-bottom";
 
+const isAndroidTV = isAndroidTVPlatform();
+
+const withBorderHack = () => {
+  if (isAndroidTV) {
+    /* @HACK: see GH#7269 */
+    return {
+      borderWidth: 1,
+      borderColor: "transparent",
+    };
+  }
+
+  return {};
+};
+
 // Styles
 const webStyles = {
   focusableGroup: {
@@ -644,7 +659,14 @@ const PlayerContainerComponent = (props: Props) => {
                   testID={"player-screen-container"}
                 >
                   {/* Player container */}
-                  <View style={styles.playerWrapper} testID={"player-wrapper"}>
+                  <View
+                    style={[
+                      styles.playerWrapper,
+                      // eslint-disable-next-line react-native/no-inline-styles, react-native/no-color-literals
+                      withBorderHack(),
+                    ]}
+                    testID={"player-wrapper"}
+                  >
                     <PlayerFocusableWrapperView
                       nextFocusDown={context.bottomFocusableId}
                     >

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/AnimationComponent.tsx

@@ -448,6 +448,10 @@ export const AnimationComponent = (props: Props) => {
     videoModalState: { visible },
   } = useNavigation();
 
+  if (additionalData?.disableAnimatedComponent) {
+    return <>{props.children}</>;
+  }
+
   const useAnimation =
     visible && !additionalData.disableAnimatedComponent && !isTV();
 

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/PlayerWrapper.tsx

@@ -100,6 +100,24 @@ const getEdges = (isTablet: boolean, isInlineModal: boolean) => {
   return ["top"];
 };
 
+const isPercentage = (value: string | number): boolean => {
+  if (typeof value === "string") {
+    return value.includes("%");
+  }
+
+  return false;
+};
+
+const getPercentageOf = (percent: string, value: number) => {
+  const percentageValue = parseFloat(percent.replace("%", ""));
+
+  if (isNaN(percentageValue)) {
+    return value;
+  }
+
+  return (value * percentageValue) / 100;
+};
+
 const getTabletWidth = (
   configuration: Configuration,
   dimensions: DimensionsT
@@ -108,18 +126,23 @@ const getTabletWidth = (
     configuration?.tablet_landscape_sidebar_width;
 
   const { width } = dimensions;
+  let widthValue = Number(width);
+
+  if (isPercentage(width)) {
+    widthValue = getPercentageOf(width.toString(), SCREEN_WIDTH);
+  }
 
   const sidebarWidth = Number(tablet_landscape_sidebar_width?.replace("%", ""));
 
   if (tablet_landscape_sidebar_width?.includes("%")) {
-    return Number(width) * (1 - sidebarWidth / 100);
+    return widthValue * (1 - sidebarWidth / 100);
   }
 
   if (Number.isNaN(sidebarWidth)) {
-    return Number(width) * 0.65;
+    return widthValue * 0.65;
   }
 
-  return Number(width) - sidebarWidth;
+  return widthValue - sidebarWidth;
 };
 
 const PlayerWrapperComponent = (props: Props) => {

package/Components/VideoModal/VideoModal.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { equals } from "ramda";
-import { StyleSheet, StatusBar } from "react-native";
+import { StyleSheet, StatusBar, View } from "react-native";
 
 import { HandlePlayable } from "@applicaster/zapp-react-native-ui-components/Components/HandlePlayable";
 import {
@@ -30,10 +30,13 @@ import { useSubscriberFor } from "@applicaster/zapp-react-native-utils/reactHook
 import { requiresAuthentication } from "@applicaster/zapp-react-native-utils/configurationUtils";
 import { playerManager } from "@applicaster/zapp-react-native-utils/appUtils";
 import { ScreenContextProvider } from "../../Contexts/ScreenContext";
+import { Spinner } from "../Spinner";
 import { OpaqueLayer } from "./OpaqueLayer";
 
 import { AnimatedPlayerModalWrapper } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
 
+const LOADER_BACKGROUND_COLOR = "rgba(64,64,64,0.5)";
+
 const styles = StyleSheet.create({
   container: {
     top: 0,
@@ -42,6 +45,16 @@ const styles = StyleSheet.create({
     bottom: 0,
     position: "absolute",
   },
+  loaderContainer: {
+    top: 0,
+    left: 0,
+    right: 0,
+    bottom: 0,
+    position: "absolute",
+    alignItems: "center",
+    justifyContent: "center",
+    backgroundColor: LOADER_BACKGROUND_COLOR,
+  },
 });
 
 const VideoModalComponent = () => {
@@ -131,14 +144,12 @@ const VideoModalComponent = () => {
           {/* Hide content underneath when we switch to next video in fullscreen mode */}
           {mode === "FULLSCREEN" && <OpaqueLayer />}
 
-          {itemIdHooksFinished === item?.id && (
+          {itemIdHooksFinished === item?.id ? (
             <AnimatedPlayerModalWrapper
               style={[
                 styles.container,
                 {
                   backgroundColor,
-                  width: modalSize.width,
-                  height: modalSize.height,
                 },
               ]}
             >
@@ -148,6 +159,10 @@ const VideoModalComponent = () => {
                 mode={mode}
               />
             </AnimatedPlayerModalWrapper>
+          ) : (
+            <View style={styles.loaderContainer}>
+              <Spinner />
+            </View>
           )}
         </ScreenContextProvider>
       </PathnameContext.Provider>

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/Components/ZappUIComponent/index.tsx

@@ -8,7 +8,6 @@ import {
 
 import { Placeholder } from "./Placeholder";
 import { useInitialLoading } from "./hooks";
-import { useIsFocusable } from "@applicaster/zapp-react-native-utils/focusManager";
 
 type ReactComponent = React.ComponentType<any>;
 
@@ -138,12 +137,13 @@ New signature: {Component, ErrorComponent, LoadingComponent, options}`
     );
 
     const componentProps = React.useMemo(
-      () => ({ ...props, parent }),
+      () => ({
+        ...props,
+        parent,
+      }),
       [props, parent]
     );
 
-    useIsFocusable(componentProps);
-
     React.useEffect(() => {
       if (!skipOnLoadFinished && !isLoading) {
         onLoadFinished();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "13.0.0-alpha.6234681660",
+  "version": "13.0.0-alpha.6372000108",
   "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.6234681660",
-    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.6234681660",
-    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.6234681660",
-    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.6234681660",
+    "@applicaster/applicaster-types": "13.0.0-alpha.6372000108",
+    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.6372000108",
+    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.6372000108",
+    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.6372000108",
     "promise": "^8.3.0",
     "react-router-native": "^5.1.2",
     "url": "^0.11.0",

package/Components/Cell/CellWrapper.ts

@@ -1,5 +0,0 @@
-import { isTvOSPlatform } from "@applicaster/zapp-react-native-utils/reactUtils";
-import React from "react";
-import { View } from "react-native";
-
-export const CellWrapper = isTvOSPlatform() ? View : React.Fragment;