@applicaster/zapp-react-native-app 12.0.0-alpha.5114122134 → 12.0.0-alpha.5131585791

package/App/InteractionManager/index.js

@@ -3,23 +3,18 @@ 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 { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
-
-type Props = {
-  children: React.CElement,
-};
+import { useRivers } from "@applicaster/zapp-react-native-utils/reactHooks/state";
 
 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 } = usePickFromState(["rivers"]);
+  const rivers = useRivers();
   const navigator = useNavigation();
 
   const isHomeScreen = () => {
@@ -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/__tests__/index.test.ts

@@ -0,0 +1,7 @@
+describe("Layout", () => {
+  it.todo("should match snapshot when appReady is true");
+  it.todo("should not render transitioner with screen when appReady is false");
+  it.todo("should render menu when showMenu is true");
+  it.todo("should render VideoModal when visible & VideoModal is true");
+  it.todo("should render ZappHooksModal");
+});

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 {
+  getNavigationProps,
+  resolveNavigationPlugin,
+} from "@applicaster/zapp-react-native-utils/navigationUtils";
+import {
+  useDimensions,
   useGetBottomTabBarHeight,
+  useNavbarState,
   useNavigation,
-  useDimensions,
-  useIsNavBarVisible,
 } 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,31 +23,30 @@ 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 { useNavbarState } from "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenContext";
 import { useListenEventBusEvent } from "@applicaster/zapp-react-native-utils/reactHooks/useListenEventBusEvent";
-import { PushTopicManager, PushTopicManagerConsts, 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;
-};
+import {
+  PushTopicManager,
+  PushTopicManagerConsts,
+  PushTopicManagerEvents,
+} from "@applicaster/zapp-react-native-bridge/PushNotifications/PushTopicManager";
 
 const containerStyle = {
   height: "100%",
 };
 
-const LayoutWithMenu = (props: Props) => {
+const LayoutWithMenu = () => {
   const {
     plugins,
     appState: { appReady },
@@ -57,47 +59,68 @@ const LayoutWithMenu = (props: Props) => {
     setOpenMenu,
     closeMenu,
     setCloseMenu,
-  } = props;
+  } = useMenuToggleContext();
 
   const dimensions = useDimensions("screen", { fullDimensions: true });
   const isRTL = useIsRTL();
-
   const navigator = useNavigation();
   const bottomTabBarHeight = useGetBottomTabBarHeight();
-
-  const {
-    activeRiver,
-    currentRoute,
-    screenData,
-    videoModalState,
-    isVideoModalDocked,
-    videoModalState: { visible },
-  } = navigator;
-
-  const isNavBarVisible = useIsNavBarVisible();
   const { title } = useNavbarState();
 
-  const NavBar = React.useMemo(
-    () => getNavigationPluginModule("nav_bar", activeRiver, plugins),
-    []
-  );
+  const { activeRiver, videoModalState, isVideoModalDocked } = navigator;
+
+  const plugin = resolveNavigationPlugin({
+    category: "menu",
+    navigations: activeRiver?.navigations,
+    plugins,
+  });
 
   const Menu = React.useMemo(
-    () => getNavigationPluginModule("menu", activeRiver, plugins),
-    []
+    () =>
+      getNavigationPluginModule(
+        "menu",
+        activeRiver,
+        plugins
+      ) as React.ComponentType<
+        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,
-        }
+            paddingBottom: bottomTabBarHeight,
+          }
         : {}),
       ...containerStyle,
       opacity: videoModalState.visible && !isVideoModalDocked ? 0 : 1,
@@ -105,37 +128,31 @@ const LayoutWithMenu = (props: Props) => {
     [bottomTabBarHeight, videoModalState.visible, isVideoModalDocked, showMenu]
   );
 
-  const navBarProps = React.useMemo(
-    () => ({
-      setToggleMenu,
-      toggleMenu,
-      openMenu,
-      setOpenMenu,
-      closeMenu,
-      setCloseMenu,
-      navigator,
-      ...getNavigationProps({ navigator, title, category: "nav_bar" }),
-    }),
-    [navigator.currentRoute]
-  );
-
-  const menuProps = {
-    setToggleMenu: setToggleMenu,
-    toggleMenu: toggleMenu,
-    openMenu: openMenu,
-    setOpenMenu: setOpenMenu,
-    closeMenu: closeMenu,
-    setCloseMenu: setCloseMenu,
-    dimensions: { window: dimensions },
-    navigator: 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,
@@ -155,31 +172,36 @@ const LayoutWithMenu = (props: Props) => {
         <View style={contentStyle}>
           <Transitioner
             transitionConfig={transitionConfig}
-            contentStyle={showMenu ? contentStyle : {}}
+            contentStyle={{}}
             isRTL={isRTL}
           >
             <Screen
               key={navigator.currentRoute}
-              NavBar={NavBar}
-              navBarProps={navBarProps}
-              Menu={Menu}
-              menuProps={menuProps}
-              pathname={currentRoute}
-              screenData={screenData}
-              isNavBarVisible={isNavBarVisible}
+              pathname={navigator.currentRoute} // required by TransitionerComponent
+              screenData={navigator.data} // required by TransitionerComponent
             />
           </Transitioner>
         </View>
       ) : null}
-      {showMenu && <Menu {...menuProps} />}
-      {VideoModal && visible && <VideoModal />}
-
+      {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 />
     </>
   );
 };
 
 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/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,10 +1,11 @@
 {
   "name": "@applicaster/zapp-react-native-app",
-  "version": "12.0.0-alpha.5114122134",
+  "version": "12.0.0-alpha.5131585791",
   "description": "Zapp App Component for Applicaster's Quick Brick React Native App",
   "main": "index.js",
   "scripts": {
     "test": "jest -w=2",
+    "build": "echo 'skipping ts build for core packages'",
     "flow-types": "node_modules/.bin/flow-copy-source -v -i '**/__tests__**' . ."
   },
   "repository": {
@@ -28,12 +29,12 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/quick-brick-core": "12.0.0-alpha.5114122134",
-    "@applicaster/zapp-react-native-bridge": "12.0.0-alpha.5114122134",
-    "@applicaster/zapp-react-native-redux": "12.0.0-alpha.5114122134",
-    "@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.5114122134",
-    "@applicaster/zapp-react-native-utils": "12.0.0-alpha.5114122134",
-    "axios": "^0.21.2",
+    "@applicaster/quick-brick-core": "12.0.0-alpha.5131585791",
+    "@applicaster/zapp-react-native-bridge": "12.0.0-alpha.5131585791",
+    "@applicaster/zapp-react-native-redux": "12.0.0-alpha.5131585791",
+    "@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.5131585791",
+    "@applicaster/zapp-react-native-utils": "12.0.0-alpha.5131585791",
+    "axios": "^0.28.0",
     "camelize": "^1.0.0",
     "query-string": "7.1.3",
     "react-router-native": "5.1.2",

package/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig.base.json",
+
+  "compilerOptions": {
+    "outDir": "./lib",
+    "rootDir": "./src"
+  },
+
+  "include": ["src/**/*"],
+  "exclude": ["src/**/*.test.ts", "src/**/*.test.tsx"]
+}