@applicaster/zapp-react-native-app 14.0.0-alpha.5621117258 → 14.0.0-alpha.5810348423

package/App/InteractionManager/index.js

@@ -10,9 +10,46 @@ import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/n
 import { useAnalytics } from "@applicaster/zapp-react-native-utils/analyticsUtils";
 import { useRivers } from "@applicaster/zapp-react-native-utils/reactHooks/state";
 import { useErrorStore } from "@applicaster/quick-brick-core/App/ErrorBoundary/store";
+import { isApplePlatform } from "@applicaster/zapp-react-native-utils/reactUtils";
 
 const getHome = R.compose(R.find(R.propEq("home", true)), R.values);
 
+const isIOS = isApplePlatform();
+/* Set to `false` in production, do not commit this change */
+const IS_DEBUGGER_ENABLED = false;
+
+/**
+ * This is a workaround to fix an error on start when debugger is connected.
+ * Update function body for this function `callNativeSyncHook`
+ * node_modules/react-native/Libraries/BatchedBridge/MessageQueue.js:167
+   
+ this.processCallbacks(moduleID, methodID, params, onFail, onSucc);
+ if(global.nativeCallSyncHook) {
+   return global.nativeCallSyncHook(moduleID, methodID, params);
+ }
+*/
+
+// Assign this to a dev-only button or useEffect call
+const connectToRemoteDebugger = () => {
+  if (__DEV__ && isIOS) {
+    try {
+      const { DevSettings, NativeModules } = require("react-native");
+
+      // eslint-disable-next-line no-console
+      console.warn(`Debugger connected: ${IS_DEBUGGER_ENABLED}`);
+
+      if (DevSettings?.setIsDebuggingRemotely) {
+        DevSettings.setIsDebuggingRemotely(IS_DEBUGGER_ENABLED);
+      }
+
+      NativeModules?.DevSettings?.setIsDebuggingRemotely?.(IS_DEBUGGER_ENABLED);
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.error(`connectToRemoteDebugger message: ${error.message}`);
+    }
+  }
+};
+
 const InteractionManagerComponent = () => {
   const { sendHardwareBackButtonClickEvent } = useAnalytics();
   const rivers = useRivers();
@@ -66,10 +103,17 @@ const InteractionManagerComponent = () => {
   }, [navigator.currentRoute]);
 
   React.useEffect(() => {
-    BackHandler.addEventListener("hardwareBackPress", onHardwareBackPress);
+    connectToRemoteDebugger();
+  }, []);
+
+  React.useEffect(() => {
+    const unsubscribe = BackHandler.addEventListener(
+      "hardwareBackPress",
+      onHardwareBackPress
+    );
 
     return () => {
-      BackHandler.removeEventListener("hardwareBackPress", onHardwareBackPress);
+      unsubscribe.remove();
     };
   }, [onHardwareBackPress]);
 

package/App/Layout/__tests__/index.test.tsx

