@applicaster/zapp-react-native-ui-components 13.0.0-alpha.6714678893 → 13.0.0-alpha.7100577251

package/Components/River/__tests__/__snapshots__/componentsMap.test.js.snap

@@ -3,7 +3,7 @@
 exports[`componentsMap renders renders components map correctly 1`] = `
 <View
   style={
-    Object {
+    {
       "flex": 1,
     }
   }
@@ -11,15 +11,98 @@ exports[`componentsMap renders renders components map correctly 1`] = `
   <View
     onLayout={[Function]}
     style={
-      Object {
+      {
         "flex": 1,
       }
     }
   >
     <RCTScrollView
-      ListFooterComponent={[Function]}
+      ListFooterComponent={
+        <Memo(RiverFooterComponent)
+          flatListHeight={null}
+          loadingState={
+            BehaviorSubject {
+              "_value": {
+                "done": false,
+                "index": -1,
+                "waitForAllComponents": false,
+              },
+              "closed": false,
+              "currentObservers": null,
+              "hasError": false,
+              "isStopped": false,
+              "observers": [
+                SafeSubscriber {
+                  "_finalizers": [
+                    Subscription {
+                      "_finalizers": null,
+                      "_parentage": [Circular],
+                      "closed": false,
+                      "initialTeardown": [Function],
+                    },
+                  ],
+                  "_parentage": null,
+                  "closed": false,
+                  "destination": ConsumerObserver {
+                    "partialObserver": {
+                      "complete": undefined,
+                      "error": undefined,
+                      "next": [Function],
+                    },
+                  },
+                  "initialTeardown": undefined,
+                  "isStopped": false,
+                },
+                SafeSubscriber {
+                  "_finalizers": [
+                    Subscription {
+                      "_finalizers": null,
+                      "_parentage": [Circular],
+                      "closed": false,
+                      "initialTeardown": [Function],
+                    },
+                  ],
+                  "_parentage": null,
+                  "closed": false,
+                  "destination": ConsumerObserver {
+                    "partialObserver": {
+                      "complete": undefined,
+                      "error": undefined,
+                      "next": [Function],
+                    },
+                  },
+                  "initialTeardown": undefined,
+                  "isStopped": false,
+                },
+                SafeSubscriber {
+                  "_finalizers": [
+                    Subscription {
+                      "_finalizers": null,
+                      "_parentage": [Circular],
+                      "closed": false,
+                      "initialTeardown": [Function],
+                    },
+                  ],
+                  "_parentage": null,
+                  "closed": false,
+                  "destination": ConsumerObserver {
+                    "partialObserver": {
+                      "complete": undefined,
+                      "error": undefined,
+                      "next": [Function],
+                    },
+                  },
+                  "initialTeardown": undefined,
+                  "isStopped": false,
+                },
+              ],
+              "thrownError": null,
+            }
+          }
+        />
+      }
       contentContainerStyle={
-        Object {
+        {
           "paddingBottom": undefined,
           "paddingLeft": undefined,
           "paddingRight": undefined,
@@ -27,22 +110,22 @@ exports[`componentsMap renders renders components map correctly 1`] = `
         }
       }
       data={
-        Array [
-          Object {
+        [
+          {
             "component_type": "hero",
             "id": "A1",
-            "styles": Object {
-              "cell_styles": Array [
+            "styles": {
+              "cell_styles": [
                 "some",
                 "obsolete",
                 "ids",
               ],
             },
           },
-          Object {
+          {
             "component_type": "grid",
             "id": "A2",
-            "styles": Object {
+            "styles": {
               "master_cell_id": "uuid-5678-B",
             },
           },
@@ -66,12 +149,12 @@ exports[`componentsMap renders renders components map correctly 1`] = `
       renderItem={[Function]}
       scrollEventThrottle={16}
       scrollIndicatorInsets={
-        Object {
+        {
           "right": 1,
         }
       }
-      stickyHeaderIndices={Array []}
-      viewabilityConfigCallbackPairs={Array []}
+      stickyHeaderIndices={[]}
+      viewabilityConfigCallbackPairs={[]}
       windowSize={12}
     >
       <View>
@@ -80,22 +163,14 @@ exports[`componentsMap renders renders components map correctly 1`] = `
           style={null}
         >
           <View
+            onLayout={[Function]}
             style={
-              Object {
-                "display": "flex",
+              {
+                "flex": 1,
               }
             }
           >
-            <View
-              onLayout={[Function]}
-              style={
-                Object {
-                  "flex": 1,
-                }
-              }
-            >
-              <View />
-            </View>
+            <View />
           </View>
         </View>
         <View
@@ -103,23 +178,13 @@ exports[`componentsMap renders renders components map correctly 1`] = `
           style={null}
         >
           <View
+            onLayout={[Function]}
             style={
-              Object {
-                "display": "none",
+              {
+                "flex": 1,
               }
             }
-          >
-            <View
-              onLayout={[Function]}
-              style={
-                Object {
-                  "flex": 1,
-                }
-              }
-            >
-              <View />
-            </View>
-          </View>
+          />
         </View>
         <View
           onLayout={[Function]}
@@ -127,12 +192,16 @@ exports[`componentsMap renders renders components map correctly 1`] = `
           <View
             renderToHardwareTextureAndroid={true}
             style={
-              Object {
-                "alignItems": "center",
-                "height": null,
-                "justifyContent": "center",
-                "width": "100%",
-              }
+              [
+                {
+                  "alignItems": "center",
+                  "justifyContent": "center",
+                  "width": "100%",
+                },
+                {
+                  "height": null,
+                },
+              ]
             }
           >
             <ActivityIndicator

package/Components/River/__tests__/__snapshots__/river.test.js.snap

@@ -6,42 +6,42 @@ exports[`When River has a general_content type <River /> renders correctly 1`] =
 >
   <RiverWithData
     appData={
-      Object {
+      {
         "layoutVersion": "v1",
       }
     }
     dispatch={[Function]}
     rivers={
-      Object {
-        "A1234": Object {
+      {
+        "A1234": {
           "home": true,
           "id": "A1234",
           "name": "foo",
           "type": "general_content",
-          "ui_components": Array [
-            Object {
+          "ui_components": [
+            {
               "component_type": "hero",
             },
-            Object {
+            {
               "component_type": "grid",
             },
           ],
         },
-        "B4567": Object {
+        "B4567": {
           "id": "B4567",
         },
-        "C0987": Object {
+        "C0987": {
           "home": false,
           "id": "C0987",
           "name": "Some-Screen-Plugin",
           "type": "some-screen-plugin",
-          "ui_components": Array [],
+          "ui_components": [],
         },
       }
     }
     screenId="A1234"
     store={
-      Object {
+      {
         "clearActions": [Function],
         "dispatch": [Function],
         "getActions": [Function],
@@ -64,13 +64,13 @@ exports[`When River has a general_content type <RiverComponent /> renders correc
 exports[`When River has any other type other than general_content <RiverComponent /> renders correctly 1`] = `
 <WithProvider
   screenData={
-    Object {
+    {
       "groupId": undefined,
       "home": false,
       "id": "C0987",
       "name": "Some-Screen-Plugin",
       "type": "some-screen-plugin",
-      "ui_components": Array [],
+      "ui_components": [],
     }
   }
   screenId="C0987"

package/Components/River/__tests__/componentsMap.test.js

@@ -1,6 +1,5 @@
 import React from "react";
-import TestRenderer from "react-test-renderer";
-import { cleanup } from "@testing-library/react-native";
+import { cleanup, render } from "@testing-library/react-native";
 import { Provider } from "react-redux";
 import configureStore from "redux-mock-store";
 
@@ -75,28 +74,70 @@ const riverComponents = [
   },
 ];
 
-const screenData = {
+const mockScreenData = {
   ui_components: riverComponents,
   rules: { pull_to_refresh_enabled: false },
   id: "A1234",
 };
 
+jest.mock("@applicaster/zapp-react-native-redux/AppStore", () => ({
+  appStore: {
+    get: jest.fn((prop) => mockStore[prop]),
+    getState: jest.fn(),
+  },
+}));
+
 jest.mock("@applicaster/zapp-react-native-utils/localizationUtils", () => ({
   useIsRTL: jest.fn(() => mock_rtl_flag),
 }));
 
-jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation", () => ({
-  useNavigation: jest.fn(() => ({ currentRoute: "/river/A1234" })),
-  useRoute: jest.fn(() => ({ pathname: "/river/A1234", screenData })),
-  useProfilerLogging: jest.fn(),
-  useIsScreenActive: jest.fn().mockReturnValue(true),
-}));
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/navigation/useNavigation",
+  () => ({
+    useNavigation: jest.fn(() => ({ currentRoute: "/river/A1234" })),
+  })
+);
 
-jest.mock("@applicaster/zapp-react-native-utils/reactHooks/screen", () => ({
-  useCurrentScreenData: jest.fn(() => screenData),
-  useScreenData: jest.fn(() => screenData),
-  useScreenContext: jest.fn(() => screenData),
-}));
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/navigation/useRoute",
+  () => ({
+    useRoute: jest.fn(() => ({
+      pathname: "/river/A1234",
+      screenData: mockScreenData,
+    })),
+  })
+);
+
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/navigation/useIsScreenActive",
+  () => ({
+    useIsScreenActive: jest.fn().mockReturnValue(true),
+  })
+);
+
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/screen/useCurrentScreenData",
+  () => ({
+    useCurrentScreenData: jest.fn(() => mockScreenData),
+  })
+);
+
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenData",
+  () => ({
+    useScreenData: jest.fn(() => mockScreenData),
+  })
+);
+
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenContext",
+  () => ({
+    ...jest.requireActual(
+      "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenContext"
+    ),
+    useScreenContext: jest.fn(() => mockScreenData),
+  })
+);
 
 const { View } = require("react-native");
 const { ComponentsMap } = require("../ComponentsMap/ComponentsMap");
@@ -118,7 +159,13 @@ const plugins = [];
 const navigation = {};
 
 const props = { components, cellStyles, riverComponents, navigation };
-const store = mockStore({ components, cellStyles, plugins });
+
+const store = mockStore({
+  components,
+  cellStyles,
+  plugins,
+  getState: jest.fn(),
+});
 
 jest.useFakeTimers();
 
@@ -135,12 +182,12 @@ describe("componentsMap", () => {
       .spyOn(themeUtils, "useTheme")
       .mockImplementation(() => () => theme);
 
-    const wrapper = TestRenderer.create(
+    const { toJSON } = render(
       <Provider store={store}>
         <ComponentsMap {...props} />
       </Provider>
     );
 
-    expect(wrapper.toJSON()).toMatchSnapshot();
+    expect(toJSON()).toMatchSnapshot();
   });
 });

package/Components/RouteManager/__tests__/__snapshots__/routeManager.test.js.snap

@@ -7,7 +7,7 @@ exports[`<RouteManager /> renders correctly 1`] = `
   <WithProvider
     pathname="/river/A1234"
     screenData={
-      Object {
+      {
         "id": "A1234",
       }
     }

package/Components/RouteManager/__tests__/__snapshots__/testId.test.js.snap

@@ -4,7 +4,7 @@ exports[`TestId renders correctly and assigns the testID to a wrapping view 1`]
 <View
   accessibilityLabel="A1234"
   style={
-    Object {
+    {
       "flex": 1,
     }
   }

package/Components/Screen/__tests__/Screen.test.tsx

@@ -46,27 +46,37 @@ jest.mock("@applicaster/zapp-react-native-utils/theme", () => ({
   })),
 }));
 
-const NavBar = jest.fn((props) => <View testID="navBar" {...props} />);
+const mockNavBar = jest.fn((props) => {
+  const View = jest.requireActual("react-native").View;
+
+  return <View testID="navBar" {...props} />;
+});
 
 jest.mock(
   "@applicaster/zapp-react-native-app/App/Layout/layoutHelpers",
   () => ({
-    getNavigationPluginModule: () => NavBar,
+    getNavigationPluginModule: () => mockNavBar,
   })
 );
 
-jest.mock("@applicaster/zapp-react-native-utils/reactHooks/screen", () => ({
-  ...(jest.requireActual(
-    "@applicaster/zapp-react-native-utils/reactHooks/screen"
-  ) as any),
-  useScreenData: jest.fn(() => ({
-    id: "testId",
-    navigations: [{ id: "testId", category: "nav_bar" }],
-  })),
-  useCurrentScreenData: jest.fn(() => ({
-    id: "testId",
-  })),
-}));
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/screen/useCurrentScreenData",
+  () => ({
+    useCurrentScreenData: jest.fn(() => ({
+      id: "testId",
+    })),
+  })
+);
+
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenData",
+  () => ({
+    useScreenData: jest.fn(() => ({
+      id: "testId",
+      navigations: [{ id: "testId", category: "nav_bar" }],
+    })),
+  })
+);
 
 jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation", () => ({
   isNavBarVisible: mockIsNavBarVisible,
@@ -84,20 +94,24 @@ jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation", () => ({
   useIsScreenActive: jest.fn().mockReturnValue(true),
 }));
 
