Skip to content

chore(preparePaths): Simplified api #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

chore(preparePaths): Simplified api #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/components/Navigator/Navigator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import {
resolveNavigatorScreenOptions,
resolveRouteOptions,
stubNavigationObject,
useScreenProps
useScreenProps,
} from '../../helpers';
import { resolveThunk, useBlueBase } from '@bluebase/core';

import { NavigatorProps as BBNavigatorProps } from '@bluebase/components';
import { RouteConfigWithResolveSubRoutes } from '../../types';
import { resolveThunk } from '@bluebase/core';

export interface NavigatorProps extends BBNavigatorProps {
// standalone?: boolean;
Expand All @@ -21,10 +21,9 @@ export interface NavigatorProps extends BBNavigatorProps {
* @param props
*/
export const Navigator = (inputProps: NavigatorProps) => {
const BB = useBlueBase();
const screenProps = useScreenProps();

const [props] = useState(preparePaths(inputProps, screenProps, BB));
const [props] = useState(preparePaths(inputProps, screenProps));

// eslint-disable-next-line react/prop-types
const { type, routes, NavigatorComponent, ...rest } = props;
Expand Down
9 changes: 4 additions & 5 deletions src/helpers/preparePaths.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { BlueBase, makeId, resolveThunk } from '@bluebase/core';
import { NavigatorProps, RouteConfig } from '@bluebase/components';
import { makeId, resolveThunk } from '@bluebase/core';

import { ScreenProps } from '../types';
import { createNavigatorScreenComponent } from './createNavigatorScreenComponent';
Expand All @@ -16,8 +16,7 @@ export interface PreparedNavigatorProps extends NavigatorProps {
*/
export const preparePaths = (
navigatorProps: NavigatorProps,
screenProps: ScreenProps,
BB: BlueBase
screenProps: ScreenProps
): PreparedNavigatorProps => {
const navigator = { ...navigatorProps };

Expand All @@ -31,10 +30,10 @@ export const preparePaths = (
// Then map it to have new paths
const routes = resolveThunk(navigator.routes || [], screenProps).map((r: RouteConfig) => {
// Do we have a navigator here? If yes then recurcively prepare its paths as well
const resolvedNavigator = r.navigator ? preparePaths(r.navigator, screenProps, BB) : undefined;
const resolvedNavigator = r.navigator ? preparePaths(r.navigator, screenProps) : undefined;

// Do we have a screen here? If yes then resolve the screen component
const component = createNavigatorScreenComponent(r, BB);
const component = createNavigatorScreenComponent(r, screenProps.BB);

// Return the final object
return { ...r, navigator: resolvedNavigator, component };
Expand Down