@applicaster/zapp-react-native-ui-components 13.0.0-alpha.7222980745 → 13.0.0-alpha.7223143213

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/utils/behaviorProvider.ts

@@ -0,0 +1,139 @@
+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 * as R from "ramda";
+
+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;
+
+  // todo: find out what utility we have instead of Ramda
+  const id = behavior.selector
+    ? R.path(behavior.selector.split("."), item)
+    : 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;
+};

package/Components/MasterCell/utils/index.ts

@@ -1,16 +1,13 @@
-import React, { useEffect, useMemo } from "react";
+import React, { useMemo } from "react";
 import * as R from "ramda";
 import validateColor from "validate-color";
 import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
 import { useActions } from "@applicaster/zapp-react-native-utils/reactHooks/actions";
 
 import { masterCellLogger } from "../logger";
-import { playerManager } from "@applicaster/zapp-react-native-utils/appUtils";
-import { usePlayer } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayer";
-import { PushTopicManager } from "@applicaster/zapp-react-native-bridge/PushNotifications/PushTopicManager";
-import { StorageMultiSelectProvider } from "@applicaster/zapp-react-native-bridge/ZappStorage/StorageMultiSelectProvider";
 import { getCellState } from "../../Cell/utils";
 import { getColorFromData } from "@applicaster/zapp-react-native-utils/cellUtils";
+import { isCellSelected, useBehaviorUpdate } from "./behaviorProvider";
 
 const hasElementSpecificViewType = (viewType) => (element) => {
   if (R.isNil(element)) {
@@ -193,147 +190,24 @@ export const getFocusedButtonId = (focusable) => {
   });
 };
 
