Hide the popup when the value changes.

dlsc-software-consulting-gmbh · Mar 8, 2024 · 13d9e8e · 13d9e8e
1 parent 3436ce4
commit 13d9e8e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/gemsfx/src/main/java/com/dlsc/gemsfx/CalendarPicker.java b/gemsfx/src/main/java/com/dlsc/gemsfx/CalendarPicker.java
@@ -48,7 +48,7 @@ public CalendarPicker() {
 
         setFocusTraversable(false);
 
-        valueProperty().addListener(it -> updateText());
+        valueProperty().addListener(it -> updateTextAndHidePopup());
 
         editor.promptTextProperty().bindBidirectional(promptTextProperty());
         editor.editableProperty().bind(editableProperty());
@@ -83,7 +83,7 @@ public CalendarPicker() {
         });
 
         setMaxWidth(Region.USE_PREF_SIZE);
-        updateText();
+        updateTextAndHidePopup();
     }
 
     private void placeCaretAtEnd() {
@@ -134,15 +134,21 @@ private void commitValue() {
 
     /*
      * Updates the text of the text field based on the current value / month.
+     * Hide the popup.
      */
-    private void updateText() {
+    private void updateTextAndHidePopup() {
         LocalDate value = getValue();
         if (value != null && getConverter() != null) {
             editor.setText(getConverter().toString(value));
         } else {
             editor.setText("");
         }
         editor.positionCaret(editor.getText().length());
+
+        CalendarPickerSkin skin = (CalendarPickerSkin) getSkin();
+        if (skin != null) {
+            skin.hide();
+        }
     }
 
     /**

diff --git a/gemsfx/src/main/java/com/dlsc/gemsfx/YearMonthPicker.java b/gemsfx/src/main/java/com/dlsc/gemsfx/YearMonthPicker.java
@@ -41,7 +41,7 @@ public YearMonthPicker() {
         setFocusTraversable(false);
         setOnTouchPressed(evt -> commitValueAndShow());
 
-        valueProperty().addListener(it -> updateText());
+        valueProperty().addListener(it -> updateTextAndHidedPopup());
 
         editor.setPromptText("Example: March 2023");
         editor.editableProperty().bind(editableProperty());
@@ -114,15 +114,21 @@ public void commit() {
 
     /*
      * Updates the text of the text field based on the current value / month.
+     * Hide the popup.
      */
-    private void updateText() {
+    private void updateTextAndHidedPopup() {
         YearMonth value = getValue();
         if (value != null && getConverter() != null) {
             editor.setText(getConverter().toString(value));
         } else {
             editor.setText("");
         }
         editor.positionCaret(editor.getText().length());
+
+        YearMonthPickerSkin skin = (YearMonthPickerSkin) getSkin();
+        if (skin != null) {
+            skin.hide();
+        }
     }
 
     /**

diff --git a/gemsfx/src/main/java/com/dlsc/gemsfx/YearPicker.java b/gemsfx/src/main/java/com/dlsc/gemsfx/YearPicker.java
@@ -43,7 +43,7 @@ public YearPicker() {
         setOnTouchPressed(evt -> commitValueAndShow());
 
         valueProperty().addListener((obs, oldV, newV) -> {
-            updateText(newV);
+            updateTextAndHidePopup(newV);
             year.set(newV == null ? null : newV.getValue());
         });
 
@@ -142,13 +142,18 @@ private void commit() {
         }
     }
 
-    private void updateText(Year value) {
+    private void updateTextAndHidePopup(Year value) {
         if (value != null) {
             editor.setText(String.valueOf(value.getValue()));
         } else {
             editor.setText("");
         }
         editor.positionCaret(editor.getText().length());
+
+        YearPickerSkin skin = (YearPickerSkin) getSkin();
+        if (skin != null) {
+            skin.hide();
+        }
     }
 
     static class NumberStringFilteredConverter extends NumberStringConverter {