@applicaster/zapp-react-native-ui-components 13.0.0-alpha.5371423120 → 13.0.0-alpha.6095951301

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/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/__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,
       },
     ]

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,14 +14,14 @@ exports[`ScreenContainer renders 1`] = `
 >
   <View
     style={
-      Array [
-        Object {
+      [
+        {
           "position": "absolute",
           "top": 0,
           "width": 1920,
           "zIndex": 10,
         },
-        Object {
+        {
           "maxHeight": 10,
         },
       ]
@@ -30,7 +30,7 @@ exports[`ScreenContainer renders 1`] = `
   >
     <View
       isVisible={true}
-      menuPlugin={Object {}}
+      menuPlugin={{}}
       navigationProps={null}
     />
   </View>
@@ -38,13 +38,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/SecondaryImage/__tests__/__snapshots__/Image.test.tsx.snap

@@ -6,7 +6,7 @@ exports[`SecondaryImage - Image SecondaryImage should render if known dimensions
 <View
   onLayout={[Function]}
   style={
-    Object {
+    {
       "borderRadius": 10,
       "height": 100,
       "width": 100,
@@ -16,12 +16,12 @@ exports[`SecondaryImage - Image SecondaryImage should render if known dimensions
   <Image
     onAsyncRender={[Function]}
     source={
-      Object {
+      {
         "uri": "",
       }
     }
     style={
-      Object {
+      {
         "aspectRatio": 1,
         "borderRadius": 10,
         "height": 100,

package/Components/MasterCell/SharedUI/CollapsibleTextContainer/__tests__/__snapshots__/index.test.tsx.snap

@@ -3,7 +3,7 @@
 exports[`CollapsibleTextContainer render container+children when label is presented 1`] = `
 <View
   style={
-    Object {
+    {
       "backgroundColor": "#000000",
     }
   }