@applicaster/zapp-react-native-ui-components 13.0.0-alpha.9946926334 → 13.0.0-rc.100

package/Components/VideoModal/PlayerDetails.tsx

@@ -1,14 +1,16 @@
 import React, { useEffect, useRef } from "react";
 import {
-  StyleProp,
-  ViewStyle,
   Animated,
-  Easing,
   Dimensions,
+  Easing,
+  StyleProp,
+  ViewStyle,
+  StyleSheet,
 } from "react-native";
 import { useTargetScreenData } from "@applicaster/zapp-react-native-utils/reactHooks/screen";
 import { ComponentsMap } from "@applicaster/zapp-react-native-ui-components/Components/River/ComponentsMap";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { isNilOrEmpty } from "@applicaster/zapp-react-native-utils/reactUtils/helpers";
 
 const { width: SCREEN_WIDTH } = Dimensions.get("screen");
 
@@ -21,9 +23,9 @@ type Props = {
   entry: ZappEntry;
   style: StyleProp<ViewStyle>;
   configuration: Configuration;
-  isTabletLandscape: boolean;
+  isTabletLandscape?: boolean;
   isAudioPlayer?: boolean;
-  isTablet: boolean;
+  isTablet?: boolean;
 };
 
 const containerStyle = ({
@@ -38,9 +40,9 @@ export const PlayerDetails = ({
   entry,
   style,
   configuration,
-  isTabletLandscape,
+  isTabletLandscape = false,
   isAudioPlayer,
-  isTablet,
+  isTablet = false,
 }: Props) => {
   const screenData = useTargetScreenData(entry);
   const insets = useSafeAreaInsets();
@@ -77,6 +79,10 @@ export const PlayerDetails = ({
     }
   }, [isAudioPlayer]);
 
+  if (isNilOrEmpty(screenData?.ui_components)) {
+    return null;
+  }
+
   return (
     <Animated.View
       style={[
@@ -90,17 +96,19 @@ export const PlayerDetails = ({
         {
           // workaround for avoid wrong text-height after going back to portrait rotation
           // we don't see this view in landscape mode, so we are able to use fixed width from portrait mode
-          width: isTablet ? undefined : SCREEN_WIDTH,
+          width: isTablet
+            ? undefined
+            : (StyleSheet.flatten(style)?.width ?? SCREEN_WIDTH),
         },
       ]}
     >
-      {screenData && (
+      {screenData ? (
         <ComponentsMap
           riverId={screenData.id}
           feed={screenData?.data?.source}
           riverComponents={screenData.ui_components}
         />
-      )}
+      ) : null}
     </Animated.View>
   );
 };

package/Components/VideoModal/PlayerWrapper.tsx

@@ -10,7 +10,8 @@ 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 { playerDimesionsHack } from "./utils";
+import { playerDimensionsHack } from "./utils";
+import { useDelayedPlayerDetails } from "./hooks";
 
 import {
   AnimatedScrollModal,
@@ -99,6 +100,24 @@ const getEdges = (isTablet: boolean, isInlineModal: boolean) => {
   return ["top"];
 };
 
+const isPercentage = (value: string | number): boolean => {
+  if (typeof value === "string") {
+    return value.includes("%");
+  }
+
+  return false;
+};
+
+const getPercentageOf = (percent: string, value: number) => {
+  const percentageValue = parseFloat(percent.replace("%", ""));
+
+  if (isNaN(percentageValue)) {
+    return value;
+  }
+
+  return (value * percentageValue) / 100;
+};
+
 const getTabletWidth = (
   configuration: Configuration,
   dimensions: DimensionsT
@@ -107,46 +126,23 @@ const getTabletWidth = (
     configuration?.tablet_landscape_sidebar_width;
 
   const { width } = dimensions;
+  let widthValue = Number(width);
+
+  if (isPercentage(width)) {
+    widthValue = getPercentageOf(width.toString(), SCREEN_WIDTH);
+  }
 
   const sidebarWidth = Number(tablet_landscape_sidebar_width?.replace("%", ""));
 
   if (tablet_landscape_sidebar_width?.includes("%")) {
-    return Number(width) * (1 - sidebarWidth / 100);
+    return widthValue * (1 - sidebarWidth / 100);
   }
 
   if (Number.isNaN(sidebarWidth)) {
-    return Number(width) * 0.65;
-  }
-
-  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 widthValue * 0.65;
   }
 
-  return true;
+  return widthValue - sidebarWidth;
 };
 
 const PlayerWrapperComponent = (props: Props) => {
@@ -167,7 +163,15 @@ const PlayerWrapperComponent = (props: Props) => {
 
   const isInlineModal = inline && isModal;
 
-  // const style = getStyles(baseStyle, !isTablet, isInlineModal, pip);
+  // 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 isTabletLandscape = !isTV() && isTablet && !isTabletPortrait;
 
@@ -203,8 +207,8 @@ const PlayerWrapperComponent = (props: Props) => {
   const WrapperView = React.useMemo(() => (isTV() ? View : SafeAreaView), []);
 
   const childrenStyles = React.useMemo(
-    () => ({ ...playerDimensions, ...playerDimesionsHack }),
-    [containerDimensions, playerDimesionsHack]
+    () => ({ ...playerDimensions, ...playerDimensionsHack }),
+    [containerDimensions, playerDimensionsHack]
   );
 
   return (
@@ -213,7 +217,7 @@ const PlayerWrapperComponent = (props: Props) => {
       style={[
         safeAreaStyles(configuration, isTablet),
         style,
-        playerDimesionsHack,
+        playerDimensionsHack,
       ]}
     >
       <AnimationComponent
@@ -227,7 +231,7 @@ const PlayerWrapperComponent = (props: Props) => {
             defaultStyles.playerContainer,
             containerDimensions,
             containerStyle,
-            playerDimesionsHack,
+            playerDimensionsHack,
           ]}
         >
           <AnimationComponent
@@ -246,7 +250,7 @@ const PlayerWrapperComponent = (props: Props) => {
         </View>
 
         <AnimatedScrollModal>
-          {showDetails(!isTablet, docked, isInlineModal, pip) && (
+          {isShowPlayerDetails ? (
             <AnimationComponent
               animationType={ComponentAnimationType.componentFade}
               style={defaultStyles.flex}
@@ -259,7 +263,7 @@ const PlayerWrapperComponent = (props: Props) => {
                 isTablet={isTablet}
               />
             </AnimationComponent>
-          )}
+          ) : null}
         </AnimatedScrollModal>
       </AnimationComponent>
     </WrapperView>

package/Components/VideoModal/VideoModal.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import * as R from "ramda";
-import { StyleSheet, View, StatusBar } from "react-native";
+import { equals } from "ramda";
+import { StyleSheet, StatusBar, View } from "react-native";
 
 import { HandlePlayable } from "@applicaster/zapp-react-native-ui-components/Components/HandlePlayable";
 import {
@@ -17,20 +17,26 @@ import {
 import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks/device/useIsTablet";
 
 import { withModalNavigationContextProvider } from "../../Contexts/ModalNavigationContext";
-import { useModalSize } from "./hooks/useModalSize";
-import { useBackgroundColor } from "./hooks/useBackgroundColor";
-import { useInitialPlayerState } from "./hooks/useInitialPlayerState";
+import {
+  useModalSize,
+  useBackgroundColor,
+  useInitialPlayerState,
+} from "./hooks";
+
 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 { Spinner } from "../Spinner";
+import { OpaqueLayer } from "./OpaqueLayer";
 
 import { AnimatedPlayerModalWrapper } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
 
+const LOADER_BACKGROUND_COLOR = "rgba(64,64,64,0.5)";
+
 const styles = StyleSheet.create({
   container: {
     top: 0,
@@ -39,7 +45,6 @@ const styles = StyleSheet.create({
     bottom: 0,
     position: "absolute",
   },
-  // eslint-disable-next-line react-native/no-color-literals
   loaderContainer: {
     top: 0,
     left: 0,
@@ -48,7 +53,7 @@ const styles = StyleSheet.create({
     position: "absolute",
     alignItems: "center",
     justifyContent: "center",
-    backgroundColor: "rgba(64,64,64,.5)",
+    backgroundColor: LOADER_BACKGROUND_COLOR,
   },
 });
 
@@ -100,7 +105,7 @@ const VideoModalComponent = () => {
 
   const onHooksSuccess = ({ payload }) => {
     // set new modified entry
-    if (!R.equals(payload, item)) {
+    if (!equals(payload, item)) {
       onVideoModalHookSuccessAnalyticsEvent();
       setVideoModalItem(payload);
     }
@@ -136,6 +141,9 @@ 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 ? (
             <AnimatedPlayerModalWrapper
               style={[
@@ -148,8 +156,6 @@ const VideoModalComponent = () => {
               <HandlePlayable
                 item={item}
                 isModal={mode !== "PIP"}
-                modalHeight={modalSize.height}
-                modalWidth={modalSize.width}
                 mode={mode}
               />
             </AnimatedPlayerModalWrapper>

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

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

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

@@ -1,43 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`PlayerDetails renders properly 1`] = `
-<View
-  collapsable={false}
-  style={
-    {
-      "backgroundColor": "transparent",
-      "flex": 1,
-      "marginTop": -8,
-      "paddingTop": -8,
-      "width": 750,
-    }
-  }
->
-  <View
-    feed="test-source"
-    riverComponents={[]}
-    riverId="test-id"
-  />
-</View>
-`;
+exports[`PlayerDetails renders properly 1`] = `null`;
 
-exports[`PlayerDetails renders properly on tablet in landscape orientation 1`] = `
-<View
-  collapsable={false}
-  style={
-    {
-      "backgroundColor": "transparent",
-      "flex": 1,
-      "marginTop": -20,
-      "paddingTop": 40,
-      "width": 750,
-    }
-  }
->
-  <View
-    feed="test-source"
-    riverComponents={[]}
-    riverId="test-id"
-  />
-</View>
-`;
+exports[`PlayerDetails renders properly on tablet in landscape orientation 1`] = `null`;

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

@@ -71,36 +71,6 @@ 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>
@@ -177,36 +147,6 @@ 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>
@@ -299,36 +239,6 @@ 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/__tests__/useDelayedPlayerDetails.test.ts

@@ -0,0 +1,89 @@
+import { renderHook } from "@testing-library/react-hooks";
+import { useDelayedPlayerDetails } from "../useDelayedPlayerDetails";
+import { withTimeout$ } from "@applicaster/zapp-react-native-utils/idleUtils";
+import { showDetails } from "../utils";
+import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
+
+jest.mock("@applicaster/zapp-react-native-utils/idleUtils", () => ({
+  withTimeout$: jest.fn(),
+}));
+
+jest.mock("../utils", () => ({
+  showDetails: jest.fn(),
+}));
+
+jest.mock("@applicaster/zapp-react-native-utils/reactHooks", () => ({
+  useIsTablet: jest.fn(),
+}));
+
+describe("useDelayedPlayerDetails", () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it("should return false initially", () => {
+    (withTimeout$ as jest.Mock).mockReturnValue({
+      subscribe: jest.fn().mockReturnValue({ unsubscribe: jest.fn() }),
+    });
+
+    const { result } = renderHook(() =>
+      useDelayedPlayerDetails({ isInline: true, isDocked: false, isPip: false })
+    );
+
+    expect(result.current).toBe(false);
+  });
+
+  it("should return true if showDetails returns true", () => {
+    (withTimeout$ as jest.Mock).mockReturnValue({
+      subscribe: (callback) => {
+        callback.next();
+
+        return { unsubscribe: jest.fn() };
+      },
+    });
+
+    (showDetails as jest.Mock).mockReturnValue(true);
+    (useIsTablet as jest.Mock).mockReturnValue(false);
+
+    const { result } = renderHook(() =>
+      useDelayedPlayerDetails({ isInline: true, isDocked: false, isPip: false })
+    );
+
+    expect(result.current).toBe(true);
+  });
+
+  it("should return false if showDetails returns false", () => {
+    (withTimeout$ as jest.Mock).mockReturnValue({
+      subscribe: (callback) => {
+        callback.next();
+
+        return { unsubscribe: jest.fn() };
+      },
+    });
+
+    (showDetails as jest.Mock).mockReturnValue(false);
+    (useIsTablet as jest.Mock).mockReturnValue(false);
+
+    const { result } = renderHook(() =>
+      useDelayedPlayerDetails({ isInline: true, isDocked: false, isPip: false })
+    );
+
+    expect(result.current).toBe(false);
+  });
+
+  it("should unsubscribe on unmount", () => {
+    const unsubscribeMock = jest.fn();
+
+    (withTimeout$ as jest.Mock).mockReturnValue({
+      subscribe: jest.fn().mockReturnValue({ unsubscribe: unsubscribeMock }),
+    });
+
+    const { unmount } = renderHook(() =>
+      useDelayedPlayerDetails({ isInline: true, isDocked: false, isPip: false })
+    );
+
+    unmount();
+
+    expect(unsubscribeMock).toHaveBeenCalled();
+  });
+});

package/Components/VideoModal/hooks/index.ts

@@ -0,0 +1,7 @@
+export { useBackgroundColor } from "./useBackgroundColor";
+
+export { useDelayedPlayerDetails } from "./useDelayedPlayerDetails";
+
+export { useInitialPlayerState } from "./useInitialPlayerState";
+
+export { useModalSize } from "./useModalSize";

package/Components/VideoModal/hooks/useDelayedPlayerDetails.ts

@@ -0,0 +1,49 @@
+import * as React from "react";
+import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
+import { withTimeout$ } from "@applicaster/zapp-react-native-utils/idleUtils";
+
+import { showDetails } from "./utils";
+
+const TIMEOUT = 100; // ms
+
+type Props = { isInline: boolean; isDocked: boolean; isPip: boolean };
+
+/**
+ * Custom hook to determine whether to show player details with a delay.
+ *
+ * @param {Object} params - The parameters object.
+ * @param {boolean} params.isInline - Indicates if the player is inline.
+ * @param {boolean} params.isDocked - Indicates if the player is docked.
+ * @param {boolean} params.isPip - Indicates if the player is in PIP mode.
+ * @returns {boolean} - Returns true if player details should be shown, otherwise false.
+ */
+export const useDelayedPlayerDetails = ({
+  isInline,
+  isDocked,
+  isPip,
+}: Props): boolean => {
+  const [shouldShowDetails, setShouldShowDetails] = React.useState(false);
+
+  const isTablet = useIsTablet();
+
+  React.useEffect(() => {
+    const subscription = withTimeout$(TIMEOUT).subscribe({
+      next: () => {
+        setShouldShowDetails(() => {
+          return showDetails({
+            isMobile: !isTablet,
+            isInline,
+            isDocked,
+            isPip,
+          });
+        });
+      },
+    });
+
+    return () => {
+      subscription.unsubscribe();
+    };
+  }, [isDocked, isTablet, isInline, isPip]);
+
+  return shouldShowDetails;
+};