@applicaster/zapp-react-native-ui-components 12.0.0-alpha.4620237415 → 12.0.0-alpha.4739493702

package/Components/VideoModal/ModalAnimation/AnimationComponent.tsx

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

package/Components/VideoModal/PlayerDetails.tsx

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

package/Components/VideoModal/PlayerWrapper.tsx

@@ -7,6 +7,7 @@ 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";
@@ -22,8 +23,6 @@ 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;
@@ -70,8 +69,10 @@ const directionStyles = (isTabletLandscape: boolean): ViewStyle => {
 };
 
 const getScreenAspectRatio = () => {
-  const longEdge = Math.max(SCREEN_WIDTH, SCREEN_HEIGHT);
-  const shortEdge = Math.min(SCREEN_WIDTH, SCREEN_HEIGHT);
+  const { width, height } = Dimensions.get("screen");
+
+  const longEdge = Math.max(width, height);
+  const shortEdge = Math.min(width, height);
 
   return longEdge / shortEdge;
 };
@@ -124,37 +125,10 @@ const getTabletWidth = (
   return Number(width) - sidebarWidth;
 };
 
-const getStyles = (baseStyle, isMobile, isPortrait) => {
-  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): boolean => {
-  // 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) => {
+export const PlayerWrapper = (props: Props) => {
   const {
     entry,
-    style: baseStyle,
+    style,
     containerStyle,
     inline,
     docked,
@@ -169,8 +143,6 @@ const PlayerWrapperComponent = (props: Props) => {
 
   const isInlineModal = inline && isModal;
 
-  const style = getStyles(baseStyle, !isTablet, isInlineModal);
-
   const isTabletLandscape = !isTV() && isTablet && !isTabletPortrait;
 
   const tabletWidth = getTabletWidth(configuration, style);
@@ -252,9 +224,8 @@ const PlayerWrapperComponent = (props: Props) => {
                     </AnimatedVideoPlayerComponent>
                   </AnimationComponent>
                 </View>
-
                 <AnimatedScrollModal>
-                  {showDetails(!isTablet, docked) && (
+                  {isInlineModal && !docked ? (
                     <AnimationComponent
                       animationType={ComponentAnimationType.componentFade}
                       style={defaultStyles.flex}
@@ -264,9 +235,10 @@ const PlayerWrapperComponent = (props: Props) => {
                         style={defaultStyles.playerDetails}
                         entry={entry}
                         isTabletLandscape={isTabletLandscape}
-                        isTablet={isTablet}
                       />
                     </AnimationComponent>
+                  ) : (
+                    <View style={defaultStyles.playerDetails} />
                   )}
                 </AnimatedScrollModal>
               </ScreenContextProvider>
@@ -277,5 +249,3 @@ const PlayerWrapperComponent = (props: Props) => {
     </PathnameContext.Provider>
   );
 };
-
-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, StatusBar } from "react-native";
+import { StyleSheet, View } from "react-native";
 
 import { HandlePlayable } from "@applicaster/zapp-react-native-ui-components/Components/HandlePlayable";
 import {
@@ -129,38 +129,32 @@ const VideoModalComponent = () => {
   const pathname = `${ROUTE_TYPES.VIDEO_MODAL}/${item?.id}`;
 
   return (
-    <>
-      {/* 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>
-    </>
+    <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,13 +8,6 @@ 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,7 +9,6 @@ exports[`PlayerDetails renders properly 1`] = `
       "flex": 1,
       "marginTop": -8,
       "paddingTop": -8,
-      "width": 750,
     }
   }
 >
@@ -30,7 +29,6 @@ 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": 1334,
-          "width": 750,
+          "height": 800,
+          "width": 300,
         },
         Object {},
       ]
@@ -91,7 +91,6 @@ exports[`PlayerWrapper renders inline 1`] = `
               "id": "test",
             }
           }
-          isTablet={false}
           isTabletLandscape={false}
           style={
             Object {
@@ -133,8 +132,8 @@ exports[`PlayerWrapper renders inline and docked 1`] = `
           "backgroundColor": "transparent",
         },
         Object {
-          "height": 1334,
-          "width": 750,
+          "height": undefined,
+          "width": 300,
         },
         Object {},
       ]
@@ -178,35 +177,13 @@ exports[`PlayerWrapper renders inline and docked 1`] = `
         testID="test-player-container"
       />
       <View
-        animationType="componentFade"
         style={
           Object {
             "flex": 1,
+            "paddingTop": 20,
           }
         }
-      >
-        <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>
@@ -319,7 +296,6 @@ exports[`PlayerWrapper renders inline on tablet in landscape orientation 1`] = `
               "id": "test",
             }
           }
-          isTablet={true}
           isTabletLandscape={true}
           style={
             Object {
@@ -361,8 +337,8 @@ exports[`PlayerWrapper renders properly 1`] = `
           "backgroundColor": "transparent",
         },
         Object {
-          "height": 750,
-          "width": 1334,
+          "height": 800,
+          "width": 300,
         },
         Object {},
       ]
@@ -406,35 +382,13 @@ exports[`PlayerWrapper renders properly 1`] = `
         testID="test-player-container"
       />
       <View
-        animationType="componentFade"
         style={
           Object {
             "flex": 1,
+            "paddingTop": 20,
           }
         }
-      >
-        <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>

package/Components/ZappFrameworkComponents/BarView/BarView.tsx

@@ -45,10 +45,7 @@ const BarView = ({ screenStyles, barState = defaultState }: Props) => {
   );
 
   return (
-    <SafeAreaView
-      style={[style.view, isRTL ? style.rtlStyle : {}]}
-      testID="BarView-safeAreaView"
-    >
+    <SafeAreaView style={[style.view, isRTL ? style.rtlStyle : {}]}>
       {backButton}
       <BarTitle title={barState.title} screenStyles={screenStyles} />
       {closeButton}

package/Components/ZappFrameworkComponents/BarView/Buttons/BackButton.tsx

@@ -11,16 +11,12 @@ const renderEmptyView = () => {
   return <View style={emptyViewStyle} />;
 };
 
-type FloatingButtonProps = Testable & {
+type FloatingButtonProps = {
   onPress: () => void;
   screenStyles: any;
 };
 
-const BackButton = ({
-  onPress,
-  screenStyles,
-  testID = "backButton",
-}: FloatingButtonProps) => {
+const BackButton = ({ onPress, screenStyles }: FloatingButtonProps) => {
   const containerStyle: any = {};
 
   if (!onPress) {
@@ -29,7 +25,6 @@ const BackButton = ({
 
   return (
     <ActionButton
-      testID={`${testID}-actionButton`}
       onPress={onPress}
       buttonStyles={containerStyle}
       imageUrl={screenStyles.back_button_image}

package/Components/ZappFrameworkComponents/BarView/Buttons/CloseButton.tsx

@@ -11,16 +11,12 @@ const renderEmptyView = () => {
   return <View style={emptyViewStyle} />;
 };
 
-type CloseButtonProps = Testable & {
+type CloseButtonProps = {
   onPress: () => void;
   screenStyles?: any;
 };
 
-const CloseButton = ({
-  onPress,
-  screenStyles,
-  testID = "closeButton",
-}: CloseButtonProps) => {
+const CloseButton = ({ onPress, screenStyles }: CloseButtonProps) => {
   const containerStyle: any = {};
 
   if (!onPress) {
@@ -29,7 +25,6 @@ const CloseButton = ({
 
   return (
     <ActionButton
-      testID={`${testID}-actionButton`}
       onPress={onPress}
       buttonStyles={containerStyle}
       imageUrl={screenStyles.close_button_image}

package/Components/ZappFrameworkComponents/Buttons/ActionButton.tsx

@@ -28,7 +28,7 @@ styles: {
 }
 */
 
-type ActionButtonProps = Testable & {
+type ActionButtonProps = {
   onPress: () => void;
   buttonStyles: any;
   imageUrl: string;
@@ -46,16 +46,11 @@ const ActionButton = ({
   buttonStyles,
   imageUrl,
   imageStyle = closeButtonStyle,
-  testID,
 }: ActionButtonProps) => {
   return (
-    <View style={buttonStyles} testID={testID}>
-      <TouchableOpacity onPress={onPress} testID={`${testID}-touchable`}>
-        <Image
-          source={{ uri: imageUrl }}
-          style={imageStyle}
-          testID={`${testID}-image`}
-        />
+    <View style={buttonStyles}>
+      <TouchableOpacity onPress={onPress}>
+        <Image source={{ uri: imageUrl }} style={imageStyle} />
       </TouchableOpacity>
     </View>
   );

package/Contexts/CachedDimensionsContext/index.ts

@@ -1,6 +1,5 @@
 import { create, useStore } from "zustand";
 import { produce } from "immer";
-import { useCallback, useMemo } from "react";
 
 type Dimensions = {
   width: Option<number>;
@@ -32,19 +31,16 @@ export const useCachedDimensions = (id: string) => {
     dimensionsStore
   ) as DimensionsState;
 
-  const getCachedDimensions = useCallback(() => {
+  const getCachedDimensions = () => {
     return dimensions[id] || initialDimensions();
-  }, [dimensions?.[id], id]);
+  };
 
-  const handleSetCachedDimensions = useCallback((newDimensions) => {
+  const handleSetCachedDimensions = (newDimensions) => {
     setCachedDimensions(id, newDimensions);
-  }, []);
-
-  return useMemo(
-    () => ({
-      getCachedDimensions,
-      setCachedDimensions: handleSetCachedDimensions,
-    }),
-    [getCachedDimensions, handleSetCachedDimensions]
-  );
+  };
+
+  return {
+    getCachedDimensions,
+    setCachedDimensions: handleSetCachedDimensions,
+  };
 };

package/Contexts/ConfirmDialogState/index.ts

@@ -2,7 +2,7 @@ import { createStore } from "zustand/vanilla";
 import { useStore } from "zustand";
 import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
 
-export interface ConfirmationDialogState {
+interface ConfirmationDialogState {
   isDialogVisible: boolean;
   messages: string;
   confirmAction: () => void;

package/Contexts/ScreenContext/index.tsx

@@ -177,12 +177,7 @@ export function withScreenContext(Component: React.ComponentType<any>) {
   return function WithScreenContextWrapper(props) {
     return (
       <ScreenContext.Consumer>
-        {useCallback(
-          (value) => (
-            <Component {...props} screenContext={value} />
-          ),
-          [Component, props]
-        )}
+        {(value) => <Component {...props} screenContext={value} />}
       </ScreenContext.Consumer>
     );
   };

package/const.ts

@@ -1,5 +1,3 @@
-import { ViewStyle } from "react-native";
-
 export const tvPluginsWithCellRenderer = [
   "group-qb",
   "gallery-qb",
@@ -7,7 +5,3 @@ export const tvPluginsWithCellRenderer = [
   "hero-qb",
   "list-qb",
 ];
-
-// Can't be used in StyleSheet.create, need to be inline/defined as a constant
-// https://github.com/necolas/react-native-web/issues/1427
-export const flatListOverflowStyle: ViewStyle = { overflow: "visible" };