@applicaster/zapp-react-native-app 12.0.0-alpha.4960304100 → 12.0.0-alpha.4987513251

package/App/InteractionManager/index.js

@@ -3,21 +3,16 @@ import { BackHandler } from "react-native";
 import * as R from "ramda";
 
 import {
-  sendQuickBrickEvent,
   QUICK_BRICK_EVENTS,
+  sendQuickBrickEvent,
 } from "@applicaster/zapp-react-native-bridge/QuickBrick";
 import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
 import { useAnalytics } from "@applicaster/zapp-react-native-utils/analyticsUtils";
 import { useRivers } from "@applicaster/zapp-react-native-utils/reactHooks/state";
 
-type Props = {
-  children: React.CElement,
-};
-
 const getHome = R.compose(R.find(R.propEq("home", true)), R.values);
 
-const InteractionManagerComponent = (props: Props) => {
-  const { children } = props;
+const InteractionManagerComponent = () => {
   const { sendHardwareBackButtonClickEvent } = useAnalytics();
   const rivers = useRivers();
   const navigator = useNavigation();
@@ -63,19 +58,7 @@ const InteractionManagerComponent = (props: Props) => {
     };
   }, [onHardwareBackPress]);
 
-  return children;
+  return null;
 };
 
 export const InteractionManager = React.memo(InteractionManagerComponent);
-
-export function withInteractionManager(
-  Component: React.ComponentType<any>
-): React.ComponentType<any> {
-  return function InteractionManagerComponent(props) {
-    return (
-      <InteractionManager>
-        <Component {...props} />
-      </InteractionManager>
-    );
-  };
-}

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,10 +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 } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
+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";
@@ -33,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 },
@@ -61,7 +59,7 @@ const LayoutWithMenu = (props: Props) => {
     setOpenMenu,
     closeMenu,
     setCloseMenu,
-  } = props;
+  } = useMenuToggleContext();
 
   const dimensions = useDimensions("screen", { fullDimensions: true });
   const isRTL = useIsRTL();
@@ -71,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(
@@ -78,46 +82,75 @@ 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 paddingBottom = React.useMemo(() => {
+    return showMenu && isBottomTabsPlugin ? bottomTabBarHeight : 0; // if activeRiver?.navigations has quick-brick-bottom-tabs - append bottomTabBarHeight as padding
+  }, [showMenu, isBottomTabsPlugin, bottomTabBarHeight]);
+
   const contentStyle = React.useMemo(
     () => ({
-      ...(showMenu
-        ? {
-            paddingBottom: bottomTabBarHeight,
-          }
-        : {}),
       ...containerStyle,
+      paddingBottom,
       opacity: videoModalState.visible && !isVideoModalDocked ? 0 : 1,
     }),
-    [bottomTabBarHeight, videoModalState.visible, isVideoModalDocked, showMenu]
+    [videoModalState.visible, isVideoModalDocked, paddingBottom]
   );
 
-  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,
@@ -137,21 +170,28 @@ const LayoutWithMenu = (props: Props) => {
         <View style={contentStyle}>
           <Transitioner
             transitionConfig={transitionConfig}
-            contentStyle={showMenu ? contentStyle : {}}
+            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 />
@@ -160,7 +200,6 @@ const LayoutWithMenu = (props: Props) => {
 };
 
 export const Layout = R.compose(
-  MenuToggleContext.withConsumer,
   withDimensionsProvider,
   withModalAnimationProvider
 )(LayoutWithMenu);

package/App/index.ts

@@ -1,13 +1,13 @@
 import * as React from "react";
 import * as R from "ramda";
-import { NativeRouter, useLocation, useHistory } from "react-router-native";
+import { NativeRouter, useHistory, useLocation } from "react-router-native";
 // @ts-ignore
 import { createQuickBrickApp } from "@applicaster/quick-brick-core";
 import * as Contexts from "@applicaster/zapp-react-native-ui-components/Contexts";
 import * as QuickBrickManager from "@applicaster/zapp-react-native-bridge/QuickBrick";
 import { OfflineHandler } from "@applicaster/zapp-react-native-ui-components/Components/OfflineHandler";
 
-import { withInteractionManager } from "./InteractionManager";
+import { InteractionManager } from "./InteractionManager";
 
 import { Layout } from "./Layout";
 
@@ -22,6 +22,6 @@ export const ZappApp: React.ComponentType<Props> = createQuickBrickApp({
   QuickBrickManager,
   Layout,
   OfflineHandler,
-  InteractionManager: withInteractionManager, // mostly back button handle in Android
+  InteractionManager, // mostly back button handle in Android
   ContextProviders: R.map(R.prop("withProvider"), R.values(Contexts)),
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-app",
-  "version": "12.0.0-alpha.4960304100",
+  "version": "12.0.0-alpha.4987513251",
   "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.4960304100",
-    "@applicaster/zapp-react-native-bridge": "12.0.0-alpha.4960304100",
-    "@applicaster/zapp-react-native-redux": "12.0.0-alpha.4960304100",
-    "@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.4960304100",
-    "@applicaster/zapp-react-native-utils": "12.0.0-alpha.4960304100",
+    "@applicaster/quick-brick-core": "12.0.0-alpha.4987513251",
+    "@applicaster/zapp-react-native-bridge": "12.0.0-alpha.4987513251",
+    "@applicaster/zapp-react-native-redux": "12.0.0-alpha.4987513251",
+    "@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.4987513251",
+    "@applicaster/zapp-react-native-utils": "12.0.0-alpha.4987513251",
     "axios": "^0.28.0",
     "camelize": "^1.0.0",
     "query-string": "7.1.3",