@applicaster/zapp-react-native-app 12.0.0-alpha.7496053101 → 12.0.0-alpha.7517336525

package/App/Layout/index.tsx

@@ -3,12 +3,15 @@ import * as R from "ramda";
 
 import { View } from "react-native";
 
-import { getNavigationProps } from "@applicaster/zapp-react-native-utils/navigationUtils";
 import {
-  useGetBottomTabBarHeight,
-  useNavigation,
+  getNavigationProps,
+  resolveNavigationPlugin,
+} from "@applicaster/zapp-react-native-utils/navigationUtils";
+import {
   useDimensions,
+  useGetBottomTabBarHeight,
   useNavbarState,
+  useNavigation,
 } from "@applicaster/zapp-react-native-utils/reactHooks";
 import { Transitioner } from "@applicaster/zapp-react-native-ui-components/Components/Transitioner";
 import { transitionConfig } from "@applicaster/zapp-react-native-ui-components/Components/Transitioner/config";
@@ -20,9 +23,16 @@ import { getNavigationPluginModule } from "./layoutHelpers";
 import { isMenuVisible } from "@applicaster/zapp-react-native-ui-components/Components/Screen/navigationHandler";
 import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
 
-import { MenuToggleContext } from "@applicaster/zapp-react-native-ui-components/Contexts";
+import {
+  useMenuToggleContext,
+  MenuToggleContextType,
+} from "@applicaster/zapp-react-native-ui-components/Contexts/MenuToggleContext";
 import { VideoModal } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal";
 import { withDimensionsProvider } from "@applicaster/zapp-react-native-utils/dimensionsProvider";
+import {
+  withModalAnimationProvider,
+  useModalAnimationContext,
+} from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
 
 import { ZappHooksModal } from "@applicaster/zapp-react-dom-ui-components/Components/ZappHooksModal";
 import { useListenEventBusEvent } from "@applicaster/zapp-react-native-utils/reactHooks/useListenEventBusEvent";
@@ -32,22 +42,11 @@ import {
   PushTopicManagerEvents,
 } from "@applicaster/zapp-react-native-bridge/PushNotifications/PushTopicManager";
 
-type Props = {
-  children: React.ReactNode;
-  toggleMenu: any;
-  setToggleMenu: () => void;
-  openMenu: any;
-  setOpenMenu: () => void;
-  closeMenu: any;
-  setCloseMenu: () => void;
-  navigator: QuickBrickAppNavigator;
-};
-
 const containerStyle = {
   height: "100%",
 };
 
