Merge pull request #1094 from japgolly/lonely-useEffect

Actually invoke init in components stuck in "first"
japgolly · Jul 10, 2024 · c6e3bbf · c6e3bbf
2 parents 1b98dcb + 8066700
commit c6e3bbf
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/library/coreGeneric/src/main/scala/japgolly/scalajs/react/hooks/HookComponentBuilder.scala b/library/coreGeneric/src/main/scala/japgolly/scalajs/react/hooks/HookComponentBuilder.scala
@@ -28,7 +28,10 @@ object HookComponentBuilder {
         new ComponentPC.First(ctx => init(ctx.props))
 
       override def render(f: P => VdomNode)(implicit s: CtorType.Summoner[Box[P], Children.None]): Component[P, s.CT] =
-        ScalaFn(f)
+        ScalaFn{ p =>
+          init(p)
+          f(p)
+        }
 
       override def renderWithReuseBy[A](reusableInputs: P => A)(f: A => VdomNode)(implicit s: CtorType.Summoner[Box[P], Children.None], r: Reusability[A]): Component[P, s.CT] =
         customBy(p => CustomHook.shouldComponentUpdate(f).apply(() => reusableInputs(p)))

diff --git a/library/tests/src/test/scala/japgolly/scalajs/react/core/HooksTest.scala b/library/tests/src/test/scala/japgolly/scalajs/react/core/HooksTest.scala
@@ -573,6 +573,23 @@ object HooksTest extends TestSuite {
     protected implicit def hooksExt1[Ctx, Step <: HooksApi.AbstractStep](api: HooksApi.Primary[Ctx, Step]): X_UseEffect_Primary[Ctx, Step]
     protected implicit def hooksExt2[Ctx, CtxFn[_], Step <: HooksApi.SubsequentStep[Ctx, CtxFn]](api: HooksApi.Secondary[Ctx, CtxFn, Step]): X_UseEffect_Secondary[Ctx, CtxFn, Step]
 
+    def testSingle(): Unit = {
+      val counter1 = new Counter
+      val counter2 = new Counter
+      def state() = s"${counter1.value}:${counter2.value}"
+
+      val comp = ScalaFnComponent.withHooks[Unit]
+        .X_useEffect(counter1.incCB.ret(counter2.incCB))
+        .X_useEffect(counter1.incCB(101))
+        .X_useEffect(counter1.incCB.ret(counter2.incCB))
+        .render(_ => EmptyVdom)
+
+      test(comp()) { _ =>
+        assertEq(state(), "103:0")
+      }
+      assertEq(state(), "103:2")
+    }
+
     def testConst(): Unit = {
       val counter1 = new Counter
       val counter2 = new Counter
@@ -1292,6 +1309,7 @@ object HooksTest extends TestSuite {
     "useDebugValue" - testUseDebugValue()
     "useEffect" - {
       import UseEffect._
+      "single" - testSingle()
       "const" - testConst()
       "constBy" - testConstBy()
       "deps" - testWithDeps()
@@ -1302,6 +1320,7 @@ object HooksTest extends TestSuite {
     "useForceUpdate" - testUseForceUpdate()
     "useLayoutEffect" - {
       import UseLayoutEffect._
+      "single" - testSingle()
       "const" - testConst()
       "constBy" - testConstBy()
       "deps" - testWithDeps()