Add .mapRaw

Author: japgolly

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

@@ -1,10 +1,9 @@
 package japgolly.scalajs.react.component
 
-import org.scalajs.dom
 import scala.scalajs.js
 import japgolly.scalajs.react.internal._
-import japgolly.scalajs.react.{Callback, CallbackTo, CtorType, ComponentDom, Key, PropsChildren, StateAccess, vdom, raw => RAW}
-import scala.scalajs.js.|
+import japgolly.scalajs.react.{Callback, CallbackTo, CtorType, ComponentDom, Key, PropsChildren, StateAccess, vdom}
+import japgolly.scalajs.react.{raw => RAW}
 
 object Generic {
 
@@ -15,6 +14,7 @@ object Generic {
     type Raw <: js.Any
     val raw: Raw
     def displayName: String
+    def mapRaw(f: Raw => Raw): ComponentRaw
   }
 
   trait ComponentSimple[P, CT[-p, +u] <: CtorType[p, u], U] extends ComponentRaw {
@@ -28,6 +28,7 @@ object Generic {
     val ctor: CT[P, U]
     implicit def ctorPF: Profunctor[CT]
 
+    override def mapRaw(f: Raw => Raw): ComponentSimple[P, CT, U]
 
     /** Create a new JS component that wraps this component and its mappings.
       *
@@ -43,6 +44,7 @@ object Generic {
     type Root <: ComponentRoot[P0, CT0, U0]
     def root: Root
 
+    override def mapRaw(f: Raw => Raw): ComponentWithRoot[P1, CT1, U1, P0, CT0, U0]
     override def cmapCtorProps[P2](f: P2 => P1): ComponentWithRoot[P2, CT1, U1, P0, CT0, U0]
     override def mapUnmounted[U2](f: U1 => U2): ComponentWithRoot[P1, CT1, U2, P0, CT0, U0]
     override def mapCtorType[CT2[-p, +u] <: CtorType[p, u]](f: CT1[P1, U1] => CT2[P1, U1])(implicit pf: Profunctor[CT2]): ComponentWithRoot[P1, CT2, U1, P0, CT0, U0]

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

@@ -16,6 +16,7 @@ trait JsBaseComponentTemplate[RawComponent[_ <: js.Object] <: js.Any] {
     override final def displayName = rawComponentDisplayName(raw)
 
     override type Raw <: RawComponent[_ <: js.Object]
+    override def mapRaw(f: Raw => Raw): ComponentSimple[P, CT, U]
     override def cmapCtorProps[P2](f: P2 => P): ComponentSimple[P2, CT, U]
     override def mapUnmounted[U2](f: U => U2): ComponentSimple[P, CT, U2]
     override def mapCtorType[CT2[-p, +u] <: CtorType[p, u]](f: CT[P, U] => CT2[P, U])(implicit pf: Profunctor[CT2]): ComponentSimple[P, CT2, U]
@@ -29,6 +30,7 @@ trait JsBaseComponentTemplate[RawComponent[_ <: js.Object] <: js.Any] {
     override final type Raw = RawComponent[P0]
     override final type Root = ComponentRoot[P0, CT0, U0]
 
+    override def mapRaw(f: Raw => Raw): ComponentWithRoot[P1, CT1, U1, P0, CT0, U0]
     override def cmapCtorProps[P2](f: P2 => P1): ComponentWithRoot[P2, CT1, U1, P0, CT0, U0]
     override def mapUnmounted[U2](f: U1 => U2): ComponentWithRoot[P1, CT1, U2, P0, CT0, U0]
     override def mapCtorType[CT2[-p, +u] <: CtorType[p, u]](f: CT1[P1, U1] => CT2[P1, U1])(implicit pf: Profunctor[CT2]): ComponentWithRoot[P1, CT2, U1, P0, CT0, U0]
@@ -44,6 +46,7 @@ trait JsBaseComponentTemplate[RawComponent[_ <: js.Object] <: js.Any] {
       override val raw = rc
       override val ctor = c
       override implicit def ctorPF = pf
+      override def mapRaw(f: Raw => Raw) = componentRoot(f(rc), c)(pf)
       override def cmapCtorProps[P2](f: P2 => P) = mappedC(this)(f, identityFn, identityFn, pf)
       override def mapUnmounted[U2](f: U => U2) = mappedC(this)(identityFn, identityFn, f, pf)
       override def mapCtorType[CT2[-p, +u] <: CtorType[p, u]](f: CT[P, U] => CT2[P, U])(implicit pf: Profunctor[CT2]) =
@@ -62,6 +65,7 @@ trait JsBaseComponentTemplate[RawComponent[_ <: js.Object] <: js.Any] {
       override val raw = from.raw
       override val ctor = mc(from.ctor).dimap(cp, mu)
       override implicit def ctorPF = pf
+      override def mapRaw(f: Raw => Raw) = mappedC(from.mapRaw(f))(cp, mc, mu, pf)
       override def cmapCtorProps[P3](f: P3 => P2) = mappedC(from)(cp compose f, mc, mu, pf)
       override def mapUnmounted[U3](f: U2 => U3) = mappedC(from)(cp, mc, f compose mu, pf)
       override def mapCtorType[CT3[-p, +u] <: CtorType[p, u]](f: CT2[P2, U2] => CT3[P2, U2])(implicit pf3: Profunctor[CT3]) =

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

@@ -42,6 +42,7 @@ object JsForwardRef {
     override final def displayName = rawComponentDisplayName(raw)
 
     override type Raw <: Raw.React.ForwardRefComponent[_ <: js.Object, R]
+    override def mapRaw(f: Raw => Raw): ComponentSimple[P, R, CT, U]
     override def cmapCtorProps[P2](f: P2 => P): ComponentSimple[P2, R, CT, U]
     override def mapUnmounted[U2](f: U => U2): ComponentSimple[P, R, CT, U2]
     override def mapCtorType[CT2[-p, +u] <: CtorType[p, u]](f: CT[P, U] => CT2[P, U])(implicit pf: Profunctor[CT2]): ComponentSimple[P, R, CT2, U]
@@ -57,6 +58,7 @@ object JsForwardRef {
     override final type Raw = Raw.React.ForwardRefComponent[P0, R]
     override final type Root = ComponentRoot[P0, R, CT0, U0]
 
+    override def mapRaw(f: Raw => Raw): ComponentWithRoot[P1, R, CT1, U1, P0, CT0, U0]
     override def cmapCtorProps[P2](f: P2 => P1): ComponentWithRoot[P2, R, CT1, U1, P0, CT0, U0]
     override def mapUnmounted[U2](f: U1 => U2): ComponentWithRoot[P1, R, CT1, U2, P0, CT0, U0]
     override def mapCtorType[CT2[-p, +u] <: CtorType[p, u]](f: CT1[P1, U1] => CT2[P1, U1])(implicit pf: Profunctor[CT2]): ComponentWithRoot[P1, R, CT2, U1, P0, CT0, U0]
@@ -74,6 +76,7 @@ object JsForwardRef {
       override val raw = rc
       override val ctor = c
       override implicit def ctorPF = pf
+      override def mapRaw(f: Raw => Raw) = componentRoot(f(rc), c)(pf)
       override def cmapCtorProps[P2](f: P2 => P) = mappedC(this)(f, identityFn, identityFn, pf)
       override def mapUnmounted[U2](f: U => U2) = mappedC(this)(identityFn, identityFn, f, pf)
       override def mapCtorType[CT2[-p, +u] <: CtorType[p, u]](f: CT[P, U] => CT2[P, U])(implicit pf: Profunctor[CT2]) =
@@ -98,6 +101,7 @@ object JsForwardRef {
       override val raw = from.raw
       override val ctor = mc(from.ctor).dimap(cp, mu)
       override implicit def ctorPF = pf
+      override def mapRaw(f: Raw => Raw) = mappedC(from.mapRaw(f))(cp, mc, mu, pf)
       override def cmapCtorProps[P3](f: P3 => P2) = mappedC(from)(cp compose f, mc, mu, pf)
       override def mapUnmounted[U3](f: U2 => U3) = mappedC(from)(cp, mc, f compose mu, pf)
       override def mapCtorType[CT3[-p, +u] <: CtorType[p, u]](f: CT2[P2, U2] => CT3[P2, U2])(implicit pf3: Profunctor[CT3]) =

doc/changelog/1.4.0.md

@@ -56,6 +56,8 @@
 
 * Removed methods deprecated < 1.2.0
 
+* Add `.mapRaw(Raw => Raw)` to components
+
 * Dependency upgrades:
   * Cats 1.5.0
   * Scala 2.12.8