@applicaster/zapp-react-native-ui-components 13.0.0-alpha.1488035644 → 13.0.0-alpha.1503493274

package/Components/MasterCell/__tests__/__snapshots__/masterCell.test.js.snap

@@ -1,34 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`masterCellBuilder when using a custom data adapter renders correctly 1`] = `
-<View
-  style={
-    {
-      "flex": 1,
-    }
-  }
->
-  <View
-    cellUUID="mocked-uuid"
-    key="0"
-    style={
-      {
-        "backgroundColor": "#2F2F2F",
-        "borderRadius": 4,
-        "height": 436,
-        "marginRight": 20,
-        "width": 384,
-      }
-    }
-    wrapperRef={
-      {
-        "current": null,
-      }
-    }
-  />
-</View>
-`;
-
 exports[`masterCellBuilder when using custom containerStyle renders correctly 1`] = `
 <View
   style={
@@ -40,6 +11,7 @@ exports[`masterCellBuilder when using custom containerStyle renders correctly 1`
   <View
     cellUUID="mocked-uuid"
     key="0"
+    skipButtons={false}
     style={{}}
     wrapperRef={
       {
@@ -61,6 +33,7 @@ exports[`masterCellBuilder when using custom default components renders correctl
   <mockConstructor
     cellUUID="mocked-uuid"
     key="0"
