Skip to content

Commit db66ce4

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

17 files changed

+57
-30
lines changed

Diff for: ‎package-lock.json

+9-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎package.json

+1-1
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": {

Diff for: ‎src/BottomTabs.bs.js

+2-2
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 */

Diff for: ‎src/BottomTabs.res

+1-1
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,

Diff for: ‎src/Core.bs.js

+2-2
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 */

Diff for: ‎src/Drawer.bs.js

+5-2
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 */

Diff for: ‎src/Drawer.res

+6-1
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+
}

Diff for: ‎src/Elements.res

+6-1
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=?,

Diff for: ‎src/MaterialBottomTabs.bs.js

+2-2
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 */

Diff for: ‎src/MaterialBottomTabs.res

+3
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"

Diff for: ‎src/MaterialTopTabs.bs.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ function Make($star) {
77
return Interop.adaptNavigatorModule(MaterialTopTabs.createMaterialTopTabNavigator());
88
}
99

10-
var Navigation = {};
10+
var $$Navigation = {};
1111

1212
exports.Make = Make;
13-
exports.Navigation = Navigation;
13+
exports.$$Navigation = $$Navigation;
1414
/* ./Interop Not a pure module */

Diff for: ‎src/MaterialTopTabs.res

+3
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,9 @@ type navigatorModule
129129
module Make = () => unpack(createMaterialTopTabNavigator()->adaptNavigatorModule)
130130

131131
module Navigation = {
132+
@send
133+
external setOptions: (navigation, options) => unit = "setOptions"
134+
132135
@send external jumpTo: (navigation, string) => unit = "jumpTo"
133136
@send
134137
external jumpToWithParams: (navigation, string, 'params) => unit = "jumpTo"

Diff for: ‎src/Native.res

+5
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ type themeColors = {
66
border: string,
77
notification: string,
88
}
9+
910
type theme = {
1011
dark: bool,
1112
colors: themeColors,
1213
}
14+
1315
@module("@react-navigation/native")
1416
external defaultTheme: theme = "DefaultTheme"
1517
@module("@react-navigation/native")
@@ -122,3 +124,6 @@ module Link = {
122124
~children: React.element,
123125
) => React.element = "Link"
124126
}
127+
128+
@module("@react-navigation/native")
129+
external getFocusedRouteNameFromRoute: Core.route => option<string> = "getFocusedRouteNameFromRoute"

Diff for: ‎src/NativeStack.bs.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ function Make($star) {
77
return Interop.adaptNavigatorModule(NativeStack.createNativeStackNavigator());
88
}
99

10-
var Navigation = {};
10+
var $$Navigation = {};
1111

1212
exports.Make = Make;
13-
exports.Navigation = Navigation;
13+
exports.$$Navigation = $$Navigation;
1414
/* ./Interop Not a pure module */

Diff for: ‎src/NativeStack.res

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// https://reactnavigation.org/docs/native-stack-navigator/
22

33
open Core
4+
open Elements
45
open ReactNative
56

67
@module("react-native-screens")
@@ -140,11 +141,11 @@ type rec options = {
140141
headerShadowVisible?: bool,
141142
headerTransparent?: bool,
142143
headerBlurEffect?: blurEffect,
143-
headerBackground?: unit => React.element,
144+
headerBackground?: Header.headerBackgroundOptions => React.element,
144145
headerTintColor?: Color.t,
145-
headerLeft?: unit => React.element,
146-
headerRight?: unit => React.element,
147-
headerTitle?: string,
146+
headerLeft?: Header.headerLeftProps => React.element,
147+
headerRight?: Header.headerRightProps => React.element,
148+
headerTitle?: Header.headerTitle,
148149
headerTitleAlign?: headerTitleAlign,
149150
headerTitleStyle?: headerTitleStyle,
150151
headerSearchBarOptions?: headerSearchBarOptions,

Diff for: ‎src/Stack.bs.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function Make($star) {
99
return Interop.adaptNavigatorModule(Stack.createStackNavigator());
1010
}
1111

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

1414
var TransitionSpecs = {};
1515

@@ -21,7 +21,7 @@ var TransitionPresets = {};
2121

2222
exports.TransitionSpec = TransitionSpec;
2323
exports.Make = Make;
24-
exports.Navigation = Navigation;
24+
exports.$$Navigation = $$Navigation;
2525
exports.TransitionSpecs = TransitionSpecs;
2626
exports.CardStyleInterpolators = CardStyleInterpolators;
2727
exports.HeaderStyleInterpolators = HeaderStyleInterpolators;

Diff for: ‎src/Stack.res

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ type rec options = {
129129
headerTruncatedBackTitle?: string,
130130
headerBackTitleStyle?: Style.t,
131131
// Header props from https://reactnavigation.org/docs/elements#header
132-
headerTitle?: Header.headerTitleProps => React.element,
132+
headerTitle?: Header.headerTitle,
133133
headerTitleAlign?: Header.headerTitleAlign,
134134
headerTitleAllowFontScaling?: bool,
135135
headerTitleStyle?: Style.t,

0 commit comments

Comments
 (0)