-jest.mock("@applicaster/zapp-react-native-redux/hooks", () => ({
-  usePickFromState: () => ({
-    plugins: [
-      {
-        name: "Offline Plugin",
-        identifier: "offline-experience",
-        type: "general",
-        module: {
-          OfflineFallbackScreen: ({ children }) => <View>{children}</View>, // eslint-disable-line
+jest.mock("@applicaster/zapp-react-native-redux/hooks/usePickFromState", () => {
+  const View = jest.requireActual("react-native").View;
+
+  return {
+    usePickFromState: () => ({
+      plugins: [
+        {
+          name: "Offline Plugin",
+          identifier: "offline-experience",
+          type: "general",
+          module: {
+            OfflineFallbackScreen: ({ children }) => <View>{children}</View>, // eslint-disable-line
+          },
         },
-      },
-    ],
-  }),
-}));
+      ],
+    }),
+  };
+});
 
 const {
   allowedOrientationsForScreen,

package/Components/Screen/__tests__/__snapshots__/Screen.test.tsx.snap

@@ -3,7 +3,7 @@
 exports[`<Screen Component /> when the navbar should be hidden renders correctly 1`] = `
 <View
   style={
-    Object {
+    {
       "backgroundColor": "blue",
       "flex": 1,
       "paddingTop": 0,
@@ -22,7 +22,7 @@ exports[`<Screen Component /> when the navbar should be hidden renders correctly
     <View
       pathname="/river/testId"
       screenData={
-        Object {
+        {
           "id": "testId",
         }
       }
@@ -35,7 +35,7 @@ exports[`<Screen Component /> when the navbar should be hidden renders correctly
 exports[`<Screen Component /> when the navbar should show renders correctly 1`] = `
 <View
   style={
-    Object {
+    {
       "backgroundColor": "blue",
       "flex": 1,
       "paddingTop": 0,
@@ -54,7 +54,7 @@ exports[`<Screen Component /> when the navbar should show renders correctly 1`]
     <View
       pathname="/river/testId"
       screenData={
-        Object {
+        {
           "id": "testId",
         }
       }

package/Components/Screen/hooks.ts

@@ -0,0 +1,56 @@
+import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
+import {
+  useGetScreenOrientation,
+  isOrientationCompatible,
+} from "@applicaster/zapp-react-native-utils/appUtils/orientationHelper";
+import {
+  useCurrentScreenData,
+  useDimensions,
+  useRoute,
+} from "@applicaster/zapp-react-native-utils/reactHooks";
+import { useMemo, useEffect, useState } from "react";
+
+export const useWaitForValidOrientation = () => {
+  const {
+    width: screenWidth,
+    height,
+    deviceInfo,
+  } = useDimensions("screen", {
+    fullDimensions: true,
+    updateForInactiveScreens: false,
+  });
+
+  const currentScreenData = useCurrentScreenData();
+
+  const { screenData } = useRoute();
+
+  const [readyState, setReadyState] = useState(false);
+
+  const isTablet = deviceInfo?.isTablet;
+
+  const { appData } = usePickFromState(["appData"]);
+  const isTabletPortrait = appData?.isTabletPortrait;
+
+  const layoutData = useMemo(
+    () => ({ isTablet, isTabletPortrait, width: screenWidth, height }),
+    [isTablet, isTabletPortrait, screenWidth, height]
+  );
+
+  const targetScreenData =
+    currentScreenData || (screenData as any)?.targetScreen || screenData;
+
+  const orientation = useGetScreenOrientation(targetScreenData);
+
+  const isReadyForDisplay = isOrientationCompatible({
+    orientation,
+    layoutData,
+  });
+
+  useEffect(() => {
+    if (isReadyForDisplay && !readyState) {
+      setReadyState(true);
+    }
+  }, [readyState, orientation, layoutData]);
+
+  return readyState;
+};