-const LayoutWithMenu = (props: Props) => {
+const LayoutWithMenu = () => {
   const {
     plugins,
     appState: { appReady },
@@ -60,7 +59,7 @@ const LayoutWithMenu = (props: Props) => {
     setOpenMenu,
     closeMenu,
     setCloseMenu,
-  } = props;
+  } = useMenuToggleContext();
 
   const dimensions = useDimensions("screen", { fullDimensions: true });
   const isRTL = useIsRTL();
@@ -70,6 +69,12 @@ const LayoutWithMenu = (props: Props) => {
 
   const { activeRiver, videoModalState, isVideoModalDocked } = navigator;
 
+  const plugin = resolveNavigationPlugin({
+    category: "menu",
+    navigations: activeRiver?.navigations,
+    plugins,
+  });
+
   const Menu = React.useMemo(
     () =>
       getNavigationPluginModule(
@@ -77,19 +82,42 @@ const LayoutWithMenu = (props: Props) => {
         activeRiver,
         plugins
       ) as React.ComponentType<
-        MobileNavBarPluginProps & { navigator: ZappNavigation }
+        MobileNavBarPluginProps &
+          MenuToggleContextType & {
+            navigator: QuickBrickAppNavigator;
+          }
       >,
-    []
+    [activeRiver]
   );
 
+  const { isActiveGesture } = useModalAnimationContext();
+
+  /** BTB shown when videoModalState - visible & minimized, maximized & animation gesture is active
+   * otherwise hidden if videoModalState - visible
+   * also check isMenuVisible
+   */
   const showMenu = React.useMemo(
-    () => isMenuVisible(navigator.currentRoute, navigator.screenData),
-    [navigator.currentRoute]
+    () =>
+      ((videoModalState.visible &&
+        (videoModalState.mode === "MINIMIZED" ||
+          (videoModalState.mode === "MAXIMIZED" && isActiveGesture))) ||
+        !videoModalState.visible) &&
+      isMenuVisible(navigator.currentRoute, navigator.screenData),
+    [
+      videoModalState.visible,
+      videoModalState.mode,
+      navigator.currentRoute,
+      isActiveGesture,
+    ]
   );
 
+  const isBottomTabsPlugin = plugin?.identifier === "quick-brick-bottom-tabs";
+
+  const shouldApplyStyleForBottomTabs = showMenu && isBottomTabsPlugin;
+
   const contentStyle = React.useMemo(
     () => ({
-      ...(showMenu
+      ...(shouldApplyStyleForBottomTabs
         ? {
             paddingBottom: bottomTabBarHeight,
           }
@@ -100,23 +128,31 @@ const LayoutWithMenu = (props: Props) => {
     [bottomTabBarHeight, videoModalState.visible, isVideoModalDocked, showMenu]
   );
 
-  const menuProps = {
-    setToggleMenu: setToggleMenu,
-    toggleMenu: toggleMenu,
-    openMenu: openMenu,
-    setOpenMenu: setOpenMenu,
-    closeMenu: closeMenu,
-    setCloseMenu: setCloseMenu,
-    dimensions: { window: dimensions },
-    navigator,
-    ...getNavigationProps({
+  const menuProps = React.useMemo(() => {
+    const navigationProps = getNavigationProps({
       navigator,
       title,
       category: "menu",
-    }),
-    bottomTabBarHeight,
-    isRTL,
-  };
+    }) ?? {
+      selected: "",
+      title: "",
+      home: false,
+      rules: {} as ZappNavBarRules,
+      assets: {} as ZappNavBarAssets,
+      styles: {},
+      nav_items: [] as NavBarItem[],
+    };
+
+    const props = {
+      ...navigationProps,
+      dimensions: { window: dimensions },
+      bottomTabBarHeight,
+      isRTL,
+      navigator,
+    };
+
+    return { ...props, id: navigator.currentRoute };
+  }, [dimensions, isRTL, bottomTabBarHeight, navigator.currentRoute]);
 
   useListenEventBusEvent(
     PushTopicManagerConsts.PushTopicManagerSubscriptionID,
@@ -136,21 +172,28 @@ const LayoutWithMenu = (props: Props) => {
         <View style={contentStyle}>
           <Transitioner
             transitionConfig={transitionConfig}
-            contentStyle={showMenu ? contentStyle : {}}
+            contentStyle={{}}
             isRTL={isRTL}
           >
-            {/* has pathname context */}
             <Screen
               key={navigator.currentRoute}
               pathname={navigator.currentRoute} // required by TransitionerComponent
-              screenData={navigator.screenData} // required by TransitionerComponent
-              setToggleMenu={setToggleMenu}
-              setCloseMenu={setCloseMenu}
+              screenData={navigator.data} // required by TransitionerComponent
             />
           </Transitioner>
         </View>
       ) : null}
-      {showMenu && <Menu {...{ ...menuProps, id: navigator.currentRoute }} />}
+      {showMenu && (
+        <Menu
+          {...menuProps}
+          setToggleMenu={setToggleMenu}
+          toggleMenu={toggleMenu}
+          openMenu={openMenu}
+          setOpenMenu={setOpenMenu}
+          closeMenu={closeMenu}
+          setCloseMenu={setCloseMenu}
+        />
+      )}
       {/* depends on active river. @TODO move below screen context */}
       {VideoModal && videoModalState.visible && <VideoModal />}
       <ZappHooksModal />
@@ -159,6 +202,6 @@ const LayoutWithMenu = (props: Props) => {
 };
 
 export const Layout = R.compose(
-  MenuToggleContext.withConsumer,
-  withDimensionsProvider
+  withDimensionsProvider,
+  withModalAnimationProvider
 )(LayoutWithMenu);

package/App/__tests__/app.test.js

@@ -54,6 +54,11 @@ jest.mock(
   () => () => null
 );
 
+jest.mock(
+  "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation",
+  () => ({ withModalAnimationProvider: () => null })
+);
+
 jest.mock("react-native-safe-area-context", () => ({
   SafeAreaProvider: jest.fn(
     () =>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-app",
-  "version": "12.0.0-alpha.7496053101",
+  "version": "12.0.0-alpha.7517336525",
   "description": "Zapp App Component for Applicaster's Quick Brick React Native App",
   "main": "index.js",
   "scripts": {
@@ -29,11 +29,11 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/quick-brick-core": "12.0.0-alpha.7496053101",
-    "@applicaster/zapp-react-native-bridge": "12.0.0-alpha.7496053101",
-    "@applicaster/zapp-react-native-redux": "12.0.0-alpha.7496053101",
-    "@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.7496053101",
-    "@applicaster/zapp-react-native-utils": "12.0.0-alpha.7496053101",
+    "@applicaster/quick-brick-core": "12.0.0-alpha.7517336525",
+    "@applicaster/zapp-react-native-bridge": "12.0.0-alpha.7517336525",
+    "@applicaster/zapp-react-native-redux": "12.0.0-alpha.7517336525",
+    "@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.7517336525",
+    "@applicaster/zapp-react-native-utils": "12.0.0-alpha.7517336525",
     "axios": "^0.28.0",
     "camelize": "^1.0.0",
     "query-string": "7.1.3",