Refactor order of type params in Js._WithFacade types

Author: japgolly

core/src/main/scala/japgolly/scalajs/react/component/Js.scala

@@ -37,16 +37,16 @@ object Js extends JsBaseComponentTemplate[RAW.ReactClass] {
 
   type RawMounted = RAW.ReactComponent
 
-  type Component[P <: js.Object, S <: js.Object, CT[-p, +u] <: CtorType[p, u]] = ComponentWithRawType[P, S, CT, RawMounted]
-  type Unmounted[P <: js.Object, S <: js.Object]                               = UnmountedWithRawType[P, S,     RawMounted]
-  type Mounted  [P <: js.Object, S <: js.Object]                               = MountedWithRawType  [P, S,     RawMounted]
+  type Component[P <: js.Object, S <: js.Object, CT[-p, +u] <: CtorType[p, u]] = ComponentWithRawType[P, S, RawMounted, CT]
+  type Unmounted[P <: js.Object, S <: js.Object]                               = UnmountedWithRawType[P, S, RawMounted]
+  type Mounted  [P <: js.Object, S <: js.Object]                               = MountedWithRawType  [P, S, RawMounted]
 
-  type ComponentWithFacade[P <: js.Object, S <: js.Object, CT[-p, +u] <: CtorType[p, u], R <: js.Object] = ComponentWithRawType[P, S, CT, RawMounted with R]
-  type UnmountedWithFacade[P <: js.Object, S <: js.Object, R <: js.Object]                               = UnmountedWithRawType[P, S,     RawMounted with R]
-  type   MountedWithFacade[P <: js.Object, S <: js.Object, R <: js.Object]                               =   MountedWithRawType[P, S,     RawMounted with R]
+  type ComponentWithFacade[P <: js.Object, S <: js.Object, F <: js.Object, CT[-p, +u] <: CtorType[p, u]] = ComponentWithRawType[P, S, RawMounted with F, CT]
+  type UnmountedWithFacade[P <: js.Object, S <: js.Object, F <: js.Object]                               = UnmountedWithRawType[P, S, RawMounted with F]
+  type   MountedWithFacade[P <: js.Object, S <: js.Object, F <: js.Object]                               =   MountedWithRawType[P, S, RawMounted with F]
 
-  type ComponentWithRawType[P <: js.Object, S <: js.Object, CT[-p, +u] <: CtorType[p, u], R <: RawMounted] = ComponentRoot[P, CT, UnmountedWithRawType[P, S, R]]
-  type UnmountedWithRawType[P <: js.Object, S <: js.Object, R <: RawMounted]                               = UnmountedRoot[P,       MountedWithRawType[P, S, R]]
+  type ComponentWithRawType[P <: js.Object, S <: js.Object, R <: RawMounted, CT[-p, +u] <: CtorType[p, u]] = ComponentRoot[P, CT, UnmountedWithRawType[P, S, R]]
+  type UnmountedWithRawType[P <: js.Object, S <: js.Object, R <: RawMounted]                               = UnmountedRoot[P, MountedWithRawType[P, S, R]]
   type   MountedWithRawType[P <: js.Object, S <: js.Object, R <: RawMounted]                               = MountedRoot[Effect.Id, P, S, R]
 
   override protected val rawComponentDisplayName: RAW.ReactClass => String =

core/src/main/scala/japgolly/scalajs/react/component/Scala.scala

@@ -37,9 +37,9 @@ object Scala {
   type MountedPure  [P, S, B] = Mounted[CallbackTo, P, S, B]
   type BackendScope [P, S]    = Generic.MountedRoot[CallbackTo, P, S]
 
-  type JsComponent[P, S, B, CT[-p, +u] <: CtorType[p, u]] = Js.ComponentWithFacade[Box[P], Box[S], CT, Vars[P, S, B]]
-  type JsUnmounted[P, S, B]                               = Js.UnmountedWithFacade[Box[P], Box[S],     Vars[P, S, B]]
-  type JsMounted  [P, S, B]                               = Js.MountedWithFacade  [Box[P], Box[S],     Vars[P, S, B]]
+  type JsComponent[P, S, B, CT[-p, +u] <: CtorType[p, u]] = Js.ComponentWithFacade[Box[P], Box[S], Vars[P, S, B], CT]
+  type JsUnmounted[P, S, B]                               = Js.UnmountedWithFacade[Box[P], Box[S], Vars[P, S, B]]
+  type JsMounted  [P, S, B]                               = Js.MountedWithFacade  [Box[P], Box[S], Vars[P, S, B]]
 
   type RawMounted[P, S, B] = Js.RawMounted with Vars[P, S, B]
 

core/src/main/scala/japgolly/scalajs/react/package.scala

@@ -21,7 +21,7 @@ package object react extends ReactEventTypes {
 
   val JsComponent = component.Js
   type JsComponent[P <: js.Object, S <: js.Object, CT[-p, +u] <: CtorType[p, u]] = JsComponent.Component[P, S, CT]
-  type JsComponentWithFacade[P <: js.Object, S <: js.Object, CT[-p, +u] <: CtorType[p, u], R <: js.Object] = JsComponent.ComponentWithFacade[P, S, CT, R]
+  type JsComponentWithFacade[P <: js.Object, S <: js.Object, F <: js.Object, CT[-p, +u] <: CtorType[p, u]] = JsComponent.ComponentWithFacade[P, S, F, CT]
 
   val JsFnComponent = component.JsFn
   type JsFnComponent[P <: js.Object, CT[-p, +u] <: CtorType[p, u]] = JsFnComponent.Component[P, CT]