@@ -138,6 +138,9 @@ jest.mock(
 );
 
 jest.mock("@applicaster/zapp-react-native-utils/navigationUtils", () => ({
+  ...(jest.requireActual(
+    "@applicaster/zapp-react-native-utils/navigationUtils"
+  ) as jest.Mock<any>),
   getNavigationProps: () => ({}),
   resolveNavigationPlugin: () => ({
     identifier: "quick-brick-bottom-tabs",

package/App/Layout/index.tsx

@@ -1,12 +1,9 @@
 import * as React from "react";
 import * as R from "ramda";
 
-import { View } from "react-native";
+import { View, StyleSheet } from "react-native";
 
-import {
-  getNavigationProps,
-  resolveNavigationPlugin,
-} from "@applicaster/zapp-react-native-utils/navigationUtils";
+import { getNavigationProps } from "@applicaster/zapp-react-native-utils/navigationUtils";
 import {
   useDimensions,
   useGetBottomTabBarHeight,
@@ -39,10 +36,13 @@ import {
   PushTopicManagerConsts,
   PushTopicManagerEvents,
 } from "@applicaster/zapp-react-native-bridge/PushNotifications/PushTopicManager";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 
-const containerStyle = {
-  height: "100%",
-};
+const styles = StyleSheet.create({
+  container: {
+    height: "100%",
+  },
+});
 
 const LayoutWithMenu = () => {
   const {
@@ -63,16 +63,11 @@ const LayoutWithMenu = () => {
   const isRTL = useIsRTL();
   const navigator = useNavigation();
   const bottomTabBarHeight = useGetBottomTabBarHeight();
+  const { bottom: safeAreaBottomInset } = useSafeAreaInsets();
   const { title } = useNavbarState();
 
   const { activeRiver, videoModalState, isVideoModalDocked } = navigator;
 
-  const plugin = resolveNavigationPlugin({
-    category: "menu",
-    navigations: activeRiver?.navigations,
-    plugins,
-  });
-
   const Menu = React.useMemo(
     () =>
       getNavigationPluginModule(
@@ -95,15 +90,17 @@ const LayoutWithMenu = () => {
    * also check isMenuVisible
    */
   const showMenu = React.useMemo(() => {
-    if (!videoModalState.visible) {
-      return isMenuVisible(navigator.currentRoute, navigator.screenData);
-    } else {
-      if (videoModalState.mode === "FULLSCREEN") {
-        return false;
-      }
-    }
-
-    return isMenuVisible(navigator.currentRoute, navigator.screenData);
+    const menuVisible = isMenuVisible(
+      navigator.currentRoute,
+      navigator.screenData,
+      plugins
+    );
+
+    const shouldShowWithVideo =
+      videoModalState.visible &&
+      ["MINIMIZED", "MAXIMIZED"].includes(videoModalState.mode);
+
+    return menuVisible && (shouldShowWithVideo || !videoModalState.visible);
   }, [
     videoModalState.visible,
     videoModalState.mode,
@@ -111,19 +108,18 @@ const LayoutWithMenu = () => {
     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 paddingBottom = showMenu ? bottomTabBarHeight + safeAreaBottomInset : 0; // if activeRiver?.navigations has quick-brick-bottom-tabs - append bottomTabBarHeight as padding
 
   const contentStyle = React.useMemo(
-    () => ({
-      ...containerStyle,
-      paddingBottom,
-      opacity: videoModalState.visible && !isVideoModalDocked ? 0 : 1,
-    }),
-    [videoModalState.visible, isVideoModalDocked, paddingBottom]
+    () =>
+      StyleSheet.flatten([
+        styles.container,
+        {
+          paddingBottom,
+          opacity: videoModalState.visible && !isVideoModalDocked ? 0 : 1,
+        },
+      ]),
+    [videoModalState.visible, isVideoModalDocked]
   );
 
   const menuProps = React.useMemo(() => {
@@ -167,7 +163,7 @@ const LayoutWithMenu = () => {
   return (
     <>
       {appReady ? (
-        <View style={containerStyle}>
+        <View style={styles.container}>
           <Transitioner
             transitionConfig={transitionConfig}
             contentStyle={contentStyle}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-app",
-  "version": "14.0.0-alpha.5621117258",
+  "version": "14.0.0-alpha.5810348423",
   "description": "Zapp App Component for Applicaster's Quick Brick React Native App",
   "main": "index.js",
   "scripts": {
@@ -27,11 +27,11 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/quick-brick-core": "14.0.0-alpha.5621117258",
-    "@applicaster/zapp-react-native-bridge": "14.0.0-alpha.5621117258",
-    "@applicaster/zapp-react-native-redux": "14.0.0-alpha.5621117258",
-    "@applicaster/zapp-react-native-ui-components": "14.0.0-alpha.5621117258",
-    "@applicaster/zapp-react-native-utils": "14.0.0-alpha.5621117258",
+    "@applicaster/quick-brick-core": "14.0.0-alpha.5810348423",
+    "@applicaster/zapp-react-native-bridge": "14.0.0-alpha.5810348423",
+    "@applicaster/zapp-react-native-redux": "14.0.0-alpha.5810348423",
+    "@applicaster/zapp-react-native-ui-components": "14.0.0-alpha.5810348423",
+    "@applicaster/zapp-react-native-utils": "14.0.0-alpha.5810348423",
     "axios": "^0.28.0",
     "camelize": "^1.0.0",
     "query-string": "7.1.3",
@@ -46,23 +46,14 @@
     "@applicaster/zapp-react-native-tvos-ui-components": "*",
     "@babel/runtime": "*",
     "@react-native-community/netinfo": "*",
-    "immer": "*",
     "react": "*",
     "react-native": "*",
     "react-native-fs": "*",
-    "react-native-gesture-handler": "*",
     "react-native-linear-gradient": "*",
-    "react-native-safe-area-context": "*",
     "react-native-svg": "*",
-    "react-native-web": "*",
     "react-native-webview": "*",
     "uglify-js": "*",
     "validate-color": "*",
     "zustand": "*"
-  },
-  "devDependencies": {
-    "nock": "^10.0.0",
-    "redux-mock-store": "^1.5.3"
-  },
-  "gitHead": "a473487564142c55cdb50f02505cf0b60fe75658"
+  }
 }