- Spinner.required() validator (#871)

edvin · Dec 26, 2018 · d808d35 · d808d35
1 parent cff8075
commit d808d35
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - The Workspace inside the `scope` of a UIComponents will assume the Workspace it is docked in (https://github.com/edvin/tornadofx/issues/806)
 - Kotlin 1.3.11
 - bindSelected for ViewModel gets `out` modifier (https://github.com/edvin/tornadofx/issues/823)
+- Spinner.required() validator (https://github.com/edvin/tornadofx/issues/871)
 
 ### Additions
 

diff --git a/src/main/java/tornadofx/ViewModel.kt b/src/main/java/tornadofx/ViewModel.kt
@@ -467,6 +467,9 @@ inline fun <reified T> ChoiceBox<T>.validator(trigger: ValidationTrigger = Valid
 inline fun <reified T> Spinner<T>.validator(trigger: ValidationTrigger = ValidationTrigger.OnChange(), noinline validator: ValidationContext.(T?) -> ValidationMessage?)
         = validator(this, valueFactory.valueProperty(), trigger, validator)
 
+inline fun <reified T> Spinner<T>.required(trigger: ValidationTrigger = tornadofx.ValidationTrigger.OnChange(), message: String? = tornadofx.viewModelBundle["required"])
+        = validator(trigger) { if (it == null) error(message) else null }
+
 /**
  * Add a validator to a TextInputControl that is already bound to a model property.
  */