@applicaster/zapp-react-native-app 12.0.0-alpha.5521005225 → 12.0.0-alpha.5545254270

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

@@ -113,19 +113,17 @@ const LayoutWithMenu = () => {
 
   const isBottomTabsPlugin = plugin?.identifier === "quick-brick-bottom-tabs";
 
-  const shouldApplyStyleForBottomTabs = showMenu && isBottomTabsPlugin;
+  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(
     () => ({
-      ...(shouldApplyStyleForBottomTabs
-        ? {
-            paddingBottom: bottomTabBarHeight,
-          }
-        : {}),
       ...containerStyle,
+      paddingBottom,
       opacity: videoModalState.visible && !isVideoModalDocked ? 0 : 1,
     }),
-    [bottomTabBarHeight, videoModalState.visible, isVideoModalDocked, showMenu]
+    [videoModalState.visible, isVideoModalDocked, paddingBottom]
   );
 
   const menuProps = React.useMemo(() => {
@@ -172,7 +170,7 @@ const LayoutWithMenu = () => {
         <View style={contentStyle}>
           <Transitioner
             transitionConfig={transitionConfig}
-            contentStyle={{}}
+            contentStyle={contentStyle}
             isRTL={isRTL}
           >
             <Screen

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