fix registerNavigator

scalajs-react-interface · May 1, 2017 · a4154b5 · a4154b5
1 parent ffe0fff
commit a4154b5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 name := "navigation"
 
-//version := "2017.4.0-SNAPSHOT"
+version := "2017.4.0-SNAPSHOT"
 
 enablePlugins(ScalaJSPlugin)
 

diff --git a/src/main/scala/sri/navigation/navigators/package.scala b/src/main/scala/sri/navigation/navigators/package.scala
@@ -48,12 +48,12 @@ package object navigators {
   }
 
   @inline
-  def StackNavigator(routes: (String, NavigationStackScreenRouteConfig)*) =
+  def StackNavigator(routes: (String, NavigationScreenRouteConfig)*) =
     StackNavigatorJS(js.Dictionary(routes: _*))
 
   @inline
   def StackNavigator(stackConfig: StackNavigatorConfig,
-                     routes: (String, NavigationStackScreenRouteConfig)*) =
+                     routes: (String, NavigationScreenRouteConfig)*) =
     StackNavigatorJS(js.Dictionary(routes: _*), stackConfig)
 
   @ScalaJSDefined
@@ -93,12 +93,12 @@ package object navigators {
   }
 
   @inline
-  def TabNavigator(routes: (String, NavigationTabScreenRouteConfig)*) =
+  def TabNavigator(routes: (String, NavigationScreenRouteConfig)*) =
     TabNavigatorJS(js.Dictionary(routes: _*))
 
   @inline
   def TabNavigator(tabConfig: TabNavigatorConfig,
-                   routes: (String, NavigationTabScreenRouteConfig)*) =
+                   routes: (String, NavigationScreenRouteConfig)*) =
     TabNavigatorJS(js.Dictionary(routes: _*), tabConfig)
 
   @ScalaJSDefined
@@ -138,11 +138,11 @@ package object navigators {
   }
 
   @inline
-  def DrawerNavigator(routes: (String, NavigationDrawerScreenRouteConfig)*) =
+  def DrawerNavigator(routes: (String, NavigationScreenRouteConfig)*) =
     DrawerNavigatorJS(js.Dictionary(routes: _*))
 
   @inline
   def DrawerNavigator(tabConfig: DrawerNavigatorConfig,
-                      routes: (String, NavigationDrawerScreenRouteConfig)*) =
+                      routes: (String, NavigationScreenRouteConfig)*) =
     DrawerNavigatorJS(js.Dictionary(routes: _*), tabConfig)
 }
diff --git a/src/main/scala/sri/navigation/package.scala b/src/main/scala/sri/navigation/package.scala
@@ -53,7 +53,7 @@ package object navigation {
     NavigationInitAction | NavigationStackAction | NavigationTabAction
 
   type NavigationRouteConfig =
-    NavigationScreenRouteConfig | NavigationLazyScreenRouteConfig
+    NavigationScreenRouteConfig
 
   type Navigation[P <: js.Object] = NavigationScreenProp[P]