@applicaster/zapp-react-native-ui-components 14.0.0-rc.9 → 14.0.0-rc.90

package/Components/VideoModal/PlayerDetails.tsx

@@ -4,13 +4,15 @@ import {
   Dimensions,
   Easing,
   StyleProp,
-  ViewStyle,
   StyleSheet,
+  ViewStyle,
 } 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";
+import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
+import { useDelayedPlayerDetails } from "./hooks";
 
 const { width: SCREEN_WIDTH } = Dimensions.get("screen");
 
@@ -26,6 +28,10 @@ type Props = {
   isTabletLandscape?: boolean;
   isAudioPlayer?: boolean;
   isTablet?: boolean;
+  inline?: any;
+  docked?: boolean;
+  isModal?: boolean;
+  pip?: boolean;
 };
 
 const containerStyle = ({
@@ -42,16 +48,31 @@ export const PlayerDetails = ({
   configuration,
   isTabletLandscape = false,
   isAudioPlayer,
-  isTablet = false,
+  inline,
+  docked,
+  isModal,
+  pip,
 }: 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 isTablet = useIsTablet();
   const screenData = useTargetScreenData(entry);
   const insets = useSafeAreaInsets();
 
-  const extraTabletStyles = !isAudioPlayer
-    ? isTabletLandscape
+  const extraTabletStyles =
+    !isAudioPlayer && isTabletLandscape
       ? { marginTop: -insets.top, paddingTop: insets.top + 20 }
-      : { marginTop: -8, paddingTop: -8 }
-    : {};
+      : null;
 
   // Animation setup
   const translateY = useRef(new Animated.Value(50)).current;
@@ -79,7 +100,7 @@ export const PlayerDetails = ({
     }
   }, [isAudioPlayer]);
 
-  if (isNilOrEmpty(screenData?.ui_components)) {
+  if (isNilOrEmpty(screenData?.ui_components) || !isShowPlayerDetails) {
     return null;
   }
 
@@ -107,6 +128,7 @@ export const PlayerDetails = ({
           riverId={screenData.id}
           feed={screenData?.data?.source}
           riverComponents={screenData.ui_components}
+          isScreenWrappedInContainer
         />
       ) : null}
     </Animated.View>

package/Components/VideoModal/PlayerWrapper.tsx

@@ -1,38 +1,11 @@
 import * as React from "react";
-import {
-  Dimensions,
-  Platform,
-  StyleSheet,
-  View,
-  ViewStyle,
-} from "react-native";
+import { View, ViewStyle } from "react-native";
 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 {
-  AnimatedScrollModal,
-  AnimatedVideoPlayerComponent,
-  AnimationComponent,
-  ComponentAnimationType,
-} from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
-
-const { width: SCREEN_WIDTH, height: SCREEN_HEIGHT } = Dimensions.get("screen");
-
-type DimensionsT = {
-  width: number | string;
-  height: number | string | undefined;
-  aspectRatio?: number;
-};
-
-type Configuration = {
-  [key: string]: any;
-  tablet_landscape_sidebar_width?: string;
-  tablet_landscape_player_container_background_color?: string;
-};
+import { DimensionsT, Configuration, getEdges } from "./playerWrapperUtils";
+import { defaultStyles, useStyle } from "./playerWrapperStyle";
 
 type Props = {
   entry: ZappEntry;
@@ -44,91 +17,9 @@ type Props = {
   isModal?: boolean;
   fullscreen?: boolean;
   isTabletPortrait?: boolean;
-  children: (playerDimensions: DimensionsT) => React.ReactNode;
   configuration: Configuration;
-};
-
-const defaultStyles = StyleSheet.create({
-  playerContainer: { position: "relative", alignSelf: "center", zIndex: 200 },
-  playerDetails: { flex: 1, paddingTop: 20 },
-  flex: { flex: 1 },
-});
-
-const orientationStyles = StyleSheet.create({
-  landscape: { flexDirection: "row" },
-  portrait: { flexDirection: "column" },
-});
-
-const directionStyles = (isTabletLandscape: boolean): ViewStyle => {
-  if (isTabletLandscape) {
-    return orientationStyles.landscape;
-  }
-
-  return orientationStyles.portrait;
-};
-
-const getScreenAspectRatio = () => {
-  const longEdge = Math.max(SCREEN_WIDTH, SCREEN_HEIGHT);
-  const shortEdge = Math.min(SCREEN_WIDTH, SCREEN_HEIGHT);
-
-  return longEdge / shortEdge;
-};
-
-const getEdges = (isTablet: boolean, isInlineModal: boolean) => {
-  if (isTablet) {
-    return ["top"];
-  }
-
-  if (!isInlineModal && Platform.OS === "android") {
-    return [];
-  }
-
-  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
-) => {
-  const tablet_landscape_sidebar_width =
-    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 widthValue * (1 - sidebarWidth / 100);
-  }
-
-  if (Number.isNaN(sidebarWidth)) {
-    return widthValue * 0.65;
-  }
-
-  return widthValue - sidebarWidth;
+  playerContent: (styles: ViewStyle) => React.ReactNode;
 };
 
 const PlayerWrapperComponent = (props: Props) => {
@@ -137,125 +28,44 @@ const PlayerWrapperComponent = (props: Props) => {
     style,
     containerStyle,
     inline,
-    docked,
     isModal,
-    children,
     isTabletPortrait,
     configuration,
-    fullscreen,
     pip,
+    playerContent,
   } = props;
 
-  const isTablet = useIsTablet();
-
-  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 styles = useStyle({
+    style,
+    inline,
+    isModal,
+    isTabletPortrait,
+    configuration,
+    pip,
   });
 
-  const isTabletLandscape = !isTV() && isTablet && !isTabletPortrait;
-
-  const tabletWidth = getTabletWidth(configuration, style);
-
-  const baseDimensions: DimensionsT = React.useMemo(
-    () => ({
-      width:
-        isInlineModal && !docked && isTabletLandscape ? tabletWidth : "100%",
-      height: undefined,
-    }),
-    [isInlineModal, tabletWidth, docked]
-  );
-
-  const playerDimensions: DimensionsT = React.useMemo(
-    () => ({
-      ...baseDimensions,
-      width: isInlineModal && docked ? undefined : baseDimensions.width,
-      aspectRatio: !isInlineModal && !pip ? getScreenAspectRatio() : 16 / 9,
-    }),
-    [baseDimensions, isInlineModal, pip]
-  );
+  const isTablet = useIsTablet();
 
-  const containerDimensions: DimensionsT = React.useMemo(
-    () => ({
-      ...baseDimensions,
-      aspectRatio:
-        isInlineModal && docked ? undefined : playerDimensions.aspectRatio,
-    }),
-    [baseDimensions, isInlineModal, docked, playerDimensions.aspectRatio]
-  );
+  const isInlineModal = inline && isModal;
 
   const WrapperView = React.useMemo(() => (isTV() ? View : SafeAreaView), []);
 
-  const childrenStyles = React.useMemo(
-    () => ({ ...playerDimensions, ...playerDimensionsHack }),
-    [containerDimensions, playerDimensionsHack]
-  );
-
-  const wrapperViewStyle: ViewStyle = {
-    backgroundColor:
-      isTablet && !fullscreen
-        ? configuration?.tablet_landscape_player_container_background_color
-        : "transparent",
-  };
-
   return (
     <WrapperView
       edges={getEdges(isTablet, isInlineModal) as readonly Edge[]}
-      style={[wrapperViewStyle, style, playerDimensionsHack]}
+      style={playerDimensionsHack}
     >
-      <AnimationComponent
-        animationType={ComponentAnimationType.moveUpComponent}
-        additionalData={{ saveArea: true }}
-        style={[directionStyles(isTabletLandscape), defaultStyles.flex]}
+      <View
+        testID={`${entry?.id}-player-container`}
+        style={[
+          defaultStyles.playerContainer,
+          playerDimensionsHack,
+          styles.containerDimensions,
+          containerStyle,
+        ]}
       >
-        <View
-          testID={`${entry?.id}-player-container`}
-          style={[
-            defaultStyles.playerContainer,
-            containerDimensions,
-            containerStyle,
-            playerDimensionsHack,
-          ]}
-        >
-          <AnimationComponent
-            animationType={ComponentAnimationType.moveUpComponent}
-            style={isTabletLandscape ? defaultStyles.flex : undefined}
-            additionalData={{
-              useLayoutMeasure: isTabletLandscape,
-              disableAnimatedComponent: !isTabletLandscape,
-              resetAnimationValue: isTabletLandscape && docked,
-            }}
-          >
-            <AnimatedVideoPlayerComponent>
-              {children(childrenStyles)}
-            </AnimatedVideoPlayerComponent>
-          </AnimationComponent>
-        </View>
-
-        <AnimatedScrollModal>
-          {isShowPlayerDetails ? (
-            <AnimationComponent
-              animationType={ComponentAnimationType.componentFade}
-              style={defaultStyles.flex}
-            >
-              <PlayerDetails
-                configuration={configuration}
-                style={defaultStyles.playerDetails}
-                entry={entry}
-                isTabletLandscape={isTabletLandscape}
-                isTablet={isTablet}
-              />
-            </AnimationComponent>
-          ) : null}
-        </AnimatedScrollModal>
-      </AnimationComponent>
+        {playerContent(styles.childrenStyles)}
+      </View>
     </WrapperView>
   );
 };

package/Components/VideoModal/VideoModal.tsx

@@ -17,11 +17,7 @@ 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, useInitialPlayerState } from "./hooks";
 
 import { APP_EVENTS } from "@applicaster/zapp-react-native-utils/appUtils/events";
 import { PathnameContext } from "@applicaster/zapp-react-native-ui-components/Contexts/PathnameContext";
@@ -33,8 +29,6 @@ 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({
@@ -65,7 +59,6 @@ const VideoModalComponent = () => {
 
   const modalSize = useModalSize();
   const isFirstRender = useIsInitialRender();
-  const backgroundColor = useBackgroundColor();
 
   const {
     closeVideoModal,
@@ -145,20 +138,9 @@ const VideoModalComponent = () => {
           {mode === "FULLSCREEN" && <OpaqueLayer />}
 
           {itemIdHooksFinished === item?.id ? (
-            <AnimatedPlayerModalWrapper
-              style={[
-                styles.container,
-                {
-                  backgroundColor,
-                },
-              ]}
-            >
-              <HandlePlayable
-                item={item}
-                isModal={mode !== "PIP"}
-                mode={mode}
-              />
-            </AnimatedPlayerModalWrapper>
+            <View pointerEvents="box-none" style={styles.container}>
+              <HandlePlayable item={item} isModal mode={mode} />
+            </View>
           ) : (
             <View style={styles.loaderContainer}>
               <Spinner />

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

@@ -1,5 +1,5 @@
 import React from "react";
-import renderer from "react-test-renderer";
+import { render } from "@testing-library/react-native";
 
 const props = {
   entry: {},
@@ -42,16 +42,16 @@ const { PlayerDetails } = require("../PlayerDetails");
 
 describe("PlayerDetails", () => {
   it("renders properly", () => {
-    const element = renderer.create(<PlayerDetails {...props} />);
+    const { toJSON } = render(<PlayerDetails {...props} />);
 
-    expect(element).toMatchSnapshot();
+    expect(toJSON()).toMatchSnapshot();
   });
 
   it("renders properly on tablet in landscape orientation", () => {
-    const element = renderer.create(
+    const { toJSON } = render(
       <PlayerDetails {...props} isTabletLandscape={true} />
     );
 
-    expect(element).toMatchSnapshot();
+    expect(toJSON()).toMatchSnapshot();
   });
 });

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

@@ -13,6 +13,7 @@ const props = {
     tablet_landscape_sidebar_width: "35%",
     tablet_landscape_player_container_background_color: "red",
   },
+  playerContent: jest.fn(() => <></>),
 };
 
 const mockUseIsDeviceTablet = jest.fn();
@@ -45,6 +46,7 @@ jest.mock("@applicaster/zapp-react-native-utils/theme", () => ({
 
 jest.mock("@applicaster/zapp-react-native-utils/reactUtils", () => ({
   isTV: jest.fn(() => false),
+  isAndroidPlatform: jest.fn(() => false),
   isApplePlatform: jest.fn(() => true),
   platformSelect: jest.fn((props) => props.android),
 }));
@@ -122,13 +124,6 @@ describe("PlayerWrapper", () => {
       </PlayerWrapper>
     );
 
-    const expectDimensions = {
-      ...dimensions,
-      width: undefined,
-      aspectRatio: 16 / 9,
-    };
-
     expect(element).toMatchSnapshot();
-    expect(children).toHaveBeenCalledWith(expectDimensions);
   });
 });