react-router6 facade fix

aappddeevv · Jun 19, 2020 · 46691e0 · 46691e0
1 parent 4a02927
commit 46691e0
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/components/fabric/src/main/scala/components/Text.scala b/components/fabric/src/main/scala/components/Text.scala
@@ -40,8 +40,19 @@ object Text {
 
   def apply(variant: Variant, text: String) =
     createElement(JS, js.Dynamic.literal("variant" -> variant), text.asInstanceOf[ReactNode])
-
-
+
+  def block(text: String) = 
+    createElement(JS, js.Dynamic.literal("block" -> true), text.asInstanceOf[ReactNode])
+
+  def block(variant: Variant, text: String) = 
+    createElement(JS, js.Dynamic.literal("variant" -> variant, "block" -> true), text.asInstanceOf[ReactNode])
+
+  def nowrap(text: String) = 
+    createElement(JS, js.Dynamic.literal("nowrap" -> true), text.asInstanceOf[ReactNode])
+
+  def ellipsis(text: String) = 
+    createElement(JS, js.Dynamic.literal("block" -> true, "nowrap" -> true), text.asInstanceOf[ReactNode])
+
   // from ReactJsProps
   trait Props extends ReactJSProps with HTMLAttributes[dom.html.Element]{
     var variant: js.UndefOr[Variant] = js.undefined

diff --git a/components/react-router-dom6/src/main/scala/react-router-module.scala b/components/react-router-dom6/src/main/scala/react-router-module.scala
@@ -37,7 +37,7 @@ object Action {
 
 // history
 trait PathPieces { 
-    var pathName: js.UndefOr[String] = js.undefined
+    var pathname: js.UndefOr[String] = js.undefined
     var search:  js.UndefOr[String] = js.undefined
     var hash:   js.UndefOr[String] = js.undefined
 }
@@ -54,8 +54,12 @@ trait LocationInit[S] extends LocationPieces[S]
 
 // history
 object LocationInit {
-  def apply[S](pathname: String) = 
-    js.Dynamic.literal("pathname" -> pathname).asInstanceOf[LocationInit[S]]
+  /** Create LocationInit from a pathname. */
+  def apply[S](p: String) = 
+    new LocationInit[S] { 
+        pathname = p
+    }
+    //js.Dynamic.literal("pathName" -> pathname).asInstanceOf[LocationInit[S]]
 }
 
 // history

diff --git a/jshelpers/src/main/scala/any.scala b/jshelpers/src/main/scala/any.scala
@@ -106,6 +106,14 @@ trait AnyOps[T] {
   def toTruthyUndefOr: js.UndefOr[T] =
     if (js.DynamicImplicits.truthValue(a.asInstanceOf[js.Dynamic])) js.defined(a)
     else js.undefined
+
+
+  //
+  // Some type tests, some of these may not work in all circumstances so you need
+  // to know what you are doing to ensure they meet your needs.
+  //
+
+
 }
 
 final class JsAnyOps[T <: js.Any](protected val a: T) extends AnyOps[T] {}