Merge pull request #1211 from gemini-hlsw/bump-sjsreact

Upgrade scalajs-react
gemini-hlsw · Jul 11, 2024 · 174950e · 174950e
2 parents 9929cdd + b80d374
commit 174950e
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 39 deletions.
diff --git a/build.sbt b/build.sbt
@@ -23,7 +23,7 @@ val Versions = new {
   val monocle           = "3.2.0"
   val mouse             = "1.3.1"
   val pprint            = "0.9.0"
-  val scalaJsReact      = "3.0.0-beta3"
+  val scalaJsReact      = "3.0.0-beta5"
 }
 
 ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots")

diff --git a/modules/ui/src/main/scala/lucuma/ui/components/state/IfLogged.scala b/modules/ui/src/main/scala/lucuma/ui/components/state/IfLogged.scala
@@ -43,42 +43,40 @@ object IfLogged:
   private type Props[E] = IfLogged[E]
 
   private def componentBuilder[E] =
-    ScalaFnComponent
-      .withHooks[Props[E]]
-      .render: props =>
-        import props.given
+    ScalaFnComponent[Props[E]]: props =>
+      import props.given
 
-        val vaultSet   = props.userVault.async.set
-        val messageSet = props.userSelectionMessage.async.set.compose((_: NonEmptyString).some)
+      val vaultSet   = props.userVault.async.set
+      val messageSet = props.userSelectionMessage.async.set.compose((_: NonEmptyString).some)
 
-        props.userVault.get.fold[VdomElement](
-          UserSelectionForm(
-            props.systemName,
-            props.systemNameStyle,
-            props.ssoClient,
-            props.userVault,
-            props.userSelectionMessage,
-            props.allowGuest
+      props.userVault.get.fold[VdomElement](
+        UserSelectionForm(
+          props.systemName,
+          props.systemNameStyle,
+          props.ssoClient,
+          props.userVault,
+          props.userSelectionMessage,
+          props.allowGuest
+        )
+      ) { vault =>
+        React.Fragment(
+          SSOManager(props.ssoClient, vault.expiration, vaultSet, messageSet),
+          ConnectionManager(
+            vault,
+            props.openConnections,
+            props.closeConnections,
+            props.onConnect
+          )(
+            LogoutTracker(
+              vaultSet,
+              messageSet,
+              props.channelName,
+              props.isLogoutEvent,
+              props.getEventNonce,
+              props.createEventWithNonce
+            )(props.render(_))
           )
-        ) { vault =>
-          React.Fragment(
-            SSOManager(props.ssoClient, vault.expiration, vaultSet, messageSet),
-            ConnectionManager(
-              vault,
-              props.openConnections,
-              props.closeConnections,
-              props.onConnect
-            )(
-              LogoutTracker(
-                vaultSet,
-                messageSet,
-                props.channelName,
-                props.isLogoutEvent,
-                props.getEventNonce,
-                props.createEventWithNonce
-              )(props.render(_))
-            )
-          )
-        }
+        )
+      }
 
   private val component = componentBuilder[Any]
diff --git a/modules/ui/src/main/scala/lucuma/ui/components/state/SSOManager.scala b/modules/ui/src/main/scala/lucuma/ui/components/state/SSOManager.scala
@@ -41,9 +41,7 @@ object SSOManager:
   private val component =
     ScalaFnComponent
       .withHooks[Props]
-      // Needed because of the infamous bug where useEffect doesn't run if it's the only hook.
-      .useState(())
-      .useEffectStreamWithDepsBy((props, _) => props.expiration): (props, _) =>
+      .useEffectStreamWithDepsBy(props => props.expiration): props =>
         expiration =>
           import props.given
 
@@ -66,4 +64,4 @@ object SSOManager:
               yield ())
                 .onError: t =>
                   Logger[DefaultA].error(t)("Error refreshing user token") >> props.setVault(none)
-      .render((_, _) => EmptyVdom) // This is a "phantom" component. Doesn't render anything.
+      .render(_ => EmptyVdom) // This is a "phantom" component. Doesn't render anything.