@applicaster/zapp-react-native-ui-components 13.0.0-alpha.6525006318 → 13.0.0-alpha.6912563393

package/Components/FocusableScrollView/index.tsx

@@ -11,6 +11,13 @@ import {
   useInitialFocus,
 } from "@applicaster/zapp-react-native-utils/focusManager";
 
+export type FocusableScrollViewRenderItem = (info: {
+  item: ZappUIComponent;
+  index: number;
+  focused: boolean;
+  parentFocus: ParentFocus;
+}) => React.ReactElement;
+
 export type Props = ScrollViewProps & {
   id?: number | string;
   horizontal?: boolean;
@@ -32,17 +39,27 @@ export type Props = ScrollViewProps & {
   initialFocusDirection?: FocusManager.Android.FocusNavigationDirections;
   onAllComponentsLoaded?: () => void;
   omitPropsPropagation?: Array<keyof FlatListProps<any>>;
-  renderItem: (info: {
-    item: ZappUIComponent;
-    index: number;
-    focused: boolean;
-    parentFocus: ParentFocus;
-  }) => React.ReactElement;
+  renderItem: FocusableScrollViewRenderItem;
 } & ParentFocus;
 
 type State = boolean[];
 type Action = { index?: number; isFocusable: boolean; type?: string };
 
+const unwrapArray = (maybeArray) =>
+  Array.isArray(maybeArray) ? maybeArray[0] : maybeArray;
+
+const getEntry = <T extends unknown>(data: T | T[], index: unknown): T => {
+  let entry;
+
+  if (R.isNil(index)) {
+    entry = unwrapArray(data);
+  } else if (typeof index === "number") {
+    entry = unwrapArray(data[index]);
+  }
+
+  return entry;
+};
+
 const focusableStateReducer = (
   state: State,
   { index = null, isFocusable, type = null }: Action
@@ -73,7 +90,7 @@ const extendScrollViewRef = (_ref, childCompsMeasurementsMap) => {
   };
 
   _ref.scrollToIndex = (params) => {
-    const { index, viewOffset } = params;
+    const { index, viewOffset = 0 } = params;
 
     const itemByIndex = R.find(R.propEq("index", index))(
       R.values(childCompsMeasurementsMap)
@@ -129,8 +146,11 @@ function FocusableScrollViewComponent(props: Props, ref) {
   );
 
   const getFocusableEntryId = React.useCallback(
-    (_entry: ZappEntry, index?: number) => {
-      const entry = R.isNil(index) ? _entry : data[index];
+    (_entry: ZappEntry | null, index?: number) => {
+      const entry: { id?: string } = getEntry(
+        R.isNil(index) ? _entry : data,
+        index
+      );
 
       return entry ? `${props.id}--${entry?.id}` : undefined;
     },
@@ -273,16 +293,25 @@ function FocusableScrollViewComponent(props: Props, ref) {
   const renderItem = React.useCallback(
     (item, index) => {
       const renderArgs = { item, index };
-      const id = `${props.id}--${renderArgs?.item?.id}`;
-      const nextFocus = getNextFocus(renderArgs?.index);
+
+      const id = getFocusableEntryId(
+        Array.isArray(item) ? item[0] : item,
+        index
+      );
+
+      const nextFocus = getNextFocus(index);
 
       const onItemLayout = (event) => {
-        childCompsMeasurementsMap.current[item.id] = {
+        childCompsMeasurementsMap.current[
+          Array.isArray(item) ? index : item.id
+        ] = {
           index,
           layout: event.nativeEvent.layout,
         };
       };
 
+      const onSetIsFocusable = setIsFocusable(renderArgs.index);
+
       return (
         <View key={id} onLayout={onItemLayout}>
           <Focusable
@@ -305,6 +334,7 @@ function FocusableScrollViewComponent(props: Props, ref) {
             id={id}
             disableFocus={shouldDisableFocus(renderArgs?.index)}
             blockFocus={!isRendered(renderArgs?.index)}
+            onSetIsFocusable={onSetIsFocusable}
             {...focusableItemProps}
           >
             {(focused, parentFocus, parentRef) => (
@@ -319,7 +349,7 @@ function FocusableScrollViewComponent(props: Props, ref) {
                 isReadyToRender={isReadyToRender}
                 onLoadFinished={onLoadFinished(renderArgs.index)}
                 onLoadFailed={onLoadFailed(renderArgs.index)}
-                setIsFocusable={setIsFocusable(renderArgs.index)}
+                setIsFocusable={onSetIsFocusable}
               />
             )}
           </Focusable>

package/Components/GeneralContentScreen/utils/__tests__/useCurationAPI.test.js

@@ -1,3 +1,4 @@
+import * as React from "react";
 import { renderHook } from "@testing-library/react-hooks";
 
 import {
@@ -9,6 +10,51 @@ import {
 import * as redux from "react-redux";
 import * as layoutPresets from "@applicaster/zapp-react-native-redux/hooks/useLayoutPresets";
 import * as pipesFeeds from "@applicaster/zapp-react-native-redux/hooks/useZappPipesFeeds";
+import { NavigationContext } from "@applicaster/zapp-react-native-ui-components/Contexts/NavigationContext";
+import { PathnameContext } from "@applicaster/zapp-react-native-ui-components/Contexts/PathnameContext";
+
+import { Provider } from "react-redux";
+import configureStore from "redux-mock-store";
+
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/navigation/useRoute",
+  () => ({
+    useRoute: jest.fn().mockReturnValue({
+      pathname: "/home",
+    }),
+  })
+);
+
+const homeStack = {
+  route: "/home",
+  state: {
+    screen: { id: "123" },
+    entry: { id: "abc" },
+  },
+};
+
+const mainStackNavigator = {
+  getStackForPathname: jest.fn().mockReturnValue(homeStack),
+  modalState: {
+    screen: {
+      id: "modal-1",
+    },
+  },
+};
+
+const store = configureStore()({});
+
+const wrapper = ({ children }) => (
+  <Provider store={store}>
+    <NavigationContext.Provider
+      value={{ ...mainStackNavigator, currentRoute: homeStack.route }}
+    >
+      <PathnameContext.Provider value={homeStack.route}>
+        {children}
+      </PathnameContext.Provider>
+    </NavigationContext.Provider>
+  </Provider>
+);
 
 describe("getTransformedPreset should return the passed components if smartComponents is empty", () => {
   describe("getTransformedPreset function", () => {
@@ -94,9 +140,13 @@ describe("getTransformedPreset should return the passed components if smartCompo
       },
     };
 
+    const mockUrlsMap = {
+      [mockSmartComp.id]: mockSmartComp.data.source,
+    };
+
     it("should return the component itself if its component_type is not SMART_COMPONENT_TYPE", () => {
       expect(
-        enrichComponent(mockComp, 0, mockFeeds, mockLayoutPresets)
+        enrichComponent(mockComp, 0, mockFeeds, mockLayoutPresets, mockUrlsMap)
       ).toEqual([mockComp]);
     });
 
@@ -106,8 +156,18 @@ describe("getTransformedPreset should return the passed components if smartCompo
         data: { source: "missing_source" },
       };
 
+      const missing_source_urls_map = {
+        [missing_source_comp.id]: missing_source_comp.data.source,
+      };
+
       expect(
-        enrichComponent(missing_source_comp, 0, mockFeeds, mockLayoutPresets)
+        enrichComponent(
+          missing_source_comp,
+          0,
+          mockFeeds,
+          mockLayoutPresets,
+          missing_source_urls_map
+        )
       ).toEqual(null);
     });
 
@@ -116,7 +176,8 @@ describe("getTransformedPreset should return the passed components if smartCompo
         mockSmartComp,
         0,
         mockFeeds,
-        mockLayoutPresets
+        mockLayoutPresets,
+        mockUrlsMap
       );
 
       expect(Array.isArray(result)).toBe(true);
@@ -262,7 +323,9 @@ describe("getTransformedPreset should return the passed components if smartCompo
 
       mockUseLayoutPresets.mockReturnValue({});
 
-      const { result } = renderHook(() => useCurationAPI(mockComponents));
+      const { result } = renderHook(() => useCurationAPI(mockComponents), {
+        wrapper,
+      });
 
       // if there are no smart components, it should return the original array
       expect(result.current).toEqual(mockComponents);
@@ -313,7 +376,9 @@ describe("getTransformedPreset should return the passed components if smartCompo
 
       mockUseLayoutPresets.mockReturnValue(mockLayoutPresets);
 
-      const { result } = renderHook(() => useCurationAPI(mockComponents));
+      const { result } = renderHook(() => useCurationAPI(mockComponents), {
+        wrapper,
+      });
 
       expect(result.current).toEqual(mockTransformedComponents);
     });
@@ -383,7 +448,9 @@ describe("getTransformedPreset should return the passed components if smartCompo
 
       mockUseLayoutPresets.mockReturnValue(mockLayoutPresets);
 
-      const { result } = renderHook(() => useCurationAPI(mockComponents));
+      const { result } = renderHook(() => useCurationAPI(mockComponents), {
+        wrapper,
+      });
 
       expect(result.current).toEqual(mockTransformedComponents);
     });
@@ -434,7 +501,9 @@ describe("getTransformedPreset should return the passed components if smartCompo
     const mockUseLayoutPresets = jest.spyOn(layoutPresets, "useLayoutPresets");
     mockUseLayoutPresets.mockReturnValue(mockLayoutPresets);
 
-    const { result } = renderHook(() => useCurationAPI(mockComponents));
+    const { result } = renderHook(() => useCurationAPI(mockComponents), {
+      wrapper,
+    });
 
     expect(result.current).toEqual(mockTransformedComponents);
   });

package/Components/GeneralContentScreen/utils/useCurationAPI.ts

@@ -9,6 +9,18 @@ import { loadPipesData } from "@applicaster/zapp-react-native-redux/ZappPipes";
 import { isEmptyOrNil } from "@applicaster/zapp-react-native-utils/cellUtils";
 import { Categories } from "./logger";
 import { createLogger } from "@applicaster/zapp-react-native-utils/logger";
+import { useRoute } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useRoute";
+import {
+  ZappPipesEntryContext,
+  ZappPipesScreenContext,
+  ZappPipesSearchContext,
+} from "@applicaster/zapp-react-native-ui-components/Contexts";
+
+import {
+  getInflatedDataSourceUrl,
+  getSearchContext,
+} from "@applicaster/zapp-react-native-utils/reactHooks/feed/useInflatedUrl";
+
 import { produce } from "immer";
 // types reference
 
@@ -20,6 +32,7 @@ type LayoutPresets = PresetsMapping["presets_mappings"];
 
 const SMART_COMPONENT_TYPE = "quick-brick-smart-component";
 const SOURCE_PATH = ["data", "source"];
+const MAPPING_PATH = ["data", "mapping"];
 
 const isSmartComponent = (component) =>
   component.component_type === SMART_COMPONENT_TYPE;
@@ -58,13 +71,14 @@ export const enrichComponent = (
   comp: ZappUIComponent,
   index: number,
   feeds: Feeds,
-  layoutPresets: LayoutPresets
+  layoutPresets: LayoutPresets,
+  urlsMap: { [key: string]: string }
 ): ZappUIComponent[] | null => {
   if (!isSmartComponent(comp)) {
     return [comp];
   }
 
-  const presets = prop<string[]>(path(SOURCE_PATH, comp), feeds);
+  const presets = prop<string[]>(urlsMap[comp.id], feeds);
 
   if (presets && presets.data && presets.data.entry) {
     return presets.data.entry
@@ -113,11 +127,35 @@ export const useCurationAPI = (
     [components]
   );
 
-  const urls = useMemo<string[]>(
-    () =>
-      smartComponents?.map?.((component) => path(SOURCE_PATH, component)) ?? [],
-    [smartComponents]
-  );
+  const { pathname } = useRoute();
+  const [entryContext] = ZappPipesEntryContext.useZappPipesContext(pathname);
+  const [searchContext] = ZappPipesSearchContext.useZappPipesContext();
+  const [screenContext] = ZappPipesScreenContext.useZappPipesContext();
+
+  const urlsMap = useMemo<{ [key: string]: string }>(() => {
+    const map = {};
+
+    smartComponents?.forEach?.((component) => {
+      const url = path(SOURCE_PATH, component);
+      const mapping = path(MAPPING_PATH, component);
+
+      map[component.id] = mapping
+        ? getInflatedDataSourceUrl({
+            source: url,
+            contexts: {
+              entry: entryContext,
+              screen: screenContext,
+              search: getSearchContext(searchContext, mapping),
+            },
+            mapping,
+          })
+        : url;
+    });
+
+    return map;
+  }, [smartComponents, entryContext, screenContext, searchContext]);
+
+  const urls = useMemo<string[]>(() => Object.values(urlsMap), [urlsMap]);
 
   useEffect(() => {
     urls.forEach((url, index) => {
@@ -138,11 +176,17 @@ export const useCurationAPI = (
     if (!components) return [];
 
     return components.reduce((acc, comp, index) => {
-      const enrichedComp = enrichComponent(comp, index, feeds, layoutPresets);
+      const enrichedComp = enrichComponent(
+        comp,
+        index,
+        feeds,
+        layoutPresets,
+        urlsMap
+      );
 
       return enrichedComp ? [...acc, ...enrichedComp] : acc;
     }, [] as Array<ZappUIComponent>);
-  }, [components, feeds, layoutPresets]);
+  }, [components, feeds, layoutPresets, urlsMap]);
 
   return getFinalComponents(
     enrichedComponents,

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/__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: () => ({}),
 }));
 

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

@@ -8,7 +8,7 @@ exports[`Layout TV renders 1`] = `
 >
   <View
     Components={
-      Object {
+      {
         "Background": [Function],
         "NavBar": [Function],
       }

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

@@ -8,9 +8,13 @@ import configureStore from "redux-mock-store";
 
 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;
+
+  return {
+    Screen: View,
+  };
+});
 
 const Layout = require("../index.web").default;
 

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

@@ -38,22 +38,16 @@ 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
       style={style as ImageStyle}
-      onError={() => setErrorState(true)}
-      source={
-        shouldRenderImg ? withDimensions(source) : defaultPlaceHolderImage
-      }
+      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)}
     />
   );