Various fixes and improvements (#69)

cknitt · web-flow · commit db66ce44a199 · 2024-12-12T11:03:08.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "lint-staged": "^10.0.0",
     "npmpub": "^5.0.0",
     "prettier": "^2.0.0",
-    "rescript": "^10.1.2",
+    "rescript": "^11.0.0",
     "rescript-react-native": ">=0.71.1"
   },
   "prettier": {
diff --git a/src/BottomTabs.bs.js b/src/BottomTabs.bs.js
@@ -9,9 +9,9 @@ function Make($star) {
   return Interop.adaptNavigatorModule(BottomTabs.createBottomTabNavigator());
 }
 
-var Navigation = {};
+var $$Navigation = {};
 
 exports.TabBarBadge = TabBarBadge;
 exports.Make = Make;
-exports.Navigation = Navigation;
+exports.$$Navigation = $$Navigation;
 /* ./Interop Not a pure module */
diff --git a/src/BottomTabs.res b/src/BottomTabs.res
@@ -46,7 +46,7 @@ type rec options = {
   header?: headerParams => React.element,
   headerShown?: bool,
   // Header props from https://reactnavigation.org/docs/elements#header
-  headerTitle?: Header.headerTitleProps => React.element,
+  headerTitle?: Header.headerTitle,
   headerTitleAlign?: Header.headerTitleAlign,
   headerTitleAllowFontScaling?: bool,
   headerTitleStyle?: Style.t,
diff --git a/src/Core.bs.js b/src/Core.bs.js
@@ -5,9 +5,9 @@ var Params = {};
 
 var NavigationEvent = {};
 
-var Navigation = {};
+var $$Navigation = {};
 
 exports.Params = Params;
 exports.NavigationEvent = NavigationEvent;
-exports.Navigation = Navigation;
+exports.$$Navigation = $$Navigation;
 /* No side effect */
diff --git a/src/Drawer.bs.js b/src/Drawer.bs.js
@@ -7,8 +7,11 @@ function Make($star) {
   return Interop.adaptNavigatorModule(Drawer.createDrawerNavigator());
 }
 
-var Navigation = {};
+var $$Navigation = {};
+
+var DrawerItemList = {};
 
 exports.Make = Make;
-exports.Navigation = Navigation;
+exports.$$Navigation = $$Navigation;
+exports.DrawerItemList = DrawerItemList;
 /* ./Interop Not a pure module */
diff --git a/src/Drawer.res b/src/Drawer.res
@@ -57,7 +57,7 @@ type rec options = {
   headerShown?: bool,
   header?: headerProps => React.element,
   // Header props from https://reactnavigation.org/docs/elements#header
-  headerTitle?: Header.headerTitleProps => React.element,
+  headerTitle?: Header.headerTitle,
   headerTitleAlign?: Header.headerTitleAlign,
   headerTitleAllowFontScaling?: bool,
   headerTitleStyle?: Style.t,
@@ -167,3 +167,8 @@ external useDrawerStatus: unit => drawerStatus = "useDrawerStatus"
 
 @module("@react-navigation/drawer")
 external getDrawerStatusFromState: navigationState => drawerStatus = "getDrawerStatusFromState"
+
+module DrawerItemList = {
+  @module("@react-navigation/drawer")
+  external make: React.component<contentComponentProps> = "DrawerItemList"
+}
diff --git a/src/Elements.res b/src/Elements.res
@@ -8,6 +8,11 @@ module Header = {
     children: string,
   }
 
+  @unboxed
+  type headerTitle =
+    | String(string)
+    | Function(headerTitleProps => React.element)
+
   type headerLeftProps = {
     tintColor: option<Color.t>,
     pressColor: option<Color.t>,
@@ -28,7 +33,7 @@ module Header = {
   @react.component @module("@react-navigation/elements")
   external make: (
     ~title: string=?,
-    ~headerTitle: headerTitleProps => React.element=?,
+    ~headerTitle: headerTitle=?,
     ~headerTitleAlign: headerTitleAlign=?,
     ~headerTitleAllowFontScaling: bool=?,
     ~headerTitleStyle: Style.t=?,
diff --git a/src/MaterialBottomTabs.bs.js b/src/MaterialBottomTabs.bs.js
@@ -9,9 +9,9 @@ function Make($star) {
   return Interop.adaptNavigatorModule(MaterialBottomTabs.createMaterialBottomTabNavigator());
 }
 
-var Navigation = {};
+var $$Navigation = {};
 
 exports.TabBarBadge = TabBarBadge;
 exports.Make = Make;
-exports.Navigation = Navigation;
+exports.$$Navigation = $$Navigation;
 /* ./Interop Not a pure module */
diff --git a/src/MaterialBottomTabs.res b/src/MaterialBottomTabs.res
@@ -80,6 +80,9 @@ type navigatorModule
 module Make = () => unpack(createMaterialBottomTabNavigator()->adaptNavigatorModule)
 
 module Navigation = {
+  @send
+  external setOptions: (navigation, options) => unit = "setOptions"
+
   @send external jumpTo: (navigation, string) => unit = "jumpTo"
   @send
   external jumpToWithParams: (navigation, string, 'params) => unit = "jumpTo"
diff --git a/src/MaterialTopTabs.bs.js b/src/MaterialTopTabs.bs.js
@@ -7,8 +7,8 @@ function Make($star) {
   return Interop.adaptNavigatorModule(MaterialTopTabs.createMaterialTopTabNavigator());
 }
 
-var Navigation = {};
+var $$Navigation = {};
 
 exports.Make = Make;
-exports.Navigation = Navigation;
+exports.$$Navigation = $$Navigation;
 /* ./Interop Not a pure module */
diff --git a/src/MaterialTopTabs.res b/src/MaterialTopTabs.res
@@ -129,6 +129,9 @@ type navigatorModule
 module Make = () => unpack(createMaterialTopTabNavigator()->adaptNavigatorModule)
 
 module Navigation = {
+  @send
+  external setOptions: (navigation, options) => unit = "setOptions"
+
   @send external jumpTo: (navigation, string) => unit = "jumpTo"
   @send
   external jumpToWithParams: (navigation, string, 'params) => unit = "jumpTo"
diff --git a/src/Native.res b/src/Native.res
@@ -6,10 +6,12 @@ type themeColors = {
   border: string,
   notification: string,
 }
+
 type theme = {
   dark: bool,
   colors: themeColors,
 }
+
 @module("@react-navigation/native")
 external defaultTheme: theme = "DefaultTheme"
 @module("@react-navigation/native")
@@ -122,3 +124,6 @@ module Link = {
     ~children: React.element,
   ) => React.element = "Link"
 }
+
+@module("@react-navigation/native")
+external getFocusedRouteNameFromRoute: Core.route => option<string> = "getFocusedRouteNameFromRoute"
diff --git a/src/NativeStack.bs.js b/src/NativeStack.bs.js
@@ -7,8 +7,8 @@ function Make($star) {
   return Interop.adaptNavigatorModule(NativeStack.createNativeStackNavigator());
 }
 
-var Navigation = {};
+var $$Navigation = {};
 
 exports.Make = Make;
-exports.Navigation = Navigation;
+exports.$$Navigation = $$Navigation;
 /* ./Interop Not a pure module */
diff --git a/src/NativeStack.res b/src/NativeStack.res
@@ -1,6 +1,7 @@
 // https://reactnavigation.org/docs/native-stack-navigator/
 
 open Core
+open Elements
 open ReactNative
 
 @module("react-native-screens")
@@ -140,11 +141,11 @@ type rec options = {
   headerShadowVisible?: bool,
   headerTransparent?: bool,
   headerBlurEffect?: blurEffect,
-  headerBackground?: unit => React.element,
+  headerBackground?: Header.headerBackgroundOptions => React.element,
   headerTintColor?: Color.t,
-  headerLeft?: unit => React.element,
-  headerRight?: unit => React.element,
-  headerTitle?: string,
+  headerLeft?: Header.headerLeftProps => React.element,
+  headerRight?: Header.headerRightProps => React.element,
+  headerTitle?: Header.headerTitle,
   headerTitleAlign?: headerTitleAlign,
   headerTitleStyle?: headerTitleStyle,
   headerSearchBarOptions?: headerSearchBarOptions,
diff --git a/src/Stack.bs.js b/src/Stack.bs.js
@@ -9,7 +9,7 @@ function Make($star) {
   return Interop.adaptNavigatorModule(Stack.createStackNavigator());
 }
 
-var Navigation = {};
+var $$Navigation = {};
 
 var TransitionSpecs = {};
 
@@ -21,7 +21,7 @@ var TransitionPresets = {};
 
 exports.TransitionSpec = TransitionSpec;
 exports.Make = Make;
-exports.Navigation = Navigation;
+exports.$$Navigation = $$Navigation;
 exports.TransitionSpecs = TransitionSpecs;
 exports.CardStyleInterpolators = CardStyleInterpolators;
 exports.HeaderStyleInterpolators = HeaderStyleInterpolators;
diff --git a/src/Stack.res b/src/Stack.res
@@ -129,7 +129,7 @@ type rec options = {
   headerTruncatedBackTitle?: string,
   headerBackTitleStyle?: Style.t,
   // Header props from https://reactnavigation.org/docs/elements#header
-  headerTitle?: Header.headerTitleProps => React.element,
+  headerTitle?: Header.headerTitle,
   headerTitleAlign?: Header.headerTitleAlign,
   headerTitleAllowFontScaling?: bool,
   headerTitleStyle?: Style.t,
