@applicaster/zapp-react-native-ui-components 13.0.0-alpha.7122212380 → 13.0.0-alpha.7196055925

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

@@ -17,7 +17,138 @@ exports[`componentsMap renders renders components map correctly 1`] = `
     }
   >
     <RCTScrollView
-      ListFooterComponent={[Function]}
+      ListFooterComponent={
+        <Memo(RiverFooterComponent)
+          flatListHeight={null}
+          loadingState={
+            BehaviorSubject {
+              "_isScalar": false,
+              "_value": {
+                "done": false,
+                "index": -1,
+                "waitForAllComponents": false,
+              },
+              "closed": false,
+              "hasError": false,
+              "isStopped": false,
+              "observers": [
+                Subscriber {
+                  "_parentOrParents": null,
+                  "_subscriptions": [
+                    SubjectSubscription {
+                      "_parentOrParents": [Circular],
+                      "_subscriptions": null,
+                      "closed": false,
+                      "subject": [Circular],
+                      "subscriber": [Circular],
+                    },
+                  ],
+                  "closed": false,
+                  "destination": SafeSubscriber {
+                    "_complete": undefined,
+                    "_context": [Circular],
+                    "_error": undefined,
+                    "_next": [Function],
+                    "_parentOrParents": null,
+                    "_parentSubscriber": [Circular],
+                    "_subscriptions": null,
+                    "closed": false,
+                    "destination": {
+                      "closed": true,
+                      "complete": [Function],
+                      "error": [Function],
+                      "next": [Function],
+                    },
+                    "isStopped": false,
+                    "syncErrorThrowable": false,
+                    "syncErrorThrown": false,
+                    "syncErrorValue": null,
+                  },
+                  "isStopped": false,
+                  "syncErrorThrowable": true,
+                  "syncErrorThrown": false,
+                  "syncErrorValue": null,
+                },
+                Subscriber {
+                  "_parentOrParents": null,
+                  "_subscriptions": [
+                    SubjectSubscription {
+                      "_parentOrParents": [Circular],
+                      "_subscriptions": null,
+                      "closed": false,
+                      "subject": [Circular],
+                      "subscriber": [Circular],
+                    },
+                  ],
+                  "closed": false,
+                  "destination": SafeSubscriber {
+                    "_complete": undefined,
+                    "_context": [Circular],
+                    "_error": undefined,
+                    "_next": [Function],
+                    "_parentOrParents": null,
+                    "_parentSubscriber": [Circular],
+                    "_subscriptions": null,
+                    "closed": false,
+                    "destination": {
+                      "closed": true,
+                      "complete": [Function],
+                      "error": [Function],
+                      "next": [Function],
+                    },
+                    "isStopped": false,
+                    "syncErrorThrowable": false,
+                    "syncErrorThrown": false,
+                    "syncErrorValue": null,
+                  },
+                  "isStopped": false,
+                  "syncErrorThrowable": true,
+                  "syncErrorThrown": false,
+                  "syncErrorValue": null,
+                },
+                Subscriber {
+                  "_parentOrParents": null,
+                  "_subscriptions": [
+                    SubjectSubscription {
+                      "_parentOrParents": [Circular],
+                      "_subscriptions": null,
+                      "closed": false,
+                      "subject": [Circular],
+                      "subscriber": [Circular],
+                    },
+                  ],
+                  "closed": false,
+                  "destination": SafeSubscriber {
+                    "_complete": undefined,
+                    "_context": [Circular],
+                    "_error": undefined,
+                    "_next": [Function],
+                    "_parentOrParents": null,
+                    "_parentSubscriber": [Circular],
+                    "_subscriptions": null,
+                    "closed": false,
+                    "destination": {
+                      "closed": true,
+                      "complete": [Function],
+                      "error": [Function],
+                      "next": [Function],
+                    },
+                    "isStopped": false,
+                    "syncErrorThrowable": false,
+                    "syncErrorThrown": false,
+                    "syncErrorValue": null,
+                  },
+                  "isStopped": false,
+                  "syncErrorThrowable": true,
+                  "syncErrorThrown": false,
+                  "syncErrorValue": null,
+                },
+              ],
+              "thrownError": null,
+            }
+          }
+        />
+      }
       contentContainerStyle={
         {
           "paddingBottom": undefined,
@@ -80,22 +211,14 @@ exports[`componentsMap renders renders components map correctly 1`] = `
           style={null}
         >
           <View
+            onLayout={[Function]}
             style={
               {
-                "display": "flex",
+                "flex": 1,
               }
             }
           >
