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

package/Components/ComponentResolver/__tests__/componentResolver.test.js

@@ -4,19 +4,21 @@ import { shallow } from "enzyme";
 import { shallowToJson } from "enzyme-to-json";
 import configureStore from "redux-mock-store";
 
-const logger = {
+const mockLogger = {
   warning: jest.fn(),
 };
 
 jest.mock("../../../Helpers/logger", () => ({
   componentsLogger: {
-    addSubsystem: jest.fn(() => logger),
+    addSubsystem: jest.fn(() => mockLogger),
   },
 }));
 
-jest.mock("../../default-cell-renderer", () =>
-  jest.fn((prop) => <View whoAmI="default renderer" someProp={prop} />)
-);
+jest.mock("../../default-cell-renderer", () => {
+  const View = jest.requireActual("react-native").View;
+
+  return jest.fn((prop) => <View whoAmI="default renderer" someProp={prop} />);
+});
 
 const mock_rtl_flag = false;
 
@@ -48,7 +50,7 @@ function clearAllMocks() {
   SomeComponent.mockClear();
   decorators.mockClear();
   renderFunction.mockClear();
-  logger.warning.mockClear();
+  mockLogger.warning.mockClear();
 }
 
 describe("ComponentResolver", () => {
@@ -104,16 +106,16 @@ describe("ComponentResolverComponent", () => {
     expect(shallowToJson(wrapper)).toMatchSnapshot();
     expect(wrapper.isEmptyRender()).toBe(true);
 
-    expect(logger.warning).toHaveBeenCalledTimes(2);
+    expect(mockLogger.warning).toHaveBeenCalledTimes(2);
 
-    expect(logger.warning).toHaveBeenNthCalledWith(
+    expect(mockLogger.warning).toHaveBeenNthCalledWith(
       1,
       expect.objectContaining({
         message: "Could not resolve cell builder plugin",
       })
     );
 
-    expect(logger.warning).toHaveBeenNthCalledWith(
+    expect(mockLogger.warning).toHaveBeenNthCalledWith(
       2,
       expect.objectContaining({
         message: warningMessage,

package/Components/DisplayState/__tests__/__snapshots__/displayState.test.js.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`DISPLAY_STATES matches the snapshot 1`] = `
-Object {
+{
   "CONTENT": "CONTENT",
   "CONTROLS": "CONTROLS",
   "DISCOVERY": "DISCOVERY",
@@ -9,7 +9,7 @@ Object {
 `;
 
 exports[`DisplayStateContext has the correct properties 1`] = `
-Object {
+{
   "Consumer": [MockFunction],
   "Provider": [MockFunction],
   "withConsumer": [MockFunction],

package/Components/Focusable/Focusable.tsx

@@ -1,5 +1,4 @@
 import * as React from "react";
-import * as R from "ramda";
 
 import { BaseFocusable } from "../BaseFocusable";
 import { focusManager } from "@applicaster/zapp-react-native-utils/appUtils/focusManager";
@@ -42,8 +41,6 @@ class Focusable extends BaseFocusable<Props> {
     this.resetLongPressTimeout = this.resetLongPressTimeout.bind(this);
     this.longPress = this.longPress.bind(this);
     this.press = this.press.bind(this);
-    this.focus = this.focus.bind(this);
-    this.blur = this.blur.bind(this);
   }
 
   /**
@@ -55,37 +52,6 @@ class Focusable extends BaseFocusable<Props> {
     return this.preferredFocus();
   }
 
-  /**
-   * Sets the focus on this item. Will trigger sequentially a sequence of
-   * functions (willReceiveFocus, focus, hasReceivedFocus). If these functions (defined in the Focusable
-   * Item underlying component) return promises, execution will wait before it proceeds to the next. This
-   * is useful for triggering sequential operations that specifically require to fully run before or after
-   * focus is actually set on that item.
-   * @param {string} scrollDirection string representation of the direction of the navigation which landed
-   * to this item being focused
-   */
-  setFocus(scrollDirection) {
-    const focusMethods = [
-      this.willReceiveFocus,
-      this.focus,
-      this.hasReceivedFocus,
-    ];
-
-    const self = this;
-
-    return R.reduce(
-      (sequence, method) => {
-        return sequence
-          .then(() => method.apply(self, [scrollDirection]))
-          .catch((e) => {
-            throw e;
-          });
-      },
-      Promise.resolve(),
-      focusMethods
-    );
-  }
-
   startLongPressTimeout() {
     this.longPressTimeout = setTimeout(() => {
       this.longPress(null);
@@ -102,26 +68,6 @@ class Focusable extends BaseFocusable<Props> {
     }
   }
 
-  /**
-   * will invoke the underlying component's focus method
-   * @param {Object} scrollDirection
-   * @returns {Promise}
-   */
-  focus(scrollDirection) {
-    return this.onFocus(this, scrollDirection); // invokeComponentMethod(this, "onFocus", scrollDirection);
-  }
-
-  /**
-   * will invoke the underlying component's blur method
-   * @param {Object} scrollDirection
-   * @returns {Promise}
-   */
-  blur(
-    scrollDirection?: FocusManager.Web.Direction | FocusManager.IOS.Direction
-  ) {
-    return this.onBlur(this, scrollDirection);
-  }
-
   /**
    * will invoke the underlying component's press method
    * @param {Object} keyEvent

package/Components/Focusable/FocusableTvOS.tsx

@@ -9,7 +9,7 @@ import {
   focusManager,
   forceFocusableFocus,
 } from "@applicaster/zapp-react-native-utils/appUtils/focusManager/index.ios";
-import { findNodeHandle } from "react-native";
+import { findNodeHandle, ViewStyle } from "react-native";
 
 function noop() {}
 
@@ -35,6 +35,10 @@ type Props = {
   forceFocus?: boolean;
   initialFocus?: boolean;
   onLayout?: (e: any) => void;
+  willReceiveFocus: () => void;
+  hasReceivedFocus: () => void;
+  offsetUpdater: (arg1: string, arg2: number) => number;
+  style: ViewStyle;
 };
 
 export class Focusable extends BaseFocusable<Props> {
@@ -90,7 +94,7 @@ export class Focusable extends BaseFocusable<Props> {
     onBlur(nativeEvent);
   }
 
-  setFocus(direction, callback) {
+  setFocus(_direction, callback) {
     const focusMethods = [
       { method: this.willReceiveFocus },
       { method: this.focus, args: [callback] },

package/Components/FocusableList/index.tsx

@@ -15,6 +15,7 @@ import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
 
 import { useParentFocus, useCheckItemIdsForUnique } from "./hooks";
 import { FocusableListItemWrapper } from "./FocusableListItemWrapper";
+import { FocusableScrollView } from "../FocusableScrollView";
 
 const mapIndexed = R.addIndex(R.map);
 
@@ -54,6 +55,7 @@ export type Props<ItemT> = FlatListProps<ItemT> & {
   disableNextFocusUp?: boolean;
   disableNextFocusLeft?: boolean;
   disableNextFocusRight?: boolean;
+  useScrollView?: boolean;
 } & ParentFocus;
 
 function FocusableListComponent<ItemT>(props: Props<ItemT>, ref) {
@@ -87,8 +89,8 @@ function FocusableListComponent<ItemT>(props: Props<ItemT>, ref) {
     initialFocusDirection = "down",
     data = [],
     // eslint-disable-next-line unused-imports/no-unused-vars
-    onAllComponentsLoaded, // TODO: re-implement it
     omitPropsPropagation = [],
+    useScrollView = false,
   } = props;
 
   useCheckItemIdsForUnique({ componentId: props.id, items: data });
@@ -274,6 +276,7 @@ function FocusableListComponent<ItemT>(props: Props<ItemT>, ref) {
         "initialFocusDirection",
         "withStateMemory",
         "useSequentialLoading",
+        "useScrollView",
         ...omitPropsPropagation,
       ],
       R.__
@@ -296,15 +299,27 @@ function FocusableListComponent<ItemT>(props: Props<ItemT>, ref) {
   return (
     // @ts-ignore
     <ChildrenFocusDeactivatorView flex={1}>
-      <FlatList
-        focusable={false}
-        scrollEnabled={false}
-        ref={ref}
-        {...getFlatListProps(props)}
-        renderItem={renderItem}
-        onEndReached={onEndReached}
-        initialNumToRender={initialNumToRender}
-      />
+      {useScrollView ? (
+        <FocusableScrollView
+          ref={ref}
+          {...getFlatListProps(props)}
+          onEndReached={onEndReached}
+          initialNumToRender={initialNumToRender}
+          renderItem={renderItem}
+          focused={focused}
+          data={data}
+        />
+      ) : (
+        <FlatList
+          focusable={false}
+          scrollEnabled={false}
+          ref={ref}
+          {...getFlatListProps(props)}
+          renderItem={renderItem}
+          onEndReached={onEndReached}
+          initialNumToRender={initialNumToRender}
+        />
+      )}
     </ChildrenFocusDeactivatorView>
   );
 }

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;
+
+function getEntry<T>(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,11 +293,18 @@ 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,
         };

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,7 +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";
 
@@ -12,12 +10,15 @@ type Props = {
 };
 
 const styles = StyleSheet.create({
-  container: { position: "absolute", top: 0, zIndex: 10, width: 1920 },
+  container: {
+    position: "absolute",
+    top: 0,
+    zIndex: 10,
+    width: 1920,
+  },
 });
 
 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);
 
@@ -26,9 +27,9 @@ export const NavBarContainer = ({ children, isVisible, onReady }: Props) => {
       // 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),
+      maxHeight: 1,
     }),
-    [screenLayout, screenConfig]
+    [screenConfig]
   );
 
   React.useEffect(() => {

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,14 +3,14 @@
 exports[`NavBarContainer renders 1`] = `
 <View
   style={
-    Array [
-      Object {
+    [
+      {
         "position": "absolute",
         "top": 0,
         "width": 1920,
         "zIndex": 10,
       },
-      Object {
+      {
         "maxHeight": 10,
       },
     ]