-export const isSelected = (id: string | number, behavior?: Behavior) => {
-  if (!behavior) {
-    return false;
-  }
-
-  if (behavior?.selection_source === "now_playing") {
-    const player = playerManager.getActivePlayer();
-
-    if (player?.entry?.id === id) {
-      return true;
-    }
-  }
-
-  if (behavior?.select_mode === "single") {
-    return behavior.current_selection === id;
-  }
-
-  if (behavior?.select_mode === "multi") {
-    // TODO: Use generic resolver source
-
-    if (behavior.selection_source === "@{push/topics}") {
-      const tags = PushTopicManager.getInstance().getRegisteredTags();
-
-      return tags.includes(String(id));
-    }
-
-    if (Array.isArray(behavior.current_selection)) {
-      return behavior.current_selection.includes(id);
-    }
-
-    const currentSelection = String(behavior.current_selection);
-
-    if (currentSelection?.startsWith("@{ctx/")) {
-      const keyWithoutCtx = currentSelection.substring(
-        "@{ctx/".length,
-        currentSelection.length - 1
-      );
-
-      const selectedItems =
-        StorageMultiSelectProvider.getProvider(
-          keyWithoutCtx
-        )?.getSelectedItems();
-
-      return selectedItems?.includes(String(id));
-    }
-  }
-
-  return false;
-};
-
-export const useBehaviorUpdate = (behavior: Behavior) => {
-  const [lastUpdate, setLastUpdate] = React.useState(null);
-
-  const player = usePlayer();
-
-  const triggerUpdate = () => {
-    setLastUpdate(Date.now());
-  };
-
-  // TODO: Create generic RX to state update
-  useEffect(() => {
-    // TODO: Use generic resolver source
-    if (!behavior) {
-      return;
-    }
-
-    const currentSelection = String(behavior.current_selection);
-
-    if (currentSelection?.startsWith("@{ctx/")) {
-      const keyWithoutCtx = currentSelection.substring(
-        "@{ctx/".length,
-        currentSelection.length - 1
-      );
-
-      if (keyWithoutCtx) {
-        const subscription = StorageMultiSelectProvider.getProvider(
-          keyWithoutCtx
-        )
-          .getObservable()
-          .subscribe(() => {
-            triggerUpdate();
-          });
-
-        return () => {
-          subscription.unsubscribe();
-        };
-      }
-    }
-  }, [behavior]);
-
-  useEffect(() => {
-    if (!behavior) {
-      return;
-    }
-
-    if (behavior?.selection_source === "@{push/topics}") {
-      const subscription = PushTopicManager.getInstance()
-        .getEntryObservable()
-        .subscribe(() => {
-          triggerUpdate();
-        });
-
-      return () => {
-        subscription.unsubscribe();
-      };
-    }
-  }, [behavior]);
-
-  useEffect(() => {
-    if (!behavior) {
-      return;
-    }
-
-    if (behavior?.selection_source === "now_playing" && player) {
-      const subscription = player.getEntryObservable().subscribe(() => {
-        triggerUpdate();
-      });
-
-      return () => {
-        subscription.unsubscribe();
-      };
-    }
-  }, [behavior, player]);
-
-  return lastUpdate;
+export const isSelected = (item: ZappEntry, behavior?: Behavior) => {
+  return isCellSelected(item, behavior);
 };
 
 export const useCellState = ({
-  id,
+  item,
   behavior,
   focused,
 }: {
-  id: string | number;
+  item: ZappEntry;
   behavior: Behavior;
   focused: boolean;
 }): CellState => {
   const lastUpdate = useBehaviorUpdate(behavior);
 
   const _isSelected = useMemo(
-    () => isSelected(id, behavior),
-    [behavior, id, lastUpdate]
+    () => isSelected(item, behavior),
+    [behavior, item, lastUpdate]
   );
 
   return getCellState({ focused, selected: _isSelected });

package/Components/ModalComponent/Button/index.tsx

@@ -3,8 +3,8 @@ import { StyleSheet, TouchableOpacity, View } from "react-native";
 import { Item, ItemProps } from "./Item";
 import { ItemIcon, ItemIconProps } from "./ItemIcon";
 import { ItemLabel, ItemLabelProps } from "./ItemLabel";
-import { defaultSelectedAsset } from "./assets";
 import * as assets from "./assets";
+import { defaultSelectedAsset } from "./assets";
 
 type ButtonProps = {
   configuration: any;
@@ -92,18 +92,18 @@ export function Button({
       >
         <Item {...itemProps} focused={focused} selected={selected}>
           <View style={styles.label_icon_container}>
-            {itemIconProps.asset && itemIconProps.asset.length > 0 && (
+            {itemIconProps.asset && itemIconProps.asset.length > 0 ? (
               <ItemIcon {...itemIconProps} />
-            )}
-            {itemLabelProps.label && (
+            ) : null}
+            {itemLabelProps.label ? (
               <ItemLabel
                 {...itemLabelProps}
                 focused={focused}
                 selected={selected}
               />
-            )}
+            ) : null}
           </View>
-          {selected && <ItemIcon {...selectedItemIconProps} />}
+          {selected ? <ItemIcon {...selectedItemIconProps} /> : null}
         </Item>
       </TouchableOpacity>
     </View>

package/Components/OfflineHandler/NotificationView/NotificationView.lg.tsx

@@ -90,7 +90,7 @@ export const NotificationView = (props: Props) => {
   return (
     <div onClick={onClose}>
       {children}
-      {open && (
+      {open ? (
         <div style={styles.body}>
           <div style={styles.title}>
             <h2>{MSG}</h2>
@@ -98,7 +98,7 @@ export const NotificationView = (props: Props) => {
 
           <h4 style={styles.subtitle}>{EXTRA_MSG}</h4>
         </div>
-      )}
+      ) : null}
     </div>
   );
 };

package/Components/OfflineHandler/NotificationView/NotificationView.samsung.tsx

@@ -85,7 +85,7 @@ export const NotificationView = (props: Props) => {
   return (
     <div onClick={onClose}>
       {children}
-      {shown && (
+      {shown ? (
         <div style={styles.body}>
           <div style={styles.title}>
             <h2>{title}</h2>
@@ -93,7 +93,7 @@ export const NotificationView = (props: Props) => {
 
           <h4 style={styles.subtitle}>{subtitle}</h4>
         </div>
-      )}
+      ) : null}
     </div>
   );
 };

package/Components/OfflineHandler/NotificationView/__tests__/index.test.tsx

@@ -1,7 +1,6 @@
 import React from "react";
 import { Text, Animated } from "react-native";
 
-import { shallow } from "enzyme";
 import renderer from "react-test-renderer";
 
 jest.useFakeTimers();
@@ -40,10 +39,6 @@ const {
 } = require("../NotificationView");
 
 describe("NotificationView", () => {
-  it("renders", () => {
-    shallow(<NotificationView dismiss={dismiss} />);
-  });
-
   it("Show online message when Online", () => {
     const component = renderer.create(
       <NotificationView online dismiss={dismiss} />

package/Components/PlayerContainer/PlayerContainer.tsx

@@ -1,17 +1,17 @@
 import * as React from "react";
+import { useEffect, useReducer } from "react";
 // @ts-ignore
-import { View, ViewStyle, TVMenuControl } from "react-native";
+import { TVMenuControl, View, ViewStyle } from "react-native";
 import * as R from "ramda";
 import uuid from "uuid/v4";
 import { playerManager } from "@applicaster/zapp-react-native-utils/appUtils/playerManager";
 import {
   isApplePlatform,
-  platformSelect,
   isTV,
+  platformSelect,
 } from "@applicaster/zapp-react-native-utils/reactUtils";
 
 import { TVEventHandlerComponent } from "@applicaster/zapp-react-native-tvos-ui-components/Components/TVEventHandlerComponent";
-import { useEffect, useReducer } from "react";
 import { usePrevious } from "@applicaster/zapp-react-native-utils/reactHooks/utils";
 import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
 import {
@@ -29,10 +29,10 @@ import {
 import { ProgramInfo } from "./ProgramInfo";
 import { AudioPlayer } from "../AudioPlayer";
 import {
-  playerContainerLogger,
   log_debug,
   log_info,
   log_warning,
+  playerContainerLogger,
 } from "./logger";
 import { usePlayer } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayer";
 import { useSetNavbarState } from "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenContext";
@@ -53,8 +53,8 @@ import { usePlayNextOverlay } from "@applicaster/zapp-react-native-utils/appUtil
 import { PlayNextState } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/OverlayObserver/OverlaysObserver";
 
 import {
-  useModalAnimationContext,
   PlayerAnimationStateEnum,
+  useModalAnimationContext,
 } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
 
 type Props = {
@@ -91,6 +91,15 @@ export type PlayNextData = {
   onPlayNextPerformNextVideoPlay: () => void;
 };
 
+export type PlayerState = {
+  duration: number;
+  currentTime?: number;
+  seekableDuration: number;
+  isLive: boolean;
+  isBuffering: boolean;
+  isPaused: boolean;
+};
+
 const focusableBottomContainerId = "player-container-bottom";
 
 // Styles
@@ -335,9 +344,9 @@ const PlayerContainerComponent = (props: Props) => {
 
     const resumeTime = Number(item?.extensions?.resumeTime);
 
-    // TODO: This is temp hack, will be removed on next pr with player refactoring
+    // Сhecking that the player itself knows where to start playing, and there is no need to call seekTo after returning from the Сhromecast
     if (
-      !!playerManager.getActivePlayer()?.getContinueWatchingOffset === false &&
+      !playerManager.getActivePlayer()?.hasResumePosition() &&
       !isNaN(resumeTime)
     ) {
       player?.seekTo(resumeTime);
@@ -514,6 +523,12 @@ const PlayerContainerComponent = (props: Props) => {
   useEffect(() => {
     playerEvent("source_changed", { item });
 
+    return () => {
+      playerEvent("player_did_close", { item });
+    };
+  }, [item?.id, Player]);
+
+  useEffect(() => {
     if (!isModal) {
       showNavBar(false);
     }
@@ -523,13 +538,11 @@ const PlayerContainerComponent = (props: Props) => {
     }
 
     return () => {
-      playerEvent("player_did_close", { item });
-
       if (!isModal) {
         showNavBar(true);
       }
     };
-  }, [showNavBar, /* added as suggested: */ item?.id, isModal, Player]);
+  }, [showNavBar, isModal, Player]);
 
   useEffect(() => {
     if (prevItemId && !R.equals(prevItemId, item?.id)) {
@@ -683,10 +696,10 @@ const PlayerContainerComponent = (props: Props) => {
 
                     {renderRestPlayers(restPlayerProps)}
 
-                    {state.error && <ErrorDisplay error={state.error} />}
+                    {state.error ? <ErrorDisplay error={state.error} /> : null}
                   </View>
                   {/* Components container */}
-                  {isInlineTV && context.showComponentsContainer && (
+                  {isInlineTV && context.showComponentsContainer ? (
                     <View
                       style={styles.inlineRiver}
                       testID={"inline-river-component-wrapper"}
@@ -717,7 +730,7 @@ const PlayerContainerComponent = (props: Props) => {
                         )}
                       </ComponentFocusableWrapperView>
                     </View>
-                  )}
+                  ) : null}
                 </View>
               </FocusableGroup>
             </TVEventHandlerComponent>

package/Components/PlayerContainer/ProgramInfo/index.tsx

@@ -114,12 +114,12 @@ function ProgramInfoComponent({
   return (
     <View style={container}>
       <View style={programStyles.programInfo.container}>
-        {logo && (
+        {logo ? (
           <Image
             source={{ uri: logo }}
             style={programStyles.programInfo.logo}
           />
-        )}
+        ) : null}
         {!isAudioContent && transportInfo}
       </View>
     </View>

package/Components/PlayerImageBackground/index.tsx

@@ -39,7 +39,7 @@ const PlayerImageBackgroundComponent = ({
   return (
     <View
       style={
-        playerAnimationState === PlayerAnimationStateEnum.maximaze
+        playerAnimationState === PlayerAnimationStateEnum.maximize
           ? defaultImageDimensions
           : style
       }

package/Components/River/ComponentsMap/ComponentsMap.tsx

@@ -34,6 +34,7 @@ type Props = {
   getStaticComponentFeed: any;
   pullToRefreshPipesV1RefreshingStateUpdater: () => boolean;
   refreshingPipesV1?: boolean;
+  stickyHeaderIndices?: number[];
 };
 
 const styles = StyleSheet.create({
@@ -61,6 +62,7 @@ function ComponentsMapComponent(props: Props) {
     // TODO: Remove when pipes v1 is deprecated.
     pullToRefreshPipesV1RefreshingStateUpdater,
     refreshingPipesV1,
+    stickyHeaderIndices,
   } = props;
 
   const flatListRef = React.useRef<FlatList | null>(null);
@@ -274,6 +276,7 @@ function ComponentsMapComponent(props: Props) {
             overScrollMode={Platform.OS === "android" ? "never" : "auto"}
             scrollIndicatorInsets={scrollIndicatorInsets}
             extraData={feed}
+            stickyHeaderIndices={stickyHeaderIndices}
             onLayout={handleOnLayout}
             removeClippedSubviews
             initialNumToRender={3}