@applicaster/zapp-react-native-ui-components 13.0.0-rc.10 → 13.0.0-rc.101

package/Components/HandlePlayable/HandlePlayable.tsx

@@ -1,17 +1,18 @@
 import * as React from "react";
 import * as R from "ramda";
-import { ViewStyle } from "react-native";
 import {
   findPluginByType,
   findPluginByIdentifier,
 } from "@applicaster/zapp-react-native-utils/pluginUtils";
-import { useDimensions } from "@applicaster/zapp-react-native-utils/reactHooks/layout";
 import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
-import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks";
-import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
+import {
+  useDimensions,
+  useNavigation,
+} from "@applicaster/zapp-react-native-utils/reactHooks";
 
 import { BufferAnimation } from "../PlayerContainer/BufferAnimation";
 import { PlayerContainer } from "../PlayerContainer";
+import { useModalSize } from "../VideoModal/hooks";
 
 type Props = {
   item: ZappEntry;
@@ -78,12 +79,6 @@ const getPlayer = (
   return getPlayerWithModuleProperties(PlayerModule);
 };
 
-const dimensionsContext: "window" | "screen" = platformSelect({
-  android_tv: "window",
-  amazon: "window",
-  default: "screen",
-});
-
 type PlayableComponent = {
   Component: React.ComponentType<any>;
 };
@@ -91,16 +86,11 @@ type PlayableComponent = {
 export function HandlePlayable({
   item,
   isModal,
-  modalHeight,
-  modalWidth,
   mode,
   groupId,
 }: Props): React.ReactElement | null {
   const state = usePickFromState();
 
-  const { width: screenWidth, height: screenHeight } =
-    useDimensions(dimensionsContext);
-
   const { closeVideoModal } = useNavigation();
 
   const [Player, playerModuleProperties] = getPlayer(item, state);
@@ -118,9 +108,7 @@ export function HandlePlayable({
     if (!isModal) {
       closeVideoModal();
     }
-  }, []);
 
-  React.useEffect(() => {
     const castStateHandler = async () => {
       const castState = await CastPlugin?.getCastState();
       setCasting(castState === "Connected");
@@ -142,23 +130,29 @@ export function HandlePlayable({
   }, []);
 
   React.useEffect(() => {
-    if (casting) {
-      setPlayable({ Component: CastPlugin?.CastHandler });
-    } else {
-      setPlayable({ Component: PlayerContainer });
-    }
+    setPlayable({
+      Component: casting ? CastPlugin?.CastHandler : PlayerContainer,
+    });
   }, [casting]);
 
-  const Component = playable?.Component;
+  const { width: screenWidth, height: screenHeight } = useDimensions("window");
+
+  const modalSize = useModalSize();
 
   const style = React.useMemo(
     () => ({
-      width: isModal ? modalWidth : mode === "PIP" ? "100%" : screenWidth,
-      height: isModal ? modalHeight : mode === "PIP" ? "100%" : screenHeight,
+      width: isModal ? modalSize.width : mode === "PIP" ? "100%" : screenWidth,
+      height: isModal
+        ? modalSize.height
+        : mode === "PIP"
+          ? "100%"
+          : screenHeight,
     }),
-    [screenWidth, screenHeight, modalHeight, modalWidth, isModal, mode]
+    [screenWidth, screenHeight, modalSize, isModal, mode]
   );
 
+  const Component = playable?.Component;
+
   if (Component) {
     return (
       <Component
@@ -174,5 +168,5 @@ export function HandlePlayable({
     );
   }
 
-  return !isModal ? <BufferAnimation videoStyle={style as ViewStyle} /> : null;
+  return !isModal ? <BufferAnimation videoStyle={style} /> : null;
 }

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

@@ -1,9 +1,5 @@
 import * as React from "react";
-import { View, StyleSheet } from "react-native";
-import { ScreenLayoutContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenLayoutContext";
-import { ifEmptyUseFallback } from "@applicaster/zapp-react-native-utils/cellUtils";
-import { useCurrentScreenData } from "@applicaster/zapp-react-native-utils/reactHooks/screen";
-import { useScreenConfiguration } from "../../River/useScreenConfiguration";
+import { StyleSheet, View } from "react-native";
 
 type Props = {
   children: React.ReactNode;
@@ -12,33 +8,33 @@ type Props = {
 };
 
 const styles = StyleSheet.create({
-  container: { position: "absolute", top: 0, zIndex: 10, width: 1920 },
+  container: {
+    position: "absolute",
+    top: 0,
+    zIndex: 10,
+    flex: 1,
+    width: "100%",
+  },
+  themeStyles: {
+    // limits the height of the focusable container of the TopMenuBarTV component
+    // to prevent it from being overlapped by the screen content,
+    // as it makes TopMenuBarTV unfocusable on tvOS
+    maxHeight: 1,
+  },
 });
 
 export const NavBarContainer = ({ children, isVisible, onReady }: Props) => {
-  const screenLayout = React.useContext(ScreenLayoutContext);
-  const screenMarginTop = screenLayout?.screenMarginTop || 0;
-  const screen = useCurrentScreenData();
-  const screenConfig = useScreenConfiguration(screen?.id);
-
-  const themeStyles = React.useMemo(
-    () => ({
-      // limits the height of the focusable container of the TopMenuBarTV component
-      // to prevent it from being overlapped by the screen content,
-      // as it makes TopMenuBarTV unfocusable on tvOS
-      maxHeight: ifEmptyUseFallback(screenConfig?.marginTop, screenMarginTop),
-    }),
-    [screenLayout, screenConfig]
-  );
-
   React.useEffect(() => {
     setTimeout(() => {
       onReady?.(true);
     }, 0);
-  }, []);
+  }, [onReady]);
 
   return isVisible ? (
-    <View testID="nav-bar-container" style={[styles.container, themeStyles]}>
+    <View
+      testID="nav-bar-container"
+      style={[styles.container, styles.themeStyles]}
+    >
       {children}
     </View>
   ) : null;

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>;
 };
 
@@ -55,8 +54,11 @@ export const ScreenContainer = React.memo(function ScreenContainer({
   ComponentsExtraProps,
   NavBar,
 }: Props) {
-  const { screenMarginBottom } = React.useContext(ScreenLayoutContext);
+  const { screenMarginBottom, resetScreenLayout } =
+    React.useContext(ScreenLayoutContext);
+
   const { currentRoute, screenData } = useNavigation();
+
   const screen = useCurrentScreenData();
 
   const { marginBottom, backgroundColor, paddingTop, paddingBottom } =
@@ -65,6 +67,10 @@ export const ScreenContainer = React.memo(function ScreenContainer({
   const theme = useTheme();
   const getThemeValue = React.useCallback(R.propOr(0, R.__, theme), [theme]);
 
+  React.useEffect(() => {
+    resetScreenLayout();
+  }, [currentRoute]);
+
   const fullscreen = React.useCallback(
     displayFullScreen({ currentRoute, screenData }),
     [currentRoute, screenData]

package/Components/Layout/TV/ScreenLayoutContextProvider.tsx

@@ -60,10 +60,15 @@ export function ScreenLayoutContextProvider(props: {
     initialState
   );
 
+  const resetScreenLayout = React.useCallback(() => {
+    setScreenLayout(initialState);
+  }, [initialState]);
+
   const screenLayoutValue = React.useMemo(
     () => ({
       ...screenLayout,
       setScreenLayout,
+      resetScreenLayout,
     }),
     [screenLayout]
   );

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

@@ -39,6 +39,7 @@ jest.mock(
 );
 
 jest.mock("@applicaster/zapp-react-native-utils/theme", () => ({
+  ...jest.requireActual<any>("@applicaster/zapp-react-native-utils/theme"),
   useTheme: () => ({}),
 }));
 
@@ -55,11 +56,12 @@ describe("ScreenContainer", () => {
   };
 
   const setScreenLayout = () => {};
+  const resetScreenLayout = () => {};
 
   const wrapper = ({ children }) => (
     <WrappedWithProviders>
       <ScreenLayoutContext.Provider
-        value={{ ...screenLayout, setScreenLayout }}
+        value={{ ...screenLayout, setScreenLayout, resetScreenLayout }}
       >
         <ScreenContainer NavBar={View}>{children}</ScreenContainer>
       </ScreenLayoutContext.Provider>

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

@@ -3,7 +3,7 @@
 exports[`LayoutContainer renders 1`] = `
 <View
   style={
-    Object {
+    {
       "flex": 1,
       "height": 1080,
       "width": 1920,

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

@@ -3,15 +3,16 @@
 exports[`NavBarContainer renders 1`] = `
 <View
   style={
-    Array [
-      Object {
+    [
+      {
+        "flex": 1,
         "position": "absolute",
         "top": 0,
-        "width": 1920,
+        "width": "100%",
         "zIndex": 10,
       },
-      Object {
-        "maxHeight": 10,
+      {
+        "maxHeight": 1,
       },
     ]
   }

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

@@ -4,8 +4,8 @@ exports[`ScreenContainer renders 1`] = `
 <RNCSafeAreaProvider
   onInsetsChange={[Function]}
   style={
-    Array [
-      Object {
+    [
+      {
         "flex": 1,
       },
       undefined,
@@ -14,15 +14,16 @@ exports[`ScreenContainer renders 1`] = `
 >
   <View
     style={
-      Array [
-        Object {
+      [
+        {
+          "flex": 1,
           "position": "absolute",
           "top": 0,
-          "width": 1920,
+          "width": "100%",
           "zIndex": 10,
         },
-        Object {
-          "maxHeight": 10,
+        {
+          "maxHeight": 1,
         },
       ]
     }
@@ -30,7 +31,7 @@ exports[`ScreenContainer renders 1`] = `
   >
     <View
       isVisible={true}
-      menuPlugin={Object {}}
+      menuPlugin={{}}
       navigationProps={null}
     />
   </View>
@@ -38,13 +39,13 @@ exports[`ScreenContainer renders 1`] = `
 `;
 
 exports[`ScreenContainer sets margins provided by the theme 1`] = `
-Array [
-  Object {
+[
+  {
     "flex": 1,
     "height": "100%",
     "width": "100%",
   },
-  Object {
+  {
     "backgroundColor": "transparent",
     "marginBottom": 10,
     "paddingBottom": 0,

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={
-      Object {
-        "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,14 +5,24 @@ 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"]);
 
-jest.mock("../../../Screen/TV/index.web", () => ({
-  Screen: View,
-}));
+jest.mock("../../../Screen/TV/index.web", () => {
+  const View = jest.requireActual("react-native").View;
 
-const Layout = require("../index.web").default;
+  return {
+    Screen: View,
+  };
+});
 
 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/ActionButton.tsx

@@ -4,7 +4,6 @@ import { TouchableOpacity, ViewStyle } from "react-native";
 import { useActions } from "@applicaster/zapp-react-native-utils/reactHooks/actions";
 
 import Image from "./Image";
-
 type Props = {
   item: ZappEntry | ZappFeed;
   flavour?: "flavour_1" | "flavour_2";
@@ -69,7 +68,7 @@ export function ActionButton(props: Props) {
     if (!((actionDisabled || !actionContext) && actionState !== null)) {
       setActionState(actionContext.initialEntryState(item));
     }
-  }, [actionDisabled, item?.id, actionContext, action]);
+  }, [actionDisabled, item?.id, actionContext, action, setActionState]);
 
   const onPress = useCallback(() => {
     actionContext.invokeAction(item, {
@@ -85,7 +84,7 @@ export function ActionButton(props: Props) {
         setActionState(state);
       });
     }
-  }, [item?.id]);
+  }, [item?.id, setActionState, actionContext]);
 
   if (actionDisabled || !actionContext) return null;
   const AssetComponent = actionState?.asset;

package/Components/MasterCell/DefaultComponents/BorderContainerView/__tests__/index.test.tsx

@@ -0,0 +1,66 @@
+import {
+  BorderContainerView,
+  getBorderPadding, // Export for testing (using a double underscore prefix is a common convention)
+} from "../index";
+import * as React from "react";
+import { render } from "@testing-library/react-native";
+import { toNumberWithDefaultZero } from "@applicaster/zapp-react-native-utils/numberUtils";
+import { View } from "react-native";
+
+jest.mock("@applicaster/zapp-react-native-utils/numberUtils", () => ({
+  toNumberWithDefaultZero: jest.fn((value) => Number(value) || 0),
+}));
+
+describe("BorderContainerView", () => {
+  describe("getBorderPadding", () => {
+    it("returns 0 for inside", () => {
+      expect(getBorderPadding("inside", 10)).toBe(0);
+    });
+
+    it("returns borderWidth / 2 for center", () => {
+      expect(getBorderPadding("center", 10)).toBe(5);
+    });
+
+    it("returns borderWidth for outside", () => {
+      expect(getBorderPadding("outside", 10)).toBe(10);
+    });
+
+    it("returns borderWidth for invalid position", () => {
+      // @ts-ignore
+      expect(getBorderPadding("other_value", 10)).toBe(10);
+    });
+  });
+
+  it("Border component renders null if no borderPosition", () => {
+    const style = { borderWidth: 5, borderRadius: 10, borderColor: "red" };
+
+    const padding = {
+      paddingTop: 2,
+      paddingRight: 3,
+      paddingBottom: 4,
+      paddingLeft: 5,
+    };
+
+    const borderPosition = null;
+
+    const { queryByTestId } = render(
+      <BorderContainerView
+        style={style}
+        testID="border-container"
+        borderPosition={borderPosition}
+        borderPaddingTop={toNumberWithDefaultZero(padding.paddingTop)}
+        borderPaddingRight={toNumberWithDefaultZero(padding.paddingRight)}
+        borderPaddingBottom={toNumberWithDefaultZero(padding.paddingBottom)}
+        borderPaddingLeft={toNumberWithDefaultZero(padding.paddingLeft)}
+      >
+        <View testID="child" />
+      </BorderContainerView>
+    );
+
+    const children = queryByTestId("border-container").children;
+
+    expect(children[1].props.testID).toBe("child");
+
+    expect(children[0].children.length).toBe(0);
+  });
+});

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

@@ -28,7 +28,10 @@ const styles = StyleSheet.create({
   },
 });
 
-const getBorderPadding = (borderPosition: BorderPosition, borderWidth) => {
+export const getBorderPadding = (
+  borderPosition: BorderPosition,
+  borderWidth: number
+) => {
   switch (borderPosition) {
     case "inside":
       return 0;

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,
@@ -38,23 +38,18 @@ function Image({
 
   const shouldRenderImg = source && !error;
 
-  // Default placeholder image fallback is empty string because it won't rerender
-  // in case of undefined or {uri: undefined} source
-  // https://github.com/facebook/react-native/issues/9195
-  const defaultPlaceHolderImage = React.useMemo(
-    () => ({ uri: placeholderImage || "" }),
-    [source, error]
-  );
+  const _source = shouldRenderImg
+    ? withDimensions(source)
+    : { uri: placeholderImage };
 
   return (
-    // @ts-ignore
     <MemoizedImage
+      key={_source?.uri || "no-image"}
       style={style as ImageStyle}
-      onError={() => setErrorState(true)}
-      source={
-        shouldRenderImg ? withDimensions(source) : defaultPlaceHolderImage
-      }
-      {...R.omit(["source"], otherProps)}
+      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}
+      {...omit(["source"], otherProps)}
     />
   );
 }