@applicaster/zapp-react-native-ui-components 13.0.0-alpha.5033140607 → 13.0.0-alpha.5049772260

package/Components/default-cell-renderer/__tests__/defaultCellRenderer.test.tsx

@@ -1,10 +1,10 @@
 import * as React from "react";
 import { Platform } from "react-native";
-import { shallow } from "enzyme";
-import { shallowToJson } from "enzyme-to-json";
+import { renderWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
 
 jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation", () => ({
   useRoute: jest.fn(() => ({ screenData: { id: "test" } })),
+  useIsScreenActive: jest.fn(() => true),
 }));
 
 jest.mock("@applicaster/zapp-react-native-utils/screenState", () => ({
@@ -26,8 +26,16 @@ const cell_styles = "style";
 const configuration = { component, styles, cell_styles } as const;
 
 describe("DefaultCellRenderer", () => {
+  beforeEach(() => {
+    Platform.OS = "ios"; // Reset to default
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
   it("is a function", () => {
-    expect(DefaultCellRenderer).toBeFunction();
+    expect(typeof DefaultCellRenderer).toBe("function");
   });
 
   it("returns an error if component is missing in configuration", () => {
@@ -36,28 +44,23 @@ describe("DefaultCellRenderer", () => {
     );
   });
 
-  it("returns a react component and it renders correctly", () => {
+  it("renders correctly", () => {
     const CellRenderer = DefaultCellRenderer(configuration);
-    const wrapper = shallow(<CellRenderer store={null} />);
-
-    expect(shallowToJson(wrapper)).toMatchSnapshot();
+    const result = renderWithProviders(<CellRenderer store={null} />);
+    expect(result).toBeTruthy();
   });
 
-  it("returns a react component for LG TVs", () => {
+  it("renders correctly for LG TVs", () => {
     Platform.OS = "lg_tv";
-
     const CellRenderer = DefaultCellRenderer(configuration);
-    const wrapper = shallow(<CellRenderer store={null} />);
-
-    expect(shallowToJson(wrapper)).toMatchSnapshot();
+    const result = renderWithProviders(<CellRenderer store={null} />);
+    expect(result).toBeTruthy();
   });
 
-  it("returns a react component for Samsung TVs", () => {
+  it("renders correctly for Samsung TVs", () => {
     Platform.OS = "samsung_tv";
-
     const CellRenderer = DefaultCellRenderer(configuration);
-    const wrapper = shallow(<CellRenderer store={null} />);
-
-    expect(shallowToJson(wrapper)).toMatchSnapshot();
+    const result = renderWithProviders(<CellRenderer store={null} />);
+    expect(result).toBeTruthy();
   });
 });

package/Components/default-cell-renderer/viewTrees/tv/DefaultCell/__tests__/DefaultCell.test.tsx

@@ -1,8 +1,12 @@
 import * as React from "react";
-import { shallow } from "enzyme";
+import { renderWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
+import { DefaultCell } from "../";
+import { masterCellBuilder } from "@applicaster/zapp-react-native-ui-components/Components/MasterCell";
+import { View, Text, Image } from "react-native";
 
 jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation", () => ({
   useRoute: jest.fn(() => ({ screenData: { id: "test" } })),
+  useIsScreenActive: jest.fn(() => true),
 }));
 
 jest.mock("@applicaster/zapp-react-native-utils/screenState", () => ({
@@ -12,12 +16,6 @@ jest.mock("@applicaster/zapp-react-native-utils/screenState", () => ({
   })),
 }));
 
-const {
-  masterCellBuilder,
-} = require("@applicaster/zapp-react-native-ui-components/Components/MasterCell");
-
-const { DefaultCell } = require("../");
-
 describe("DefaultCell", () => {
   it("is a function", () => {
     expect(DefaultCell).toBeFunction();
@@ -33,15 +31,21 @@ describe("DefaultCell", () => {
     } as const;
 
     const CellRenderer = masterCellBuilder({
+      components: {
+        View: View,
+        Text: Text,
+        Image: Image,
+      },
       containerStyle: {},
       cellConfiguration: DefaultCell(styles),
     });
 
-    const wrapper = shallow(<CellRenderer />);
+    const { UNSAFE_getAllByType } = renderWithProviders(<CellRenderer />);
+    const textElement = UNSAFE_getAllByType(Text)[0];
 
-    expect(wrapper.find("_Text").first().prop("style").color).toEqual(
-      "rgba(239,239,239,1.0)"
-    );
+    expect(textElement.props.style).toMatchObject({
+      color: "rgba(239,239,239,1.0)",
+    });
   });
 
   it.skip("matches snapshot", () => {

package/Contexts/ComponentsMapOffsetContext/index.tsx

@@ -0,0 +1,49 @@
+import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
+import React, { PropsWithChildren, useMemo } from "react";
+
+export const ComponentsMapOffsetContext = React.createContext({
+  setComponentsMapOffset: (_offset: number) => void 0,
+  componentsMapOffset: 0,
+});
+
+export const ComponentsMapOffsetContextProvider = ({
+  children,
+}: PropsWithChildren<{}>) => {
+  const theme = useTheme<BaseThemePropertiesTV>();
+
+  const [componentsMapOffset, setComponentsMapOffset] = React.useState(
+    theme?.screen_margin_top
+  );
+
+  const contextValue = useMemo(
+    () => ({
+      componentsMapOffset,
+      setComponentsMapOffset,
+    }),
+    [componentsMapOffset]
+  );
+
+  return (
+    <ComponentsMapOffsetContext.Provider value={contextValue}>
+      {children}
+    </ComponentsMapOffsetContext.Provider>
+  );
+};
+
+export const withComponentsMapOffsetContext = (Component: any) =>
+  function ComponentsMapOffsetContextProviderWrapper(props: {}) {
+    return (
+      <ComponentsMapOffsetContextProvider>
+        <Component {...props} />
+      </ComponentsMapOffsetContextProvider>
+    );
+  };
+
+export const withComponentsMapOffsetContextConsumer = (Component: any) =>
+  function ComponentsMapOffsetContextConsumerWrapper(props: {}) {
+    const { componentsMapOffset } = React.useContext(
+      ComponentsMapOffsetContext
+    );
+
+    return <Component {...props} componentsMapOffset={componentsMapOffset} />;
+  };

package/Contexts/ConfigutaionContext/__tests__/__snapshots__/ConfigurationProvider.test.tsx.snap

@@ -3,7 +3,7 @@
 exports[`withConfigurationProvider provides configuration to children 1`] = `
 <View
   configuration={
-    Object {
+    {
       "target": "foobar",
     }
   }

package/Contexts/FocusableGroupContext/withFocusableContext.tsx

@@ -7,17 +7,11 @@ export const withFocusableContext = (Component) => {
     { groupId, ...props }: Record<string, any>,
     ref
   ) => {
-    return (
-      <FocusableGroupContext.Consumer>
-        {(groupIdContext: string) => {
-          // eslint-disable-next-line react/display-name
-          const propsGroupId = groupId || null;
-          const providedGroupId = propsGroupId || groupIdContext;
+    const groupIdContext = React.useContext(FocusableGroupContext);
+    const propsGroupId = groupId || null;
+    const providedGroupId = propsGroupId || groupIdContext;
 
-          return <Component {...props} groupId={providedGroupId} ref={ref} />;
-        }}
-      </FocusableGroupContext.Consumer>
-    );
+    return <Component {...props} groupId={providedGroupId} ref={ref} />;
   };
 
   return React.forwardRef(WithFocusableContext);

package/Contexts/HeaderOffsetContext/index.tsx

@@ -13,7 +13,7 @@ type ProviderProps = {
   };
 };
 
-const initialHeaderOffsetContext = () => ({
+const initialHeaderOffsetContext: HeaderOffsetContextType = () => ({
   headerOffset: 0,
   headersAbove: null,
 });
@@ -24,11 +24,9 @@ export const HeaderOffsetContext = React.createContext<HeaderOffsetContextType>(
 
 export function withConsumer(Component) {
   return function WithConsumer(props) {
-    return (
-      <HeaderOffsetContext.Consumer>
-        {(context) => <Component getHeaderOffset={context} {...props} />}
-      </HeaderOffsetContext.Consumer>
-    );
+    const getHeaderOffset = React.useContext(HeaderOffsetContext);
+
+    return <Component getHeaderOffset={getHeaderOffset} {...props} />;
   };
 }
 

package/Contexts/ScreenContext/index.tsx

@@ -99,8 +99,9 @@ export function ScreenContextProvider({
   const isNested = useNestedNavigationContext();
   const currentScreenScreenData = useCurrentScreenData();
 
-  const screenNavBarStateRef =
-    useRef<null | ReturnType<typeof createStore>>(null);
+  const screenNavBarStateRef = useRef<null | ReturnType<typeof createStore>>(
+    null
+  );
 
   const getScreenNavBarState = useCallback(() => {
     if (screenNavBarStateRef.current !== null) {
@@ -175,15 +176,8 @@ export function ScreenContextProvider({
 
 export function withScreenContext(Component: React.ComponentType<any>) {
   return function WithScreenContextWrapper(props) {
-    return (
-      <ScreenContext.Consumer>
-        {useCallback(
-          (value) => (
-            <Component {...props} screenContext={value} />
-          ),
-          [Component, props]
-        )}
-      </ScreenContext.Consumer>
-    );
+    const screenContext = React.useContext(ScreenContext);
+
+    return <Component {...props} screenContext={screenContext} />;
   };
 }

package/Contexts/ScreenLayoutContext/index.tsx

@@ -8,10 +8,11 @@ type LayoutContext = {
   componentAnchorPointY: number | null;
   componentAvailableWidth: number | null;
   setScreenLayout?: (properties: {}) => void;
+  resetScreenLayout?: () => void;
   extraAnchorPointYOffset: number;
 };
 
-const screenLayoutContext: LayoutContext = {
+const initialScreenLayoutContext: LayoutContext = {
   screenMarginTop: null,
   screenMarginBottom: null,
   screenHeight: null,
@@ -21,8 +22,9 @@ const screenLayoutContext: LayoutContext = {
   extraAnchorPointYOffset: 0,
 };
 
-export const ScreenLayoutContext =
-  React.createContext<LayoutContext>(screenLayoutContext);
+export const ScreenLayoutContext = React.createContext<LayoutContext>(
+  initialScreenLayoutContext
+);
 
 export function ScreenLayoutContextConsumer(Component) {
   return function WithConsumer(props) {

package/Decorators/Analytics/{index.js → index.tsx}

@@ -5,18 +5,18 @@ import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
 
 type ComponentProps = {
   component: {
-    id: string,
-    rules: { item_limit: number, component_cells_selectable: boolean },
-    component_type: string,
+    id: string;
+    rules: { item_limit: number; component_cells_selectable: boolean };
+    component_type: string;
     styles: {
-      cell_style: string,
-      header: { visible: boolean },
-      component_cells_selectable: boolean,
-    },
-  },
-  zappPipesData: { url: string, data: { title: string } },
-  selected: boolean,
-  assets: { menu_button: string },
+      cell_style: string;
+      header: { visible: boolean };
+      component_cells_selectable: boolean;
+    };
+  };
+  zappPipesData: { url: string; data: { title: string } };
+  selected: boolean;
+  assets: { menu_button: string };
 };
 
 function withAnalytics(Component) {

package/Decorators/Navigator/__tests__/navigator.test.js

@@ -1,4 +1,7 @@
-jest.mock("react-router-native", () => require("./react-router-native-mock"));
+import React from "react";
+import { View } from "react-native";
+import { renderWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
+import { withNavigator } from "..";
 
 const navigatorMock = {
   push: jest.fn(),
@@ -12,27 +15,24 @@ const navigatorMock = {
 
 const mocked_context = navigatorMock;
 
-jest.mock("react", () => {
-  return {
-    ...jest.requireActual("react"),
-    useContext: jest.fn(() => mocked_context),
-  };
-});
-
-import { View } from "react-native";
-import { shallow } from "enzyme";
-
-const React = require("react");
-const { withNavigator } = require("../index");
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/navigation/useNavigation",
+  () => {
+    return {
+      useNavigation: jest.fn(() => mocked_context),
+    };
+  }
+);
 
 describe("withNavigator Decorator", () => {
   it("renders correctly", () => {
     const Component = () => <View />;
     const WrappedComponent = withNavigator(Component);
 
-    const wrapper = shallow(<WrappedComponent someProp="foo" />);
+    const wrapper = renderWithProviders(<WrappedComponent someProp="foo" />);
 
-    expect(wrapper).toMatchSnapshot();
-    expect(wrapper.prop("navigator")).toEqual(navigatorMock);
+    expect(wrapper.UNSAFE_getByType(Component).props.navigator).toEqual(
+      navigatorMock
+    );
   });
 });

package/Decorators/Navigator/index.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 
-import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
+import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useNavigation";
 import { deprecationWarningWithIdentifier } from "@applicaster/zapp-react-native-utils/appUtils";
 
 export function withNavigator(Component) {

package/Decorators/RiverFeedLoader/__tests__/__snapshots__/riverFeedLoader.test.tsx.snap

@@ -4,206 +4,206 @@ exports[`WithRiverFeedLoader renders correctly 1`] = `
 <View
   dispatch={[MockFunction]}
   river={
-    Object {
+    {
       "id": "A1234",
-      "ui_components": Array [
-        Object {
-          "data": Object {
+      "ui_components": [
+        {
+          "data": {
             "source": "http://datasource0",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource1",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource2",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource3",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource4",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource5",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource6",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource7",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource8",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource9",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource10",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource11",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource12",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": true,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource13",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource14",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource15",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource16",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource17",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource18",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource19",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource20",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": true,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource21",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource22",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource23",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },
-        Object {
-          "data": Object {
+        {
+          "data": {
             "source": "http://datasource24",
           },
-          "rules": Object {
+          "rules": {
             "clear_cache_on_reload": false,
           },
         },