@applicaster/zapp-react-native-ui-components 13.0.0-alpha.8532113155 → 13.0.0-alpha.9103242840

package/Components/VideoLive/LiveImageManager.ts

@@ -8,8 +8,6 @@ import { loggerLiveImageManager } from "./loggerHelper";
 import { isTV } from "@applicaster/zapp-react-native-utils/reactUtils";
 import { Component } from "react";
 
-const TIMEOUT_FOR_DELAY_CHECK_PLAYER_POSITION = 500; // ms
-
 const { log_debug, log_info, log_error } = loggerLiveImageManager;
 
 export type LiveImageManagerEvent =
@@ -64,9 +62,6 @@ export class LiveImageManager implements PlayerLifecycleListener {
   protected currentlyPlaying: LiveImage | null = null;
   protected primaryPlayer: Player | null = null;
 
-  private checkPlayerPositionTimeout: ReturnType<typeof setTimeout> | null =
-    null;
-
   protected listeners: Record<
     string,
     Record<LiveImageManagerEvent, (event?: Record<string, any>) => void>
@@ -123,11 +118,6 @@ export class LiveImageManager implements PlayerLifecycleListener {
     });
   };
 
-  private cancelCheckPlayerPositionTimeout = () => {
-    clearTimeout(this.checkPlayerPositionTimeout);
-    this.checkPlayerPositionTimeout = null;
-  };
-
   public onViewportEnter = (item: LiveImage) => {
     log_debug(
       `onViewportEnter: live-image ${playerInfo(
@@ -135,21 +125,7 @@ export class LiveImageManager implements PlayerLifecycleListener {
       )}, primary ${playerInfo(this.primaryPlayer)}`
     );
 
-    if (!isTV()) {
-      // mobile only
-      // we have to delay running checkPlayerPosition, because sometimes on fast scrolling we get wrong order onEnter, then onLeave.
-      // which could cause select wrong item to play
-
-      this.cancelCheckPlayerPositionTimeout();
-
-      this.checkPlayerPositionTimeout = setTimeout(() => {
-        this.cancelCheckPlayerPositionTimeout();
-
-        this.checkPlayerPosition(item);
-      }, TIMEOUT_FOR_DELAY_CHECK_PLAYER_POSITION);
-    } else {
-      this.checkPlayerPosition(item);
-    }
+    this.checkPlayerPosition(item);
   };
 
   public onViewportLeave = (item: LiveImage) => {
@@ -270,8 +246,6 @@ export class LiveImageManager implements PlayerLifecycleListener {
   };
 
   public checkPlayerPosition = (item: LiveImage) => {
-    this.cancelCheckPlayerPositionTimeout();
-
     log_debug(
       `checkPlayerPosition: live-image playerId: ${playerInfo(
         item.player

package/Components/VideoLive/PlayerLiveImageComponent.tsx

@@ -44,10 +44,7 @@ type Props = {
 };
 
 const PlayerLiveImageComponent = (props: Props) => {
-  const dimensions = useDimensions("screen", {
-    fullDimensions: true,
-    updateForInactiveScreens: false,
-  });
+  const dimensions = useDimensions("screen", { fullDimensions: true });
 
   const { item, style, playerId } = props;
 
@@ -138,16 +135,13 @@ const PlayerLiveImageComponent = (props: Props) => {
     } else {
       throw new Error("Player factory item is null");
     }
-  }, [playerId, item.id, playerPluginId, screenConfig]);
+  }, [playerId, item, playerPluginId, screenConfig]);
 
   React.useEffect(() => {
     liveImageItem.setMode = setModeDebounced;
   }, [setModeDebounced, liveImageItem]);
 
-  const { start, end } = React.useMemo(
-    () => getAutoplaySettings(item),
-    [item.id]
-  );
+  const { start, end } = React.useMemo(() => getAutoplaySettings(item), [item]);
 
   const controller = liveImageItem.getPlayer();
   const player = usePlayer(playerId);
@@ -180,7 +174,7 @@ const PlayerLiveImageComponent = (props: Props) => {
 
       unregister();
     };
-  }, [item.id, liveImageItem]);
+  }, [item, liveImageItem]);
 
   React.useEffect(() => {
     if (!player) {
@@ -250,27 +244,25 @@ const PlayerLiveImageComponent = (props: Props) => {
   }, [item.id]);
 
   React.useEffect(() => {
-    if (isMeasurement(item) || !playerManager) {
-      return;
-    }
+    if (playerManager) {
+      const isPlayerRegistered = playerManager.isPlayerRegistered(playerId);
 
-    const isPlayerRegistered = playerManager.isPlayerRegistered(playerId);
-
-    if (isPlayerRegistered) {
-      log_error(
-        `PlayerLiveImageComponent: player ${playerId} already registered`
-      );
-    } else {
-      playerManager.registerPlayer({
-        id: playerId,
-        playerController: controller,
-      });
+      if (isPlayerRegistered) {
+        log_error(
+          `PlayerLiveImageComponent: player ${playerId} already registered`
+        );
+      } else {
+        playerManager.registerPlayer({
+          id: playerId,
+          playerController: controller,
+        });
 
-      return () => {
-        playerManager.unregisterPlayer(playerId);
-      };
+        return () => {
+          playerManager.unregisterPlayer(playerId);
+        };
+      }
     }
-  }, [liveImageItem, playerId, controller, item.id]);
+  }, [liveImageItem, playerId, controller]);
 
   const onPositionUpdated = React.useCallback(
     (data) => {
@@ -310,7 +302,7 @@ const PlayerLiveImageComponent = (props: Props) => {
         LiveImageManager.instance.checkPlayerPosition(liveImageItem);
       }
     },
-    [liveImageItem, dimensions.height, dimensions.width]
+    [liveImageItem, dimensions]
   );
 
   const platformSpecificProps = isApplePlatform()

package/Components/VideoLive/__tests__/PlayerLiveImageComponent.test.tsx

@@ -4,7 +4,6 @@ import { render } from "@testing-library/react-native";
 import * as PlayerFactory from "@applicaster/zapp-react-native-utils/appUtils/playerManager/playerFactory";
 import { ThemeContext } from "@applicaster/zapp-react-native-utils/theme";
 import * as navigationHooks from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
-import { playerManager } from "@applicaster/zapp-react-native-utils/appUtils/playerManager";
 
 import { PlayerLiveImage } from "../PlayerLiveImageComponent";
 import * as useNavigationHooks from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useNavigation";
@@ -33,7 +32,7 @@ const mockStore = configureStore();
 
 const store = mockStore({ appData: {} });
 
-const Wrapper = ({ children }: { children: React.ReactNode }) => (
+const Wrapper = ({ children }: { children: React.ReactChildren }) => (
   /* @ts-ignore */
   <Provider store={store}>
     <ThemeContext.Provider
@@ -119,53 +118,4 @@ describe("PlayerLiveImageComponent", () => {
 
     // TODO: implement this test
   });
-
-  it("should register the player for normal item", () => {
-    render(
-      <Wrapper>
-        <PlayerLiveImage {...defaultProps} />
-      </Wrapper>
-    );
-
-    const isPlayerRegistered = playerManager.isPlayerRegistered(
-      defaultProps.playerId
-    );
-
-    expect(isPlayerRegistered).toBe(true);
-  });
-
-  it("should unregister the player for normal item", () => {
-    const component = render(
-      <Wrapper>
-        <PlayerLiveImage {...defaultProps} />
-      </Wrapper>
-    );
-
-    component.unmount();
-
-    const isPlayerRegistered = playerManager.isPlayerRegistered(
-      defaultProps.playerId
-    );
-
-    expect(isPlayerRegistered).toBe(false);
-  });
-
-  it("should not register the player for 'pre-measurement' item", () => {
-    const props = {
-      ...defaultProps,
-      item: {
-        ...defaultProps.item,
-        id: "pre-measurement-1",
-      },
-    };
-
-    render(
-      <Wrapper>
-        <PlayerLiveImage {...props} />
-      </Wrapper>
-    );
-
-    const isPlayerRegistered = playerManager.isPlayerRegistered(props.playerId);
-    expect(isPlayerRegistered).toBe(false);
-  });
 });

package/Components/VideoLive/__tests__/__snapshots__/PlayerLiveImageComponent.test.tsx.snap

@@ -31,6 +31,11 @@ exports[`PlayerLiveImageComponent should render correctly with default props 1`]
         playerId="player1"
         resizeMode="cover"
         screenConfig={{}}
+        source={
+          {
+            "uri": "",
+          }
+        }
         style={{}}
       />
     </View>

package/Components/VideoModal/ModalAnimation/AnimationComponent.tsx

@@ -100,11 +100,10 @@ export const AnimationView = ({
   const moveUpValue = additionalData.saveArea
     ? -insets.top + (isAudioItem ? 0 : progressBarHeight)
     : isTablet
-      ? isTabletLandscape &&
-        (!isAudioItem || (isAudioItem && inlineAudioPlayer))
-        ? -tabletLandscapePlayerTopPosition + progressBarHeight
-        : -130
-      : -50 + progressBarHeight;
+    ? isTabletLandscape && (!isAudioItem || (isAudioItem && inlineAudioPlayer))
+      ? -tabletLandscapePlayerTopPosition + progressBarHeight
+      : -130
+    : -50 + progressBarHeight;
 
   const moveComponentHorizontalValue = additionalData.moveValue
     ? isRTL
@@ -435,8 +434,8 @@ export const AnimationComponent = (props: Props) => {
   const Component = useAnimation
     ? AnimationView
     : style
-      ? View
-      : React.Fragment;
+    ? View
+    : React.Fragment;
 
   if (
     additionalData.extraAnimation &&

package/Components/VideoModal/ModalAnimation/ModalAnimationContext.tsx

@@ -118,10 +118,11 @@ const Provider = ({ children }: { children: React.ReactNode }) => {
     If bottomTabBarHeight is equal 0 it means an app does not use bottomTabBar.
     Because of this we need to minus bottom SafeArea offset.
   */
-
   const minValue =
     height -
-    (minimisedHeight + bottomTabBarHeight + progressBarHeight + bottomSafeArea);
+    minimisedHeight -
+    (bottomTabBarHeight || bottomSafeArea) -
+    progressBarHeight;
 
   const modalSnapPoints = React.useMemo(() => [0, minValue], [minValue]);
   // Last snap state which will helps us to make smooth responder to scrollview animation

package/Components/VideoModal/ModalAnimation/utils.ts

@@ -108,8 +108,8 @@ export const calculateAnimationValue = (animationType, dragPosition, data) => {
               : { forWidth: 3, forHeight: 3 }
             : { forWidth: 2, forHeight: 2 }
           : isTabletLandscape
-            ? { forWidth: 8, forHeight: 6.5 }
-            : { forWidth: 3.5, forHeight: 2 };
+          ? { forWidth: 8, forHeight: 6.5 }
+          : { forWidth: 3.5, forHeight: 2 };
 
       const minWidth =
         isAudioItem && !inlineAudioPlayer ? minimisedHeight : minimisedWidth;

package/Components/VideoModal/PlayerWrapper.tsx

@@ -10,8 +10,7 @@ import { Edge, SafeAreaView } from "react-native-safe-area-context";
 import { isTV } from "@applicaster/zapp-react-native-utils/reactUtils";
 import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
 import { PlayerDetails } from "./PlayerDetails";
-import { playerDimensionsHack } from "./utils";
-import { useDelayedPlayerDetails } from "./hooks";
+import { playerDimesionsHack } from "./utils";
 
 import {
   AnimatedScrollModal,
@@ -122,6 +121,34 @@ const getTabletWidth = (
   return Number(width) - sidebarWidth;
 };
 
+const showDetails = (
+  isMobile: boolean,
+  docked: boolean,
+  isInlineModal,
+  pip
+): boolean => {
+  if (pip) {
+    return false;
+  }
+
+  if (!isInlineModal) {
+    return false;
+  }
+
+  // for mobile we always show details. Mounting of it very heavy operation.
+  if (isMobile) {
+    return true;
+  }
+
+  // workaround for tablets we need to mount/unmount in order to avoid PlayerDetails content dissappearing
+  // FIXME - find out the reason of dissapearing of content
+  if (docked) {
+    return false;
+  }
+
+  return true;
+};
+
 const PlayerWrapperComponent = (props: Props) => {
   const {
     entry,
@@ -140,15 +167,7 @@ const PlayerWrapperComponent = (props: Props) => {
 
   const isInlineModal = inline && isModal;
 
-  // Mounting the PlayerDetails component is a resource-intensive process.
-  // Therefore, for performance reasons, we mount it with a delay to make the rotation process as smooth as possible.
-  // The flow is as follows: the rotation occurs first, and then, after a short delay, we mount the PlayerDetails component.
-  // This helps to avoid blocking the rotation and any animations related to the rotation.
-  const isShowPlayerDetails = useDelayedPlayerDetails({
-    isInline: isInlineModal,
-    isDocked: docked,
-    isPip: pip,
-  });
+  // const style = getStyles(baseStyle, !isTablet, isInlineModal, pip);
 
   const isTabletLandscape = !isTV() && isTablet && !isTabletPortrait;
 
@@ -184,8 +203,8 @@ const PlayerWrapperComponent = (props: Props) => {
   const WrapperView = React.useMemo(() => (isTV() ? View : SafeAreaView), []);
 
   const childrenStyles = React.useMemo(
-    () => ({ ...playerDimensions, ...playerDimensionsHack }),
-    [containerDimensions, playerDimensionsHack]
+    () => ({ ...playerDimensions, ...playerDimesionsHack }),
+    [containerDimensions, playerDimesionsHack]
   );
 
   return (
@@ -194,7 +213,7 @@ const PlayerWrapperComponent = (props: Props) => {
       style={[
         safeAreaStyles(configuration, isTablet),
         style,
-        playerDimensionsHack,
+        playerDimesionsHack,
       ]}
     >
       <AnimationComponent
@@ -208,7 +227,7 @@ const PlayerWrapperComponent = (props: Props) => {
             defaultStyles.playerContainer,
             containerDimensions,
             containerStyle,
-            playerDimensionsHack,
+            playerDimesionsHack,
           ]}
         >
           <AnimationComponent
@@ -227,7 +246,7 @@ const PlayerWrapperComponent = (props: Props) => {
         </View>
 
         <AnimatedScrollModal>
-          {isShowPlayerDetails && (
+          {showDetails(!isTablet, docked, isInlineModal, pip) && (
             <AnimationComponent
               animationType={ComponentAnimationType.componentFade}
               style={defaultStyles.flex}

package/Components/VideoModal/VideoModal.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { equals } from "ramda";
-import { StyleSheet, StatusBar } from "react-native";
+import * as R from "ramda";
+import { StyleSheet, View, StatusBar } from "react-native";
 
 import { HandlePlayable } from "@applicaster/zapp-react-native-ui-components/Components/HandlePlayable";
 import {
@@ -17,20 +17,17 @@ import {
 import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks/device/useIsTablet";
 
 import { withModalNavigationContextProvider } from "../../Contexts/ModalNavigationContext";
-import {
-  useModalSize,
-  useBackgroundColor,
-  useInitialPlayerState,
-} from "./hooks";
-
+import { useModalSize } from "./hooks/useModalSize";
+import { useBackgroundColor } from "./hooks/useBackgroundColor";
+import { useInitialPlayerState } from "./hooks/useInitialPlayerState";
 import { APP_EVENTS } from "@applicaster/zapp-react-native-utils/appUtils/events";
+import { Spinner } from "../Spinner";
 import { PathnameContext } from "@applicaster/zapp-react-native-ui-components/Contexts/PathnameContext";
 import { ROUTE_TYPES } from "@applicaster/zapp-react-native-utils/navigationUtils/routeTypes";
 import { useSubscriberFor } from "@applicaster/zapp-react-native-utils/reactHooks/useSubscriberFor";
 import { requiresAuthentication } from "@applicaster/zapp-react-native-utils/configurationUtils";
 import { playerManager } from "@applicaster/zapp-react-native-utils/appUtils";
 import { ScreenContextProvider } from "../../Contexts/ScreenContext";
-import { OpaqueLayer } from "./OpaqueLayer";
 
 import { AnimatedPlayerModalWrapper } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
 
@@ -42,6 +39,17 @@ const styles = StyleSheet.create({
     bottom: 0,
     position: "absolute",
   },
+  // eslint-disable-next-line react-native/no-color-literals
+  loaderContainer: {
+    top: 0,
+    left: 0,
+    right: 0,
+    bottom: 0,
+    position: "absolute",
+    alignItems: "center",
+    justifyContent: "center",
+    backgroundColor: "rgba(64,64,64,.5)",
+  },
 });
 
 const VideoModalComponent = () => {
@@ -92,7 +100,7 @@ const VideoModalComponent = () => {
 
   const onHooksSuccess = ({ payload }) => {
     // set new modified entry
-    if (!equals(payload, item)) {
+    if (!R.equals(payload, item)) {
       onVideoModalHookSuccessAnalyticsEvent();
       setVideoModalItem(payload);
     }
@@ -128,10 +136,7 @@ const VideoModalComponent = () => {
 
       <PathnameContext.Provider value={pathname}>
         <ScreenContextProvider pathname={pathname}>
-          {/* Hide content underneath when we switch to next video in fullscreen mode */}
-          {mode === "FULLSCREEN" && <OpaqueLayer />}
-
-          {itemIdHooksFinished === item?.id && (
+          {itemIdHooksFinished === item?.id ? (
             <AnimatedPlayerModalWrapper
               style={[
                 styles.container,
@@ -148,6 +153,10 @@ const VideoModalComponent = () => {
                 mode={mode}
               />
             </AnimatedPlayerModalWrapper>
+          ) : (
+            <View style={styles.loaderContainer}>
+              <Spinner />
+            </View>
           )}
         </ScreenContextProvider>
       </PathnameContext.Provider>

package/Components/VideoModal/__tests__/PlayerWrapper.test.tsx

@@ -62,7 +62,7 @@ jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation", () => ({
   })),
 }));
 
-jest.mock("../utils", () => ({ playerDimensionsHack: {} }));
+jest.mock("../utils", () => ({ playerDimesionsHack: {} }));
 
 const { PlayerWrapper } = require("../PlayerWrapper");
 

package/Components/VideoModal/__tests__/__snapshots__/PlayerWrapper.test.tsx.snap

@@ -71,6 +71,36 @@ exports[`PlayerWrapper renders inline 1`] = `
         }
         testID="test-player-container"
       />
+      <View
+        animationType="componentFade"
+        style={
+          {
+            "flex": 1,
+          }
+        }
+      >
+        <View
+          configuration={
+            {
+              "tablet_landscape_player_container_background_color": "red",
+              "tablet_landscape_sidebar_width": "35%",
+            }
+          }
+          entry={
+            {
+              "id": "test",
+            }
+          }
+          isTablet={false}
+          isTabletLandscape={false}
+          style={
+            {
+              "flex": 1,
+              "paddingTop": 20,
+            }
+          }
+        />
+      </View>
     </View>
   </RNCSafeAreaView>
 </RNCSafeAreaProvider>
@@ -147,6 +177,36 @@ exports[`PlayerWrapper renders inline and docked 1`] = `
         }
         testID="test-player-container"
       />
+      <View
+        animationType="componentFade"
+        style={
+          {
+            "flex": 1,
+          }
+        }
+      >
+        <View
+          configuration={
+            {
+              "tablet_landscape_player_container_background_color": "red",
+              "tablet_landscape_sidebar_width": "35%",
+            }
+          }
+          entry={
+            {
+              "id": "test",
+            }
+          }
+          isTablet={false}
+          isTabletLandscape={false}
+          style={
+            {
+              "flex": 1,
+              "paddingTop": 20,
+            }
+          }
+        />
+      </View>
     </View>
   </RNCSafeAreaView>
 </RNCSafeAreaProvider>
@@ -239,6 +299,36 @@ exports[`PlayerWrapper renders inline on tablet in landscape orientation 1`] = `
           }
         />
       </View>
+      <View
+        animationType="componentFade"
+        style={
+          {
+            "flex": 1,
+          }
+        }
+      >
+        <View
+          configuration={
+            {
+              "tablet_landscape_player_container_background_color": "red",
+              "tablet_landscape_sidebar_width": "35%",
+            }
+          }
+          entry={
+            {
+              "id": "test",
+            }
+          }
+          isTablet={true}
+          isTabletLandscape={true}
+          style={
+            {
+              "flex": 1,
+              "paddingTop": 20,
+            }
+          }
+        />
+      </View>
     </View>
   </RNCSafeAreaView>
 </RNCSafeAreaProvider>

package/Components/VideoModal/hooks/utils/index.ts

@@ -35,36 +35,3 @@ export const orientationWasChangedFromPortraitToLandscape = ({
     isOrientationLandscape(toOrientation)
   );
 };
-
-export const showDetails = ({
-  isMobile,
-  isInline,
-  isDocked,
-  isPip,
-}: {
-  isMobile: boolean;
-  isInline: boolean;
-  isDocked: boolean;
-  isPip: boolean;
-}): boolean => {
-  if (isPip) {
-    return false;
-  }
-
-  if (isDocked) {
-    return false;
-  }
-
-  // for mobile with inline mode(rotation is portrait) we always show details.
-  if (isMobile && isInline) {
-    return true;
-  }
-
-  // for mobile with landscape rotation(player is fullscreen) we always hide details. Mounting of it is very heavy operation.
-  if (isMobile && !isInline) {
-    return false;
-  }
-
-  // for tablets we always show details
-  return true;
-};

package/Components/VideoModal/utils.ts

@@ -52,7 +52,7 @@ const fullSize = {
   height: "100%",
 };
 
-export const playerDimensionsHack = platformSelect({
+export const playerDimesionsHack = platformSelect({
   android_tv: fullSize,
   amazon: fullSize,
   lg_tv: fullSize,

package/Contexts/ComponentsMapOffsetContext/index.tsx

@@ -0,0 +1,46 @@
+import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
+import React, { PropsWithChildren } from "react";
+
+export const ComponentsMapOffsetContext = React.createContext({
+  setComponentsMapOffset: (_offset: number) => void 0,
+  componentsMapOffset: 0,
+});
+
+export const ComponentsMapOffsetContextProvider = ({
+  children,
+}: PropsWithChildren<{}>) => {
+  const theme = useTheme<BaseThemePropertiesTV>();
+
+  const [componentsMapOffset, setComponentsMapOffset] = React.useState(
+    theme?.screen_margin_top
+  );
+
+  const contextValue = {
+    componentsMapOffset,
+    setComponentsMapOffset,
+  };
+
+  return (
+    <ComponentsMapOffsetContext.Provider value={contextValue}>
+      {children}
+    </ComponentsMapOffsetContext.Provider>
+  );
+};
+
+export const withComponentsMapOffsetContext = (Component: any) =>
+  function ComponentsMapOffsetContextProviderWrapper(props: {}) {
+    return (
+      <ComponentsMapOffsetContextProvider>
+        <Component {...props} />
+      </ComponentsMapOffsetContextProvider>
+    );
+  };
+
+export const withComponentsMapOffsetContextConsumer = (Component: any) =>
+  function ComponentsMapOffsetContextConsumerWrapper(props: {}) {
+    const { componentsMapOffset } = React.useContext(
+      ComponentsMapOffsetContext
+    );
+
+    return <Component {...props} componentsMapOffset={componentsMapOffset} />;
+  };