Merge pull request #1264 from gemini-hlsw/empty-message

Empty message
gemini-hlsw · Sep 7, 2024 · c911e35 · c911e35
2 parents 5b996a8 + 4df9ce1
commit c911e35
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 25 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,24 +1,24 @@
 import org.scalajs.linker.interface.ModuleSplitStyle
 
-ThisBuild / tlBaseVersion       := "0.116"
+ThisBuild / tlBaseVersion       := "0.117"
 ThisBuild / tlCiReleaseBranches := Seq("master")
 
 val Versions = new {
   val cats              = "2.12.0"
   val catsRetry         = "3.1.3"
   val catsTime          = "0.5.1"
   val circe             = "0.14.10"
-  val crystal           = "0.42.1"
+  val crystal           = "0.43.0"
   val fs2Dom            = "0.3.0-M1"
   val kittens           = "3.4.0"
   val http4s            = "0.23.27"
   val http4sDom         = "0.2.11"
   val log4catsLogLevel  = "0.3.1"
-  val lucumaCore        = "0.103.1"
+  val lucumaCore        = "0.104.0"
   val lucumaPrimeStyles = "0.3.0"
   val lucumaReact       = "0.71.0"
   val lucumaRefined     = "0.1.2"
-  val lucumaSchemas     = "0.96.0"
+  val lucumaSchemas     = "0.99.1"
   val lucumaSso         = "0.6.23"
   val monocle           = "3.3.0"
   val mouse             = "1.3.2"
@@ -38,8 +38,8 @@ addCommandAlias(
 
 ThisBuild / turbo                    := true
 ThisBuild / Test / parallelExecution := false
-ThisBuild / scalaVersion             := "3.4.3"
-ThisBuild / crossScalaVersions       := Seq("3.4.3")
+ThisBuild / scalaVersion             := "3.5.0"
+ThisBuild / crossScalaVersions       := Seq("3.5.0")
 ThisBuild / scalacOptions ++= Seq("-language:implicitConversions")
 
 enablePlugins(NoPublishPlugin)

diff --git a/modules/demo/src/main/scala/lucuma/ui/demo/FormComponent.scala b/modules/demo/src/main/scala/lucuma/ui/demo/FormComponent.scala
@@ -28,7 +28,6 @@ import lucuma.core.math.validation.MathValidators
 import lucuma.core.util.TimeSpan
 import lucuma.core.validation.*
 import lucuma.react.common.ReactFnProps
-import lucuma.react.common.style.Css
 import lucuma.refined.*
 import lucuma.ui.input.ChangeAuditor
 import lucuma.ui.input.FilterMode

diff --git a/modules/ui/src/main/resources/lucuma-css/lucuma-ui-prime.scss b/modules/ui/src/main/resources/lucuma-css/lucuma-ui-prime.scss
@@ -328,3 +328,8 @@
 .pl-react-table.pl-very-compact .p-datatable-tbody > tr > td.p-datatable-emptymessage {
   padding: 0;
 }
+
+.p-dropdown-label-empty {
+  opacity: 0.5;
+  visibility: visible;
+}
diff --git a/modules/ui/src/main/scala/lucuma/ui/primereact/EnumOptionalDropdown.scala b/modules/ui/src/main/scala/lucuma/ui/primereact/EnumOptionalDropdown.scala
@@ -16,24 +16,26 @@ import lucuma.react.primereact.SelectItem
 import scalajs.js
 
 case class EnumOptionalDropdown[A](
-  id:              NonEmptyString,
-  value:           Option[A],
-  exclude:         Set[A] = Set.empty[A],
-  disabledItems:   Set[A] = Set.empty[A],
-  clazz:           js.UndefOr[Css] = js.undefined,
-  showClear:       Boolean = true,
-  panelClass:      js.UndefOr[Css] = js.undefined,
-  filter:          js.UndefOr[Boolean] = js.undefined,
-  showFilterClear: js.UndefOr[Boolean] = js.undefined,
-  disabled:        js.UndefOr[Boolean] = js.undefined,
-  size:            js.UndefOr[PlSize] = js.undefined,
-  itemTemplate:    js.UndefOr[SelectItem[A] => VdomNode] = js.undefined,
-  valueTemplate:   js.UndefOr[SelectItem[A] => VdomNode] = js.undefined,
-  onChange:        js.UndefOr[Option[A] => Callback] = js.undefined,
-  onChangeE:       js.UndefOr[(Option[A], ReactEvent) => Callback] =
+  id:                   NonEmptyString,
+  value:                Option[A],
+  exclude:              Set[A] = Set.empty[A],
+  disabledItems:        Set[A] = Set.empty[A],
+  clazz:                js.UndefOr[Css] = js.undefined,
+  showClear:            Boolean = true,
+  panelClass:           js.UndefOr[Css] = js.undefined,
+  filter:               js.UndefOr[Boolean] = js.undefined,
+  showFilterClear:      js.UndefOr[Boolean] = js.undefined,
+  disabled:             js.UndefOr[Boolean] = js.undefined,
+  size:                 js.UndefOr[PlSize] = js.undefined,
+  itemTemplate:         js.UndefOr[SelectItem[A] => VdomNode] = js.undefined,
+  valueTemplate:        js.UndefOr[SelectItem[A] => VdomNode] = js.undefined,
+  emptyMessage:         js.UndefOr[VdomNode] = js.undefined,
+  emptyMessageTemplate: js.UndefOr[VdomNode] = js.undefined,
+  onChange:             js.UndefOr[Option[A] => Callback] = js.undefined,
+  onChangeE:            js.UndefOr[(Option[A], ReactEvent) => Callback] =
     js.undefined, // called after onChange
-  placeholder:     js.UndefOr[String] = js.undefined,
-  modifiers:       Seq[TagMod] = Seq.empty
+  placeholder:          js.UndefOr[String] = js.undefined,
+  modifiers:            Seq[TagMod] = Seq.empty
 )(using val enumerated: Enumerated[A], val display: Display[A])
     extends ReactFnProps(EnumOptionalDropdown.component):
   def addModifiers(modifiers: Seq[TagMod]) = copy(modifiers = this.modifiers ++ modifiers)
@@ -67,6 +69,8 @@ object EnumOptionalDropdown {
       placeholder = props.placeholder,
       itemTemplate = props.itemTemplate,
       valueTemplate = props.valueTemplate,
+      emptyMessage = props.emptyMessage,
+      emptyMessageTemplate = props.emptyMessageTemplate,
       onChange = props.onChange,
       onChangeE = props.onChangeE,
       modifiers = props.modifiers

diff --git a/modules/ui/src/main/scala/lucuma/ui/syntax/mod.scala b/modules/ui/src/main/scala/lucuma/ui/syntax/mod.scala
@@ -17,7 +17,6 @@ import lucuma.react.common.GenericFnComponentPC
 import lucuma.react.common.ReactRender
 
 import scala.scalajs.js
-import scala.scalajs.js.UndefOr
 
 trait mod:
   // Syntaxis for apply