@applicaster/zapp-react-native-ui-components 13.0.0-alpha.5928753399 → 13.0.0-alpha.5942605655

package/Components/AudioPlayer/AudioPlayer.tsx

@@ -22,8 +22,6 @@ type Props = {
       audio_player_title_color?: string;
       audio_player_summary_color?: string;
       audio_player_rtl?: boolean;
-      magic_background?: boolean;
-      audio_player_background_image_query?: string;
       audio_player_background_image_default_color?: string;
       start_time?: string;
       end_time?: string;
@@ -34,8 +32,6 @@ type Props = {
     audio_player_title_color?: string;
     audio_player_summary_color?: string;
     audio_player_rtl?: string;
-    magic_background?: string;
-    audio_player_background_image_query?: string;
     audio_player_background_image_default_color?: string;
     audio_player_background_image?: string;
     audio_player_artwork_aspect_ratio?: string;
@@ -76,11 +72,6 @@ export function AudioPlayer(props: Props) {
     const artworkAspectRatio = getProp("audio_player_artwork_aspect_ratio");
     const channelIcon = getProp("audio_player_channel_icon");
     const rtlFlag = getProp("audio_player_rtl");
-    const magicBackground = getProp("magic_background");
-
-    const audioPlayerBackgroundImageQuery = getProp(
-      "audio_player_background_image_query"
-    );
 
     const audioPlayerBackgroundImageDefaultColor = getProp(
       "audio_player_background_image_default_color"
@@ -162,8 +153,6 @@ export function AudioPlayer(props: Props) {
       runTimeFontSize,
       artworkAspectRatio,
       channelIcon,
-      magicBackground,
-      audioPlayerBackgroundImageQuery,
       audioPlayerBackgroundImageDefaultColor,
     };
   }, [getProp]);

package/Components/AudioPlayer/AudioPlayerLayout.tsx

@@ -32,7 +32,7 @@ export function AudioPlayerLayout({ artwork, config, children, style }: Props) {
 
   const { isRTL, backgroundColor, backgroundImage } = config;
 
-  const backgroundImg = { uri: backgroundImage };
+  const backgroundImageSource = { uri: backgroundImage };
 
   const backgroundColorStyle = backgroundImage
     ? "transparent"
@@ -97,15 +97,14 @@ export function AudioPlayerLayout({ artwork, config, children, style }: Props) {
 
   const backgroundImgStyles = platformSelect({
     tvos: {
-      width: 1920,
-      height: 1080,
+      width: "100%",
+      height: "100%",
       alignItems: "center",
       justifyContent: "center",
     },
     android_tv: {
-      position: "absolute",
-      width: 1920,
-      height: 1080,
+      width: "100%",
+      height: "100%",
       alignItems: "center",
       justifyContent: "center",
     },
@@ -146,9 +145,9 @@ export function AudioPlayerLayout({ artwork, config, children, style }: Props) {
     },
   });
 
-  const audioPlayerLayoutTV = backgroundImg?.uri ? (
+  const audioPlayerLayoutTV = backgroundImageSource?.uri ? (
     <ImageBackground
-      source={backgroundImg}
+      source={backgroundImageSource}
       style={backgroundImgStyles}
       resizeMode="cover"
     >
@@ -178,7 +177,7 @@ export function AudioPlayerLayout({ artwork, config, children, style }: Props) {
           ]}
         >
           <ImageBackground
-            source={backgroundImg}
+            source={backgroundImageSource}
             style={backgroundImgStyles}
             resizeMode="cover"
           >

package/Components/AudioPlayer/helpers.tsx

@@ -4,8 +4,6 @@ const defaults = {
   audio_player_background_color: "black",
   audio_player_artwork_aspect_ratio: "1:1",
   audio_player_rtl: false,
-  magic_background: false,
-  audio_player_background_image_query: "",
   audio_player_background_image_default_color: "",
 };
 

package/Components/Cell/Cell.tsx

@@ -12,6 +12,7 @@ import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
 import { CellWithFocusable } from "./CellWithFocusable";
 import { BaseFocusable } from "../BaseFocusable";
 import { AccessibilityManager } from "@applicaster/zapp-react-native-utils/appUtils/accessibilityManager";
+import { styles } from "./styles";
 
 type Props = {
   item: ZappEntry;
@@ -68,17 +69,6 @@ type State = {
   hasFocusableInside: boolean;
 };
 
-const baseCellStyles = {
-  height: "100%",
-  display: "flex",
-  flex: 1,
-} as const;
-
-const touchableStyles = {
-  flex: 1,
-  height: "100%",
-} as const;
-
 export class CellComponent extends React.Component<Props, State> {
   constructor(props) {
     super(props);
@@ -252,7 +242,7 @@ export class CellComponent extends React.Component<Props, State> {
       <View
         testID={`${component?.id}-${id}`}
         accessible={false}
-        style={touchableStyles}
+        style={styles.touchableCell}
       >
         <Focusable
           id={focusableId}
@@ -264,7 +254,7 @@ export class CellComponent extends React.Component<Props, State> {
           hasReceivedFocus={hasReceivedFocus || this.hasReceivedFocus}
           preferredFocus={preferredFocus}
           offsetUpdater={offsetUpdater}
-          style={baseCellStyles}
+          style={styles.baseCell}
           isFocusable={isFocusable}
           skipFocusManagerRegistration={skipFocusManagerRegistration}
         >

package/Components/Cell/CellWithFocusable.tsx

@@ -5,6 +5,8 @@ import { toBooleanWithDefaultFalse } from "@applicaster/zapp-react-native-utils/
 
 import { useCellState } from "../MasterCell/utils";
 import { FocusableGroup } from "../FocusableGroup";
+import { CellWrapper } from "./CellWrapper";
+import { styles } from "./styles";
 
 type Props = {
   item: ZappEntry;
@@ -21,6 +23,8 @@ type Props = {
   focused?: boolean;
 };
 
+const addPrefix = (id: string) => `focusable-cell-wrapper-${id}`;
+
 export function CellWithFocusable(props: Props) {
   const {
     index,
@@ -79,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}
@@ -88,19 +92,21 @@ export function CellWithFocusable(props: Props) {
       onBlur={onGroupBlur}
       skipFocusManagerRegistration={skipFocusManagerRegistration}
     >
-      <CellRenderer
-        testID={"cell-with-focusable-cell-renderer"}
-        item={item}
-        groupId={`focusable-cell-wrapper-${id}`}
-        onToggleFocus={handleToggleFocus}
-        state={state}
-        prefixId={id}
-        focusedButtonId={focusedButtonId}
-        preferredFocus={true}
-        skipFocusManagerRegistration={skipFocusManagerRegistration}
-        isFocusable={isFocusable}
-        focused={focused}
-      />
+      <CellWrapper style={styles.cellWrapper}>
+        <CellRenderer
+          testID={"cell-with-focusable-cell-renderer"}
+          item={item}
+          groupId={addPrefix(id)}
+          onToggleFocus={handleToggleFocus}
+          state={state}
+          prefixId={id}
+          focusedButtonId={focusedButtonId}
+          preferredFocus={true}
+          skipFocusManagerRegistration={skipFocusManagerRegistration}
+          isFocusable={isFocusable}
+          focused={focused}
+        />
+      </CellWrapper>
     </FocusableGroup>
   );
 }

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/Cell/styles.ts

@@ -0,0 +1,17 @@
+import { StyleSheet } from "react-native";
+
+export const styles = StyleSheet.create({
+  cellWrapper: {
+    flex: 0,
+    height: "100%",
+  },
+  baseCell: {
+    height: "100%",
+    display: "flex",
+    flex: 1,
+  },
+  touchableCell: {
+    flex: 1,
+    height: "100%",
+  },
+});

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

@@ -105,6 +105,11 @@ const defaultProps = {
       alignItems: "center",
       justifyContent: "center",
     },
+    focusedButton: {
+      backgroundColor: "#3a3a3a",
+      borderColor: "#ffffff",
+      borderWidth: 2,
+    },
     buttonText: {
       fontFamily: platformSelect({
         ios: "SFProText-Medium",
@@ -116,6 +121,9 @@ const defaultProps = {
       color: "rgba(255, 255, 255, 1)",
       textTransform: "uppercase",
     },
+    focusedText: {
+      color: "#ffffff",
+    },
   },
 };
 

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/useCurationAPI.ts

@@ -3,8 +3,10 @@ import { all, equals, path, prop, isEmpty, pluck, values } from "ramda";
 import { useEffect, useMemo } from "react";
 import { useDispatch } from "react-redux";
 
-import { useLayoutPresets } from "@applicaster/zapp-react-native-redux/hooks/useLayoutPresets";
-import { useZappPipesFeeds } from "@applicaster/zapp-react-native-redux/hooks/useZappPipesFeeds";
+import {
+  useLayoutPresets,
+  useZappPipesFeeds,
+} from "@applicaster/zapp-react-native-redux/hooks";
 import { loadPipesData } from "@applicaster/zapp-react-native-redux/ZappPipes";
 import { isEmptyOrNil } from "@applicaster/zapp-react-native-utils/cellUtils";
 import { Categories } from "./logger";

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/Image/Image.ios.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { Image as RnImage, ImageStyle } from "react-native";
-import * as R from "ramda";
+import { equals, omit } from "ramda";
 
 import { useImageSource } from "./hooks";
 
@@ -17,7 +17,7 @@ type Props = Record<string, any> & {
   withDimensions: (source: Source) => Source;
 };
 
-const MemoizedImage = React.memo(RnImage, R.equals);
+const MemoizedImage = React.memo(RnImage, equals);
 
 function Image({
   style,
@@ -44,11 +44,12 @@ function Image({
 
   return (
     <MemoizedImage
+      key={_source?.uri || "no-image"}
       style={style as ImageStyle}
       onError={React.useCallback(() => setErrorState(true), [])}
       // as we have defaults as "" for placeholder image, we need to pass undefined to source to not throw warnings
       source={_source?.uri ? _source : undefined}
-      {...R.omit(["source"], otherProps)}
+      {...omit(["source"], otherProps)}
     />
   );
 }

package/Components/MasterCell/DefaultComponents/Image/hooks/useImage.ts

@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as R from "ramda";
+import { path } from "ramda";
 
 import { isTV } from "@applicaster/zapp-react-native-utils/reactUtils";
 import { useActions } from "@applicaster/zapp-react-native-utils/reactHooks/actions";
@@ -7,9 +7,13 @@ import { extractAsset } from "./utils";
 
 type Return = { uri: string } | null;
 
+const getSourceContext = path(["source", "context"]);
+const getSourceUri = path(["source", "uri"]);
+const getState = path(["state"]);
+
 export const useImageSource = ({ uri, entry, otherProps }): Return => {
-  const uriContext = R.path(["source", "context"], otherProps);
-  const uriState = R.path(["state"], otherProps);
+  const uriContext = getSourceContext(otherProps);
+  const uriState = getState(otherProps);
 
   const action = useActions(uriContext);
 
@@ -34,7 +38,7 @@ export const useImageSource = ({ uri, entry, otherProps }): Return => {
     return { uri };
   }
 
-  const uriFromSource = R.path(["source", "uri"], otherProps);
+  const uriFromSource = getSourceUri(otherProps);
 
   if (uriFromSource) {
     return { uri: uriFromSource };
@@ -56,7 +60,7 @@ const getSource = (uri, showDefault, placeholderImage, otherProps) => {
     return { uri };
   }
 
-  const uriFromSource = R.path(["source", "uri"], otherProps);
+  const uriFromSource = getSourceUri(otherProps);
 
   if (uriFromSource) {
     return { uri: uriFromSource };
@@ -72,8 +76,8 @@ export const useImageSourceWithDefault = ({
   placeholderImage,
   otherProps,
 }): Return => {
-  const uriContext = R.path(["source", "context"], otherProps);
-  const uriState = R.path(["state"], otherProps);
+  const uriContext = getSourceContext(otherProps);
+  const uriState = getState(otherProps);
 
   const action = useActions(uriContext);
 

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

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