Skip to content

Fix navigateBy* functions #46

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

Merged
merged 1 commit into from
Sep 20, 2021
Merged

Fix navigateBy* functions #46

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
16 changes: 8 additions & 8 deletions src/Core.bs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
var Caml_option = require("rescript/lib/js/caml_option.js");

function NavigationHelpersCommon(M) {
var navigateByKey = function (key, params, param) {
var navigateByKey = function (key, params, navigation) {
var tmp = {
key: key
};
if (params !== undefined) {
tmp.params = Caml_option.valFromOption(params);
}
tmp.navigate();
navigation.navigate(tmp);

};
var navigateByName = function (name, key, params, param) {
var navigateByName = function (name, key, params, navigation) {
var tmp = {
name: name
};
Expand All @@ -23,7 +23,7 @@ function NavigationHelpersCommon(M) {
if (params !== undefined) {
tmp.params = Caml_option.valFromOption(params);
}
tmp.navigate();
navigation.navigate(tmp);

};
return {
Expand All @@ -37,17 +37,17 @@ function EventConsumer(M) {
}

function NavigationScreenProp(M) {
var navigateByKey = function (key, params, param) {
var navigateByKey = function (key, params, navigation) {
var tmp = {
key: key
};
if (params !== undefined) {
tmp.params = Caml_option.valFromOption(params);
}
tmp.navigate();
navigation.navigate(tmp);

};
var navigateByName = function (name, key, params, param) {
var navigateByName = function (name, key, params, navigation) {
var tmp = {
name: name
};
Expand All @@ -57,7 +57,7 @@ function NavigationScreenProp(M) {
if (params !== undefined) {
tmp.params = Caml_option.valFromOption(params);
}
tmp.navigate();
navigation.navigate(tmp);

};
return {
Expand Down
14 changes: 9 additions & 5 deletions src/Core.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,17 @@ module NavigationHelpersCommon = (
unit,
) => navigationParams = ""

@send external navigateBy: navigationParams => unit = "navigate"
@send external navigateBy: (navigation, navigationParams) => unit = "navigate"

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

let navigateByName = (~name: string, ~key: option<string>=?, ~params: option<M.params>=?, _) =>
navigateBy(navigateByNameParams(~name, ~key?, ~params?, ()))
let navigateByName = (
~name: string,
~key: option<string>=?,
~params: option<M.params>=?,
navigation,
) => navigateBy(navigation, navigateByNameParams(~name, ~key?, ~params?, ()))

@send external replace: (navigation, string) => unit = "replace"
@send
Expand Down