@applicaster/zapp-react-native-ui-components 12.0.0-alpha.5923342081 → 12.0.0-alpha.5933014273

package/Components/PlayerContainer/PlayerContainer.tsx

@@ -363,19 +363,11 @@ const PlayerContainerComponent = (props: Props) => {
     const { fullscreen = false } = event || {};
 
     if (fullscreen) {
-      // in order to avoid UI glitches with player we have to start re-render ealier and then start real rotation
+      playerEvent("onFullscreenPlayerWillPresent");
       navigator.fullscreenVideoModal();
-
-      setTimeout(() => {
-        playerEvent("onFullscreenPlayerWillPresent");
-      });
     } else {
-      // in order to avoid UI glitches with player we have to start re-render ealier and then start real rotation
+      playerEvent("onFullscreenPlayerWillDismiss");
       navigator.maximiseVideoModal();
-
-      setTimeout(() => {
-        playerEvent("onFullscreenPlayerWillDismiss");
-      });
     }
   };
 
@@ -527,7 +519,7 @@ const PlayerContainerComponent = (props: Props) => {
     }
 
     return () => {
-      playerEvent("player_did_close", { item });
+      playerEvent("player_did_close");
 
       if (!isModal) {
         showNavBar(true);

package/Components/Transitioner/Transitioner.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { View } from "react-native";
-import { update, compose, tail, append, take, identity, isNil } from "ramda";
+import { update, compose, tail, append, take, identity } from "ramda";
 
 import { AnimationManager } from "./AnimationManager";
 import { Scene } from "./Scene";
@@ -50,10 +50,6 @@ function scenesForBackTransition(props: SceneProps, { scenes }) {
     : [prepareScene(props.children), scenes[0]];
 }
 
-const isModalClosed = (navigator) => {
-  return !!isNil(navigator?.modalData);
-};
-
 type Props = {
   transitionConfig: any;
   children: React.ReactNode;
@@ -317,10 +313,7 @@ export class TransitionerComponent extends React.PureComponent<Props, State> {
       <Scene
         key={scenes[from.index].key}
         pathname={scenes[from.index].key}
-        isActive={
-          scenes[from.index].key === this.props.navigator.currentRoute &&
-          isModalClosed(this.props.navigator)
-        }
+        isActive={scenes[from.index].key === this.props.navigator.currentRoute}
         style={from.style}
         pointerEvents="none"
         overlayStyle={from.overlayStyle}
@@ -336,10 +329,7 @@ export class TransitionerComponent extends React.PureComponent<Props, State> {
     const toScene = scenes[to.index] && (
       <Scene
         pathname={scenes[to.index].key}
-        isActive={
-          scenes[to.index].key === this.props.navigator.currentRoute &&
-          isModalClosed(this.props.navigator)
-        }
+        isActive={scenes[to.index].key === this.props.navigator.currentRoute}
         key={scenes[to.index].key}
         style={to.style}
         overlayStyle={to.overlayStyle}

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "12.0.0-alpha.5923342081",
+  "version": "12.0.0-alpha.5933014273",
   "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-alpha.5923342081",
-    "@applicaster/zapp-react-native-bridge": "12.0.0-alpha.5923342081",
-    "@applicaster/zapp-react-native-redux": "12.0.0-alpha.5923342081",
-    "@applicaster/zapp-react-native-utils": "12.0.0-alpha.5923342081",
+    "@applicaster/applicaster-types": "12.0.0-alpha.5933014273",
+    "@applicaster/zapp-react-native-bridge": "12.0.0-alpha.5933014273",
+    "@applicaster/zapp-react-native-redux": "12.0.0-alpha.5933014273",
+    "@applicaster/zapp-react-native-utils": "12.0.0-alpha.5933014273",
     "promise": "^8.3.0",
     "react-router-native": "^5.1.2",
     "url": "^0.11.0",