@applicaster/zapp-react-native-app 15.1.0-rc.1 → 16.0.0-alpha.9803580571

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

@@ -57,7 +57,17 @@ exports[`Layout should match snapshot when appReady is true 1`] = `
         },
         "currentRoute": "home",
         "data": {},
-        "isVideoModalDocked": false,
+        "isVideoModalDocked": [MockFunction] {
+          "calls": [
+            [],
+          ],
+          "results": [
+            {
+              "type": "return",
+              "value": false,
+            },
+          ],
+        },
         "videoModalState": {
           "mode": "MINIMIZED",
           "visible": false,

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

@@ -59,7 +59,13 @@ jest.mock(
   })
 );
 
-const mockUseNavigation = jest.fn();
+const mockUseNavigation = jest.fn(() => ({
+  activeRiver: { navigations: [] },
+  videoModalState: { visible: false, mode: "MINIMIZED" },
+  currentRoute: "home",
+  data: {},
+  isVideoModalDocked: jest.fn(() => false),
+}));
 
 jest.mock(
   "@applicaster/zapp-react-native-utils/reactHooks/navigation/useNavigation",
@@ -160,28 +166,6 @@ jest.mock("@applicaster/zapp-react-native-utils/navigationUtils", () => ({
 const { Layout } = require("../");
 
 describe("Layout", () => {
-  beforeAll(() => {
-    mockUseNavigation.mockImplementation(() => ({
-      activeRiver: { navigations: [] },
-      videoModalState: { visible: false, mode: "MINIMIZED" },
-      isVideoModalDocked: false,
-      currentRoute: "home",
-      data: {},
-    }));
-  });
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-
-    mockUseNavigation.mockImplementation(() => ({
-      activeRiver: { navigations: [] },
-      videoModalState: { visible: false, mode: "MINIMIZED" },
-      isVideoModalDocked: false,
-      currentRoute: "home",
-      data: {},
-    }));
-  });
-
   it("should match snapshot when appReady is true", () => {
     const { toJSON } = renderWithProviders(<Layout />);
 
@@ -208,7 +192,7 @@ describe("Layout", () => {
     mockUseNavigation.mockReturnValue({
       activeRiver: { navigations: [] },
       videoModalState: { visible: true, mode: "MINIMIZED" },
-      isVideoModalDocked: false,
+      isVideoModalDocked: jest.fn(() => true),
       currentRoute: "home",
       data: {},
     });
@@ -226,7 +210,7 @@ describe("Layout", () => {
     mockUseNavigation.mockReturnValueOnce({
       activeRiver: { navigations: [{ identifier: "quick-brick-bottom-tabs" }] },
       videoModalState: { visible: false, mode: "MINIMIZED" },
-      isVideoModalDocked: false,
+      isVideoModalDocked: jest.fn(() => false),
       currentRoute: "home",
       data: {},
     });
@@ -256,7 +240,7 @@ describe("Layout", () => {
     mockUseNavigation.mockReturnValue({
       activeRiver: { navigations: [] },
       videoModalState: { visible: true, mode: "FULLSCREEN" },
-      isVideoModalDocked: false,
+      isVideoModalDocked: jest.fn(() => false),
       currentRoute: "home",
       data: {},
     });
@@ -273,7 +257,7 @@ describe("Layout", () => {
     mockUseNavigation.mockReturnValue({
       activeRiver: { navigations: [] },
       videoModalState: { visible: true, mode: "FULLSCREEN" },
-      isVideoModalDocked: false,
+      isVideoModalDocked: jest.fn(() => false),
       currentRoute: "home",
       data: {},
     });
@@ -292,7 +276,7 @@ describe("Layout", () => {
     mockUseNavigation.mockReturnValue({
       activeRiver: { navigations: [] },
       videoModalState: { visible: false, mode: "MINIMIZED" },
-      isVideoModalDocked: false,
+      isVideoModalDocked: jest.fn(() => false),
       currentRoute: "home",
       data: {},
     });

package/App/Layout/index.tsx

@@ -20,13 +20,18 @@ import {
   isVideoOverlayVisible,
 } from "./layoutHelpers";
 
+import {
+  usePlugins,
+  useAppSelector,
+  selectAppReady,
+} from "@applicaster/zapp-react-native-redux";
+
 import {
   getMenuPlugin,
   isBottomTabVisible,
   isMenuVisible,
   SIDE_MENU_PLUGIN_ID,
 } from "@applicaster/zapp-react-native-ui-components/Components/Screen/navigationHandler";
-import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
 
 import {
   MenuToggleContextType,
@@ -52,10 +57,8 @@ const styles = StyleSheet.create({
 });
 
 const LayoutWithMenu = () => {
-  const {
-    plugins,
-    appState: { appReady },
-  } = usePickFromState(["plugins", "appState"]);
+  const plugins = usePlugins();
+  const appReady = useAppSelector(selectAppReady);
 
   const {
     toggleMenu,
@@ -140,16 +143,18 @@ const LayoutWithMenu = () => {
     ? bottomTabBarHeight + safeAreaBottomInset
     : 0; // if activeRiver?.navigations has quick-brick-bottom-tabs - append bottomTabBarHeight as padding
 
+  const videoModalStateDocked = isVideoModalDocked();
+
   const contentStyle = React.useMemo(
     () =>
       StyleSheet.flatten([
         styles.container,
         {
           paddingBottom,
-          opacity: videoModalState.visible && !isVideoModalDocked ? 0 : 1,
+          opacity: videoModalState.visible && !videoModalStateDocked ? 0 : 1,
         },
       ]),
-    [videoModalState.visible, isVideoModalDocked]
+    [paddingBottom, videoModalState.visible, videoModalStateDocked]
   );
 
   const menuProps = React.useMemo(() => {

package/package.json

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