feat: Cleaned up navigation context logic

Author: artalat

src/components/NavigationActions/NavigationActions.tsx

@@ -1,7 +1,5 @@
-import { useNavigation, useRoute } from '@react-navigation/native';
-
 import { NavigationActionsProps } from '@bluebase/components';
-import { navigationToActionObject } from '../../helpers';
+import { useNavigation } from '@bluebase/core';
 
 /**
  * NavigationActions (Legacy)
@@ -14,7 +12,6 @@ export const NavigationActions: React.ComponentType<NavigationActionsProps> = ({
 	children,
 }: NavigationActionsProps) => {
 	const navigation = useNavigation();
-	const route = useRoute();
 
-	return children(navigationToActionObject(navigation, route)) as any;
+	return children(navigation) as any;
 };

src/components/NavigationActions/__tests__/NavigationActions.test.tsx

@@ -1,67 +1,28 @@
-const mockedNavigation: any = {
-	addListener: jest.fn(),
-	closeDrawer: jest.fn(),
-	dangerouslyGetParent: jest.fn(),
-	dismiss: jest.fn(),
-	dispatch: jest.fn(),
-	getParam: jest.fn(),
-	goBack: jest.fn(),
-	isFocused: jest.fn(),
-	navigate: jest.fn(),
-	openDrawer: jest.fn(),
-	pop: jest.fn(),
-	popToTop: jest.fn(),
-	push: jest.fn(),
-	replace: jest.fn(),
-	setParams: jest.fn(),
-	toggleDrawer: jest.fn(),
-};
-
-const mockedRoute = {
-	index: 0,
-	isTransitioning: false,
-	key: 'kjdkj',
-	name: 'Home',
-	params: { foo: 'bar' },
-	path: '/',
-	routes: [
-		{
-			index: 1,
-			isTransitioning: false,
-			key: 'jsdfl',
-			path: '/settings',
-			routeName: 'Settings',
-			routes: [],
-		},
-	],
-};
-
-jest.mock('@react-navigation/native', () => {
-	const actual = jest.requireActual('@react-navigation/native');
-	return {
-		...actual,
-
-		useNavigation: () => mockedNavigation,
-		useRoute: () => mockedRoute,
-	};
-});
-
 import { NavigationActions } from '../NavigationActions';
+import { NavigationContext } from '@bluebase/core';
 import React from 'react';
 import { mount } from 'enzyme';
 
 describe('NavigationActions tests', () => {
 	it('should check props', async () => {
 		const children = jest.fn().mockReturnValue(null);
-
-		mount(<NavigationActions>{children}</NavigationActions>);
+		const nav: any = {
+			state: {
+				name: 'Home',
+				params: { foo: 'bar' },
+				path: '/',
+			},
+		};
+
+		mount(
+			<NavigationContext.Provider value={nav}>
+				<NavigationActions>{children}</NavigationActions>
+			</NavigationContext.Provider>
+		);
 
 		expect(children).toHaveBeenCalledTimes(1);
 
 		const result = children.mock.calls[0][0];
-		expect(result.state.key).toBe('kjdkj');
-		expect(result.state.routeName).toBe('Home');
-		expect(result.state.params).toMatchObject({ foo: 'bar' });
-		expect(result.source).toBeTruthy();
+		expect(result).toMatchObject(nav);
 	});
 });

src/components/NavigationProvider/NavigationProvider.tsx

@@ -9,7 +9,8 @@ import { navigationToActionObject } from '../../helpers';
  * and injects it into the context
  * @param param
  */
-export const NavigationProvider = ({ children }: { children: React.ReactNode }) => {
+export const NavigationProvider = (props: { children: React.ReactNode }) => {
+	const { children } = props;
 	const navigation = useNavigation();
 	const route = useRoute();
 

src/components/ScreenView/ScreenView.tsx

@@ -1,8 +1,6 @@
-import { useNavigation, useRoute } from '@react-navigation/native';
-
 import React from 'react';
 import { RouteConfig } from '@bluebase/components';
-import { navigationToActionObject } from '../../helpers';
+import { useNavigation } from '@bluebase/core';
 
 export interface ScreenViewProps {
 	children?: React.ReactNode;
@@ -16,9 +14,7 @@ export const ScreenView: React.ComponentType<ScreenViewProps> = ({
 	ScreenComponent,
 	...rest
 }: ScreenViewProps & any) => {
-	const state = useRoute();
-	const navObj = useNavigation();
-	const navigation = navigationToActionObject(navObj, state);
+	const navigation = useNavigation();
 
 	return (
 		<ScreenComponent {...rest} navigation={navigation}>

src/helpers/createNavigatorScreenComponent.tsx

@@ -22,7 +22,7 @@ export const createNavigatorScreenComponent = (route: RouteConfig, BB: BlueBase)
 
 		if (screen) {
 			const WrappedNavigator = (props: any) => (
-				<NavigationProvider>
+				<NavigationProvider {...props}>
 					<ScreenComponent {...props} route={route} ScreenComponent={ScreenComponent}>
 						{navigatorNode}
 					</ScreenComponent>
@@ -36,7 +36,7 @@ export const createNavigatorScreenComponent = (route: RouteConfig, BB: BlueBase)
 	}
 
 	const Screen = (props: any) => (
-		<NavigationProvider>
+		<NavigationProvider {...props}>
 			<ScreenComponent {...props} route={route} ScreenComponent={ScreenComponent} />
 		</NavigationProvider>
 	);