@applicaster/zapp-react-native-ui-components 12.0.0-rc.142 → 12.0.0-rc.143

package/Components/Screen/index.tsx

@@ -128,7 +128,7 @@ export function Screen(_props: Props) {
     <View style={style}>
       {navBarProps && <NavBar {...navBarProps} hasMenu={hasMenu} />}
 
-      <OfflineFallbackScreen screenData={targetScreenData}>
+      <OfflineFallbackScreen>
         {/* @TODO RouteManager doesn't use props, can they be removed ?  */}
         <RouteManager pathname={pathname} screenData={screenData} />
       </OfflineFallbackScreen>

package/Components/VideoModal/PlayerWrapper.tsx

@@ -11,9 +11,6 @@ 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,
@@ -136,7 +133,15 @@ const getStyles = (baseStyle, isMobile, isPortrait) => {
   return baseStyle;
 };
 
-const showDetails = (isMobile: boolean, docked: boolean): boolean => {
+const showDetails = (
+  isMobile: boolean,
+  docked: boolean,
+  isInlineModal
+): boolean => {
+  if (!isInlineModal) {
+    return false;
+  }
+
   // for mobile we always show details. Mounting of it very heavy operation.
   if (isMobile) {
     return true;
@@ -209,72 +214,62 @@ const PlayerWrapperComponent = (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>
-                  {showDetails(!isTablet, docked) && (
-                    <AnimationComponent
-                      animationType={ComponentAnimationType.componentFade}
-                      style={defaultStyles.flex}
-                    >
-                      <PlayerDetails
-                        configuration={configuration}
-                        style={defaultStyles.playerDetails}
-                        entry={entry}
-                        isTabletLandscape={isTabletLandscape}
-                        isTablet={isTablet}
-                      />
-                    </AnimationComponent>
-                  )}
-                </AnimatedScrollModal>
-              </ScreenContextProvider>
-            </PathnameContext.Provider>
+            <AnimatedVideoPlayerComponent>
+              {children(childrenStyles)}
+            </AnimatedVideoPlayerComponent>
           </AnimationComponent>
-        </WrapperView>
-      </ScreenContextProvider>
-    </PathnameContext.Provider>
+        </View>
+
+        <AnimatedScrollModal>
+          {showDetails(!isTablet, docked, isInlineModal) && (
+            <AnimationComponent
+              animationType={ComponentAnimationType.componentFade}
+              style={defaultStyles.flex}
+            >
+              <PlayerDetails
+                configuration={configuration}
+                style={defaultStyles.playerDetails}
+                entry={entry}
+                isTabletLandscape={isTabletLandscape}
+                isTablet={isTablet}
+              />
+            </AnimationComponent>
+          )}
+        </AnimatedScrollModal>
+      </AnimationComponent>
+    </WrapperView>
   );
 };
 

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

@@ -405,36 +405,6 @@ exports[`PlayerWrapper renders properly 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>

package/package.json

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