Combine AppContainerFunctor and AppContainer again, get example to run. (#7)

Author: cknitt

README.md

@@ -94,7 +94,7 @@ The main React component of the app (App.re):
 open ReactNavigation;
 
 module MyAppContainer =
-  AppContainerFunctor.Make({
+  AppContainer.Make({
     type screenProps = {. "someProp": int};
     let navigator = MyStackNavigator.navigator;
   });

bsconfig.json

@@ -18,7 +18,7 @@
   ],
   "bsc-flags": ["-bs-no-version-header"],
   "warnings": {
-    "number": "+102"
+    "number": "+102-105"
   },
   "bs-dependencies": ["reason-react", "reason-react-native"]
 }

example/bsconfig.json

@@ -18,6 +18,6 @@
   "bs-dependencies": [
     "reason-react",
     "reason-react-native",
-    "reason-react-navigation"
+    "@reason-react-native/navigation"
   ]
 }

example/package.json

@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@unimodules/react-native-adapter": "^2.0.1",
-    "bs-platform": "^5.0.4",
+    "bs-platform": "^5.2.0",
     "expo": "^33.0.7",
     "react": "16.8.6",
     "react-native": "https://github.com/expo/react-native/archive/sdk-33.0.0.tar.gz",
@@ -27,4 +27,4 @@
     "babel-preset-expo": "^5.0.0",
     "expo-yarn-workspaces": "^1.2.0"
   }
-}
+}

example/yarn.lock

@@ -1349,10 +1349,10 @@ browserslist@^4.6.0, browserslist@^4.6.2:
     electron-to-chromium "^1.3.164"
     node-releases "^1.1.23"
 
-bs-platform@^5.0.4:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/bs-platform/-/bs-platform-5.0.4.tgz#d406ef43c12d1b19d8546884d8b5b4e0fb709372"
-  integrity sha512-rXM+ztN8wYXQ4ojfFGylvPOf8GRLOvM94QJsMMV9VpsLChKCjesWMNybTZvpoyNsESu2nC5q+C9soG+BPhuUFQ==
+bs-platform@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/bs-platform/-/bs-platform-5.2.0.tgz#0ec317273daed573491c105f68ea48826a285b7a"
+  integrity sha512-miyePsOF9VbuhT5QD5E/hb+l454Fo4MAcg5xV1GJhbWxmejuF/X7mCYUsNrK1UUAaYt8hnoyFdeLG22sxVta9A==
 
 bser@^2.0.0:
   version "2.1.0"

src/AppContainer.bs.js

@@ -1 +1,13 @@
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
+'use strict';
+
+var ReactNavigation = require("react-navigation");
+
+function Make(S) {
+  var make = ReactNavigation.createAppContainer(S.navigator);
+  return {
+          make: make
+        };
+}
+
+exports.Make = Make;
+/* react-navigation Not a pure module */

src/AppContainer.re

@@ -1,16 +1,21 @@
-// Low-level, zero-cost bindings to AppContainer.
+// There are two ways to use the AppContainer module.
 //
-// Usage:
+// 1. With React.createElement, zero-cost
+// ======================================
 //
-// let appContainer = AppContainer.makeAppContainer(rootNavigator);
+// open ReactNavigation;
 //
-// React.createElement(
-//   appContainer,
-//   AppContainer.makeProps(
-//     ~screenProps, /* ... more props ... */
-//     (),
-//   ),
-// );
+// let appContainer = AppContainer.makeAppContainer(MyStackNavigator.navigator);
+//
+// [@react.component]
+// let make = () => {
+//   let screenProps = {"someProp": 42};
+//
+//   React.createElement(
+//     appContainer,
+//     AppContainer.makeProps(~screenProps, ()),
+//   );
+// };
 
 type persistNavigationState = NavigationState.t => Js.Promise.t(unit);
 type loadNavigationState = unit => Js.Promise.t(option(NavigationState.t));
@@ -40,3 +45,46 @@ external makeProps:
 external makeAppContainer:
   Navigator.t => React.component(appContainerProps('screenProps)) =
   "createAppContainer";
+
+// 2. Without create element, using a functor instead
+// ==================================================
+//
+// open ReactNavigation;
+//
+// module MyAppContainer =
+//   AppContainer.Make({
+//     type screenProps = {. "someProp": int};
+//     let navigator = MyStackNavigator.navigator;
+//   });
+//
+// [@react.component]
+// let make = () => {
+//   let screenProps = {"someProp": 42};
+//
+//   <MyAppContainer screenProps />;
+// };
+
+module Make = (S: {
+                 type screenProps;
+                 let navigator: Navigator.t;
+               }) => {
+  [@bs.module "react-navigation"]
+  external make:
+    Navigator.t => React.component(appContainerProps(S.screenProps)) =
+    "createAppContainer";
+
+  [@bs.obj]
+  external makeProps:
+    (
+      ~persistNavigationState: persistNavigationState=?,
+      ~loadNavigationState: loadNavigationState=?,
+      ~screenProps: S.screenProps=?,
+      ~setNavigatorRef: Js.Nullable.t(NavigationContainer.t) => unit=?,
+      ~key: string=?,
+      unit
+    ) =>
+    appContainerProps(S.screenProps) =
+    "";
+
+  let make = make(S.navigator);
+};