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 db66ce4

Browse files
authored
Various fixes and improvements (#69)
1 parent 02e967f commit db66ce4

17 files changed

+57
-30
lines changed

‎package-lock.json‎

Lines changed: 9 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"lint-staged": "^10.0.0",
4949
"npmpub": "^5.0.0",
5050
"prettier": "^2.0.0",
51-
"rescript": "^10.1.2",
51+
"rescript": "^11.0.0",
5252
"rescript-react-native": ">=0.71.1"
5353
},
5454
"prettier": {

‎src/BottomTabs.bs.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ function Make($star) {
99
return Interop.adaptNavigatorModule(BottomTabs.createBottomTabNavigator());
1010
}
1111

12-
var Navigation = {};
12+
var $$Navigation = {};
1313

1414
exports.TabBarBadge = TabBarBadge;
1515
exports.Make = Make;
16-
exports.Navigation = Navigation;
16+
exports.$$Navigation = $$Navigation;
1717
/* ./Interop Not a pure module */

‎src/BottomTabs.res‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ type rec options = {
4646
header?: headerParams => React.element,
4747
headerShown?: bool,
4848
// Header props from https://reactnavigation.org/docs/elements#header
49-
headerTitle?: Header.headerTitleProps=>React.element,
49+
headerTitle?: Header.headerTitle,
5050
headerTitleAlign?: Header.headerTitleAlign,
5151
headerTitleAllowFontScaling?: bool,
5252
headerTitleStyle?: Style.t,

‎src/Core.bs.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ var Params = {};
55

66
var NavigationEvent = {};
77

8-
var Navigation = {};
8+
var $$Navigation = {};
99

1010
exports.Params = Params;
1111
exports.NavigationEvent = NavigationEvent;
12-
exports.Navigation = Navigation;
12+
exports.$$Navigation = $$Navigation;
1313
/* No side effect */

‎src/Drawer.bs.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@ function Make($star) {
77
return Interop.adaptNavigatorModule(Drawer.createDrawerNavigator());
88
}
99

10-
var Navigation = {};
10+
var $$Navigation = {};
11+
12+
var DrawerItemList = {};
1113

1214
exports.Make = Make;
13-
exports.Navigation = Navigation;
15+
exports.$$Navigation = $$Navigation;
16+
exports.DrawerItemList = DrawerItemList;
1417
/* ./Interop Not a pure module */

‎src/Drawer.res‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ type rec options = {
5757
headerShown?: bool,
5858
header?: headerProps => React.element,
5959
// Header props from https://reactnavigation.org/docs/elements#header
60-
headerTitle?: Header.headerTitleProps=>React.element,
60+
headerTitle?: Header.headerTitle,
6161
headerTitleAlign?: Header.headerTitleAlign,
6262
headerTitleAllowFontScaling?: bool,
6363
headerTitleStyle?: Style.t,
@@ -167,3 +167,8 @@ external useDrawerStatus: unit => drawerStatus = "useDrawerStatus"
167167

168168
@module("@react-navigation/drawer")
169169
external getDrawerStatusFromState: navigationState => drawerStatus = "getDrawerStatusFromState"
170+
171+
module DrawerItemList = {
172+
@module("@react-navigation/drawer")
173+
external make: React.component<contentComponentProps> = "DrawerItemList"
174+
}

‎src/Elements.res‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ module Header = {
88
children: string,
99
}
1010

11+
@unboxed
12+
type headerTitle =
13+
| String(string)
14+
| Function(headerTitleProps => React.element)
15+
1116
type headerLeftProps = {
1217
tintColor: option<Color.t>,
1318
pressColor: option<Color.t>,
@@ -28,7 +33,7 @@ module Header = {
2833
@react.component @module("@react-navigation/elements")
2934
external make: (
3035
~title: string=?,
31-
~headerTitle: headerTitleProps=>React.element=?,
36+
~headerTitle: headerTitle=?,
3237
~headerTitleAlign: headerTitleAlign=?,
3338
~headerTitleAllowFontScaling: bool=?,
3439
~headerTitleStyle: Style.t=?,

‎src/MaterialBottomTabs.bs.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ function Make($star) {
99
return Interop.adaptNavigatorModule(MaterialBottomTabs.createMaterialBottomTabNavigator());
1010
}
1111

12-
var Navigation = {};
12+
var $$Navigation = {};
1313

1414
exports.TabBarBadge = TabBarBadge;
1515
exports.Make = Make;
16-
exports.Navigation = Navigation;
16+
exports.$$Navigation = $$Navigation;
1717
/* ./Interop Not a pure module */

‎src/MaterialBottomTabs.res‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ type navigatorModule
8080
module Make = () => unpack(createMaterialBottomTabNavigator()->adaptNavigatorModule)
8181

8282
module Navigation = {
83+
@send
84+
external setOptions: (navigation, options) => unit = "setOptions"
85+
8386
@send external jumpTo: (navigation, string) => unit = "jumpTo"
8487
@send
8588
external jumpToWithParams: (navigation, string, 'params) => unit = "jumpTo"

0 commit comments

Comments
(0)

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