Skip to content

Commit b89bf1e

Browse files
authored
Fix navigateBy* functions (#46)
- `navigateBy` didn't accept `navigation`
1 parent e077974 commit b89bf1e

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

src/Core.bs.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
var Caml_option = require("rescript/lib/js/caml_option.js");
44

55
function NavigationHelpersCommon(M) {
6-
var navigateByKey = function (key, params, param) {
6+
var navigateByKey = function (key, params, navigation) {
77
var tmp = {
88
key: key
99
};
1010
if (params !== undefined) {
1111
tmp.params = Caml_option.valFromOption(params);
1212
}
13-
tmp.navigate();
13+
navigation.navigate(tmp);
1414

1515
};
16-
var navigateByName = function (name, key, params, param) {
16+
var navigateByName = function (name, key, params, navigation) {
1717
var tmp = {
1818
name: name
1919
};
@@ -23,7 +23,7 @@ function NavigationHelpersCommon(M) {
2323
if (params !== undefined) {
2424
tmp.params = Caml_option.valFromOption(params);
2525
}
26-
tmp.navigate();
26+
navigation.navigate(tmp);
2727

2828
};
2929
return {
@@ -37,17 +37,17 @@ function EventConsumer(M) {
3737
}
3838

3939
function NavigationScreenProp(M) {
40-
var navigateByKey = function (key, params, param) {
40+
var navigateByKey = function (key, params, navigation) {
4141
var tmp = {
4242
key: key
4343
};
4444
if (params !== undefined) {
4545
tmp.params = Caml_option.valFromOption(params);
4646
}
47-
tmp.navigate();
47+
navigation.navigate(tmp);
4848

4949
};
50-
var navigateByName = function (name, key, params, param) {
50+
var navigateByName = function (name, key, params, navigation) {
5151
var tmp = {
5252
name: name
5353
};
@@ -57,7 +57,7 @@ function NavigationScreenProp(M) {
5757
if (params !== undefined) {
5858
tmp.params = Caml_option.valFromOption(params);
5959
}
60-
tmp.navigate();
60+
navigation.navigate(tmp);
6161

6262
};
6363
return {

src/Core.res

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,17 @@ module NavigationHelpersCommon = (
3939
unit,
4040
) => navigationParams = ""
4141

42-
@send external navigateBy: navigationParams => unit = "navigate"
42+
@send external navigateBy: (navigation, navigationParams) => unit = "navigate"
4343

44-
let navigateByKey = (~key: string, ~params: option<M.params>=?, _) =>
45-
navigateBy(navigateByKeyParams(~key, ~params?, ()))
44+
let navigateByKey = (~key: string, ~params: option<M.params>=?, navigation) =>
45+
navigateBy(navigation, navigateByKeyParams(~key, ~params?, ()))
4646

47-
let navigateByName = (~name: string, ~key: option<string>=?, ~params: option<M.params>=?, _) =>
48-
navigateBy(navigateByNameParams(~name, ~key?, ~params?, ()))
47+
let navigateByName = (
48+
~name: string,
49+
~key: option<string>=?,
50+
~params: option<M.params>=?,
51+
navigation,
52+
) => navigateBy(navigation, navigateByNameParams(~name, ~key?, ~params?, ()))
4953

5054
@send external replace: (navigation, string) => unit = "replace"
5155
@send

0 commit comments

Comments
 (0)