-            <View
-              onLayout={[Function]}
-              style={
-                {
-                  "flex": 1,
-                }
-              }
-            >
-              <View />
-            </View>
+            <View />
           </View>
         </View>
         <View
@@ -103,23 +226,13 @@ exports[`componentsMap renders renders components map correctly 1`] = `
           style={null}
         >
           <View
+            onLayout={[Function]}
             style={
               {
-                "display": "none",
+                "flex": 1,
               }
             }
-          >
-            <View
-              onLayout={[Function]}
-              style={
-                {
-                  "flex": 1,
-                }
-              }
-            >
-              <View />
-            </View>
-          </View>
+          />
         </View>
         <View
           onLayout={[Function]}
@@ -127,12 +240,16 @@ exports[`componentsMap renders renders components map correctly 1`] = `
           <View
             renderToHardwareTextureAndroid={true}
             style={
-              {
-                "alignItems": "center",
-                "height": null,
-                "justifyContent": "center",
-                "width": "100%",
-              }
+              [
+                {
+                  "alignItems": "center",
+                  "justifyContent": "center",
+                  "width": "100%",
+                },
+                {
+                  "height": null,
+                },
+              ]
             }
           >
             <ActivityIndicator

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";
 
@@ -183,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/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/Transitioner/Scene.tsx

@@ -1,4 +1,5 @@
 import React from "react";
+import { equals } from "ramda";
 import { Animated, ViewProps, ViewStyle } from "react-native";
 import { useSafeAreaFrame } from "react-native-safe-area-context";
 
@@ -8,6 +9,11 @@ import { PathnameContext } from "../../Contexts/PathnameContext";
 import { ScreenDataContext } from "../../Contexts/ScreenDataContext";
 import { ScreenContextProvider } from "../../Contexts/ScreenContext";
 
+const fullWidthDimensions = {
+  height: "100%",
+  width: "100%",
+};
+
 type Props = {
   children: any;
   style: any;
@@ -20,6 +26,47 @@ type Props = {
   screenData: NavigationScreenData;
 };
 
+export function CurrentScreenContextProvider({
+  children,
+  ...props
+}: {
+  children: any;
+  pathname: string;
+  isActive: boolean;
+  screenData: NavigationScreenData;
+}) {
+  const { pathname, isActive = false, screenData } = props;
+
+  const [initialScreenData, setInitialScreenData] = React.useState(screenData);
+
+  React.useLayoutEffect(() => {
+    const screenDataChanged = !equals(initialScreenData, screenData);
+
+    if (isActive && screenDataChanged) {
+      setInitialScreenData(screenData);
+    }
+  }, [initialScreenData, screenData, isActive]);
+
+  return (
+    <ScreenDataContext.Provider value={initialScreenData}>
+      <PathnameContext.Provider value={pathname}>
+        <ScreenContextProvider pathname={pathname}>
+          {children}
+        </ScreenContextProvider>
+      </PathnameContext.Provider>
+    </ScreenDataContext.Provider>
+  );
+}
+
+const withCurrentScreenContext = (Component) =>
+  function SceneComponent(props: Props) {
+    return (
+      <CurrentScreenContextProvider {...props}>
+        <Component {...props} />
+      </CurrentScreenContextProvider>
+    );
+  };
+
 /**
  * Animated View container for any purpose.
  * Renders given children with given style object.
@@ -32,53 +79,35 @@ type Props = {
  * @param contentStyle
  * @param screenUniqueId
  */
-export function Scene({
+function SceneComponent({
   children,
   style,
   pointerEvents = "auto",
   overlayStyle,
   animating,
   contentStyle,
-  pathname,
   isActive = false,
   screenData,
 }: Props) {
-  const [initialScreenData, setInitialScreenData] = React.useState(screenData);
-
   useScreenOrientationHandler({
     screenData,
     isActive,
   });
 
-  React.useLayoutEffect(() => {
-    if (isActive) {
-      setInitialScreenData(screenData);
-    }
-  }, [screenData, isActive]);
-
   const frame = useSafeAreaFrame();
   const isAnimating = animating && overlayStyle;
 
-  const dimensions = isAnimating
-    ? {
-        width: "100%",
-        height: "100%",
-      }
-    : frame;
+  const dimensions = isAnimating ? fullWidthDimensions : frame;
 
   return (
     <Animated.View
       pointerEvents={pointerEvents}
       style={[style, contentStyle, dimensions]}
     >
-      <ScreenDataContext.Provider value={initialScreenData}>
-        <PathnameContext.Provider value={pathname}>
-          <ScreenContextProvider pathname={pathname}>
-            {children}
-          </ScreenContextProvider>
-        </PathnameContext.Provider>
-      </ScreenDataContext.Provider>
+      {children}
       {isAnimating && <Animated.View style={overlayStyle} />}
     </Animated.View>
   );
 }
+
+export const Scene = withCurrentScreenContext(SceneComponent);

package/Components/Transitioner/__tests__/__snapshots__/Scene.test.js.snap

@@ -1,63 +1,79 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<Scene /> renders correctly 1`] = `
-<ForwardRef(AnimatedComponentWrapper)
-  pointerEvents="auto"
+<CurrentScreenContextProvider
+  contentStyle={
+    {
+      "paddingBottom": 49,
+    }
+  }
+  overlayStyle={
+    {
+      "opacity": 1,
+    }
+  }
   style={
-    [
-      {
-        "flex": 1,
-      },
+    {
+      "flex": 1,
+    }
+  }
+>
+  <SceneComponent
+    contentStyle={
       {
         "paddingBottom": 49,
-      },
+      }
+    }
+    overlayStyle={
       {
-        "fontScale": 2,
-        "height": 1334,
-        "scale": 2,
-        "statusBarHeight": null,
-        "width": 750,
-      },
-    ]
-  }
->
-  <ContextProvider>
-    <ContextProvider>
-      <ScreenContextProvider />
-    </ContextProvider>
-  </ContextProvider>
-</ForwardRef(AnimatedComponentWrapper)>
+        "opacity": 1,
+      }
+    }
+    style={
+      {
+        "flex": 1,
+      }
+    }
+  />
+</CurrentScreenContextProvider>
 `;
 
 exports[`<Scene /> renders the overlay while animating 1`] = `
