@applicaster/zapp-react-native-ui-components 13.0.0-alpha.1102149799 → 13.0.0-alpha.1124981321

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

@@ -75,28 +75,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 +160,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();
 

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;
+};

package/Components/Screen/index.tsx

@@ -2,10 +2,6 @@
 import React from "react";
 import { View } from "react-native";
 import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
-import {
-  isOrientationCompatible,
-  useGetScreenOrientation,
-} from "@applicaster/zapp-react-native-utils/appUtils/orientationHelper";
 
 import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
 import { getComponentModule } from "@applicaster/zapp-react-native-utils/pluginUtils";
@@ -15,7 +11,6 @@ import {
   getScreenId,
 } from "@applicaster/zapp-react-native-utils/navigationUtils";
 import {
-  useDimensions,
   useRoute,
   useCurrentScreenData,
   useNavbarState,
@@ -27,6 +22,7 @@ import { getNavigationPluginModule } from "@applicaster/zapp-react-native-app/Ap
 import { RouteManager } from "../RouteManager";
 import { useScreenConfiguration } from "../River/useScreenConfiguration";
 import { isValidColor } from "./utils";
+import { useWaitForValidOrientation } from "./hooks";
 
 const screenStyles = {
   flex: 1,
@@ -50,14 +46,6 @@ export function Screen(_props: Props) {
   const currentScreenData = useCurrentScreenData();
   const { backgroundColor } = useScreenConfiguration(currentScreenData.id);
 
-  const {
-    width: screenWidth,
-    height,
-    deviceInfo,
-  } = useDimensions("screen", {
-    fullDimensions: true,
-  });
-
   const { screenData, pathname } = useRoute();
 
   const currentRiver = useScreenData(
@@ -66,13 +54,6 @@ export function Screen(_props: Props) {
 
   const { title } = useNavbarState();
 
-  const isTablet = deviceInfo?.isTablet;
-
-  const { appData } = usePickFromState(["appData"]);
-  const isTabletPortrait = appData?.isTabletPortrait;
-
-  const layoutData = { isTablet, isTabletPortrait, width: screenWidth, height };
-
   const hasMenu = shouldNavBarDisplayMenu(currentRiver, plugins);
 
   const navBarProps = React.useMemo<MobileNavBarPluginProps | null>(
@@ -108,30 +89,23 @@ export function Screen(_props: Props) {
     [theme.app_background_color, backgroundColor]
   );
 
-  const targetScreenData =
-    currentScreenData || (screenData as any)?.targetScreen || screenData;
-
-  const orientation = useGetScreenOrientation(targetScreenData);
+  // Set ready state when screen is rotated to desired orientation
+  const isReady = useWaitForValidOrientation();
 
   // We prevent rendering of the screen until UI is actually rotated to screen desired orientation.
   // This saves unnecessary re-renders and user will not see distorted aspect screen.
-  if (
-    !isOrientationCompatible({
-      orientation,
-      layoutData,
-    })
-  ) {
-    return <View style={style} />;
-  }
-
   return (
     <View style={style}>
-      {navBarProps && <NavBar {...navBarProps} hasMenu={hasMenu} />}
-
-      <OfflineFallbackScreen>
-        {/* @TODO RouteManager doesn't use props, can they be removed ?  */}
-        <RouteManager pathname={pathname} screenData={screenData} />
-      </OfflineFallbackScreen>
+      {isReady ? (
+        <>
+          {navBarProps && <NavBar {...navBarProps} hasMenu={hasMenu} />}
+
+          <OfflineFallbackScreen>
+            {/* @TODO RouteManager doesn't use props, can they be removed ?  */}
+            <RouteManager pathname={pathname} screenData={screenData} />
+          </OfflineFallbackScreen>
+        </>
+      ) : null}
     </View>
   );
 }

package/Components/ScreenResolver/__tests__/__snapshots__/screenResolver.test.js.snap

@@ -2,7 +2,7 @@
 
 exports[`<ScreenResolver /> renders correctly 1`] = `
 <mockConstructor
-  screenData={Object {}}
+  screenData={{}}
   screenId="1234"
   screenType="screen_type_1"
 />
@@ -11,7 +11,7 @@ exports[`<ScreenResolver /> renders correctly 1`] = `
 exports[`<ScreenResolver /> wraps the player with the playerController component when the screenType is playable 1`] = `
 <HandlePlayable
   isModal={false}
-  item={Object {}}
+  item={{}}
   mode="FULLSCREEN"
 />
 `;

package/Components/ScreenResolver/__tests__/screenResolver.test.js

@@ -2,42 +2,39 @@ import React from "react";
 import { View } from "react-native";
 import { shallow } from "enzyme";
 import { shallowToJson } from "enzyme-to-json";
-import { connect as realConnect } from "react-redux";
-
 const pluginConfiguration = { foo: "bar" };
 
 const ScreenType1 = jest.fn(() => <View />);
 const ScreenType2 = jest.fn(() => <View />);
+const PlayerController = jest.fn(() => <View />);
 
-const ScreenType3 = {
+const mockScreenType3 = {
   module: jest.fn(() => <View />),
   name: "ScreenType3",
   type: "screen_type_3",
   configuration: pluginConfiguration,
 };
 
-const ScreenType4 = {
+const mockScreenType4 = {
   module: jest.fn(() => <View />),
   name: "ScreenType4",
   type: "screen_type_4",
 };
 
-const PlayerController = jest.fn(() => <View />);
-
-const playerPlugin = {
+const mockPlayerPlugin = {
   module: jest.fn(() => <View />),
   name: "playerPlugin",
   type: "player",
 };
 
-const ScreenPlugin = {
+const mockScreenPlugin = {
   module: jest.fn(() => <View />),
   type: "general",
   name: "Screen plugin",
   identifier: "screen-plugin",
 };
 
-const PluginWithConfig = {
+const mockPluginWithConfig = {
   module: jest.fn(() => <View />),
   type: "general",
   name: "Plugin with config",
@@ -47,15 +44,7 @@ const PluginWithConfig = {
 
 const components = { ScreenType1, ScreenType2, PlayerController };
 
-const plugins = {
-  ScreenType3,
-  ScreenType4,
-  playerPlugin,
-  ScreenPlugin,
-  PluginWithConfig,
-};
-
-const withAnalytics = {
+const mockWithAnalytics = {
   sendOnClickEvent: jest.fn(),
   sendMenuClickEvent: jest.fn(),
   sendMenuToggleEvent: jest.fn(),
@@ -66,24 +55,39 @@ const withAnalytics = {
   sendScreenEvent: jest.fn(),
 };
 
+const mockUsePickFromState = jest.fn(() => {
+  return {
+    components,
+    plugins: {
+      ScreenType3: mockScreenType3,
+      ScreenType4: mockScreenType4,
+      playerPlugin: mockPlayerPlugin,
+      ScreenPlugin: mockScreenPlugin,
+      PluginWithConfig: mockPluginWithConfig,
+    },
+  };
+});
+
 jest.mock("@applicaster/zapp-react-native-utils/analyticsUtils", () => ({
-  useAnalytics: jest.fn().mockReturnValue(withAnalytics),
+  useAnalytics: jest.fn().mockReturnValue(mockWithAnalytics),
 }));
 
 jest.mock("@applicaster/zapp-react-native-redux/hooks", () => ({
-  usePickFromState: jest.fn(() => ({ components, plugins })),
+  usePickFromState: mockUsePickFromState,
 }));
 
+const mockUseScreenAnalytics = jest.fn();
+
 jest.mock(
   "@applicaster/zapp-react-native-utils/analyticsUtils/helpers/hooks",
   () => ({
-    useScreenAnalytics: jest.fn(() => {}),
+    useScreenAnalytics: mockUseScreenAnalytics,
   })
 );
 
 jest.mock("react-redux", () => ({
+  ...jest.requireActual("react-redux"),
   useDispatch: jest.fn(() => () => {}),
-  connect: realConnect,
 }));
 
 jest.mock("@applicaster/zapp-react-native-utils/reactHooks", () => ({
@@ -118,13 +122,13 @@ describe("<ScreenResolver />", () => {
   it("picks screen from plugins if it exists", () => {
     const wrapper = getWrapper("A1234", "screen_type_3", {});
 
-    expect(wrapper.find(ScreenType3.module)).toHaveProperty("length", 1);
+    expect(wrapper.find(mockScreenType3.module)).toHaveProperty("length", 1);
   });
 
   it("picks the screen from its identifier if it exists", () => {
     const wrapper = getWrapper("A1234", "screen-plugin", {});
 
-    expect(wrapper.find(ScreenPlugin.module)).toHaveProperty("length", 1);
+    expect(wrapper.find(mockScreenPlugin.module)).toHaveProperty("length", 1);
   });
 
   it("picks screen from components if it doesn't exist in plugins", () => {
@@ -136,7 +140,7 @@ describe("<ScreenResolver />", () => {
   it("renders the screen and passes screenId & locationState as props", () => {
     const wrapper = getWrapper("A1234", "screen_type_3", "foo");
 
-    const screenWrapper = wrapper.find(ScreenType3.module);
+    const screenWrapper = wrapper.find(mockScreenType3.module);
 
     expect(screenWrapper.prop("screenId")).toEqual("A1234");
     expect(screenWrapper.prop("screenData")).toEqual("foo");
@@ -151,7 +155,7 @@ describe("<ScreenResolver />", () => {
   it("injects the plugin configuration if it exists", () => {
     const wrapper = getWrapper("A1234", "plugin-with-config", {});
 
-    expect(wrapper.find(PluginWithConfig.module).props()).toHaveProperty(
+    expect(wrapper.find(mockPluginWithConfig.module).props()).toHaveProperty(
       "configuration",
       expect.objectContaining(pluginConfiguration)
     );
@@ -160,7 +164,7 @@ describe("<ScreenResolver />", () => {
   it("injects the plugin configuration if it exists, even when plugin is resolved by type", () => {
     const wrapper = getWrapper("A1234", "screen_type_3", {});
 
-    expect(wrapper.find(ScreenType3.module).props()).toHaveProperty(
+    expect(wrapper.find(mockScreenType3.module).props()).toHaveProperty(
       "configuration",
       expect.objectContaining(pluginConfiguration)
     );

package/Components/Tabs/Tab.tsx

@@ -69,8 +69,8 @@ const getStyles = (configuration, selected, focused) => {
           ? tab_cell_background_color_selected_active
           : tab_cell_background_color_selected_default
         : focused
-        ? tab_cell_background_color_active
-        : tab_cell_background_color_default,
+          ? tab_cell_background_color_active
+          : tab_cell_background_color_default,
       justifyContent: "center",
       alignItems: "center",
       position: "relative",
@@ -85,8 +85,8 @@ const getStyles = (configuration, selected, focused) => {
           ? tab_cell_border_color_active_focused
           : tab_cell_border_color_active
         : focused
-        ? tab_cell_border_color_default_focused
-        : tab_cell_border_color_default,
+          ? tab_cell_border_color_default_focused
+          : tab_cell_border_color_default,
     },
     label: {
       fontFamily: text_label_font_family,
@@ -98,8 +98,8 @@ const getStyles = (configuration, selected, focused) => {
           ? text_label_selected_active_font_color
           : text_label_selected_default_font_color
         : focused
-        ? text_label_active_font_color
-        : text_label_default_font_color,
+          ? text_label_active_font_color
+          : text_label_default_font_color,
     },
     underline: {
       position: "absolute",
@@ -138,6 +138,7 @@ const Tab = ({ title, selected, handleOnPress }: Props, ref: any) => {
 
   return (
     <TouchableWithoutFeedback
+      testID="tab-touchable"
       onPressIn={handleOnPressIn}
       onPressOut={handleOnPressOut}
       onPress={handleOnPress}