@applicaster/zapp-react-native-ui-components 12.0.0-rc.95 → 12.0.0-rc.97

package/Components/VideoModal/ModalAnimation/AnimatedPlayerModalWrapper.tsx

@@ -5,7 +5,6 @@ import {
   useModalAnimationContext,
   PlayerAnimationStateEnum,
 } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
-import { useDimensions } from "@applicaster/zapp-react-native-utils/reactHooks";
 
 type Props = {
   style: ViewStyle[];
@@ -18,13 +17,8 @@ export const AnimatedPlayerModalWrapper = (props: Props) => {
     animatedValues: { lastScrollY, dragScrollY, translateYOffset },
     modalSnapPoints,
     setStartComponentsAnimation,
-    lastScrollYValue,
   } = useModalAnimationContext();
 
-  const { height: screenHeight } = useDimensions("screen", {
-    deviceInfo: true,
-  });
-
   const interpolateConfig: Animated.InterpolationConfigType = React.useMemo(
     () => ({
       inputRange: modalSnapPoints,
@@ -51,16 +45,10 @@ export const AnimatedPlayerModalWrapper = (props: Props) => {
   }
 
   React.useEffect(() => {
-    const translateYListener = translateY.addListener(({ value }) => {
-      const preparedValue = Math.round(
-        Math.abs(value) - lastScrollYValue.current
-      );
-
+    const translateYListener = translateY.addListener(() => {
       (playerAnimationState === PlayerAnimationStateEnum.minimize ||
         playerAnimationState === PlayerAnimationStateEnum.maximaze) &&
-        setStartComponentsAnimation(
-          preparedValue >= Math.round((screenHeight * 10) / 100)
-        );
+        setStartComponentsAnimation(true);
     });
 
     return () => {

package/Components/VideoModal/ModalAnimation/AnimatedScrollModal.tsx

@@ -205,7 +205,8 @@ export const AnimatedScrollModalComponent = ({ children }: Props) => {
 
     if (
       (videoModalState.mode === "MAXIMIZED" &&
-        videoModalState.previousMode === "MAXIMIZED") ||
+        videoModalState.previousMode === "MINIMIZED" &&
+        previousItemId === videoModalState.item?.id) ||
       previousItemId !== videoModalState.item?.id
     ) {
       setPlayerAnimationState(PlayerAnimationStateEnum.maximaze);

package/Components/VideoModal/ModalAnimation/AnimationComponent.tsx

@@ -51,6 +51,7 @@ export const AnimationView = ({
     setTabletLandscapePlayerTopPosition,
     modalSnapPoints,
     startComponentsAnimationDistance,
+    progressBarHeight,
   } = useModalAnimationContext();
 
   const isRTL = useIsRTL();
@@ -62,9 +63,9 @@ export const AnimationView = ({
   } = useDimensions("window", { deviceInfo: true });
 
   const { videoModalState } = useNavigation();
-  const bottomTabBarHeight = useGetBottomTabBarHeight();
-  const minimisedWidth = defaultAspectRatioWidth(minimisedHeight);
   const insets = useSafeAreaInsets();
+  const bottomTabBarHeight = useGetBottomTabBarHeight() + (insets.bottom || 0);
+  const minimisedWidth = defaultAspectRatioWidth(minimisedHeight);
   const animationComponentRef = useRef(null);
 
   // retrieving top position of the player for tablet landscape mode
@@ -92,12 +93,12 @@ export const AnimationView = ({
   const inlineAudioPlayer = additionalData.inlineAudioPlayer;
 
   const moveUpValue = additionalData.saveArea
-    ? -insets.top
+    ? -insets.top + (isAudioItem ? 0 : progressBarHeight)
     : isTablet
     ? isTabletLandscape && (!isAudioItem || (isAudioItem && inlineAudioPlayer))
-      ? -tabletLandscapePlayerTopPosition
+      ? -tabletLandscapePlayerTopPosition + progressBarHeight
       : -130
-    : -50;
+    : -50 + progressBarHeight;
 
   const moveComponentHorizontalValue = additionalData.moveValue
     ? isRTL

package/Components/VideoModal/ModalAnimation/ModalAnimationContext.tsx

@@ -1,12 +1,17 @@
 import React, { useContext } from "react";
 import { Animated } from "react-native";
 
-import { useSafeAreaInsets } from "react-native-safe-area-context";
+import {
+  useSafeAreaInsets,
+  useSafeAreaFrame,
+} from "react-native-safe-area-context";
 import {
   useGetBottomTabBarHeight,
-  useDimensions,
+  useNavigation,
 } from "@applicaster/zapp-react-native-utils/reactHooks";
+import { isLive } from "@applicaster/zapp-react-native-utils/playerUtils";
 
+import { PROGRESS_BAR_HEIGHT } from "./utils";
 import { useConfiguration } from "../utils";
 
 export enum PlayerAnimationStateEnum {
@@ -40,6 +45,7 @@ export type ModalAnimationContextT = {
   tabletLandscapePlayerTopPosition: number;
   setTabletLandscapePlayerTopPosition: (value: number) => void;
   startComponentsAnimationDistance: number;
+  progressBarHeight: number;
 };
 
 const ReactContext = React.createContext<ModalAnimationContextT>({
@@ -64,6 +70,7 @@ const ReactContext = React.createContext<ModalAnimationContextT>({
   tabletLandscapePlayerTopPosition: 0,
   setTabletLandscapePlayerTopPosition: () => null,
   startComponentsAnimationDistance: 0,
+  progressBarHeight: 0,
 });
 
 export function useModalAnimationContext() {
@@ -82,6 +89,11 @@ const Provider = ({ children }: { children: React.ReactNode }) => {
   const [startComponentsAnimation, setStartComponentsAnimation] =
     React.useState<boolean>(false);
 
+  const {
+    videoModalState: { mode, visible, item },
+  } = useNavigation();
+
+  const isLiveItem = isLive(item);
   const { minimised_height: minimisedHeight } = useConfiguration();
 
   const resetPlayerAnimationState = React.useCallback(() => {
@@ -95,21 +107,28 @@ const Provider = ({ children }: { children: React.ReactNode }) => {
   const translateYOffset = React.useRef(new Animated.Value(0)).current;
   const dragVideoPlayerY = React.useRef(new Animated.Value(0)).current;
 
-  const { height } = useDimensions("window", { fullDimensions: true });
+  const { height: safeAreaFrameHeight } = useSafeAreaFrame();
+  const [height, setHeight] = React.useState<number>(safeAreaFrameHeight);
+  const progressBarHeight = isLiveItem ? 0 : PROGRESS_BAR_HEIGHT;
   const { bottom: bottomSafeArea } = useSafeAreaInsets();
   const bottomTabBarHeight = useGetBottomTabBarHeight();
+  const startComponentsAnimationDistance = Math.round((height * 60) / 100);
 
-  const startComponentsAnimationDistance = React.useMemo(
-    () => Math.round((height * 60) / 100),
-    [height]
-  );
+  React.useEffect(() => {
+    if (visible && mode === "MAXIMIZED" && height !== safeAreaFrameHeight) {
+      setHeight(safeAreaFrameHeight);
+    }
+  }, [height, safeAreaFrameHeight, mode, visible]);
 
   /*
     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 || bottomSafeArea);
+    height -
+    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
@@ -142,6 +161,7 @@ const Provider = ({ children }: { children: React.ReactNode }) => {
         tabletLandscapePlayerTopPosition,
         setTabletLandscapePlayerTopPosition,
         startComponentsAnimationDistance,
+        progressBarHeight,
       }}
     >
       {children}

package/Components/VideoModal/ModalAnimation/utils.ts

@@ -13,6 +13,7 @@ export enum ComponentAnimationType {
 }
 
 export const AUDIO_PLAYER_HORIZONTAL_PADDING = 15;
+export const PROGRESS_BAR_HEIGHT = 3;
 
 export const defaultAspectRatioWidth = (height: number): number =>
   (height / 9) * 16;

package/Components/VideoModal/PlayerWrapper.tsx

@@ -225,7 +225,7 @@ export const PlayerWrapper = (props: Props) => {
                   </AnimationComponent>
                 </View>
                 <AnimatedScrollModal>
-                  {isInlineModal ? (
+                  {isInlineModal && !docked ? (
                     <AnimationComponent
                       animationType={ComponentAnimationType.componentFade}
                       style={defaultStyles.flex}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "12.0.0-rc.95",
+  "version": "12.0.0-rc.97",
   "description": "Applicaster Zapp React Native ui components for the Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -34,10 +34,10 @@
     "redux-mock-store": "^1.5.3"
   },
   "dependencies": {
-    "@applicaster/applicaster-types": "12.0.0-rc.95",
-    "@applicaster/zapp-react-native-bridge": "12.0.0-rc.95",
-    "@applicaster/zapp-react-native-redux": "12.0.0-rc.95",
-    "@applicaster/zapp-react-native-utils": "12.0.0-rc.95",
+    "@applicaster/applicaster-types": "12.0.0-rc.97",
+    "@applicaster/zapp-react-native-bridge": "12.0.0-rc.97",
+    "@applicaster/zapp-react-native-redux": "12.0.0-rc.97",
+    "@applicaster/zapp-react-native-utils": "12.0.0-rc.97",
     "promise": "^8.3.0",
     "react-router-native": "^5.1.2",
     "url": "^0.11.0",