@applicaster/zapp-react-native-ui-components 12.0.0-rc.5 → 12.0.0-rc.50

package/Components/VideoModal/utils.ts

@@ -23,13 +23,13 @@ export const useConfiguration = () => {
   const targetScreenConfiguration = rivers?.[targetScreenId];
 
   const pluginConfiguration =
-    pluginConfigurations[targetScreenConfiguration.type].configuration_json;
+    pluginConfigurations[targetScreenConfiguration?.type]?.configuration_json;
 
   const playerPluginConfig = playerManager.getPluginConfiguration();
 
   const config = R.mergeRight(playerPluginConfig, {
-    ...targetScreenConfiguration.general,
-    ...targetScreenConfiguration.styles,
+    ...targetScreenConfiguration?.general,
+    ...targetScreenConfiguration?.styles,
     ...pluginConfiguration,
   });
 

package/Components/Viewport/ViewportAware/__tests__/viewportAware.test.js

@@ -1,35 +1,38 @@
 /* eslint-disable react/prop-types */
 
-jest.mock("react-native", () => {
-  const { ScrollView } = jest.requireActual("react-native");
+import * as React from "react";
+
+import { shallow } from "enzyme";
+import { create, act } from "react-test-renderer";
+import { shallowToJson } from "enzyme-to-json";
+
+import { ViewportEvents } from "../../ViewportEvents";
+
+jest.useFakeTimers();
 
+jest.mock("react-native/Libraries/ReactNative/UIManager", () => {
   return {
-    ScrollView,
-    UIManager: {
-      measureLayout: jest.fn((handle, parent, error, success) => {
-        success(100, 100, 400, 400);
-      }),
-    },
-    findNodeHandle: jest.fn(() => 1234),
-    Animated: {
-      timing: jest.fn(() => ({ start: jest.fn() })),
+    ...jest.requireActual("react-native/Libraries/ReactNative/NativeUIManager"),
+    measureLayout: (handle, parent, error, success) => {
+      success(100, 100, 400, 400);
     },
   };
 });
 
-import * as React from "react";
+jest.mock("react-native/Libraries/Renderer/shims/ReactNative", () => ({
+  ...jest.requireActual("react-native/Libraries/Renderer/shims/ReactNative"),
+  findNodeHandle: () => 1234,
+}));
 
-import { shallow } from "enzyme";
-import TestRenderer from "react-test-renderer";
-import { act } from "@testing-library/react-hooks";
-import { shallowToJson } from "enzyme-to-json";
+const ReactNative = require("react-native");
 
-import { ViewportEvents } from "../../ViewportEvents";
+const { Animated, ScrollView } = ReactNative;
+
+Animated.timing = jest.fn(() => ({ start: jest.fn() }));
 
 const viewportEventsManager = new ViewportEvents(true);
 
-const { ScrollView } = require("react-native");
-const { ViewportAware } = require("../index");
+const { ViewportAware } = require("../");
 const { ViewportTracker } = require("../../ViewportTracker");
 
 const TestComponent = (props) => {
@@ -116,7 +119,7 @@ describe("<ViewportAware />", () => {
   });
 
   it("invokes the onViewportEnter function when entering the viewport", () => {
-    const wrapper = TestRenderer.create(
+    const wrapper = create(
       getWrapper(() => (
         <TestComponent
           preTriggerRatio={0.1}
@@ -134,6 +137,8 @@ describe("<ViewportAware />", () => {
         width: 1920,
         height: 1080,
       });
+
+      jest.runAllTimers();
     });
 
     expect(wrapper.toJSON()).toMatchSnapshot();
@@ -151,7 +156,7 @@ describe("<ViewportAware />", () => {
   });
 
   it("invokes the onViewportLeave function when leaving the viewport", () => {
-    const wrapper = TestRenderer.create(
+    const wrapper = create(
       getWrapper(() => (
         <TestComponent
           preTriggerRatio={0.1}

package/Components/Viewport/ViewportTracker/__tests__/viewportTracker.test.js

@@ -5,11 +5,10 @@ import { ViewportEvents } from "../../ViewportEvents";
 
 const TestComponent = () => <ScrollView />;
 
-jest.mock("react-native", () => {
-  return {
-    findNodeHandle: jest.fn(() => 1234),
-  };
-});
+jest.mock("react-native/Libraries/Renderer/shims/ReactNative", () => ({
+  ...jest.requireActual("react-native/Libraries/Renderer/shims/ReactNative"),
+  findNodeHandle: () => 1234,
+}));
 
 const viewportEventsManager = new ViewportEvents(true);
 

package/Components/ZappUIComponent/index.tsx

@@ -10,7 +10,7 @@ import {
 
 import { Placeholder } from "./Placeholder";
 import { useInitialLoading } from "./hooks";
-import { FocusableContext } from "../Focusable/index.android";
+import { useFocusable } from "../Focusable/index.android";
 
 type ReactComponent = React.ComponentType<any>;
 
@@ -26,13 +26,23 @@ type ZappUIComponentType = {
   options?: Options;
 };
 
-const renderComponent = (Component: ReactComponent | undefined, props) => {
-  if (Component) {
-    const { component, parent } = props;
+type RenderComponentProps = any;
+
+const RenderComponent = (
+  Component: ReactComponent | undefined,
+  args: RenderComponentProps
+) => {
+  const { component, parent } = args;
 
+  const contextValue = React.useMemo(
+    () => ({ ...component, parent }),
+    [component, parent]
+  );
+
+  if (Component) {
     return (
-      <UIComponentContext.Provider value={{ ...component, parent }}>
-        <Component {...props} />
+      <UIComponentContext.Provider value={contextValue}>
+        <Component {...args} />
       </UIComponentContext.Provider>
     );
   }
@@ -117,7 +127,7 @@ New signature: {Component, ErrorComponent, LoadingComponent, options}`
       props;
 
     const parent = useUIComponentContext();
-    const { setIsFocusable } = React.useContext(FocusableContext) || {};
+    const { setIsFocusable } = useFocusable();
 
     const isLoading = toBooleanWithDefaultFalse(zappPipesData?.loading);
     const isInitialLoading = useInitialLoading(isLoading);
@@ -154,11 +164,11 @@ New signature: {Component, ErrorComponent, LoadingComponent, options}`
     }, [props.component?.rules?.component_cells_focusable]);
 
     if (isDataSourceEmpty(props) && allowsEmptyDataSource) {
-      return renderComponent(Component, componentProps);
+      return RenderComponent(Component, componentProps);
     }
 
-    if (isLoading && !zappPipesData.data && isInitialLoading) {
-      return renderComponent(LoadingComponent || Placeholder, componentProps);
+    if (isLoading && !zappPipesData?.data && isInitialLoading) {
+      return RenderComponent(LoadingComponent || Placeholder, componentProps);
     }
 
     if (zappPipesData?.error) {
@@ -167,9 +177,9 @@ New signature: {Component, ErrorComponent, LoadingComponent, options}`
         index: componentIndex,
       });
 
-      return renderComponent(ErrorComponent, componentProps);
+      return RenderComponent(ErrorComponent, componentProps);
     }
 
-    return renderComponent(Component, componentProps);
+    return RenderComponent(Component, componentProps);
   };
 }

package/Components/index.js

@@ -4,6 +4,8 @@ export { River } from "./River";
 
 export { PlayerContainer } from "./PlayerContainer";
 
+export { ModalComponent } from "./ModalComponent";
+
 export { ContentScreen } from "./ContentScreen";
 
 export { TextInputTv } from "./TextInputTv";

package/Contexts/ScreenContext/index.tsx

@@ -1,13 +1,12 @@
 import React, { createContext, ReactNode, useMemo, useState } from "react";
-import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
 import {
   useCurrentScreenData,
   useNavigation,
   useRoute,
+  isNavBarVisible,
 } from "@applicaster/zapp-react-native-utils/reactHooks";
 import { useModalNavigationContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ModalNavigationContext";
 import { useNestedNavigationContext } from "@applicaster/zapp-react-native-ui-components/Contexts/NestedNavigationContext";
-import { isNavBarVisible } from "../../Components/Screen/navigationHandler";
 
 type ScreenContextType = {
   navBar: {
@@ -42,8 +41,6 @@ export function ScreenContextProvider({
 }) {
   const { data, modalData, videoModalState, canGoBack } = useNavigation();
 
-  const { rivers: _rivers } = usePickFromState(["rivers", "plugins"]);
-
   // There are 4 route scenarios
   // For regular screens take date from navigator stack.
   // is path is model grab screenData from modal state

package/Decorators/ComponentsMapWrapper/withComponentsMapProvider.tsx

@@ -12,11 +12,16 @@ export function withComponentsMapProvider(Component: React.ComponentType<any>) {
     };
 
     const setComponentHeightById = (id: string | number, height: number) => {
-      componentsHeightMapRef.current = { ...componentsHeightMapRef.current, [id]: height };
+      componentsHeightMapRef.current = {
+        ...componentsHeightMapRef.current,
+        [id]: height,
+      };
     };
 
     return (
-      <ComponentsMapProvider {...{ setComponentHeightById, getComponentHeightById }}>
+      <ComponentsMapProvider
+        {...{ setComponentHeightById, getComponentHeightById }}
+      >
         <Component {...props} />
       </ComponentsMapProvider>
     );

package/Decorators/RiverResolver/index.tsx

@@ -1,9 +1,5 @@
 import * as React from "react";
 
-import type {
-  ZappComponent,
-  ZappRivers,
-} from "@applicaster/zapp-react-native-flow-types";
 import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
 import { isTV } from "@applicaster/zapp-react-native-utils/reactUtils";
 import { usePathname } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";

package/Decorators/index.tsx

@@ -1,9 +1,5 @@
 import { zappPipesDataConnector } from "./ZappPipesDataConnector";
 import * as R from "ramda";
-import type {
-  ZappComponent,
-  ZappDecorator,
-} from "@applicaster/zapp-react-native-flow-types";
 
 import { withNavigator } from "./Navigator";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "12.0.0-rc.5",
+  "version": "12.0.0-rc.50",
   "description": "Applicaster Zapp React Native ui components for the Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -29,16 +29,15 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "devDependencies": {
-    "@applicaster/zapp-react-native-flow-types": "1.5.0",
     "@types/react": "17.0.2",
     "@types/react-native": "0.69.6",
     "redux-mock-store": "^1.5.3"
   },
   "dependencies": {
-    "@applicaster/applicaster-types": "12.0.0-rc.5",
-    "@applicaster/zapp-react-native-bridge": "12.0.0-rc.5",
-    "@applicaster/zapp-react-native-redux": "12.0.0-rc.5",
-    "@applicaster/zapp-react-native-utils": "12.0.0-rc.5",
+    "@applicaster/applicaster-types": "12.0.0-rc.50",
+    "@applicaster/zapp-react-native-bridge": "12.0.0-rc.50",
+    "@applicaster/zapp-react-native-redux": "12.0.0-rc.50",
+    "@applicaster/zapp-react-native-utils": "12.0.0-rc.50",
     "promise": "^8.3.0",
     "react-router-native": "^5.1.2",
     "url": "^0.11.0",

package/Components/VideoModal/hooks/usePosition.ts

@@ -1,50 +0,0 @@
-import {
-  useNavigation,
-  useNavigationType,
-  MenuTypes,
-  useGetBottomTabBarHeight,
-} from "@applicaster/zapp-react-native-utils/reactHooks";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { isMenuVisible } from "@applicaster/zapp-react-native-ui-components/Components/Screen/navigationHandler";
-
-import { useConfiguration } from "../utils";
-
-type Option<T> = T | undefined;
-
-type Return = {
-  top: Option<number>;
-  height: Option<number>;
-  bottom: Option<number>;
-};
-
-export const usePosition = (): Return => {
-  const { minimised_height: minimisedHeight } = useConfiguration();
-  const insets = useSafeAreaInsets();
-  const bottomTabBarHeight = useGetBottomTabBarHeight();
-
-  const {
-    videoModalState: { mode },
-    currentRoute,
-    screenData,
-  } = useNavigation();
-
-  const docked = mode === "MINIMIZED";
-
-  const navType = useNavigationType();
-  const isBottomBarNavigation = navType === MenuTypes.bottomTabBar;
-
-  const minimisedMarginBottom =
-    isMenuVisible(currentRoute, screenData) && isBottomBarNavigation
-      ? bottomTabBarHeight
-      : insets.bottom;
-
-  if (docked) {
-    return {
-      top: undefined,
-      height: minimisedHeight,
-      bottom: minimisedMarginBottom,
-    };
-  }
-
-  return { top: 0, height: undefined, bottom: 0 };
-};