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

package/Components/Cell/Cell.tsx

@@ -14,10 +14,7 @@ import { BaseFocusable } from "../BaseFocusable";
 import { AccessibilityManager } from "@applicaster/zapp-react-native-utils/appUtils/accessibilityManager";
 
 type Props = {
-  item: {
-    id: string;
-    title: string;
-  };
+  item: ZappEntry;
   index: number;
   shouldScrollHorizontally: (arg1: [any]) => boolean | null | undefined;
   shouldScrollVertically: (...args: any) => boolean | null | undefined;
@@ -33,10 +30,9 @@ type Props = {
     id: string;
   };
   selected?: boolean;
-  CellRenderer: React.ComponentType<{
-    item: any;
-    state: string;
-  }> & { hasFocusableInside: (item: Record<string, string>) => boolean };
+  CellRenderer: React.FunctionComponent<any> & {
+    hasFocusableInside: (item: ZappEntry) => boolean;
+  };
   preferredFocus: boolean;
   navigator: {
     push: (arg1: Record<any, any>) => void;
@@ -276,7 +272,12 @@ export class CellComponent extends React.Component<Props, State> {
 
             if (isFocused) {
               const accessibilityManager = AccessibilityManager.getInstance();
-              accessibilityManager.readText({ text: item.title });
+
+              accessibilityManager.readText({
+                text: String(
+                  item.extensions?.accessibility?.label || item.title
+                ),
+              });
             }
 
             return (

package/Components/Cell/CellWithFocusable.tsx

@@ -46,7 +46,7 @@ const useCellFocusedState = (
 
 type Props = {
   item: ZappEntry;
-  CellRenderer: React.ComponentType<{ item: Object; state: string }>;
+  CellRenderer: React.FunctionComponent<any>;
   id: string;
   groupId: string;
   onFocus: Function;

package/Components/Cell/TvOSCellComponent.tsx

@@ -2,7 +2,7 @@ import * as React from "react";
 import * as R from "ramda";
 import { View, StyleSheet } from "react-native";
 
-import { Focusable } from "@applicaster/zapp-react-native-ui-components/Components/Focusable";
+import { Focusable } from "@applicaster/zapp-react-native-ui-components/Components/Focusable/FocusableTvOS";
 import { FocusableCell } from "@applicaster/zapp-react-native-ui-components/Components/FocusableCell";
 import { getItemType } from "@applicaster/zapp-react-native-utils/navigationUtils";
 import { SCREEN_TYPES } from "@applicaster/zapp-react-native-utils/navigationUtils/itemTypes";
@@ -36,10 +36,9 @@ type Props = {
     component_type: string;
   };
   selected: boolean;
-  CellRenderer: React.ComponentType<{
-    item: any;
-    state: string;
-  }> & { hasFocusableInside: (item: any) => boolean };
+  CellRenderer: React.FunctionComponent<any> & {
+    hasFocusableInside: (item: any) => boolean;
+  };
   preferredFocus: boolean;
   navigator: {
     push: (arg1: Record<any, any>) => void;
@@ -252,7 +251,7 @@ export class TvOSCellComponent extends React.Component<Props, State> {
 
     const focusableId = R.join("-", [component?.id, id, index]);
 
-    const handleFocus = (arg1: any, index: number) => {
+    const handleFocus = (arg1: any, index?: number) => {
       const focusFn = onFocus || noop;
       focusFn(arg1, index);
 
@@ -285,7 +284,7 @@ export class TvOSCellComponent extends React.Component<Props, State> {
       <View onLayout={this.onLayout} style={styles.container}>
         <Focusable
           id={focusableId}
-          groupId={groupId || component?.id}
+          groupId={(groupId || component?.id).toString()}
           onFocus={handleFocus}
           onBlur={onBlur || this.onBlur}
           isParallaxDisabled={this.layout?.width > 1740}
@@ -304,7 +303,7 @@ export class TvOSCellComponent extends React.Component<Props, State> {
                   index,
                   CellRenderer,
                   item,
-                  focused: this.props.focused || selectedCell || focused,
+                  focused: !!(this.props.focused || selectedCell || focused),
                   scrollTo: this.scrollTo,
                   behavior,
                 }}

package/Components/Focusable/FocusableTvOS.tsx

@@ -16,6 +16,8 @@ function noop() {}
 type Props = {
   id: string;
   groupId: string;
+  willReceiveFocus?: (nativeEvent: React.SyntheticEvent) => void;
+  hasReceivedFocus?: (nativeEvent: React.SyntheticEvent) => void;
   onPress?: (nativeEvent: React.SyntheticEvent) => void;
   onFocus?: (nativeEvent: React.SyntheticEvent) => void;
   onBlur?: (nativeEvent: React.SyntheticEvent) => void;
@@ -35,6 +37,8 @@ type Props = {
   forceFocus?: boolean;
   initialFocus?: boolean;
   onLayout?: (e: any) => void;
+  offsetUpdater: (arg1: string, arg2: number) => number;
+  style: any;
 };
 
 export class Focusable extends BaseFocusable<Props> {

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,42 @@ 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";
+
+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 +131,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 +147,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 +167,8 @@ describe("getTransformedPreset should return the passed components if smartCompo
         mockSmartComp,
         0,
         mockFeeds,
-        mockLayoutPresets
+        mockLayoutPresets,
+        mockUrlsMap
       );
 
       expect(Array.isArray(result)).toBe(true);
@@ -262,7 +314,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 +367,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 +439,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 +492,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";
+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/NativeFocusables/{index.js → index.ts}

@@ -1,10 +1,12 @@
 import { requireNativeComponent, View } from "react-native";
 import { isAppleTV } from "@applicaster/zapp-react-native-ui-components/Helpers/Platform";
 
+// @TODO define the types
 export const FocusableGroupNative = isAppleTV()
-  ? requireNativeComponent("FocusableGroupViewModule", null)
+  ? requireNativeComponent<any>("FocusableGroupViewModule")
   : View;
 
+// @TODO define the types
 export const FocusableItemNative = isAppleTV()
-  ? requireNativeComponent("FocusableViewModule", null)
+  ? requireNativeComponent<any>("FocusableViewModule")
   : View;

package/Components/ZappFrameworkComponents/BarView/BarView.tsx

@@ -46,6 +46,7 @@ const BarView = ({ screenStyles, barState = defaultState }: Props) => {
 
   return (
     <SafeAreaView
+      edges={["top", "left", "right"]}
       style={[style.view, isRTL ? style.rtlStyle : {}]}
       testID="BarView-safeAreaView"
     >

package/Contexts/FocusableGroupContext/withFocusableContext.tsx

@@ -1,17 +1,24 @@
-import React from "react";
+import * as React from "react";
 import { FocusableGroupContext } from "./FocusableGroupContext";
 
 export const withFocusableContext = (Component) => {
   // eslint-disable-next-line react/display-name
-  return ({ groupId, ...props }: Record<string, any>) => (
-    <FocusableGroupContext.Consumer>
-      {(groupIdContext: string) => {
-        // eslint-disable-next-line react/display-name
-        const propsGroupId = groupId || null;
-        const providedGroupId = propsGroupId || groupIdContext;
+  const WithFocusableContext = (
+    { groupId, ...props }: Record<string, any>,
+    ref
+  ) => {
+    return (
+      <FocusableGroupContext.Consumer>
+        {(groupIdContext: string) => {
+          // eslint-disable-next-line react/display-name
+          const propsGroupId = groupId || null;
+          const providedGroupId = propsGroupId || groupIdContext;
 
-        return <Component {...props} groupId={providedGroupId} />;
-      }}
-    </FocusableGroupContext.Consumer>
-  );
+          return <Component {...props} groupId={providedGroupId} ref={ref} />;
+        }}
+      </FocusableGroupContext.Consumer>
+    );
+  };
+
+  return React.forwardRef(WithFocusableContext);
 };

package/Decorators/Analytics/{index.js → index.tsx}

@@ -5,18 +5,18 @@ import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
 
 type ComponentProps = {
   component: {
-    id: string,
-    rules: { item_limit: number, component_cells_selectable: boolean },
-    component_type: string,
+    id: string;
+    rules: { item_limit: number; component_cells_selectable: boolean };
+    component_type: string;
     styles: {
-      cell_style: string,
-      header: { visible: boolean },
-      component_cells_selectable: boolean,
-    },
-  },
-  zappPipesData: { url: string, data: { title: string } },
-  selected: boolean,
-  assets: { menu_button: string },
+      cell_style: string;
+      header: { visible: boolean };
+      component_cells_selectable: boolean;
+    };
+  };
+  zappPipesData: { url: string; data: { title: string } };
+  selected: boolean;
+  assets: { menu_button: string };
 };
 
 function withAnalytics(Component) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "13.0.0-alpha.6525006318",
+  "version": "13.0.0-alpha.6714678893",
   "description": "Applicaster Zapp React Native ui components for the Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -34,10 +34,10 @@
     "redux-mock-store": "^1.5.3"
   },
   "dependencies": {
-    "@applicaster/applicaster-types": "13.0.0-alpha.6525006318",
-    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.6525006318",
-    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.6525006318",
-    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.6525006318",
+    "@applicaster/applicaster-types": "13.0.0-alpha.6714678893",
+    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.6714678893",
+    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.6714678893",
+    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.6714678893",
     "promise": "^8.3.0",
     "react-router-native": "^5.1.2",
     "url": "^0.11.0",