@applicaster/zapp-react-native-app 15.0.0-rc.99 → 15.1.0-alpha.2915689988

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

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

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

@@ -59,13 +59,7 @@ jest.mock(
   })
 );
 
-const mockUseNavigation = jest.fn(() => ({
-  activeRiver: { navigations: [] },
-  videoModalState: { visible: false, mode: "MINIMIZED" },
-  currentRoute: "home",
-  data: {},
-  isVideoModalDocked: jest.fn(() => false),
-}));
+const mockUseNavigation = jest.fn();
 
 jest.mock(
   "@applicaster/zapp-react-native-utils/reactHooks/navigation/useNavigation",
@@ -166,6 +160,28 @@ 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 />);
 
@@ -192,7 +208,7 @@ describe("Layout", () => {
     mockUseNavigation.mockReturnValue({
       activeRiver: { navigations: [] },
       videoModalState: { visible: true, mode: "MINIMIZED" },
-      isVideoModalDocked: jest.fn(() => true),
+      isVideoModalDocked: false,
       currentRoute: "home",
       data: {},
     });
@@ -210,7 +226,7 @@ describe("Layout", () => {
     mockUseNavigation.mockReturnValueOnce({
       activeRiver: { navigations: [{ identifier: "quick-brick-bottom-tabs" }] },
       videoModalState: { visible: false, mode: "MINIMIZED" },
-      isVideoModalDocked: jest.fn(() => false),
+      isVideoModalDocked: false,
       currentRoute: "home",
       data: {},
     });
@@ -240,7 +256,7 @@ describe("Layout", () => {
     mockUseNavigation.mockReturnValue({
       activeRiver: { navigations: [] },
       videoModalState: { visible: true, mode: "FULLSCREEN" },
-      isVideoModalDocked: jest.fn(() => false),
+      isVideoModalDocked: false,
       currentRoute: "home",
       data: {},
     });
@@ -257,7 +273,7 @@ describe("Layout", () => {
     mockUseNavigation.mockReturnValue({
       activeRiver: { navigations: [] },
       videoModalState: { visible: true, mode: "FULLSCREEN" },
-      isVideoModalDocked: jest.fn(() => false),
+      isVideoModalDocked: false,
       currentRoute: "home",
       data: {},
     });
@@ -276,7 +292,7 @@ describe("Layout", () => {
     mockUseNavigation.mockReturnValue({
       activeRiver: { navigations: [] },
       videoModalState: { visible: false, mode: "MINIMIZED" },
-      isVideoModalDocked: jest.fn(() => false),
+      isVideoModalDocked: false,
       currentRoute: "home",
       data: {},
     });

package/App/Layout/index.tsx

@@ -20,18 +20,13 @@ 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,
@@ -57,8 +52,10 @@ const styles = StyleSheet.create({
 });
 
 const LayoutWithMenu = () => {
-  const plugins = usePlugins();
-  const appReady = useAppSelector(selectAppReady);
+  const {
+    plugins,
+    appState: { appReady },
+  } = usePickFromState(["plugins", "appState"]);
 
   const {
     toggleMenu,
@@ -143,18 +140,16 @@ 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 && !videoModalStateDocked ? 0 : 1,
+          opacity: videoModalState.visible && !isVideoModalDocked ? 0 : 1,
         },
       ]),
-    [paddingBottom, videoModalState.visible, videoModalStateDocked]
+    [videoModalState.visible, isVideoModalDocked]
   );
 
   const menuProps = React.useMemo(() => {

package/package.json

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