Skip to content

Commit d2b033f

Browse files
MoOxDCKTbroerjuang
committed
change NavigationNativeContainer to NavigationContainer (rescript-react-native#25) (rescript-react-native#26)
Closes rescript-react-native#25 Closes rescript-react-native#26 Co-Authored-By: Thomas Deconinck <tqs.deconinck@gmail.com> Co-Authored-By: Juang Wiantoro <juangwiantoro@gmail.com>
1 parent 94d2de2 commit d2b033f

File tree

9 files changed

+42
-97
lines changed

9 files changed

+42
-97
lines changed

‎src/BottomTabs.bs.js‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,12 @@
33
var Core$ReactNavigation = require("./Core.bs.js");
44
var BottomTabs = require("@react-navigation/bottom-tabs");
55

6-
function BottomTabNavigationProp(M) {
7-
var include = Core$ReactNavigation.NavigationScreenProp(M);
8-
return {
9-
navigateByKey: include.navigateByKey,
10-
navigateByName: include.navigateByName
11-
};
12-
}
6+
var BottomTabNavigationProp = Core$ReactNavigation.NavigationScreenProp;
137

148
function Make(M) {
159
var M$1 = { };
1610
var include = Core$ReactNavigation.NavigationScreenProp(M$1);
17-
var Navigation_navigateByKey = include.navigateByKey;
18-
var Navigation_navigateByName = include.navigateByName;
19-
var Navigation = {
20-
navigateByKey: Navigation_navigateByKey,
21-
navigateByName: Navigation_navigateByName
22-
};
11+
var Navigation = include;
2312
var bottomTabs = BottomTabs.createBottomTabNavigator();
2413
var make = bottomTabs.Screen;
2514
var $$Screen = {
@@ -32,8 +21,8 @@ function Make(M) {
3221
return {
3322
Navigation: Navigation,
3423
bottomTabs: bottomTabs,
35-
Screen: $$Screen,
36-
Navigator: $$Navigator
24+
$$Screen: $$Screen,
25+
$$Navigator: $$Navigator
3726
};
3827
}
3928

‎src/Drawer.bs.js‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,12 @@
33
var Core$ReactNavigation = require("./Core.bs.js");
44
var Drawer = require("@react-navigation/drawer");
55

6-
function DrawerNavigationProp(M) {
7-
var include = Core$ReactNavigation.NavigationScreenProp(M);
8-
return {
9-
navigateByKey: include.navigateByKey,
10-
navigateByName: include.navigateByName
11-
};
12-
}
6+
var DrawerNavigationProp = Core$ReactNavigation.NavigationScreenProp;
137

148
function Make(M) {
159
var M$1 = { };
1610
var include = Core$ReactNavigation.NavigationScreenProp(M$1);
17-
var Navigation_navigateByKey = include.navigateByKey;
18-
var Navigation_navigateByName = include.navigateByName;
19-
var Navigation = {
20-
navigateByKey: Navigation_navigateByKey,
21-
navigateByName: Navigation_navigateByName
22-
};
11+
var Navigation = include;
2312
var stack = Drawer.createDrawerNavigator();
2413
var make = stack.Screen;
2514
var $$Screen = {
@@ -32,8 +21,8 @@ function Make(M) {
3221
return {
3322
Navigation: Navigation,
3423
stack: stack,
35-
Screen: $$Screen,
36-
Navigator: $$Navigator
24+
$$Screen: $$Screen,
25+
$$Navigator: $$Navigator
3726
};
3827
}
3928

‎src/Example.bs.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ var StakeParams = { };
3333

3434
var include = Stack$ReactNavigation.Make(StakeParams);
3535

36-
var $$Screen = include.Screen;
36+
var $$Screen = include.$$Screen;
3737

38-
var $$Navigator = include.Navigator;
38+
var $$Navigator = include.$$Navigator;
3939

4040
function Example$MainStackScreen(Props) {
4141
Props.navigation;
@@ -44,14 +44,14 @@ function Example$MainStackScreen(Props) {
4444
children: React.createElement($$Screen.make, {
4545
name: "Home",
4646
options: (function (props) {
47-
var match = props[/* route */1][/* params */2];
47+
var match = props.route.params;
4848
return {
49-
title: match !== undefined ? match[/* name */0] : "Reason",
49+
title: match !== undefined ? match.name : "Reason",
5050
headerRight: (function (param) {
5151
return React.createElement(ReactNative.Button, {
5252
color: "#f00",
5353
onPress: (function (param) {
54-
props[/* navigation */0].navigate("MyModal");
54+
props.navigation.navigate("MyModal");
5555
return /* () */0;
5656
}),
5757
title: "Info"
@@ -78,19 +78,19 @@ var MainStackScreen = {
7878
HeaderTitle: MainStackScreen_HeaderTitle,
7979
Header: MainStackScreen_Header,
8080
stack: MainStackScreen_stack,
81-
Screen: $$Screen,
82-
Navigator: $$Navigator,
81+
$$Screen: $$Screen,
82+
$$Navigator: $$Navigator,
8383
make: Example$MainStackScreen
8484
};
8585

8686
var include$1 = Stack$ReactNavigation.Make({ });
8787

88-
var $$Screen$1 = include$1.Screen;
88+
var $$Screen$1 = include$1.$$Screen;
8989

90-
var $$Navigator$1 = include$1.Navigator;
90+
var $$Navigator$1 = include$1.$$Navigator;
9191

9292
function Example$RootStackScreen(Props) {
93-
return React.createElement(Native.NavigationNativeContainer, {
93+
return React.createElement(Native.NavigationContainer, {
9494
children: React.createElement($$Navigator$1.make, {
9595
mode: "modal",
9696
headerMode: "none",
@@ -118,8 +118,8 @@ var RootStackScreen = {
118118
HeaderTitle: RootStackScreen_HeaderTitle,
119119
Header: RootStackScreen_Header,
120120
stack: RootStackScreen_stack,
121-
Screen: $$Screen$1,
122-
Navigator: $$Navigator$1,
121+
$$Screen: $$Screen$1,
122+
$$Navigator: $$Navigator$1,
123123
make: Example$RootStackScreen
124124
};
125125

‎src/Example.re‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ module RootStackScreen = {
5353
});
5454
[@react.component]
5555
let make = () =>
56-
<Native.NavigationNativeContainer>
56+
<Native.NavigationContainer>
5757
<Navigator mode=`modal headerMode=`none>
5858
<Screen name="Main" component=MainStackScreen.make />
5959
<Screen name="MyModal" component=ModalScreen.make />
6060
</Navigator>
61-
</Native.NavigationNativeContainer>;
61+
</Native.NavigationContainer>;
6262
};

‎src/MaterialBottomTabs.bs.js‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,12 @@ var Interop = require("./Interop");
44
var Core$ReactNavigation = require("./Core.bs.js");
55
var MaterialBottomTabs = require("@react-navigation/material-bottom-tabs");
66

7-
function MaterialBottomTabNavigationProp(M) {
8-
var include = Core$ReactNavigation.NavigationScreenProp(M);
9-
return {
10-
navigateByKey: include.navigateByKey,
11-
navigateByName: include.navigateByName
12-
};
13-
}
7+
var MaterialBottomTabNavigationProp = Core$ReactNavigation.NavigationScreenProp;
148

159
function Make(M) {
1610
var M$1 = { };
1711
var include = Core$ReactNavigation.NavigationScreenProp(M$1);
18-
var Navigation_navigateByKey = include.navigateByKey;
19-
var Navigation_navigateByName = include.navigateByName;
20-
var Navigation = {
21-
navigateByKey: Navigation_navigateByKey,
22-
navigateByName: Navigation_navigateByName
23-
};
12+
var Navigation = include;
2413
var t = function (prim) {
2514
return Interop.identity(prim[1]);
2615
};
@@ -35,7 +24,7 @@ function Make(M) {
3524
};
3625
var TabBarBadge = {
3726
t: t,
38-
boolean: $$boolean,
27+
$$boolean: $$boolean,
3928
number: number,
4029
string: string
4130
};
@@ -52,8 +41,8 @@ function Make(M) {
5241
Navigation: Navigation,
5342
TabBarBadge: TabBarBadge,
5443
stack: stack,
55-
Screen: $$Screen,
56-
Navigator: $$Navigator
44+
$$Screen: $$Screen,
45+
$$Navigator: $$Navigator
5746
};
5847
}
5948

‎src/MaterialTopTabs.bs.js‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,12 @@
33
var Core$ReactNavigation = require("./Core.bs.js");
44
var MaterialTopTabs = require("@react-navigation/material-top-tabs");
55

6-
function MaterialTopTabNavigationProp(M) {
7-
var include = Core$ReactNavigation.NavigationScreenProp(M);
8-
return {
9-
navigateByKey: include.navigateByKey,
10-
navigateByName: include.navigateByName
11-
};
12-
}
6+
var MaterialTopTabNavigationProp = Core$ReactNavigation.NavigationScreenProp;
137

148
function Make(M) {
159
var M$1 = { };
1610
var include = Core$ReactNavigation.NavigationScreenProp(M$1);
17-
var Navigation_navigateByKey = include.navigateByKey;
18-
var Navigation_navigateByName = include.navigateByName;
19-
var Navigation = {
20-
navigateByKey: Navigation_navigateByKey,
21-
navigateByName: Navigation_navigateByName
22-
};
11+
var Navigation = include;
2312
var stack = MaterialTopTabs.createMaterialTopTabNavigator();
2413
var make = stack.Screen;
2514
var $$Screen = {
@@ -32,8 +21,8 @@ function Make(M) {
3221
return {
3322
Navigation: Navigation,
3423
stack: stack,
35-
Screen: $$Screen,
36-
Navigator: $$Navigator
24+
$$Screen: $$Screen,
25+
$$Navigator: $$Navigator
3726
};
3827
}
3928

‎src/Native.bs.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33

4-
var NavigationNativeContainer = { };
4+
var NavigationContainer = { };
55

6-
exports.NavigationNativeContainer = NavigationNativeContainer;
6+
exports.NavigationContainer = NavigationContainer;
77
/* No side effect */

‎src/Native.re‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<>
7272
{initialStateContainer
7373
->Option.map(initialState =>
74-
<Native.NavigationNativeContainer
74+
<Native.NavigationContainer
7575
?initialState
7676
onStateChange={state => {
7777
let maybeJsonState = Js.Json.stringifyAny(state);
@@ -83,7 +83,7 @@
8383
};
8484
}}>
8585
<RootNavigator />
86-
</Native.NavigationNativeContainer>
86+
</Native.NavigationContainer>
8787
)
8888
->Option.getWithDefault(React.null)}
8989
<Bootsplash isReady />
@@ -92,7 +92,7 @@
9292
```
9393
*/
9494

95-
module NavigationNativeContainer = {
95+
module NavigationContainer = {
9696
type state = Js.Json.t;
9797
type navigationState = state => unit;
9898

@@ -104,7 +104,7 @@ module NavigationNativeContainer = {
104104
~children: React.element
105105
) =>
106106
React.element =
107-
"NavigationNativeContainer";
107+
"NavigationContainer";
108108
};
109109

110110
[@bs.module "@react-navigation/native"]

‎src/Stack.bs.js‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,12 @@ var Stack = require("@react-navigation/stack");
66

77
var TransitionSpec = { };
88

9-
function StackNavigationScreenProp(M) {
10-
var include = Core$ReactNavigation.NavigationScreenProp(M);
11-
return {
12-
navigateByKey: include.navigateByKey,
13-
navigateByName: include.navigateByName
14-
};
15-
}
9+
var StackNavigationScreenProp = Core$ReactNavigation.NavigationScreenProp;
1610

1711
function Make(M) {
1812
var M$1 = { };
1913
var include = Core$ReactNavigation.NavigationScreenProp(M$1);
20-
var Navigation_navigateByKey = include.navigateByKey;
21-
var Navigation_navigateByName = include.navigateByName;
22-
var Navigation = {
23-
navigateByKey: Navigation_navigateByKey,
24-
navigateByName: Navigation_navigateByName
25-
};
14+
var Navigation = include;
2615
var t = function (prim) {
2716
return Interop.identity(prim[1]);
2817
};
@@ -47,7 +36,7 @@ function Make(M) {
4736
var Header = {
4837
t: t$1,
4938
render: render$1,
50-
null: $$null
39+
$$null: $$null
5140
};
5241
var stack = Stack.createStackNavigator();
5342
var make = stack.Screen;
@@ -63,8 +52,8 @@ function Make(M) {
6352
HeaderTitle: HeaderTitle,
6453
Header: Header,
6554
stack: stack,
66-
Screen: $$Screen,
67-
Navigator: $$Navigator
55+
$$Screen: $$Screen,
56+
$$Navigator: $$Navigator
6857
};
6958
}
7059

0 commit comments

Comments
 (0)