Merge pull request #3760 from mohamean/clear-searchfield-on-esc

Pressing ESC while searching clears searchfield and selects first available entry

src/main/java/org/jabref/gui/search/GlobalSearchBar.java

@@ -27,6 +27,7 @@
 import javafx.scene.control.ToolBar;
 import javafx.scene.control.Tooltip;
 import javafx.scene.control.cell.TextFieldListCell;
+import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseButton;
 import javafx.scene.layout.BorderPane;
@@ -136,11 +137,17 @@ public void actionPerformed(ActionEvent e) {
         KeyBindingRepository keyBindingRepository = Globals.getKeyPrefs();
         addEventFilter(KeyEvent.KEY_PRESSED, event -> {
             Optional<KeyBinding> keyBinding = keyBindingRepository.mapToKeyBinding(event);
-            if (keyBinding.isPresent() && keyBinding.get().equals(KeyBinding.GLOBAL_SEARCH)) {
-                globalSearch.setSelected(true);
-                searchPreferences.setGlobalSearch(globalSearch.isSelected());
-                updateOpenCurrentResultsTooltip(globalSearch.isSelected());
-                focus();
+            if (keyBinding.isPresent()) {
+                if (keyBinding.get().equals(KeyBinding.GLOBAL_SEARCH)) {
+                    globalSearch.setSelected(true);
+                    searchPreferences.setGlobalSearch(globalSearch.isSelected());
+                    updateOpenCurrentResultsTooltip(globalSearch.isSelected());
+                    focus();
+                } else if (keyBinding.get().equals(KeyBinding.CLEAR_SEARCH)) {
+                    // Clear search and select first entry, if available
+                    clearSearch();
+                    frame.getCurrentBasePanel().getMainTable().getSelectionModel().selectFirst();
+                }
             }
         });
 
@@ -204,6 +211,7 @@ public void actionPerformed(ActionEvent e) {
                 searchField,
                 currentResults
         );
+
         this.setAlignment(Pos.CENTER_LEFT);
     }