@applicaster/zapp-react-native-ui-components 12.0.0-rc.99 → 13.0.0-alpha.2322412833

package/Components/VideoModal/ModalAnimation/AnimationComponent.tsx

@@ -60,9 +60,14 @@ export const AnimationView = ({
   const {
     width: screenWidth,
     deviceInfo: { isTablet, isTabletLandscape },
-  } = useDimensions("window", { deviceInfo: true });
+  } = useDimensions("window", {
+    deviceInfo: true,
+    updateForInactiveScreens: true,
+  });
 
   const { videoModalState } = useNavigation();
+  const { mode: videoModalMode, item: videoModalItem } = videoModalState;
+
   const insets = useSafeAreaInsets();
   const bottomTabBarHeight = useGetBottomTabBarHeight() + (insets.bottom || 0);
   const minimisedWidth = defaultAspectRatioWidth(minimisedHeight);
@@ -85,9 +90,9 @@ export const AnimationView = ({
 
   const isAudioItem = React.useMemo(
     () =>
-      videoModalState.item?.content?.type?.includes?.("audio") ||
-      videoModalState.item?.type?.value === "audio",
-    [videoModalState.item]
+      videoModalItem?.content?.type?.includes?.("audio") ||
+      videoModalItem?.type?.value === "audio",
+    [videoModalItem]
   );
 
   const inlineAudioPlayer = additionalData.inlineAudioPlayer;
@@ -226,10 +231,8 @@ export const AnimationView = ({
   );
 
   const getInitialValue = React.useCallback(() => {
-    const mode =
-      videoModalState.mode === "PIP"
-        ? videoModalState.previousMode
-        : videoModalState.mode;
+    const { mode: videoModalMode, previousMode } = videoModalState;
+    const mode = videoModalMode === "PIP" ? previousMode : videoModalMode;
 
     switch (mode) {
       case "MINIMIZED":
@@ -263,7 +266,7 @@ export const AnimationView = ({
       isTablet,
       isTabletLandscape,
       isRTL,
-      fromMiniPlayer: videoModalState.mode === "MINIMIZED",
+      fromMiniPlayer: videoModalMode === "MINIMIZED",
       inlineAudioPlayer,
     }),
     [
@@ -273,7 +276,7 @@ export const AnimationView = ({
       defaultValue,
       moveUpValue,
       moveComponentHorizontalValue,
-      videoModalState.mode,
+      videoModalMode,
     ]
   );
 
@@ -301,19 +304,40 @@ export const AnimationView = ({
           typeof additionalData.height === "number" && additionalData.height;
       }
 
-      if (defaultValue.x === 0 && width && height) {
+      if (
+        videoModalMode === "MAXIMIZED" &&
+        defaultValue.x !== screenWidth &&
+        width &&
+        height
+      ) {
         const value = { x: width, y: height };
         setDefaultValue(value);
         animatedValue.setValue(value);
       }
     }
-  }, [additionalData, screenWidth]);
+  }, [screenWidth]);
+
+  React.useEffect(() => {
+    const { mode, previousMode } = videoModalState;
+
+    if (mode === "MINIMIZED" && previousMode === "MAXIMIZED") {
+      // set animation to the minimize values if moving from the player to another screen
+      if (playerAnimationState === null) {
+        const value = getAnimationValue(
+          animationType,
+          PlayerAnimationStateEnum.minimize
+        ).toValue;
+
+        animatedValue.setValue(value);
+      }
+    }
+  }, [videoModalState]);
 
   React.useEffect(() => {
     if (
       playerAnimationState === PlayerAnimationStateEnum.minimize &&
       startComponentsAnimation &&
-      videoModalState.mode === "MAXIMIZED"
+      videoModalMode === "MAXIMIZED"
     ) {
       Animated.timing(
         animatedValue,
@@ -322,12 +346,7 @@ export const AnimationView = ({
     } else if (playerAnimationState === PlayerAnimationStateEnum.maximaze) {
       animatedValue.setValue(defaultValue);
     }
-  }, [
-    playerAnimationState,
-    startComponentsAnimation,
-    videoModalState.mode,
-    defaultValue,
-  ]);
+  }, [playerAnimationState, startComponentsAnimation, defaultValue]);
 
   React.useEffect(() => {
     const dragVideoPlayerYListenerId = dragVideoPlayerY.addListener(
@@ -389,9 +408,9 @@ export const AnimationView = ({
       ref={animationComponentRef}
       style={[
         ...preparedStyles,
-        (videoModalState.mode === "MAXIMIZED" ||
-          videoModalState.mode === "MINIMIZED" ||
-          (videoModalState.mode === "PIP" && isAppActive)) &&
+        (videoModalMode === "MAXIMIZED" ||
+          videoModalMode === "MINIMIZED" ||
+          (videoModalMode === "PIP" && isAppActive)) &&
           getAnimationStyle(animationType, animatedValue),
       ]}
     >

package/Components/VideoModal/PlayerDetails.tsx

@@ -1,9 +1,17 @@
 import React, { useEffect, useRef } from "react";
-import { StyleProp, ViewStyle, Animated, Easing } from "react-native";
+import {
+  StyleProp,
+  ViewStyle,
+  Animated,
+  Easing,
+  Dimensions,
+} 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";
 
+const { width: SCREEN_WIDTH } = Dimensions.get("screen");
+
 type Configuration = {
   [key: string]: any;
   modal_background_color?: string;
@@ -15,6 +23,7 @@ type Props = {
   configuration: Configuration;
   isTabletLandscape: boolean;
   isAudioPlayer?: boolean;
+  isTablet: boolean;
 };
 
 const containerStyle = ({
@@ -31,6 +40,7 @@ export const PlayerDetails = ({
   configuration,
   isTabletLandscape,
   isAudioPlayer,
+  isTablet,
 }: Props) => {
   const screenData = useTargetScreenData(entry);
   const insets = useSafeAreaInsets();
@@ -77,7 +87,11 @@ export const PlayerDetails = ({
           transform: [{ translateY }],
           opacity,
         },
-        // isAudioPlayer && audioMarginStyle,
+        {
+          // 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,
+        },
       ]}
     >
       {screenData && (

package/Components/VideoModal/PlayerWrapper.tsx

@@ -7,14 +7,10 @@ import {
   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 { playerDimesionsHack } from "./utils";
-import { PathnameContext } from "../../Contexts/PathnameContext";
-import { ScreenContextProvider } from "../../Contexts/ScreenContext";
-import { ROUTE_TYPES } from "@applicaster/zapp-react-native-utils/navigationUtils/routeTypes";
 
 import {
   AnimatedScrollModal,
@@ -23,6 +19,8 @@ import {
   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;
@@ -69,10 +67,8 @@ const directionStyles = (isTabletLandscape: boolean): ViewStyle => {
 };
 
 const getScreenAspectRatio = () => {
-  const { width, height } = Dimensions.get("screen");
-
-  const longEdge = Math.max(width, height);
-  const shortEdge = Math.min(width, height);
+  const longEdge = Math.max(SCREEN_WIDTH, SCREEN_HEIGHT);
+  const shortEdge = Math.min(SCREEN_WIDTH, SCREEN_HEIGHT);
 
   return longEdge / shortEdge;
 };
@@ -125,10 +121,54 @@ const getTabletWidth = (
   return Number(width) - sidebarWidth;
 };
 
-export const PlayerWrapper = (props: Props) => {
+const getStyles = (baseStyle, isMobile, isPortrait, pip) => {
+  if (pip) {
+    return baseStyle;
+  }
+
+  if (isMobile && isPortrait) {
+    return { width: SCREEN_WIDTH, height: SCREEN_HEIGHT };
+  }
+
+  if (isMobile && !isPortrait) {
+    return { width: SCREEN_HEIGHT, height: SCREEN_WIDTH };
+  }
+
+  return baseStyle;
+};
+
+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,
-    style,
+    style: baseStyle,
     containerStyle,
     inline,
     docked,
@@ -143,6 +183,8 @@ export const PlayerWrapper = (props: Props) => {
 
   const isInlineModal = inline && isModal;
 
+  const style = getStyles(baseStyle, !isTablet, isInlineModal, pip);
+
   const isTabletLandscape = !isTV() && isTablet && !isTabletPortrait;
 
   const tabletWidth = getTabletWidth(configuration, style);
@@ -181,71 +223,63 @@ export const PlayerWrapper = (props: Props) => {
     [containerDimensions, playerDimesionsHack]
   );
 
-  const pathname = `${ROUTE_TYPES.VIDEO_MODAL}/${entry?.id}`;
-
   return (
-    <PathnameContext.Provider value={pathname}>
-      <ScreenContextProvider pathname={pathname}>
-        <WrapperView
-          edges={getEdges(isTablet, isInlineModal) as readonly Edge[]}
+    <WrapperView
+      edges={getEdges(isTablet, isInlineModal) as readonly Edge[]}
+      style={[
+        safeAreaStyles(configuration, isTablet),
+        style,
+        playerDimesionsHack,
+      ]}
+    >
+      <AnimationComponent
+        animationType={ComponentAnimationType.moveUpComponent}
+        additionalData={{ saveArea: true }}
+        style={[directionStyles(isTabletLandscape), defaultStyles.flex]}
+      >
+        <View
+          testID={`${entry?.id}-player-container`}
           style={[
-            safeAreaStyles(configuration, isTablet),
-            style,
+            defaultStyles.playerContainer,
+            containerDimensions,
+            containerStyle,
             playerDimesionsHack,
           ]}
         >
           <AnimationComponent
             animationType={ComponentAnimationType.moveUpComponent}
-            additionalData={{ saveArea: true }}
-            style={[directionStyles(isTabletLandscape), defaultStyles.flex]}
+            style={isTabletLandscape ? defaultStyles.flex : undefined}
+            additionalData={{
+              useLayoutMeasure: isTabletLandscape,
+              disableAnimatedComponent: !isTabletLandscape,
+              resetAnimationValue: isTabletLandscape && docked,
+            }}
           >
-            <PathnameContext.Provider value={pathname}>
-              <ScreenContextProvider pathname={pathname}>
-                <View
-                  testID={`${entry?.id}-player-container`}
-                  style={[
-                    defaultStyles.playerContainer,
-                    containerDimensions,
-                    containerStyle,
-                    playerDimesionsHack,
-                  ]}
-                >
-                  <AnimationComponent
-                    animationType={ComponentAnimationType.moveUpComponent}
-                    style={isTabletLandscape ? defaultStyles.flex : undefined}
-                    additionalData={{
-                      useLayoutMeasure: isTabletLandscape,
-                      disableAnimatedComponent: !isTabletLandscape,
-                      resetAnimationValue: isTabletLandscape && docked,
-                    }}
-                  >
-                    <AnimatedVideoPlayerComponent>
-                      {children(childrenStyles)}
-                    </AnimatedVideoPlayerComponent>
-                  </AnimationComponent>
-                </View>
-                <AnimatedScrollModal>
-                  {isInlineModal && !docked ? (
-                    <AnimationComponent
-                      animationType={ComponentAnimationType.componentFade}
-                      style={defaultStyles.flex}
-                    >
-                      <PlayerDetails
-                        configuration={configuration}
-                        style={defaultStyles.playerDetails}
-                        entry={entry}
-                        isTabletLandscape={isTabletLandscape}
-                      />
-                    </AnimationComponent>
-                  ) : (
-                    <View style={defaultStyles.playerDetails} />
-                  )}
-                </AnimatedScrollModal>
-              </ScreenContextProvider>
-            </PathnameContext.Provider>
+            <AnimatedVideoPlayerComponent>
+              {children(childrenStyles)}
+            </AnimatedVideoPlayerComponent>
           </AnimationComponent>
-        </WrapperView>
-      </ScreenContextProvider>
-    </PathnameContext.Provider>
+        </View>
+
+        <AnimatedScrollModal>
+          {showDetails(!isTablet, docked, isInlineModal, pip) && (
+            <AnimationComponent
+              animationType={ComponentAnimationType.componentFade}
+              style={defaultStyles.flex}
+            >
+              <PlayerDetails
+                configuration={configuration}
+                style={defaultStyles.playerDetails}
+                entry={entry}
+                isTabletLandscape={isTabletLandscape}
+                isTablet={isTablet}
+              />
+            </AnimationComponent>
+          )}
+        </AnimatedScrollModal>
+      </AnimationComponent>
+    </WrapperView>
   );
 };
+
+export const PlayerWrapper = PlayerWrapperComponent;

package/Components/VideoModal/VideoModal.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import * as R from "ramda";
-import { StyleSheet, View } from "react-native";
+import { StyleSheet, View, StatusBar } from "react-native";
 
 import { HandlePlayable } from "@applicaster/zapp-react-native-ui-components/Components/HandlePlayable";
 import {
@@ -129,32 +129,38 @@ const VideoModalComponent = () => {
   const pathname = `${ROUTE_TYPES.VIDEO_MODAL}/${item?.id}`;
 
   return (
-    <PathnameContext.Provider value={pathname}>
-      <ScreenContextProvider pathname={pathname}>
-        {itemIdHooksFinished === item?.id ? (
-          <AnimatedPlayerModalWrapper
-            style={[
-              styles.container,
-              {
-                backgroundColor,
-              },
-            ]}
-          >
-            <HandlePlayable
-              item={item}
-              isModal={mode !== "PIP"}
-              modalHeight={modalSize.height}
-              modalWidth={modalSize.width}
-              mode={mode}
-            />
-          </AnimatedPlayerModalWrapper>
-        ) : (
-          <View style={styles.loaderContainer}>
-            <Spinner />
-          </View>
-        )}
-      </ScreenContextProvider>
-    </PathnameContext.Provider>
+    <>
+      {/* TODO: Workaround to avoid unnecessary UI effect when switching from portrait to fullscreen */}
+      <StatusBar hidden={false} />
+      {/* TODO: Workaround to avoid unnecessary UI effect when switching from portrait to fullscreen */}
+
+      <PathnameContext.Provider value={pathname}>
+        <ScreenContextProvider pathname={pathname}>
+          {itemIdHooksFinished === item?.id ? (
+            <AnimatedPlayerModalWrapper
+              style={[
+                styles.container,
+                {
+                  backgroundColor,
+                },
+              ]}
+            >
+              <HandlePlayable
+                item={item}
+                isModal={mode !== "PIP"}
+                modalHeight={modalSize.height}
+                modalWidth={modalSize.width}
+                mode={mode}
+              />
+            </AnimatedPlayerModalWrapper>
+          ) : (
+            <View style={styles.loaderContainer}>
+              <Spinner />
+            </View>
+          )}
+        </ScreenContextProvider>
+      </PathnameContext.Provider>
+    </>
   );
 };
 

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

@@ -8,6 +8,13 @@ const props = {
   configuration: { modal_background_color: "transparent" },
 };
 
+jest.mock("@applicaster/zapp-react-native-utils/reactHooks/layout", () => ({
+  useDimensions: jest.fn(() => ({
+    width: 20,
+    height: 30,
+  })),
+}));
+
 jest.mock("react-native-safe-area-context", () => ({
   useSafeAreaInsets: jest.fn(() => ({
     top: 20,

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

@@ -9,6 +9,7 @@ exports[`PlayerDetails renders properly 1`] = `
       "flex": 1,
       "marginTop": -8,
       "paddingTop": -8,
+      "width": 750,
     }
   }
 >
@@ -29,6 +30,7 @@ exports[`PlayerDetails renders properly on tablet in landscape orientation 1`] =
       "flex": 1,
       "marginTop": -20,
       "paddingTop": 40,
+      "width": 750,
     }
   }
 >

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

@@ -27,8 +27,8 @@ exports[`PlayerWrapper renders inline 1`] = `
           "backgroundColor": "transparent",
         },
         Object {
-          "height": 800,
-          "width": 300,
+          "height": 1334,
+          "width": 750,
         },
         Object {},
       ]
@@ -72,12 +72,35 @@ exports[`PlayerWrapper renders inline 1`] = `
         testID="test-player-container"
       />
       <View
+        animationType="componentFade"
         style={
           Object {
             "flex": 1,
           }
         }
-      />
+      >
+        <View
+          configuration={
+            Object {
+              "tablet_landscape_player_container_background_color": "red",
+              "tablet_landscape_sidebar_width": "35%",
+            }
+          }
+          entry={
+            Object {
+              "id": "test",
+            }
+          }
+          isTablet={false}
+          isTabletLandscape={false}
+          style={
+            Object {
+              "flex": 1,
+              "paddingTop": 20,
+            }
+          }
+        />
+      </View>
     </View>
   </RNCSafeAreaView>
 </RNCSafeAreaProvider>
@@ -110,8 +133,8 @@ exports[`PlayerWrapper renders inline and docked 1`] = `
           "backgroundColor": "transparent",
         },
         Object {
-          "height": undefined,
-          "width": 300,
+          "height": 1334,
+          "width": 750,
         },
         Object {},
       ]
@@ -155,12 +178,35 @@ exports[`PlayerWrapper renders inline and docked 1`] = `
         testID="test-player-container"
       />
       <View
+        animationType="componentFade"
         style={
           Object {
             "flex": 1,
           }
         }
-      />
+      >
+        <View
+          configuration={
+            Object {
+              "tablet_landscape_player_container_background_color": "red",
+              "tablet_landscape_sidebar_width": "35%",
+            }
+          }
+          entry={
+            Object {
+              "id": "test",
+            }
+          }
+          isTablet={false}
+          isTabletLandscape={false}
+          style={
+            Object {
+              "flex": 1,
+              "paddingTop": 20,
+            }
+          }
+        />
+      </View>
     </View>
   </RNCSafeAreaView>
 </RNCSafeAreaProvider>
@@ -254,12 +300,35 @@ exports[`PlayerWrapper renders inline on tablet in landscape orientation 1`] = `
         />
       </View>
       <View
+        animationType="componentFade"
         style={
           Object {
             "flex": 1,
           }
         }
-      />
+      >
+        <View
+          configuration={
+            Object {
+              "tablet_landscape_player_container_background_color": "red",
+              "tablet_landscape_sidebar_width": "35%",
+            }
+          }
+          entry={
+            Object {
+              "id": "test",
+            }
+          }
+          isTablet={true}
+          isTabletLandscape={true}
+          style={
+            Object {
+              "flex": 1,
+              "paddingTop": 20,
+            }
+          }
+        />
+      </View>
     </View>
   </RNCSafeAreaView>
 </RNCSafeAreaProvider>
@@ -292,8 +361,8 @@ exports[`PlayerWrapper renders properly 1`] = `
           "backgroundColor": "transparent",
         },
         Object {
-          "height": 800,
-          "width": 300,
+          "height": 750,
+          "width": 1334,
         },
         Object {},
       ]
@@ -336,13 +405,6 @@ exports[`PlayerWrapper renders properly 1`] = `
         }
         testID="test-player-container"
       />
-      <View
-        style={
-          Object {
-            "flex": 1,
-          }
-        }
-      />
     </View>
   </RNCSafeAreaView>
 </RNCSafeAreaProvider>

package/Components/ZappFrameworkComponents/BarView/BarView.tsx

@@ -1,5 +1,6 @@
 import React from "react";
-import { View, StyleSheet } from "react-native";
+import { StyleSheet } from "react-native";
+import { SafeAreaView } from "react-native-safe-area-context";
 
 import { useIsRTL } from "@applicaster/zapp-react-native-utils/localizationUtils";
 import CloseButton from "./Buttons/CloseButton";
@@ -44,11 +45,14 @@ const BarView = ({ screenStyles, barState = defaultState }: Props) => {
   );
 
   return (
-    <View style={[style.view, isRTL ? style.rtlStyle : {}]}>
+    <SafeAreaView
+      style={[style.view, isRTL ? style.rtlStyle : {}]}
+      testID="BarView-safeAreaView"
+    >
       {backButton}
       <BarTitle title={barState.title} screenStyles={screenStyles} />
       {closeButton}
-    </View>
+    </SafeAreaView>
   );
 };