Skip to content

Commit bd212f4

Browse files
committed
fix(resolveRouteOptions): Fixed wrong treatment of options prop
1 parent fb27767 commit bd212f4

1 file changed

Lines changed: 14 additions & 3 deletions

File tree

src/helpers/resolveRouteOptions.ts

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,23 @@ import { resolveThunk } from '@bluebase/core';
1111
export const resolveRouteOptions = (route: RouteConfig, navigationData: NavigationData) => {
1212
const ScreenComponent = resolveScreenComponent(route, navigationData.screenProps.BB);
1313

14-
const options =
15-
route.options || route.navigationOptions || (ScreenComponent as any).navigationOptions || {};
14+
if (route.options) {
15+
return route.options;
16+
}
17+
18+
if (route.navigationOptions) {
19+
console.warn('route.navigationOptions is deprecated');
20+
}
21+
22+
const options = resolveThunk(
23+
route.navigationOptions || (ScreenComponent as any).navigationOptions || {},
24+
navigationData
25+
);
1626

1727
return {
1828
// FIXME: missing navigation
19-
...resolveThunk(options, navigationData),
29+
...options,
30+
2031
header:
2132
typeof options.header === 'function' || options.header === undefined
2233
? options.header

0 commit comments

Comments
 (0)