Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 1bc03b8

Browse files
authored
Fix drawerContent & drawerContentOptions props for Drawer navigator (#23)
1 parent 6ad7b1b commit 1bc03b8

File tree

7 files changed

+90
-35
lines changed

7 files changed

+90
-35
lines changed

‎src/BottomTabs.bs.js‎

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

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

814
function Make(M) {
915
var M1ドル = { };
1016
var include = Core$ReactNavigation.NavigationScreenProp(M1ドル);
11-
var Navigation = include;
17+
var Navigation_navigateByKey = include.navigateByKey;
18+
var Navigation_navigateByName = include.navigateByName;
19+
var Navigation = {
20+
navigateByKey: Navigation_navigateByKey,
21+
navigateByName: Navigation_navigateByName
22+
};
1223
var bottomTabs = BottomTabs.createBottomTabNavigator();
1324
var make = bottomTabs.Screen;
1425
var $$Screen = {
@@ -21,8 +32,8 @@ function Make(M) {
2132
return {
2233
Navigation: Navigation,
2334
bottomTabs: bottomTabs,
24-
$$Screen: $$Screen,
25-
$$Navigator: $$Navigator
35+
Screen: $$Screen,
36+
Navigator: $$Navigator
2637
};
2738
}
2839

‎src/Drawer.bs.js‎

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

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

814
function Make(M) {
915
var M1ドル = { };
1016
var include = Core$ReactNavigation.NavigationScreenProp(M1ドル);
11-
var Navigation = include;
17+
var Navigation_navigateByKey = include.navigateByKey;
18+
var Navigation_navigateByName = include.navigateByName;
19+
var Navigation = {
20+
navigateByKey: Navigation_navigateByKey,
21+
navigateByName: Navigation_navigateByName
22+
};
1223
var stack = Drawer.createDrawerNavigator();
1324
var make = stack.Screen;
1425
var $$Screen = {
@@ -21,8 +32,8 @@ function Make(M) {
2132
return {
2233
Navigation: Navigation,
2334
stack: stack,
24-
$$Screen: $$Screen,
25-
$$Navigator: $$Navigator
35+
Screen: $$Screen,
36+
Navigator: $$Navigator
2637
};
2738
}
2839

‎src/Drawer.re‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ module Make = (M: {type params;}) => {
156156
//TODO: ~gestureHandlerProps: React.ComponentProps<typeof PanGestureHandler>;
157157
~_lazy: bool=?,
158158
~unmountInactiveRoutes: bool=?,
159-
~contentComponent: React.component(Js.t(contentComponentProps))=?,
160-
~contentOptions: Js.t(contentOptions)=?,
159+
~drawerContent: React.component(Js.t(contentComponentProps))=?,
160+
~drawerContentOptions: Js.t(contentOptions)=?,
161161
~sceneContainerStyle: ReactNative.Style.t=?,
162162
~style: ReactNative.Style.t=?,
163163
unit

‎src/Example.bs.js‎

Lines changed: 11 additions & 11 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.params;
47+
var match = props[/* route */1][/* params */2];
4848
return {
49-
title: match !== undefined ? match.name : "Reason",
49+
title: match !== undefined ? match[/* name */0] : "Reason",
5050
headerRight: (function (param) {
5151
return React.createElement(ReactNative.Button, {
5252
color: "#f00",
5353
onPress: (function (param) {
54-
props.navigation.navigate("MyModal");
54+
props[/* navigation */0].navigate("MyModal");
5555
return /* () */0;
5656
}),
5757
title: "Info"
@@ -78,16 +78,16 @@ 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 include1ドル = Stack$ReactNavigation.Make({ });
8787

88-
var $$Screen1ドル = include1ドル.$$Screen;
88+
var $$Screen1ドル = include1ドル.Screen;
8989

90-
var $$Navigator1ドル = include1ドル.$$Navigator;
90+
var $$Navigator1ドル = include1ドル.Navigator;
9191

9292
function Example$RootStackScreen(Props) {
9393
return React.createElement(Native.NavigationNativeContainer, {
@@ -118,8 +118,8 @@ var RootStackScreen = {
118118
HeaderTitle: RootStackScreen_HeaderTitle,
119119
Header: RootStackScreen_Header,
120120
stack: RootStackScreen_stack,
121-
$$Screen: $$Screen1ドル,
122-
$$Navigator: $$Navigator1ドル,
121+
Screen: $$Screen1ドル,
122+
Navigator: $$Navigator1ドル,
123123
make: Example$RootStackScreen
124124
};
125125

‎src/MaterialBottomTabs.bs.js‎

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

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

915
function Make(M) {
1016
var M1ドル = { };
1117
var include = Core$ReactNavigation.NavigationScreenProp(M1ドル);
12-
var Navigation = include;
18+
var Navigation_navigateByKey = include.navigateByKey;
19+
var Navigation_navigateByName = include.navigateByName;
20+
var Navigation = {
21+
navigateByKey: Navigation_navigateByKey,
22+
navigateByName: Navigation_navigateByName
23+
};
1324
var t = function (prim) {
1425
return Interop.identity(prim[1]);
1526
};
@@ -24,7 +35,7 @@ function Make(M) {
2435
};
2536
var TabBarBadge = {
2637
t: t,
27-
$$boolean: $$boolean,
38+
boolean: $$boolean,
2839
number: number,
2940
string: string
3041
};
@@ -41,8 +52,8 @@ function Make(M) {
4152
Navigation: Navigation,
4253
TabBarBadge: TabBarBadge,
4354
stack: stack,
44-
$$Screen: $$Screen,
45-
$$Navigator: $$Navigator
55+
Screen: $$Screen,
56+
Navigator: $$Navigator
4657
};
4758
}
4859

‎src/MaterialTopTabs.bs.js‎

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

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

814
function Make(M) {
915
var M1ドル = { };
1016
var include = Core$ReactNavigation.NavigationScreenProp(M1ドル);
11-
var Navigation = include;
17+
var Navigation_navigateByKey = include.navigateByKey;
18+
var Navigation_navigateByName = include.navigateByName;
19+
var Navigation = {
20+
navigateByKey: Navigation_navigateByKey,
21+
navigateByName: Navigation_navigateByName
22+
};
1223
var stack = MaterialTopTabs.createMaterialTopTabNavigator();
1324
var make = stack.Screen;
1425
var $$Screen = {
@@ -21,8 +32,8 @@ function Make(M) {
2132
return {
2233
Navigation: Navigation,
2334
stack: stack,
24-
$$Screen: $$Screen,
25-
$$Navigator: $$Navigator
35+
Screen: $$Screen,
36+
Navigator: $$Navigator
2637
};
2738
}
2839

‎src/Stack.bs.js‎

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

77
var TransitionSpec = { };
88

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

1117
function Make(M) {
1218
var M1ドル = { };
1319
var include = Core$ReactNavigation.NavigationScreenProp(M1ドル);
14-
var Navigation = include;
20+
var Navigation_navigateByKey = include.navigateByKey;
21+
var Navigation_navigateByName = include.navigateByName;
22+
var Navigation = {
23+
navigateByKey: Navigation_navigateByKey,
24+
navigateByName: Navigation_navigateByName
25+
};
1526
var t = function (prim) {
1627
return Interop.identity(prim[1]);
1728
};
@@ -36,7 +47,7 @@ function Make(M) {
3647
var Header = {
3748
t: t1ドル,
3849
render: render1ドル,
39-
$$null: $$null
50+
null: $$null
4051
};
4152
var stack = Stack.createStackNavigator();
4253
var make = stack.Screen;
@@ -52,8 +63,8 @@ function Make(M) {
5263
HeaderTitle: HeaderTitle,
5364
Header: Header,
5465
stack: stack,
55-
$$Screen: $$Screen,
56-
$$Navigator: $$Navigator
66+
Screen: $$Screen,
67+
Navigator: $$Navigator
5768
};
5869
}
5970

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /