@applicaster/zapp-react-native-app 14.0.0-alpha.6461844364 → 14.0.0-alpha.6893149866

package/App/InteractionManager/index.js

@@ -12,8 +12,6 @@ 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";
 
-import NativeDevSettings from "react-native/Libraries/NativeModules/specs/NativeDevSettings";
-
 const getHome = R.compose(R.find(R.propEq("home", true)), R.values);
 
 const isIOS = isApplePlatform();
@@ -21,27 +19,34 @@ const isIOS = isApplePlatform();
 const IS_DEBUGGER_ENABLED = false;
 
 /**
-     * This is a workaround to fix an error on start when debugger is connected.
-   * node_modules/react-native/Libraries/BatchedBridge/MessageQueue.js :167
-   * callNativeSyncHook(
-      moduleID: number,
-      methodID: number,
-      params: mixed[],
-      onFail: ?Function,
-      onSucc: ?Function,
-    ): any {
-      this.processCallbacks(moduleID, methodID, params, onFail, onSucc);
-    if(global.nativeCallSyncHook)
-      {
-        return global.nativeCallSyncHook(moduleID, methodID, params);
-      }
-    }
-   */
+ * 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 (isIOS) {
-    NativeDevSettings.setIsDebuggingRemotely(IS_DEBUGGER_ENABLED);
+  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}`);
+    }
   }
 };
 

package/App/Layout/index.tsx

@@ -3,10 +3,7 @@ import * as R from "ramda";
 
 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,
@@ -71,12 +68,6 @@ const LayoutWithMenu = () => {
 
   const { activeRiver, videoModalState, isVideoModalDocked } = navigator;
 
-  const plugin = resolveNavigationPlugin({
-    category: "menu",
-    navigations: activeRiver?.navigations,
-    plugins,
-  });
-
   const Menu = React.useMemo(
     () =>
       getNavigationPluginModule(
@@ -99,11 +90,17 @@ const LayoutWithMenu = () => {
    * also check isMenuVisible
    */
   const showMenu = React.useMemo(() => {
-    if (!videoModalState.visible && videoModalState.mode === "FULLSCREEN") {
-      return false;
-    }
+    const menuVisible = isMenuVisible(
+      navigator.currentRoute,
+      navigator.screenData,
+      plugins
+    );
 
-    return isMenuVisible(navigator.currentRoute, navigator.screenData);
+    const shouldShowWithVideo =
+      videoModalState.visible &&
+      ["MINIMIZED", "MAXIMIZED"].includes(videoModalState.mode);
+
+    return menuVisible && (shouldShowWithVideo || !videoModalState.visible);
   }, [
     videoModalState.visible,
     videoModalState.mode,
@@ -111,12 +108,7 @@ const LayoutWithMenu = () => {
     isActiveGesture,
   ]);
 
-  const isBottomTabsPlugin = plugin?.identifier === "quick-brick-bottom-tabs";
-
-  const paddingBottom =
-    showMenu && isBottomTabsPlugin
-      ? bottomTabBarHeight + safeAreaBottomInset
-      : 0; // if activeRiver?.navigations has quick-brick-bottom-tabs - append bottomTabBarHeight as padding
+  const paddingBottom = showMenu ? bottomTabBarHeight + safeAreaBottomInset : 0; // if activeRiver?.navigations has quick-brick-bottom-tabs - append bottomTabBarHeight as padding
 
   const contentStyle = React.useMemo(
     () =>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-app",
-  "version": "14.0.0-alpha.6461844364",
+  "version": "14.0.0-alpha.6893149866",
   "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.6461844364",
-    "@applicaster/zapp-react-native-bridge": "14.0.0-alpha.6461844364",
-    "@applicaster/zapp-react-native-redux": "14.0.0-alpha.6461844364",
-    "@applicaster/zapp-react-native-ui-components": "14.0.0-alpha.6461844364",
-    "@applicaster/zapp-react-native-utils": "14.0.0-alpha.6461844364",
+    "@applicaster/quick-brick-core": "14.0.0-alpha.6893149866",
+    "@applicaster/zapp-react-native-bridge": "14.0.0-alpha.6893149866",
+    "@applicaster/zapp-react-native-redux": "14.0.0-alpha.6893149866",
+    "@applicaster/zapp-react-native-ui-components": "14.0.0-alpha.6893149866",
+    "@applicaster/zapp-react-native-utils": "14.0.0-alpha.6893149866",
     "axios": "^0.28.0",
     "camelize": "^1.0.0",
     "query-string": "7.1.3",
@@ -46,7 +46,6 @@
     "@applicaster/zapp-react-native-tvos-ui-components": "*",
     "@babel/runtime": "*",
     "@react-native-community/netinfo": "*",
-    "immer": "*",
     "react": "*",
     "react-native": "*",
     "react-native-fs": "*",