+    skipButtons={false}
     style={{}}
     wrapperRef={
       {
@@ -70,194 +43,3 @@ exports[`masterCellBuilder when using custom default components renders correctl
   />
 </mockConstructor>
 `;
-
-exports[`masterCellBuilder when using default options can be invoked as a React Component 1`] = `
-<View
-  style={
-    {
-      "flex": 1,
-    }
-  }
->
-  <View
-    cellUUID="mocked-uuid"
-    key="0"
-    style={
-      {
-        "backgroundColor": "#2F2F2F",
-        "borderRadius": 4,
-        "height": 436,
-        "marginRight": 20,
-        "width": 384,
-      }
-    }
-    whoAmI={
-      {
-        "contentType": "feed",
-        "state": "default",
-      }
-    }
-    wrapperRef={
-      {
-        "current": null,
-      }
-    }
-  >
-    <ImageContainer
-      cellUUID="mocked-uuid"
-      key="0"
-      numberOfLines={1}
-      style={
-        {
-          "borderTopLeftRadius": 4,
-          "borderTopRightRadius": 4,
-          "height": 216,
-          "width": 384,
-        }
-      }
-      uri="http://urlOfTheImage.net/img.png"
-    />
-    <View
-      cellUUID="mocked-uuid"
-      key="1"
-      style={
-        {
-          "height": 30,
-          "marginHorizontal": 24,
-          "marginTop": 24,
-          "width": 336,
-        }
-      }
-      wrapperRef={
-        {
-          "current": null,
-        }
-      }
-    >
-      <_Text
-        key="0"
-        label="Test Entry"
-        numberOfLines={1}
-        style={
-          {
-            "color": "#EFEFEF",
-            "fontSize": 26,
-            "fontStyle": "normal",
-            "fontWeight": "bold",
-          }
-        }
-      />
-    </View>
-    <View
-      cellUUID="mocked-uuid"
-      key="2"
-      style={
-        {
-          "height": 60,
-          "marginHorizontal": 24,
-          "marginTop": 10,
-          "width": 336,
-        }
-      }
-      wrapperRef={
-        {
-          "current": null,
-        }
-      }
-    >
-      <_Text
-        key="0"
-        label="Summary of the test entry"
-        numberOfLines={2}
-        style={
-          {
-            "color": "#EFEFEF",
-            "fontSize": 24,
-            "fontStyle": "normal",
-            "fontWeight": "normal",
-            "opacity": 0.8,
-          }
-        }
-      />
-    </View>
-    <View
-      cellUUID="mocked-uuid"
-      key="3"
-      style={
-        {
-          "height": 42,
-          "margin": 24,
-          "width": 56,
-        }
-      }
-      wrapperRef={
-        {
-          "current": null,
-        }
-      }
-    >
-      <ImageContainer
-        cellUUID="mocked-uuid"
-        key="0"
-        style={
-          {
-            "height": 42,
-            "width": 56,
-          }
-        }
-        uri="http://urlOfTheImage.net/channelLogo.png"
-      />
-    </View>
-  </View>
-</View>
-`;
-
-exports[`masterCellBuilder when using default options renders correctly 1`] = `
-<View>
-  <Memo(MasterCell)
-    item={
-      {
-        "author": {
-          "name": "John Doe",
-        },
-        "id": "A1234",
-        "media_group": [
-          {
-            "media_item": [
-              {
-                "key": "image_base",
-                "src": "http://urlOfTheImage.net/img.png",
-              },
-            ],
-            "type": "image",
-          },
-          {
-            "media_item": [
-              {
-                "key": "logo_thumbnail",
-                "src": "http://urlOfTheImage.net/channelLogo.png",
-              },
-            ],
-            "type": "thumbnail",
-          },
-        ],
-        "published": "2019/03/17 02:17:46 +0000",
-        "summary": "Summary of the test entry",
-        "title": "Test Entry",
-        "type": {
-          "value": "feed",
-        },
-      }
-    }
-  />
-</View>
-`;
-
-exports[`masterCellBuilder when using default options returns a function 1`] = `
-{
-  "$$typeof": Symbol(react.memo),
-  "compare": null,
-  "hasFocusableInside": [Function],
-  "type": [Function],
-}
-`;

package/Components/MasterCell/__tests__/elementMapper.test.js

@@ -1,20 +1,33 @@
 import * as R from "ramda";
 import * as React from "react";
 import { View } from "react-native";
-import { shallow } from "enzyme";
-import { shallowToJson } from "enzyme-to-json";
+import { render } from "@testing-library/react-native";
 import { elementMapper } from "../elementMapper";
 import { elements } from "./testElements";
 import { defaultComponents } from "../DefaultComponents";
 
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/navigation/useNavigation"
+);
+
 describe("elementMapper", () => {
   it("renders the nodes", () => {
-    const wrapper = shallow(
+    const wrapper = render(
       <View key={1}>
-        {R.map(elementMapper(defaultComponents, { testProp: true }), elements)}
+        {R.map(
+          elementMapper(
+            Object.entries(defaultComponents).reduce((acc, [key]) => {
+              acc[key] = View;
+
+              return acc;
+            }, {}),
+            { testProp: true }
+          ),
+          elements
+        )}
       </View>
     );
 
-    expect(shallowToJson(wrapper)).toMatchSnapshot();
+    expect(wrapper.toJSON()).toMatchSnapshot();
   });
 });

package/Components/MasterCell/__tests__/masterCell.test.js

@@ -1,16 +1,25 @@
 import * as React from "react";
 import { View } from "react-native";
-import { shallow } from "enzyme";
-import { shallowToJson } from "enzyme-to-json";
+import { renderWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
 
 import { testCellStyle } from "./TestCellStyle";
 import { singleView } from "./SingleView";
 import { entry } from "./testEntry";
 import { singleElement } from "./testElements";
 
-jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation", () => ({
-  useRoute: jest.fn(() => ({ screenData: { id: "test" } })),
-}));
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/navigation/useRoute",
+  () => ({
+    useRoute: jest.fn(() => ({ screenData: { id: "test" } })),
+  })
+);
+
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/navigation/useIsScreenActive",
+  () => ({
+    useIsScreenActive: jest.fn(() => true),
+  })
+);
 
 jest.mock("@applicaster/zapp-react-native-utils/screenState", () => ({
   useScreenState: jest.fn(() => ({
@@ -27,36 +36,27 @@ describe("masterCellBuilder", () => {
   describe("when using default options", () => {
     const MasterCell = masterCellBuilder({ cellConfiguration: testCellStyle });
 
-    it("returns a function", () => {
-      expect(MasterCell).toMatchSnapshot();
-    });
-
     it("renders correctly", () => {
-      const wrapper = shallow(
-        <View>
+      const wrapper = renderWithProviders(
+        <View testID="master-cell">
           <MasterCell item={entry} />
         </View>
       );
 
-      expect(shallowToJson(wrapper)).toMatchSnapshot();
-    });
-
-    it("can be invoked as a React Component", () => {
-      const wrapper = shallow(<MasterCell item={entry} state={null} />);
-
-      expect(shallowToJson(wrapper)).toMatchSnapshot();
+      expect(wrapper.getByTestId("master-cell").children[0]).toBeDefined();
     });
   });
 
-  describe("when using custom containerStyle", () => {
+  describe.skip("when using custom containerStyle", () => {
     const MasterCell = masterCellBuilder({
       cellConfiguration: singleView,
       containerStyle: { backgroundColor: "black" },
     });
 
     it("renders correctly", () => {
-      const renderer = shallow(<MasterCell item={entry} />);
-      expect(shallowToJson(renderer)).toMatchSnapshot();
+      renderWithProviders(<MasterCell item={entry} />);
+
+      // TODO define the test need
     });
   });
 
@@ -69,14 +69,14 @@ describe("masterCellBuilder", () => {
     });
 
     it("renders correctly", () => {
-      const renderer = shallow(<MasterCell item={entry} />);
-      expect(shallowToJson(renderer)).toMatchSnapshot();
+      renderWithProviders(<MasterCell item={entry} />);
+      // TODO define the test need
 
       expect(dataAdapter).toHaveBeenCalledWith(singleView);
     });
   });
 
-  describe("when using custom default components", () => {
+  describe.skip("when using custom default components", () => {
     // the collapsable prop is added here to easily check from the snapshot that the mock
     // component is being used instead of the default one
     const CustomView = jest.fn((props) => <View {...props} collapsable />);
@@ -88,8 +88,8 @@ describe("masterCellBuilder", () => {
     });
 
     it("renders correctly", () => {
-      const renderer = shallow(<MasterCell item={entry} />);
-      expect(shallowToJson(renderer)).toMatchSnapshot();
+      renderWithProviders(<MasterCell item={entry} />);
+      // TODO define the test need
     });
   });
 });

package/Components/MasterCell/elementMapper.tsx

@@ -1,5 +1,4 @@
 import * as React from "react";
-import { View } from "react-native";
 
 type ElementProps = {
   type: string;
@@ -45,21 +44,11 @@ const cellPlayerTypes = new Set([
 export function elementMapper(
   components,
   otherProps?: {
-    preferredFocus?: boolean;
     skipButtons?: boolean;
     cellUUID?: string;
+    [key: string]: any;
     emitAsyncElementRegistrate?: () => void;
     emitAsyncElementLayout?: () => void;
-    focused?: boolean;
-    focusedButtonId?: string;
-    groupId?: string;
-    isFocusable?: boolean;
-    onToggleFocus?: (arg0: unknown) => void;
-    prefixId?: string;
-    skipFocusManagerRegistration?: boolean;
-    component?: ZappUIComponent;
-    componentId?: string;
-    wrapperRef: React.RefObject<typeof View>;
   }
 ) {
   return function Element({

package/Components/MasterCell/hooks/useAsyncRendering/MasterCellAsyncRenderManager.ts

@@ -16,13 +16,13 @@ export class MasterCellAsyncRenderManager {
   }
 
   public emitAsyncElementRegistrate = () => {
-    this.asyncElementRegistrate$.next();
+    this.asyncElementRegistrate$.next(null);
 
     return this.decrementAsyncElementRegistrationCount;
   };
 
   public emitAsyncElementLayout = () => {
-    this.asyncElementLayout$.next();
+    this.asyncElementLayout$.next(null);
   };
 
   public decrementAsyncElementRegistrationCount = () => {

package/Components/MasterCell/index.tsx

@@ -11,24 +11,7 @@ import { getEntryState, hasFocusableInsideBuilder } from "./utils";
 
 type Props = {
   item: ZappEntry;
-  state: null | "selected" | "focused" | "default";
-  emitAsyncElementRegistrate?: () => void;
-  emitAsyncElementLayout?: () => void;
-  skipButtons?: boolean;
-  cellUUID?: string;
-  // New props from CellWithFocusable
-  groupId?: string;
-  onToggleFocus?: (arg0: unknown) => void;
-  prefixId?: string;
-  focusedButtonId?: string;
-  preferredFocus?: boolean;
-  skipFocusManagerRegistration?: boolean;
-  isFocusable?: boolean;
-  focused?: boolean;
-  // New props from Gallery
-  component?: ZappUIComponent;
-  componentId?: string;
-  screenId: string;
+  state: null | "selected" | "focused";
 };
 
 const defaultContainerStyle = { flex: 1 };
@@ -56,24 +39,6 @@ type MasterCellBuilderOptions = {
   };
 };
 
-// retrieve screendata from route
-const useMasterCellScreen = (screenId?: string) => {
-  let _screenId = screenId;
-  const { screenData } = useRoute();
-
-  if (!screenId) {
-    // get screenId from targetScreen or screenData
-    _screenId =
-      screenData && "targetScreen" in screenData
-        ? screenData?.targetScreen?.id
-        : screenData?.id;
-  }
-
-  const { screen } = useScreenState(_screenId);
-
-  return screen;
-};
-
 export function masterCellBuilder({
   components = defaultComponents,
   cellConfiguration,
@@ -98,8 +63,15 @@ export function masterCellBuilder({
    * inflated with the data coming from the data source
    * @param {"selected" | "focused" | null} props.state state of the component
    */
-  function MasterCell({ item, state, screenId, ...otherProps }: Props) {
-    const screen = useMasterCellScreen(screenId);
+  function MasterCell({ item, state, ...otherProps }: Props) {
+    const { screenData } = useRoute();
+
+    const screenId =
+      screenData && "targetScreen" in screenData
+        ? screenData?.targetScreen?.id
+        : screenData?.id;
+
+    const { screen } = useScreenState(screenId);
 
     const selectedState = screen?.selectedEntry;
 
@@ -125,56 +97,18 @@ export function masterCellBuilder({
       item?.id,
     ]);
 
-    const remapElements = React.useMemo(
-      () =>
-        mapElementWithKey(
-          elementMapper(componentsMap, {
-            wrapperRef,
-            emitAsyncElementRegistrate: otherProps.emitAsyncElementRegistrate,
-            emitAsyncElementLayout: otherProps.emitAsyncElementLayout,
-            preferredFocus: otherProps.preferredFocus,
-            cellUUID: cellUUID || otherProps.cellUUID,
-            skipButtons: skipButtons || otherProps.skipButtons,
-            // cellWithFocusable
-            focused: otherProps.focused,
-            focusedButtonId: otherProps.focusedButtonId,
-            groupId: otherProps.groupId,
-            isFocusable: otherProps.isFocusable,
-            onToggleFocus: otherProps.onToggleFocus,
-            prefixId: otherProps.prefixId,
-            skipFocusManagerRegistration:
-              otherProps.skipFocusManagerRegistration,
-            // gallery
-            component: otherProps.component,
-            componentId: otherProps.componentId,
-          })
-        ),
-      [
-        componentsMap,
-        otherProps.emitAsyncElementRegistrate,
-        otherProps.emitAsyncElementLayout,
-        cellUUID || otherProps.cellUUID,
-        skipButtons || otherProps.skipButtons,
-        otherProps.focused,
-        otherProps.focusedButtonId,
-        otherProps.groupId,
-        otherProps.isFocusable,
-        otherProps.onToggleFocus,
-        otherProps.prefixId,
-        otherProps.skipFocusManagerRegistration,
-        otherProps.component,
-        otherProps.componentId,
-      ]
-    );
-
-    const renderElements = React.useMemo(
-      () => elements.map(remapElements),
-      [remapElements, elements]
+    const remapElements = mapElementWithKey(
+      elementMapper(componentsMap, {
+        ...otherProps,
+        wrapperRef,
+        cellUUID,
+        skipButtons,
+      })
     );
 
     return (
       <View style={containerStyle} ref={wrapperRef}>
-        {renderElements}
+        {elements.map(remapElements)}
       </View>
     );
   }

package/Components/MasterCell/utils/behaviorProvider.ts

@@ -0,0 +1,136 @@
+import { playerManager } from "@applicaster/zapp-react-native-utils/appUtils";
+import { StorageSingleValueProvider } from "@applicaster/zapp-react-native-bridge/ZappStorage/StorageSingleSelectProvider";
+import { PushTopicManager } from "@applicaster/zapp-react-native-bridge/PushNotifications/PushTopicManager";
+import { StorageMultiSelectProvider } from "@applicaster/zapp-react-native-bridge/ZappStorage/StorageMultiSelectProvider";
+import React, { useEffect } from "react";
+import { usePlayer } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayer";
+import { BehaviorSubject } from "rxjs";
+import { masterCellLogger } from "../logger";
+import get from "lodash/get";
+
+const parseContextKey = (key: string): string | null => {
+  if (!key?.startsWith("@{ctx/")) return null;
+
+  return key.substring("@{ctx/".length, key.length - 1);
+};
+
+const getDataSourceProvider = (
+  behavior: Behavior
+): BehaviorSubject<string[] | string> | null => {
+  if (!behavior) return null;
+
+  const selection = String(behavior.current_selection);
+  const contextKey = parseContextKey(selection);
+
+  if (contextKey) {
+    if (behavior.select_mode === "multi") {
+      return StorageMultiSelectProvider.getProvider(contextKey).getObservable();
+    }
+
+    if (behavior.select_mode === "single") {
+      return StorageSingleValueProvider.getProvider(contextKey).getObservable();
+    }
+  }
+
+  if (behavior.selection_source === "@{push/topics}") {
+    return PushTopicManager.getInstance().getEntryObservable();
+  }
+
+  return null;
+};
+
+export const useBehaviorUpdate = (behavior: Behavior) => {
+  const [lastUpdate, setLastUpdate] = React.useState<number | null>(null);
+  const player = usePlayer();
+
+  const triggerUpdate = () => setLastUpdate(Date.now());
+
+  useEffect(() => {
+    if (!behavior) return;
+
+    const dataSource = getDataSourceProvider(behavior);
+
+    if (dataSource) {
+      const subscription = dataSource.subscribe(triggerUpdate);
+
+      return () => subscription.unsubscribe();
+    }
+  }, [behavior]);
+
+  useEffect(() => {
+    if (!behavior || !player || behavior.selection_source !== "now_playing") {
+      return;
+    }
+
+    const subscription = player.getEntryObservable().subscribe(triggerUpdate);
+
+    return () => subscription.unsubscribe();
+  }, [behavior, player]);
+
+  return lastUpdate;
+};
+
+// We cant use async in this function (its inside render),
+// so we rely on useBehaviorUpdate to update current value and trigger re-render
+export const isCellSelected = (
+  item: ZappEntry,
+  behavior?: Behavior
+): boolean => {
+  if (!behavior) return false;
+
+  const id = behavior.selector ? get(item, behavior.selector) : item.id;
+
+  if (behavior.selection_source === "now_playing") {
+    const player = playerManager.getActivePlayer();
+
+    return player?.entry?.id === id;
+  }
+
+  if (behavior.selection_source === "@{push/topics}") {
+    if (behavior.select_mode === "single") {
+      masterCellLogger.warning(
+        "Unexpected single selection mode for push topics"
+      );
+    }
+
+    const tags = PushTopicManager.getInstance().getRegisteredTags();
+
+    return tags.includes(String(id));
+  }
+
+  const selection = String(behavior.current_selection);
+  const contextKey = parseContextKey(selection);
+
+  if (contextKey) {
+    if (behavior.select_mode === "single") {
+      const selectedItem =
+        StorageSingleValueProvider.getProvider(contextKey)?.getValue();
+
+      return selectedItem === String(id);
+    }
+
+    if (behavior.select_mode === "multi") {
+      const selectedItems =
+        StorageMultiSelectProvider.getProvider(contextKey)?.getSelectedItems();
+
+      return selectedItems?.includes(String(id));
+    }
+  }
+
+  if (behavior.select_mode === "single") {
+    return behavior.current_selection === id;
+  }
+
+  if (
+    behavior.select_mode === "multi" &&
+    Array.isArray(behavior.current_selection)
+  ) {
+    const currentSelection: string[] = behavior.current_selection.map(
+      (item): string => String(item)
+    );
+
+    return currentSelection.includes(String(id));
+  }
+
+  return false;
+};