@applicaster/zapp-react-native-ui-components 13.0.0-alpha.5033140607 → 13.0.0-alpha.5144285042

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)) {
@@ -103,7 +100,7 @@ export const useFilterChildren = <
       item: any;
       pluginIdentifier: string;
     };
-  }
+  },
 >(
   children: T[]
 ): T[] => {
@@ -194,130 +191,7 @@ 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;
+  return isCellSelected(id, behavior);
 };
 
 export const useCellState = ({

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/ModalComponent/Header/index.tsx

@@ -1,5 +1,5 @@
 import React, { useMemo } from "react";
-import { View, StyleSheet, LayoutChangeEvent } from "react-native";
+import { LayoutChangeEvent, StyleSheet, View } from "react-native";
 import { Title, TitleProps } from "./Title";
 import { CloseButton, CloseButtonProps } from "./CloseButton";
 import { getCloseButtonProps, getTitleProps } from "./utils";
@@ -60,8 +60,8 @@ export function ModalHeader(props: Props) {
           width: width - buttonsContainerWidth,
         }}
       >
-        {title && <Title {...titleProps} />}
-        {summary && <Title {...summaryProps} />}
+        {title ? <Title {...titleProps} /> : null}
+        {summary ? <Title {...summaryProps} /> : null}
       </View>
       <View style={{ width: buttonsContainerWidth }}>
         <CloseButton {...closeButtonProps} />

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/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/OfflineHandler/__tests__/__snapshots__/index.test.tsx.snap

@@ -3,7 +3,7 @@
 exports[`OfflineHandler renders 1`] = `
 <View
   style={
-    Object {
+    {
       "flex": 1,
       "position": "relative",
     }
@@ -11,7 +11,7 @@ exports[`OfflineHandler renders 1`] = `
 >
   <View
     style={
-      Object {
+      {
         "bottom": 0,
         "left": 0,
         "position": "absolute",
@@ -32,7 +32,7 @@ exports[`OfflineHandler renders 1`] = `
       onResponderTerminationRequest={[Function]}
       onStartShouldSetResponder={[Function]}
       style={
-        Object {
+        {
           "alignItems": "center",
           "backgroundColor": undefined,
           "flex": 1,
@@ -43,8 +43,8 @@ exports[`OfflineHandler renders 1`] = `
           "position": "absolute",
           "right": 0,
           "top": 0,
-          "transform": Array [
-            Object {
+          "transform": [
+            {
               "translateY": -88,
             },
           ],
@@ -54,7 +54,7 @@ exports[`OfflineHandler renders 1`] = `
     >
       <View
         style={
-          Object {
+          {
             "backgroundColor": undefined,
             "height": 44,
           }
@@ -62,7 +62,7 @@ exports[`OfflineHandler renders 1`] = `
       />
       <Text
         style={
-          Object {
+          {
             "color": undefined,
             "fontFamily": undefined,
             "fontSize": undefined,

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

@@ -2,43 +2,46 @@ import React from "react";
 
 import renderer, { act } from "react-test-renderer";
 
-jest.useFakeTimers();
+jest.useFakeTimers({ legacyFakeTimers: true });
 
-let connectionStatus = false;
-const previousValue = null;
+let mockConnectionStatus = false;
+const mockPreviousValue = null;
 
 jest.mock("@applicaster/zapp-react-native-utils/reactHooks/connection", () => {
   return {
-    useConnectionInfo: jest.fn(() => connectionStatus),
+    useConnectionInfo: jest.fn(() => mockConnectionStatus),
   };
 });
 
 jest.mock("@applicaster/zapp-react-native-utils/reactHooks/utils", () => {
   return {
-    usePrevious: jest.fn(() => previousValue),
+    usePrevious: jest.fn(() => mockPreviousValue),
   };
 });
 
-jest.mock("@applicaster/zapp-react-native-redux/hooks", () => ({
-  usePickFromState: () => ({
-    plugins: [
-      {
-        name: "offline experience",
-        identifier: "offline-experience",
-        type: "general",
-        module: {
-          useOfflineExperienceConfiguration: () => ({
-            configurationFields: {},
-            localizations: {
-              offline_toast_message: "No internet connection",
-              online_toast_message: "You are back online",
-            },
-          }),
+jest.mock(
+  "@applicaster/zapp-react-native-redux/hooks/usePickFromState",
+  () => ({
+    usePickFromState: () => ({
+      plugins: [
+        {
+          name: "offline experience",
+          identifier: "offline-experience",
+          type: "general",
+          module: {
+            useOfflineExperienceConfiguration: () => ({
+              configurationFields: {},
+              localizations: {
+                offline_toast_message: "No internet connection",
+                online_toast_message: "You are back online",
+              },
+            }),
+          },
         },
-      },
-    ],
-  }),
-}));
+      ],
+    }),
+  })
+);
 
 jest.mock("react-native-safe-area-context", () => ({
   useSafeAreaInsets: () => ({ top: 44 }),
@@ -53,7 +56,7 @@ describe("OfflineHandler", () => {
   });
 
   it("renders Notification mode if component was rendered while online", () => {
-    connectionStatus = true;
+    mockConnectionStatus = true;
 
     let instance;
 

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,16 +29,14 @@ 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,
-  useTargetScreenData,
-} from "@applicaster/zapp-react-native-utils/reactHooks/screen";
+import { useSetNavbarState } from "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenContext";
+import { useTargetScreenData } from "@applicaster/zapp-react-native-utils/reactHooks/screen/useTargetScreenData";
 import {
   PlayerContainerContext,
   PlayerContainerContextProvider,
@@ -55,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 = {
@@ -382,7 +380,7 @@ const PlayerContainerComponent = (props: Props) => {
     }
   };
 
-  const playerRemoteHandler = (component, event, isLanguageOverlayVisible) => {
+  const playerRemoteHandler = (event, isLanguageOverlayVisible) => {
     const { eventType } = event;
 
     if (!isLanguageOverlayVisible && eventType === "menu") {
@@ -625,12 +623,8 @@ const PlayerContainerComponent = (props: Props) => {
         <PlayerContainerContext.Consumer>
           {(context) => (
             <TVEventHandlerComponent
-              tvEventHandler={(component, event) =>
-                playerRemoteHandler(
-                  component,
-                  event,
-                  context.isLanguageOverlayVisible
-                )
+              tvEventHandler={(_component, event) =>
+                playerRemoteHandler(event, context.isLanguageOverlayVisible)
               }
             >
               <FocusableGroup
@@ -689,10 +683,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"}
@@ -723,7 +717,7 @@ const PlayerContainerComponent = (props: Props) => {
                         )}
                       </ComponentFocusableWrapperView>
                     </View>
-                  )}
+                  ) : null}
                 </View>
               </FocusableGroup>
             </TVEventHandlerComponent>

package/Components/PlayerContainer/PlayerContainerContext.tsx

@@ -9,11 +9,14 @@ type ContextProps = {
   setIsLanguageOverlayVisible: (isVisible) => void;
   setShowComponentsContainer: (isVisible) => void;
   showComponentsContainer: boolean;
+  setIsSeekBarTouch: (isTouch) => void;
+  isSeekBarTouch: boolean;
 };
 
 export const PlayerContainerContext = createContext({
   ignoreOffsetContainer: false,
   isLanguageOverlayVisible: false,
+  isSeekBarTouch: false,
 } as ContextProps);
 
 type Props = {
@@ -40,6 +43,8 @@ export const PlayerContainerContextProvider = ({
   const [showComponentsContainer, setShowComponentsContainer] =
     React.useState(true);
 
+  const [isSeekBarTouch, setIsSeekBarTouch] = React.useState(false);
+
   const value = React.useMemo(
     () => ({
       ignoreOffsetContainer,
@@ -49,6 +54,8 @@ export const PlayerContainerContextProvider = ({
       setIsLanguageOverlayVisible,
       showComponentsContainer,
       setShowComponentsContainer: inline ? setShowComponentsContainer : null,
+      isSeekBarTouch,
+      setIsSeekBarTouch,
     }),
     [
       ignoreOffsetContainer,
@@ -58,6 +65,8 @@ export const PlayerContainerContextProvider = ({
       setIsLanguageOverlayVisible,
       showComponentsContainer,
       setShowComponentsContainer,
+      isSeekBarTouch,
+      setIsSeekBarTouch,
     ]
   );
 

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

@@ -1,4 +1,4 @@
-import React, { PropsWithChildren } from "react";
+import React, { PropsWithChildren, useEffect, useState } from "react";
 import { ImageBackground, View } from "react-native";
 
 import { imageSrcFromMediaItem } from "@applicaster/zapp-react-native-utils/configurationUtils";
@@ -12,6 +12,7 @@ import {
 type Props = PropsWithChildren<{
   entry: ZappEntry;
   style?: { [K: string]: any };
+  docked?: boolean;
   imageStyle?: { [K: string]: any };
   imageKey?: string;
   defaultImageDimensions?: { [K: string]: any };
@@ -23,6 +24,7 @@ const PlayerImageBackgroundComponent = ({
   entry,
   children,
   style,
+  docked,
   imageStyle,
   imageKey,
   defaultImageDimensions,
@@ -34,8 +36,22 @@ const PlayerImageBackgroundComponent = ({
 
   const { playerAnimationState } = useModalAnimationContext();
 
+  const [lastNonNullAnimationState, setLastNonNullAnimationState] =
+    useState(playerAnimationState);
+
+  useEffect(() => {
+    if (playerAnimationState !== null) {
+      setLastNonNullAnimationState(playerAnimationState);
+    }
+  }, [playerAnimationState]);
+
   if (!source) return <>{children}</>;
 
+  const imageBackgroundStyle =
+    lastNonNullAnimationState !== PlayerAnimationStateEnum.minimize && !docked
+      ? defaultImageDimensions
+      : imageSize;
+
   return (
     <View
       style={
@@ -45,13 +61,17 @@ const PlayerImageBackgroundComponent = ({
       }
     >
       <AnimationComponent
-        style={style}
+        style={
+          playerAnimationState === PlayerAnimationStateEnum.maximaze
+            ? defaultImageDimensions
+            : style
+        }
         animationType={ComponentAnimationType.player}
         additionalData={defaultImageDimensions}
       >
         <ImageBackground
           resizeMode="cover"
-          style={imageSize}
+          style={imageBackgroundStyle}
           imageStyle={imageStyle}
           source={source}
         >