@applicaster/zapp-react-native-ui-components 13.0.0-alpha.9946926334 → 13.0.0-rc.100

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/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/RiverResolver/__tests__/riverResolver.test.tsx

@@ -1,8 +1,8 @@
 import React from "react";
-import { shallow } from "enzyme";
 import { View } from "react-native";
-import { shallowToJson } from "enzyme-to-json";
-import * as usePathnameHooks from "@applicaster/zapp-react-native-utils/reactHooks/navigation/usePathname";
+import { renderWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
+
+import { withRiver } from "../";
 
 const rivers = {
   A123: {
@@ -20,37 +20,31 @@ jest.doMock(
   })
 );
 
-jest.mock(
-  "@applicaster/zapp-react-native-utils/reactHooks/layout/useLayoutVersion",
+jest.doMock(
+  "@applicaster/zapp-react-native-utils/reactHooks/navigation/usePathname",
   () => ({
-    useLayoutVersion: jest.fn(() => true),
+    usePathname: jest.fn(() => "/home"),
   })
 );
 
-jest.spyOn(usePathnameHooks, "usePathname").mockReturnValue("/home");
-
-// mocks useNavigator to return currentRoute: "/home"
-jest.mock("@applicaster/zapp-react-native-utils/reactHooks", () => ({
-  useNavigation: jest.fn(() => ({ currentRoute: "/home" })),
-  useRoute: jest.fn(() => ({ pathname: "/home" })),
-}));
-
-const { withRiver } = require("../index");
-
-const TestComponent = jest.fn(() => <View />);
+const TestComponent = jest.fn((props) => <View {...props} />);
 
 describe("withRiver HoC", () => {
   const WrappedComponent = withRiver(TestComponent);
 
-  const wrapper = shallow(
-    <WrappedComponent screenId="A123" rivers={rivers} otherProp="otherProp" />
+  const wrapper = renderWithProviders(
+    <WrappedComponent
+      testID="test-view"
+      screenId="A123"
+      otherProp="otherProp"
+    />,
+    { rivers: rivers }
   );
 
-  it("renders correctly", () => {
-    expect(shallowToJson(wrapper)).toMatchSnapshot();
-  });
-
   it("populates the river prop", () => {
-    expect(wrapper.find(TestComponent).prop("river")).toEqual(rivers.A123);
+    const targetView = wrapper.getByTestId("test-view");
+
+    expect(targetView.props.river).toEqual(rivers.A123);
+    expect(targetView.props.screenData).toEqual(rivers.A123);
   });
 });

package/Decorators/RiverResolver/index.tsx

@@ -1,8 +1,8 @@
 import * as React from "react";
 
-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";
+import { usePathname } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/usePathname";
+import { useRivers } from "@applicaster/zapp-react-native-utils/reactHooks";
 
 type Props = ZappUIComponentProps & {
   rivers: ZappRivers;
@@ -12,27 +12,25 @@ type Props = ZappUIComponentProps & {
 
 export function withRiver(Component: ZappComponent): ZappComponent {
   const RiverWithData = ({ screenId, ...otherProps }: Props) => {
-    const { rivers } = usePickFromState(["rivers"]);
+    const river = useRivers()?.[screenId];
     const pathname = usePathname();
-    const river = rivers[screenId];
 
     if (!river) {
       return null;
     }
 
-    if (!otherProps.screenData) {
-      otherProps.screenData = river;
-    }
-
     return (
       <Component
         screenId={screenId}
         river={river}
         key={isTV() ? pathname : undefined}
         {...otherProps}
+        screenData={otherProps.screenData || river}
       />
     );
   };
 
+  RiverWithData.displayName = `RiverWithData(${Component.displayName || Component.name})`;
+
   return RiverWithData;
 }

package/Decorators/ZappPipesDataConnector/__tests__/Hero.js

@@ -2,7 +2,7 @@ import React, { useEffect } from "react";
 import { View } from "react-native";
 
 type Props = {
-  onLoadFinished: () => void,
+  onLoadFinished: () => void;
 };
 
 export function Hero(props: Props) {

package/Decorators/ZappPipesDataConnector/__tests__/zappPipesDataConnector.test.js

@@ -1,6 +1,6 @@
 import React from "react";
-import { shallow } from "enzyme";
-import { shallowToJson } from "enzyme-to-json";
+import { renderWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
+
 import * as zappPipesRedux from "@applicaster/zapp-react-native-redux/ZappPipes";
 import configureStore from "redux-mock-store";
 import thunk from "redux-thunk";
@@ -8,6 +8,7 @@ import thunk from "redux-thunk";
 import { zappPipesDataConnector } from "../index";
 
 import { Hero } from "./Hero";
+import { render } from "ejs";
 
 const mockStore = configureStore([thunk]);
 
@@ -20,6 +21,15 @@ const initialState = {
   },
 };
 
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/navigation/useIsScreenActive",
+  () => ({
+    useIsScreenActive: () => ({
+      isScreenActive: true,
+    }),
+  })
+);
+
 const store = mockStore(initialState);
 
 const zappPipesSpy = jest
@@ -31,6 +41,7 @@ const WrappedComponent = zappPipesDataConnector(Hero);
 const componentProp = (data) => ({ data });
 
 // tests need to be re-written due to TS refactor
+// this test has old usage of enzyme API, that's need to be replaced with @testing-library/react-native
 describe.skip("zappPipesDataConnector", () => {
   beforeEach(() => {
     zappPipesSpy.mockClear();
@@ -43,7 +54,7 @@ describe.skip("zappPipesDataConnector", () => {
     it("loads the provided feed url", () => {
       expect(zappPipesDataConnector).toBeFunction();
 
-      const wrapper = shallow(
+      const wrapper = renderWithProviders(
         <WrappedComponent
           component={componentProp(data)}
           feedUrl={feedUrl}
@@ -51,8 +62,7 @@ describe.skip("zappPipesDataConnector", () => {
         />
       ).dive();
 
-      expect(shallowToJson(wrapper)).toMatchSnapshot();
-      expect(wrapper.first().shallow()).toMatchSnapshot();
+      expect(wrapper.toJSON()).toMatchSnapshot();
 
       expect(zappPipesSpy).toHaveBeenCalledWith(feedUrl, {
         clearCache: false,
@@ -71,12 +81,11 @@ describe.skip("zappPipesDataConnector", () => {
     it("is a HoC", () => {
       expect(zappPipesDataConnector).toBeFunction();
 
-      const wrapper = shallow(
+      const wrapper = renderWithProviders(
         <WrappedComponent component={componentProp(data)} store={store} />
       ).dive();
 
-      expect(shallowToJson(wrapper)).toMatchSnapshot();
-      expect(wrapper.first().shallow()).toMatchSnapshot();
+      expect(wrapper.toJSON()).toMatchSnapshot();
 
       expect(zappPipesSpy).toHaveBeenCalledWith(data.source, {
         clearCache: false,
@@ -99,12 +108,11 @@ describe.skip("zappPipesDataConnector", () => {
     it("calls clearCache true and silentRefresh with false", () => {
       expect(zappPipesDataConnector).toBeFunction();
 
-      const wrapper = shallow(
+      const wrapper = renderWithProviders(
         <WrappedComponent component={{ data, rules }} store={store} />
       ).dive();
 
-      expect(shallowToJson(wrapper)).toMatchSnapshot();
-      expect(wrapper.first().shallow()).toMatchSnapshot();
+      expect(wrapper.toJSON()).toMatchSnapshot();
 
       expect(zappPipesSpy).toHaveBeenCalledWith(data.source, {
         clearCache: true,
@@ -123,12 +131,11 @@ describe.skip("zappPipesDataConnector", () => {
     it("is a HoC", () => {
       expect(zappPipesDataConnector).toBeFunction();
 
-      const wrapper = shallow(
+      const wrapper = renderWithProviders(
         <WrappedComponent component={componentProp(data)} store={store} />
       ).dive();
 
-      expect(shallowToJson(wrapper)).toMatchSnapshot();
-      expect(wrapper.first().shallow()).toMatchSnapshot();
+      expect(wrapper.toJSON()).toMatchSnapshot();
 
       expect(zappPipesSpy).toHaveBeenCalledWith(
         "applicaster://fetchData?type=APPLICASTER_COLLECTION&collectionId=1234",
@@ -146,11 +153,11 @@ describe.skip("zappPipesDataConnector", () => {
     it("is a HoC", () => {
       expect(zappPipesDataConnector).toBeFunction();
 
-      const wrapper = shallow(
+      const wrapper = renderWithProviders(
         <WrappedComponent component={componentProp(data)} store={store} />
       ).dive();
 
-      expect(shallowToJson(wrapper)).toMatchSnapshot();
+      expect(wrapper.toJSON()).toMatchSnapshot();
       expect(wrapper.first().shallow()).toMatchSnapshot();
 
       expect(zappPipesSpy).toHaveBeenCalledWith(
@@ -171,11 +178,11 @@ describe.skip("zappPipesDataConnector", () => {
     };
 
     it("calls loadPipesData with favourites option", () => {
-      const wrapper = shallow(
+      const wrapper = renderWithProviders(
         <WrappedComponent component={componentProp(data)} store={store} />
       ).dive();
 
-      expect(shallowToJson(wrapper)).toMatchSnapshot();
+      expect(wrapper.toJSON()).toMatchSnapshot();
       expect(wrapper.first().shallow()).toMatchSnapshot();
 
       expect(zappPipesSpy).toHaveBeenCalledWith("FAVOURITES", {
@@ -188,7 +195,7 @@ describe.skip("zappPipesDataConnector", () => {
 
   describe("getDataSourceUrl", () => {
     it("returns null if data prop is empty", () => {
-      const wrapper = shallow(
+      const wrapper = render(
         <WrappedComponent component={componentProp({})} store={store} />
       ).dive();
 
@@ -199,7 +206,7 @@ describe.skip("zappPipesDataConnector", () => {
     });
 
     it("returns null if data.source is falsy", () => {
-      const wrapper = shallow(
+      const wrapper = renderWithProviders(
         <WrappedComponent
           component={componentProp({ source: null })}
           store={store}
@@ -222,7 +229,7 @@ describe.skip("zappPipesDataConnector", () => {
     it("reloads the app's datasource", () => {
       store.clearActions();
 
-      const wrapper = shallow(
+      const wrapper = renderWithProviders(
         <WrappedComponent component={componentProp(data)} store={store} />
       ).dive();
 
@@ -251,7 +258,7 @@ describe.skip("zappPipesDataConnector", () => {
         entry: [{ id: "test-entry", title: "test entry" }],
       }));
 
-      const wrapper = shallow(
+      const wrapper = renderWithProviders(
         <WrappedComponent
           component={{ data, getStaticComponentFeed }}
           store={store}

package/Decorators/ZappPipesDataConnector/index.tsx

@@ -1,10 +1,10 @@
 /// <reference types="@applicaster/applicaster-types" />
 /// <reference types="@applicaster/zapp-react-native-ui-components" />
 import React, { useEffect, useMemo } from "react";
+
 import * as R from "ramda";
 import { Platform } from "react-native";
 import Url from "url";
-
 import { favoritesListener } from "@applicaster/zapp-react-native-bridge/Favorites";
 import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
 import { useRoute } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
@@ -19,6 +19,7 @@ import { ZappPipesSearchContext } from "@applicaster/zapp-react-native-ui-compon
 import { useScreenContext } from "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenContext";
 
 import { isVerticalListOrGrid } from "./utils";
+import { subscribeForUrlContextKeyChanges } from "@applicaster/zapp-pipes-v2-client";
 
 type Props = {
   component: ZappUIComponent;
@@ -229,7 +230,8 @@ export function zappPipesDataConnector(
     const entryContext =
       (shouldUseNestedContext && screenContextData?.nested?.entry
         ? screenContextData?.nested?.entry
-        : screenContextData?.entry) || {};
+        : (screenContextData?.entry?.payload ?? screenContextData?.entry)) ||
+      {};
 
     const screenContext =
       (shouldUseNestedContext && screenContextData?.nested?.screen
@@ -291,6 +293,8 @@ export function zappPipesDataConnector(
         if (addListener) {
           return addListener(reloadData);
         }
+      } else {
+        return subscribeForUrlContextKeyChanges(dataSourceUrl, {}, reloadData);
       }
     }, [dataSourceUrl, reloadData]);
 

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "13.0.0-alpha.9946926334",
+  "version": "13.0.0-rc.100",
   "description": "Applicaster Zapp React Native ui components for the Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
   "scripts": {
-    "test": "jest -w=2",
     "build": "echo skipping hybrid typescript build for now"
   },
   "publishConfig": {
@@ -29,15 +28,13 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "devDependencies": {
-    "@types/react": "17.0.2",
-    "@types/react-native": "0.69.6",
     "redux-mock-store": "^1.5.3"
   },
   "dependencies": {
-    "@applicaster/applicaster-types": "13.0.0-alpha.9946926334",
-    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.9946926334",
-    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.9946926334",
-    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.9946926334",
+    "@applicaster/applicaster-types": "13.0.0-rc.100",
+    "@applicaster/zapp-react-native-bridge": "13.0.0-rc.100",
+    "@applicaster/zapp-react-native-redux": "13.0.0-rc.100",
+    "@applicaster/zapp-react-native-utils": "13.0.0-rc.100",
     "promise": "^8.3.0",
     "react-router-native": "^5.1.2",
     "url": "^0.11.0",
@@ -46,10 +43,9 @@
   "peerDependencies": {
     "@applicaster/zapp-pipes-v2-client": "*",
     "@react-native-community/netinfo": "*",
-    "@types/node": "*",
     "immer": "*",
-    "react": "17.0.2",
-    "react-native": "0.68.6",
+    "react": "*",
+    "react-native": "*",
     "react-native-safe-area-context": "*",
     "react-native-svg": "*",
     "uglify-js": "*",

package/tsconfig.json

@@ -2,8 +2,7 @@
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./lib",
-    "rootDir": "./src"
+    "rootDir": "./"
   },
-  "exclude": ["src/**/*.test.tsx"],
-  "include": ["src/**/*"]
+  "include": ["**/*"],
 }

package/.babelrc

@@ -1,8 +0,0 @@
-{
-  "presets": ["react-native", "flow", "react-native-stage-0/decorator-support"],
-  "env": {
-    "test": {
-      "presets": [["env", { "modules": "commonjs" }], "react-native", "flow"]
-    }
-  }
-}