-<ForwardRef(AnimatedComponentWrapper)
-  pointerEvents="auto"
+<CurrentScreenContextProvider
+  animating={true}
+  contentStyle={
+    {
+      "paddingBottom": 49,
+    }
+  }
+  overlayStyle={
+    {
+      "opacity": 1,
+    }
+  }
   style={
-    [
-      {
-        "flex": 1,
-      },
+    {
+      "flex": 1,
+    }
+  }
+>
+  <SceneComponent
+    animating={true}
+    contentStyle={
       {
         "paddingBottom": 49,
-      },
+      }
+    }
+    overlayStyle={
       {
-        "height": "100%",
-        "width": "100%",
-      },
-    ]
-  }
->
-  <ContextProvider>
-    <ContextProvider>
-      <ScreenContextProvider />
-    </ContextProvider>
-  </ContextProvider>
-  <ForwardRef(AnimatedComponentWrapper)
+        "opacity": 1,
+      }
+    }
     style={
       {
-        "opacity": 1,
+        "flex": 1,
       }
     }
   />
-</ForwardRef(AnimatedComponentWrapper)>
+</CurrentScreenContextProvider>
 `;

package/Components/Transitioner/__tests__/__snapshots__/transitioner.test.js.snap

@@ -9,7 +9,7 @@ exports[`<TransitionerComponent /> renders correctly 1`] = `
     }
   }
 >
-  <Scene
+  <SceneComponent
     isActive={true}
     screenUniqueId="mocked-uuid"
     style={{}}
@@ -23,6 +23,6 @@ exports[`<TransitionerComponent /> renders correctly 1`] = `
         children
       </Text>
     </View>
-  </Scene>
+  </SceneComponent>
 </View>
 `;

package/Components/Transitioner/index.js

@@ -1,5 +1,4 @@
 import * as React from "react";
-import { useWindowDimensions } from "react-native";
 import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
 import { useDimensions } from "@applicaster/zapp-react-native-utils/reactHooks/layout";
 import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
@@ -7,10 +6,15 @@ import { TransitionerComponent } from "./Transitioner";
 
 export const Transitioner = (props) => {
   const navigator = useNavigation();
-  const { height, width } = useWindowDimensions();
 
-  const dimensions = useDimensions("window", { deviceInfo: true });
-  const isTablet = dimensions?.deviceInfo?.isTablet;
+  const {
+    width,
+    height,
+    deviceInfo: { isTablet },
+  } = useDimensions("window", {
+    updateForInactiveScreens: false,
+    deviceInfo: true,
+  });
 
   const { appData } = usePickFromState(["appData"]);
   const isTabletPortrait = appData?.isTabletPortrait;