Add function to hide previous JFXDialog before showing a new one, u…

…se `WeakReference` and `WeakHashMap` to store singletons

ktfx-commons/src/main/kotlin/ktfx/dialogs/Selectors.kt → ktfx-commons/src/main/kotlin/ktfx/dialogs/ChoiceDialog.kt

@@ -16,7 +16,7 @@ import kotlin.contracts.contract
  * @param configuration custom dialog action.
  * @return selected item.
  */
-public inline fun <T> selector(
+public inline fun <T> choiceDialog(
     items: Collection<T>? = null,
     prefill: T? = null,
     configuration: ChoiceDialog<T>.() -> Unit,
@@ -35,7 +35,7 @@ public inline fun <T> selector(
  * @param configuration custom dialog action.
  * @return selected item.
  */
-public inline fun <T> selector(
+public inline fun <T> choiceDialog(
     vararg items: T,
     prefill: T? = null,
     configuration: ChoiceDialog<T>.() -> Unit,

ktfx-commons/src/main/kotlin/ktfx/dialogs/InputDialogs.kt → ktfx-commons/src/main/kotlin/ktfx/dialogs/TextInputDialog.kt

@@ -15,7 +15,7 @@ import kotlin.contracts.contract
  * @param configuration custom dialog action.
  * @return input text.
  */
-public inline fun inputDialog(
+public inline fun textInputDialog(
     prefill: String = "",
     configuration: TextInputDialog.() -> Unit,
 ): Optional<String> {

ktfx-commons/src/test/kotlin/ktfx/controls/ToggleGroupsTest.kt → ktfx-commons/src/test/kotlin/ktfx/controls/ToggleGroupTest.kt

@@ -9,7 +9,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
-class ToggleGroupsTest {
+class ToggleGroupTest {
     private lateinit var button: RadioButton
     private lateinit var group: ToggleGroup
 

ktfx-commons/src/test/kotlin/ktfx/dialogs/AlertsTest.kt → ktfx-commons/src/test/kotlin/ktfx/dialogs/AlertTest.kt

@@ -7,7 +7,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 
 @Ignore
-class AlertsTest : DialogShowingTest() {
+class AlertTest : DialogShowingTest() {
     @Test
     fun alert() {
         interact {

ktfx-commons/src/test/kotlin/ktfx/dialogs/SelectorsTest.kt → ktfx-commons/src/test/kotlin/ktfx/dialogs/ChoiceDialogTest.kt

@@ -6,13 +6,13 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 
 @Ignore
-class SelectorsTest : DialogShowingTest() {
+class ChoiceDialogTest : DialogShowingTest() {
     @Test
-    fun selector() {
+    fun choiceDialog() {
         interact {
             assertEquals(
                 "Jump off bridge",
-                selector<String>(
+                choiceDialog<String>(
                     listOf("Jump off bridge", "Live a happy life"),
                     "Live a happy life",
                 ) {
@@ -30,7 +30,7 @@ class SelectorsTest : DialogShowingTest() {
             )
             assertEquals(
                 "Jump off bridge",
-                selector(
+                choiceDialog(
                     "Jump off bridge",
                     "Live a happy life",
                     prefill = "Live a happy life",

ktfx-commons/src/test/kotlin/ktfx/dialogs/InputDialogsTest.kt → ktfx-commons/src/test/kotlin/ktfx/dialogs/TextInputDialogTest.kt

@@ -6,13 +6,13 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 
 @Ignore
-class InputDialogsTest : DialogShowingTest() {
+class TextInputDialogTest : DialogShowingTest() {
     @Test
-    fun inputDialog() {
+    fun textInputDialog() {
         interact {
             assertEquals(
                 "Awesome input",
-                inputDialog("Awful input") {
+                textInputDialog("Awful input") {
                     headerTitle = "Input dialog"
                     graphicIcon = sampleGraphic
 

ktfx-layouts/src/main/kotlin/javafx/scene/layout/KtfxAnchorPane.kt

@@ -53,45 +53,45 @@ public open class KtfxAnchorPane :
 
     /** Set children anchor on each side in this layout. */
     public fun <T : Node> T.anchor(
-        horizontal: Int = Int.MAX_VALUE,
-        vertical: Int = Int.MAX_VALUE,
+        horizontal: Int = Int.MIN_VALUE,
+        vertical: Int = Int.MIN_VALUE,
     ): T = anchor(vertical, horizontal, vertical, horizontal)
 
     /** Set children anchor on each side in this layout. */
     public fun <T : Node> T.anchor(
-        top: Int = Int.MAX_VALUE,
-        right: Int = Int.MAX_VALUE,
-        bottom: Int = Int.MAX_VALUE,
-        left: Int = Int.MAX_VALUE,
+        top: Int = Int.MIN_VALUE,
+        right: Int = Int.MIN_VALUE,
+        bottom: Int = Int.MIN_VALUE,
+        left: Int = Int.MIN_VALUE,
     ): T =
         anchor(
-            if (top != Int.MAX_VALUE) top.toDouble() else Double.NaN,
-            if (right != Int.MAX_VALUE) right.toDouble() else Double.NaN,
-            if (bottom != Int.MAX_VALUE) bottom.toDouble() else Double.NaN,
-            if (left != Int.MAX_VALUE) left.toDouble() else Double.NaN,
+            if (top != Int.MIN_VALUE) top.toDouble() else Double.NaN,
+            if (right != Int.MIN_VALUE) right.toDouble() else Double.NaN,
+            if (bottom != Int.MIN_VALUE) bottom.toDouble() else Double.NaN,
+            if (left != Int.MIN_VALUE) left.toDouble() else Double.NaN,
         )
 
     /** Set children anchor on all side in this layout. */
     public fun <T : Node> T.anchor(all: Long): T = anchor(all, all, all, all)
 
     /** Set children anchor on each side in this layout. */
     public fun <T : Node> T.anchor(
-        horizontal: Long = Long.MAX_VALUE,
-        vertical: Long = Long.MAX_VALUE,
+        horizontal: Long = Long.MIN_VALUE,
+        vertical: Long = Long.MIN_VALUE,
     ): T = anchor(vertical, horizontal, vertical, horizontal)
 
     /** Set children anchor on each side in this layout. */
     public fun <T : Node> T.anchor(
-        top: Long = Long.MAX_VALUE,
-        right: Long = Long.MAX_VALUE,
-        bottom: Long = Long.MAX_VALUE,
-        left: Long = Long.MAX_VALUE,
+        top: Long = Long.MIN_VALUE,
+        right: Long = Long.MIN_VALUE,
+        bottom: Long = Long.MIN_VALUE,
+        left: Long = Long.MIN_VALUE,
     ): T =
         anchor(
-            if (top != Long.MAX_VALUE) top.toDouble() else Double.NaN,
-            if (right != Long.MAX_VALUE) right.toDouble() else Double.NaN,
-            if (bottom != Long.MAX_VALUE) bottom.toDouble() else Double.NaN,
-            if (left != Long.MAX_VALUE) left.toDouble() else Double.NaN,
+            if (top != Long.MIN_VALUE) top.toDouble() else Double.NaN,
+            if (right != Long.MIN_VALUE) right.toDouble() else Double.NaN,
+            if (bottom != Long.MIN_VALUE) bottom.toDouble() else Double.NaN,
+            if (left != Long.MIN_VALUE) left.toDouble() else Double.NaN,
         )
 
     /** Set children anchor on all side in this layout. */
@@ -104,17 +104,16 @@ public open class KtfxAnchorPane :
     ): T = anchor(vertical, horizontal, vertical, horizontal)
 
     /** Set children anchor on each side in this layout. */
-    @Suppress("ConvertNaNEquality")
     public fun <T : Node> T.anchor(
         top: Double = Double.NaN,
         right: Double = Double.NaN,
         bottom: Double = Double.NaN,
         left: Double = Double.NaN,
     ): T {
-        if (topAnchor != Double.NaN) topAnchor = top
-        if (rightAnchor != Double.NaN) rightAnchor = right
-        if (bottomAnchor != Double.NaN) bottomAnchor = bottom
-        if (leftAnchor != Double.NaN) leftAnchor = left
+        if (!top.isNaN()) topAnchor = top
+        if (!right.isNaN()) rightAnchor = right
+        if (!bottom.isNaN()) bottomAnchor = bottom
+        if (!left.isNaN()) leftAnchor = left
         return this
     }
 

thirdparty/ktfx-controlsfx-commons/src/main/kotlin/ktfx/controlsfx/Platform.kt

@@ -1,15 +1,14 @@
 @file:JvmName("ControlsfxPlatformKt")
-@file:Suppress("NOTHING_TO_INLINE")
 
 package ktfx.controlsfx
 
 import org.controlsfx.tools.Platform
 
 /** Returns true if this is running on Windows. */
-public inline fun isPlatformWindows(): Boolean = Platform.getCurrent() == Platform.WINDOWS
+public fun isPlatformWindows(): Boolean = Platform.getCurrent() == Platform.WINDOWS
 
 /** Returns true if this is running on OSX. */
-public inline fun isPlatformOsx(): Boolean = Platform.getCurrent() == Platform.OSX
+public fun isPlatformOsx(): Boolean = Platform.getCurrent() == Platform.OSX
 
 /** Returns true if this is running on Unix. */
-public inline fun isPlatformUnix(): Boolean = Platform.getCurrent() == Platform.UNIX
+public fun isPlatformUnix(): Boolean = Platform.getCurrent() == Platform.UNIX

thirdparty/ktfx-controlsfx-commons/src/main/kotlin/ktfx/controlsfx/controls/ValidationSupport.kt

@@ -4,15 +4,13 @@ import javafx.scene.control.Control
 import org.controlsfx.validation.Severity
 import org.controlsfx.validation.ValidationSupport
 import org.controlsfx.validation.Validator
+import java.lang.ref.WeakReference
 
-private lateinit var support: ValidationSupport
-private val singletonSupport: ValidationSupport
-    get() {
-        if (!::support.isInitialized) {
-            support = ValidationSupport()
-        }
-        return support
-    }
+private lateinit var validationSupportRef: WeakReference<ValidationSupport>
+private val validationSupport: ValidationSupport
+    get() =
+        validationSupportRef.get()
+            ?: ValidationSupport().also { validationSupportRef = WeakReference(it) }
 
 /** Set control's required flag. */
 public inline var Control.isValidationRequired: Boolean
@@ -24,7 +22,7 @@ public fun <T> Control.registerEmptyValidator(
     message: String,
     severity: Severity = Severity.ERROR,
     required: Boolean = true,
-    support: ValidationSupport = singletonSupport,
+    support: ValidationSupport = validationSupport,
 ): Boolean =
     support.registerValidator(
         this,
@@ -38,7 +36,7 @@ public fun <T> Control.registerEqualsValidator(
     collection: Collection<T>,
     severity: Severity = Severity.ERROR,
     required: Boolean = true,
-    support: ValidationSupport = singletonSupport,
+    support: ValidationSupport = validationSupport,
 ): Boolean =
     support.registerValidator(
         this,
@@ -51,7 +49,7 @@ public fun <T> Control.registerPredicateValidator(
     message: String,
     severity: Severity = Severity.ERROR,
     required: Boolean = true,
-    support: ValidationSupport = singletonSupport,
+    support: ValidationSupport = validationSupport,
     predicate: (T) -> Boolean,
 ): Boolean =
     support.registerValidator(
@@ -66,7 +64,7 @@ public fun Control.registerRegexValidator(
     regex: String,
     severity: Severity = Severity.ERROR,
     required: Boolean = true,
-    support: ValidationSupport = singletonSupport,
+    support: ValidationSupport = validationSupport,
 ): Boolean =
     support.registerValidator(
         this,
@@ -80,7 +78,7 @@ public fun Control.registerRegexValidator(
     regex: Regex,
     severity: Severity = Severity.ERROR,
     required: Boolean = true,
-    support: ValidationSupport = singletonSupport,
+    support: ValidationSupport = validationSupport,
 ): Boolean =
     support.registerValidator(
         this,

thirdparty/ktfx-controlsfx-commons/src/test/kotlin/ktfx/controlsfx/dialogs/CommandLinksDialogsTest.kt → thirdparty/ktfx-controlsfx-commons/src/test/kotlin/ktfx/controlsfx/dialogs/CommandLinksDialogTest.kt

@@ -10,7 +10,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 
 @Ignore
-class CommandLinksDialogsTest : DialogShowingTest() {
+class CommandLinksDialogTest : DialogShowingTest() {
     @Test
     fun commandLinksDialogFromArray() {
         interact {

thirdparty/ktfx-controlsfx-commons/src/test/kotlin/ktfx/controlsfx/dialogs/ExceptionDialogsTest.kt → thirdparty/ktfx-controlsfx-commons/src/test/kotlin/ktfx/controlsfx/dialogs/ExceptionDialogTest.kt

@@ -10,7 +10,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 
 @Ignore
-class ExceptionDialogsTest : DialogShowingTest() {
+class ExceptionDialogTest : DialogShowingTest() {
     @Test
     fun exceptionDialog() {
         interact {

thirdparty/ktfx-controlsfx-commons/src/test/kotlin/ktfx/controlsfx/dialogs/FontSelectorsTest.kt → thirdparty/ktfx-controlsfx-commons/src/test/kotlin/ktfx/controlsfx/dialogs/FontSelectorTest.kt

@@ -10,7 +10,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 
 @Ignore
-class FontSelectorsTest : DialogShowingTest() {
+class FontSelectorTest : DialogShowingTest() {
     private val arial18 = Font.font("Arial", 18.0)
 
     @Test

thirdparty/ktfx-controlsfx-commons/src/test/kotlin/ktfx/controlsfx/dialogs/LoginDialogsTest.kt → thirdparty/ktfx-controlsfx-commons/src/test/kotlin/ktfx/controlsfx/dialogs/LoginDialogTest.kt

@@ -10,7 +10,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 
 @Ignore
-class LoginDialogsTest : DialogShowingTest() {
+class LoginDialogTest : DialogShowingTest() {
     private val userInfo = "Hello" to "World"
 
     @Test

thirdparty/ktfx-controlsfx-commons/src/test/kotlin/ktfx/controlsfx/dialogs/ProgressDialogsTest.kt → thirdparty/ktfx-controlsfx-commons/src/test/kotlin/ktfx/controlsfx/dialogs/ProgressDialogTest.kt

@@ -12,7 +12,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 
 @Ignore
-class ProgressDialogsTest : DialogShowingTest() {
+class ProgressDialogTest : DialogShowingTest() {
     private lateinit var helloWorldService: Service<String>
 
     override fun start(stage: Stage) {

thirdparty/ktfx-jfoenix-commons/src/main/kotlin/ktfx/jfoenix/controls/JfxSnackbar.kt

@@ -1,5 +1,5 @@
-@file:Suppress("NOTHING_TO_INLINE")
 @file:OptIn(ExperimentalContracts::class)
+@file:Suppress("NOTHING_TO_INLINE")
 
 package ktfx.jfoenix.controls
 
@@ -17,7 +17,13 @@ import kotlin.contracts.contract
 public inline fun JFXSnackbar.show(content: Node, duration: Duration): Unit =
     enqueue(JFXSnackbar.SnackbarEvent(content, duration))
 
-/** Show this snackbar with default layout. */
+/**
+ * Show this snackbar with default layout.
+ * May throw `NullPointerException` due to JFXSnackbar bug.
+ *
+ * @throws NullPointerException
+ * @see [GitHub issue](https://github.com/sshahine/JFoenix/issues/1101)
+ */
 public fun JFXSnackbar.show(
     message: String,
     duration: Duration,
@@ -26,8 +32,8 @@ public fun JFXSnackbar.show(
 ): Unit =
     show(
         JFXSnackbarLayout(message, actionText) {
-            close()
             action?.invoke(it)
+            close()
         },
         duration,
     )
@@ -36,16 +42,22 @@ public fun JFXSnackbar.show(
 public inline fun JFXSnackbar.showIndefinite(content: Node): Unit =
     enqueue(JFXSnackbar.SnackbarEvent(content, Duration.INDEFINITE))
 
-/** Show this snackbar indefinitely with default layout. */
+/**
+ * Show this snackbar indefinitely with default layout.
+ * May throw `NullPointerException` due to JFXSnackbar bug.
+ *
+ * @throws NullPointerException
+ * @see [GitHub issue](https://github.com/sshahine/JFoenix/issues/1101)
+ */
 public fun JFXSnackbar.showIndefinite(
     message: String,
     actionText: String? = null,
     action: ((ActionEvent) -> Unit)? = null,
 ): Unit =
     showIndefinite(
         JFXSnackbarLayout(message, actionText) {
-            close()
             action?.invoke(it)
+            close()
         },
     )
 

thirdparty/ktfx-jfoenix-commons/src/main/kotlin/ktfx/jfoenix/dialogs/JfxDialog.kt

@@ -0,0 +1,19 @@
+package ktfx.jfoenix.dialogs
+
+import com.jfoenix.controls.JFXDialog
+import javafx.scene.layout.StackPane
+import java.util.WeakHashMap
+
+private val shownDialogs = WeakHashMap<StackPane, JFXDialog>()
+
+/**
+ * Track a previously shown dialog within a container to close it before showing a new dialog.
+ *
+ * @param container parent layout, or the dialog's default container.
+ */
+public fun JFXDialog.showSingle(container: StackPane = dialogContainer) {
+    shownDialogs[container]
+        ?.takeIf { it in container.children }
+        ?.close()
+    shownDialogs[container] = apply { show() }
+}