From 0cc39a18396a2d8e510e9e34eaee000d26a518f6 Mon Sep 17 00:00:00 2001
From: Loay Ghreeb <loayahmed655@gmail.com>
Date: Thu, 15 Aug 2024 01:24:17 +0300
Subject: [PATCH 1/5] Update PreviewView to listen for library search queries

---
 .../DatabaseChangeDetailsViewFactory.java     |  5 ---
 .../collab/DatabaseChangesResolverDialog.java |  6 +--
 .../entrychange/EntryChangeDetailsView.java   |  8 ++--
 .../jabref/gui/entryeditor/CommentsTab.java   | 11 +++---
 .../gui/entryeditor/DeprecatedFieldsTab.java  |  9 +++--
 .../entryeditor/DetailOptionalFieldsTab.java  | 11 +++---
 .../jabref/gui/entryeditor/EntryEditor.java   | 16 ++++----
 .../gui/entryeditor/FieldsEditorTab.java      | 16 ++++----
 .../ImportantOptionalFieldsTab.java           | 11 +++---
 .../entryeditor/OptionalFieldsTabBase.java    | 11 +++---
 .../gui/entryeditor/OtherFieldsTab.java       | 11 +++---
 .../jabref/gui/entryeditor/PreviewTab.java    | 13 ++++---
 .../gui/entryeditor/RequiredFieldsTab.java    |  9 +++--
 .../gui/entryeditor/UserDefinedFieldsTab.java |  9 +++--
 .../gui/maintable/MainTableColumnFactory.java |  2 +-
 .../gui/maintable/MainTableTooltip.java       |  7 +---
 .../gui/openoffice/StyleSelectDialogView.java |  7 +---
 .../gui/preferences/preview/PreviewTab.java   |  2 +-
 .../org/jabref/gui/preview/PreviewPanel.java  | 13 +++----
 .../org/jabref/gui/preview/PreviewViewer.java | 38 ++++++++++---------
 .../gui/search/GlobalSearchResultDialog.java  |  2 +-
 21 files changed, 106 insertions(+), 111 deletions(-)

diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsViewFactory.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsViewFactory.java
index e20809388f0..41bee3ad227 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsViewFactory.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsViewFactory.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.collab;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
 import org.jabref.gui.collab.entryadd.EntryAdd;
 import org.jabref.gui.collab.entrychange.EntryChange;
 import org.jabref.gui.collab.entrychange.EntryChangeDetailsView;
@@ -31,7 +30,6 @@
 public class DatabaseChangeDetailsViewFactory {
     private final BibDatabaseContext databaseContext;
     private final DialogService dialogService;
-    private final StateManager stateManager;
     private final ThemeManager themeManager;
     private final PreferencesService preferencesService;
     private final BibEntryTypesManager entryTypesManager;
@@ -40,7 +38,6 @@ public class DatabaseChangeDetailsViewFactory {
 
     public DatabaseChangeDetailsViewFactory(BibDatabaseContext databaseContext,
                                             DialogService dialogService,
-                                            StateManager stateManager,
                                             ThemeManager themeManager,
                                             PreferencesService preferencesService,
                                             BibEntryTypesManager entryTypesManager,
@@ -48,7 +45,6 @@ public DatabaseChangeDetailsViewFactory(BibDatabaseContext databaseContext,
                                             TaskExecutor taskExecutor) {
         this.databaseContext = databaseContext;
         this.dialogService = dialogService;
-        this.stateManager = stateManager;
         this.themeManager = themeManager;
         this.preferencesService = preferencesService;
         this.entryTypesManager = entryTypesManager;
@@ -63,7 +59,6 @@ public DatabaseChangeDetailsView create(DatabaseChange databaseChange) {
                 entryChange.getNewEntry(),
                 databaseContext,
                 dialogService,
-                stateManager,
                 themeManager,
                 preferencesService,
                 entryTypesManager,
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java b/src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java
index 3feb8b95de1..7da15d69823 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java
@@ -15,7 +15,6 @@
 import javafx.scene.layout.BorderPane;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
 import org.jabref.gui.preview.PreviewViewer;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BaseDialog;
@@ -57,7 +56,6 @@ public class DatabaseChangesResolverDialog extends BaseDialog<Boolean> {
     private boolean areAllChangesDenied;
 
     @Inject private UndoManager undoManager;
-    @Inject private StateManager stateManager;
     @Inject private DialogService dialogService;
     @Inject private PreferencesService preferencesService;
     @Inject private ThemeManager themeManager;
@@ -101,8 +99,8 @@ public boolean areAllChangesDenied() {
 
     @FXML
     private void initialize() {
-        PreviewViewer previewViewer = new PreviewViewer(database, dialogService, preferencesService, stateManager, themeManager, taskExecutor);
-        DatabaseChangeDetailsViewFactory databaseChangeDetailsViewFactory = new DatabaseChangeDetailsViewFactory(database, dialogService, stateManager, themeManager, preferencesService, entryTypesManager, previewViewer, taskExecutor);
+        PreviewViewer previewViewer = new PreviewViewer(database, dialogService, preferencesService, themeManager, taskExecutor);
+        DatabaseChangeDetailsViewFactory databaseChangeDetailsViewFactory = new DatabaseChangeDetailsViewFactory(database, dialogService, themeManager, preferencesService, entryTypesManager, previewViewer, taskExecutor);
 
         viewModel = new ExternalChangesResolverViewModel(changes, undoManager);
 
diff --git a/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java b/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java
index f2722c5ee49..80e7762c49d 100644
--- a/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java
@@ -10,7 +10,6 @@
 import javafx.scene.web.WebView;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
 import org.jabref.gui.collab.DatabaseChangeDetailsView;
 import org.jabref.gui.preview.PreviewViewer;
 import org.jabref.gui.theme.ThemeManager;
@@ -24,15 +23,12 @@
 import com.tobiasdiez.easybind.EasyBind;
 
 public final class EntryChangeDetailsView extends DatabaseChangeDetailsView {
-    private final PreviewWithSourceTab oldPreviewWithSourcesTab = new PreviewWithSourceTab();
-    private final PreviewWithSourceTab newPreviewWithSourcesTab = new PreviewWithSourceTab();
     private boolean scrolling = false;
 
     public EntryChangeDetailsView(BibEntry oldEntry,
                                   BibEntry newEntry,
                                   BibDatabaseContext databaseContext,
                                   DialogService dialogService,
-                                  StateManager stateManager,
                                   ThemeManager themeManager,
                                   PreferencesService preferencesService,
                                   BibEntryTypesManager entryTypesManager,
@@ -44,7 +40,7 @@ public EntryChangeDetailsView(BibEntry oldEntry,
         onDisk.getStyleClass().add("lib-change-header");
 
         // we need a copy here as we otherwise would set the same entry twice
-        PreviewViewer previewClone = new PreviewViewer(databaseContext, dialogService, preferencesService, stateManager, themeManager, taskExecutor);
+        PreviewViewer previewClone = new PreviewViewer(databaseContext, dialogService, preferencesService, themeManager, taskExecutor);
 
         // The scroll bar used is not part of ScrollPane, but the attached WebView.
         WebView previewCloneView = (WebView) previewClone.getContent();
@@ -53,7 +49,9 @@ public EntryChangeDetailsView(BibEntry oldEntry,
         synchronizeScrolling(previewViewerView, previewCloneView);
         // TODO: Also sync scrolling for BibTeX view.
 
+        PreviewWithSourceTab oldPreviewWithSourcesTab = new PreviewWithSourceTab();
         TabPane oldEntryTabPane = oldPreviewWithSourcesTab.getPreviewWithSourceTab(oldEntry, databaseContext, preferencesService, entryTypesManager, previewClone, Localization.lang("Entry Preview"));
+        PreviewWithSourceTab newPreviewWithSourcesTab = new PreviewWithSourceTab();
         TabPane newEntryTabPane = newPreviewWithSourcesTab.getPreviewWithSourceTab(newEntry, databaseContext, preferencesService, entryTypesManager, previewViewer, Localization.lang("Entry Preview"));
 
         EasyBind.subscribe(oldEntryTabPane.getSelectionModel().selectedIndexProperty(), selectedIndex -> {
diff --git a/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java b/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
index 0bfc0ffa1dc..cef2ba9e160 100644
--- a/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
@@ -17,7 +17,6 @@
 import javafx.scene.layout.RowConstraints;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.fieldeditors.FieldEditorFX;
 import org.jabref.gui.fieldeditors.FieldNameLabel;
@@ -25,10 +24,12 @@
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
+import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.pdf.search.IndexingTaskManager;
+import org.jabref.logic.search.SearchQuery;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
@@ -51,11 +52,11 @@ public CommentsTab(PreferencesService preferences,
                        UndoAction undoAction,
                        RedoAction redoAction,
                        DialogService dialogService,
-                       StateManager stateManager,
                        ThemeManager themeManager,
                        IndexingTaskManager indexingTaskManager,
                        TaskExecutor taskExecutor,
-                       JournalAbbreviationRepository journalAbbreviationRepository) {
+                       JournalAbbreviationRepository journalAbbreviationRepository,
+                       OptionalObjectProperty<SearchQuery> searchQueryProperty) {
         super(
                 false,
                 databaseContext,
@@ -65,11 +66,11 @@ public CommentsTab(PreferencesService preferences,
                 redoAction,
                 dialogService,
                 preferences,
-                stateManager,
                 themeManager,
                 taskExecutor,
                 journalAbbreviationRepository,
-                indexingTaskManager
+                indexingTaskManager,
+                searchQueryProperty
         );
         this.defaultOwner = preferences.getOwnerPreferences().getDefaultOwner().toLowerCase(Locale.ROOT).replaceAll("[^a-z0-9]", "-");
         setText(Localization.lang("Comments"));
diff --git a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
index 78eab1dd9ed..00da70da64d 100644
--- a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
@@ -10,16 +10,17 @@
 import javafx.scene.control.Tooltip;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
+import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.pdf.search.IndexingTaskManager;
+import org.jabref.logic.search.SearchQuery;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
@@ -42,13 +43,13 @@ public DeprecatedFieldsTab(BibDatabaseContext databaseContext,
                                RedoAction redoAction,
                                DialogService dialogService,
                                PreferencesService preferences,
-                               StateManager stateManager,
                                ThemeManager themeManager,
                                IndexingTaskManager indexingTaskManager,
                                BibEntryTypesManager entryTypesManager,
                                TaskExecutor taskExecutor,
-                               JournalAbbreviationRepository journalAbbreviationRepository) {
-        super(false, databaseContext, suggestionProviders, undoManager, undoAction, redoAction, dialogService, preferences, stateManager, themeManager, taskExecutor, journalAbbreviationRepository, indexingTaskManager);
+                               JournalAbbreviationRepository journalAbbreviationRepository,
+                               OptionalObjectProperty<SearchQuery> searchQueryProperty) {
+        super(false, databaseContext, suggestionProviders, undoManager, undoAction, redoAction, dialogService, preferences, themeManager, taskExecutor, journalAbbreviationRepository, indexingTaskManager, searchQueryProperty);
         this.entryTypesManager = entryTypesManager;
 
         setText(Localization.lang("Deprecated fields"));
diff --git a/src/main/java/org/jabref/gui/entryeditor/DetailOptionalFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/DetailOptionalFieldsTab.java
index 8fe322331b8..ecd387e5546 100644
--- a/src/main/java/org/jabref/gui/entryeditor/DetailOptionalFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/DetailOptionalFieldsTab.java
@@ -3,15 +3,16 @@
 import javax.swing.undo.UndoManager;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
+import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.pdf.search.IndexingTaskManager;
+import org.jabref.logic.search.SearchQuery;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.preferences.PreferencesService;
@@ -27,12 +28,12 @@ public DetailOptionalFieldsTab(BibDatabaseContext databaseContext,
                                    RedoAction redoAction,
                                    DialogService dialogService,
                                    PreferencesService preferences,
-                                   StateManager stateManager,
                                    ThemeManager themeManager,
                                    IndexingTaskManager indexingTaskManager,
                                    BibEntryTypesManager entryTypesManager,
                                    TaskExecutor taskExecutor,
-                                   JournalAbbreviationRepository journalAbbreviationRepository) {
+                                   JournalAbbreviationRepository journalAbbreviationRepository,
+                                   OptionalObjectProperty<SearchQuery> searchQueryProperty) {
         super(
                 Localization.lang("Optional fields 2"),
                 false,
@@ -43,12 +44,12 @@ public DetailOptionalFieldsTab(BibDatabaseContext databaseContext,
                 redoAction,
                 dialogService,
                 preferences,
-                stateManager,
                 themeManager,
                 indexingTaskManager,
                 entryTypesManager,
                 taskExecutor,
-                journalAbbreviationRepository
+                journalAbbreviationRepository,
+                searchQueryProperty
         );
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index f0a460ba93d..3a752018c96 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -278,21 +278,21 @@ private void navigateToNextEntry() {
     private List<EntryEditorTab> createTabs() {
         List<EntryEditorTab> tabs = new LinkedList<>();
 
-        tabs.add(new PreviewTab(databaseContext, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), taskExecutor));
+        tabs.add(new PreviewTab(databaseContext, dialogService, preferencesService, themeManager, libraryTab.getIndexingTaskManager(), taskExecutor, libraryTab.searchQueryProperty()));
 
         // Required, optional (important+detail), deprecated, and "other" fields
-        tabs.add(new RequiredFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, taskExecutor, journalAbbreviationRepository));
-        tabs.add(new ImportantOptionalFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, taskExecutor, journalAbbreviationRepository));
-        tabs.add(new DetailOptionalFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, taskExecutor, journalAbbreviationRepository));
-        tabs.add(new DeprecatedFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, taskExecutor, journalAbbreviationRepository));
-        tabs.add(new OtherFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, taskExecutor, journalAbbreviationRepository));
+        tabs.add(new RequiredFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, libraryTab.searchQueryProperty()));
+        tabs.add(new ImportantOptionalFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, libraryTab.searchQueryProperty()));
+        tabs.add(new DetailOptionalFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, libraryTab.searchQueryProperty()));
+        tabs.add(new DeprecatedFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, libraryTab.searchQueryProperty()));
+        tabs.add(new OtherFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, libraryTab.searchQueryProperty()));
 
         // Comment Tab: Tab for general and user-specific comments
-        tabs.add(new CommentsTab(preferencesService, databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), taskExecutor, journalAbbreviationRepository));
+        tabs.add(new CommentsTab(preferencesService, databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, themeManager, libraryTab.getIndexingTaskManager(), taskExecutor, journalAbbreviationRepository, libraryTab.searchQueryProperty()));
 
         Map<String, Set<Field>> entryEditorTabList = getAdditionalUserConfiguredTabs();
         for (Map.Entry<String, Set<Field>> tab : entryEditorTabList.entrySet()) {
-            tabs.add(new UserDefinedFieldsTab(tab.getKey(), tab.getValue(), databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), taskExecutor, journalAbbreviationRepository));
+            tabs.add(new UserDefinedFieldsTab(tab.getKey(), tab.getValue(), databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferencesService, themeManager, libraryTab.getIndexingTaskManager(), taskExecutor, journalAbbreviationRepository, libraryTab.searchQueryProperty()));
         }
 
         tabs.add(new MathSciNetTab());
diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index 2fa51d23a19..b0ea9c742f0 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -25,7 +25,6 @@
 import javafx.scene.layout.RowConstraints;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.fieldeditors.FieldEditorFX;
 import org.jabref.gui.fieldeditors.FieldEditors;
@@ -34,9 +33,11 @@
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
+import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.pdf.search.IndexingTaskManager;
+import org.jabref.logic.search.SearchQuery;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
@@ -61,11 +62,12 @@ abstract class FieldsEditorTab extends EntryEditorTab implements OffersPreview {
     private final ThemeManager themeManager;
     private final TaskExecutor taskExecutor;
     private final JournalAbbreviationRepository journalAbbreviationRepository;
-    private final StateManager stateManager;
     private final IndexingTaskManager indexingTaskManager;
     private PreviewPanel previewPanel;
     private final UndoManager undoManager;
+    private final OptionalObjectProperty<SearchQuery> searchQueryProperty;
     private Collection<Field> fields = new ArrayList<>();
+    @SuppressWarnings("FieldCanBeLocal")
     private Subscription dividerPositionSubscription;
 
     public FieldsEditorTab(boolean compressed,
@@ -76,11 +78,11 @@ public FieldsEditorTab(boolean compressed,
                            RedoAction redoAction,
                            DialogService dialogService,
                            PreferencesService preferences,
-                           StateManager stateManager,
                            ThemeManager themeManager,
                            TaskExecutor taskExecutor,
                            JournalAbbreviationRepository journalAbbreviationRepository,
-                           IndexingTaskManager indexingTaskManager) {
+                           IndexingTaskManager indexingTaskManager,
+                           OptionalObjectProperty<SearchQuery> searchQueryProperty) {
         this.isCompressed = compressed;
         this.databaseContext = Objects.requireNonNull(databaseContext);
         this.suggestionProviders = Objects.requireNonNull(suggestionProviders);
@@ -92,8 +94,8 @@ public FieldsEditorTab(boolean compressed,
         this.themeManager = themeManager;
         this.taskExecutor = Objects.requireNonNull(taskExecutor);
         this.journalAbbreviationRepository = Objects.requireNonNull(journalAbbreviationRepository);
-        this.stateManager = stateManager;
         this.indexingTaskManager = indexingTaskManager;
+        this.searchQueryProperty = searchQueryProperty;
     }
 
     private static void addColumn(GridPane gridPane, int columnIndex, List<Label> nodes) {
@@ -261,10 +263,10 @@ private void initPanel() {
                     dialogService,
                     preferences.getKeyBindingRepository(),
                     preferences,
-                    stateManager,
                     themeManager,
                     indexingTaskManager,
-                    taskExecutor);
+                    taskExecutor,
+                    searchQueryProperty);
             EasyBind.subscribe(preferences.getPreviewPreferences().showPreviewAsExtraTabProperty(), show -> {
                 if (show) {
                     container.getItems().remove(previewPanel);
diff --git a/src/main/java/org/jabref/gui/entryeditor/ImportantOptionalFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/ImportantOptionalFieldsTab.java
index 810f5afda8c..255a07688fa 100644
--- a/src/main/java/org/jabref/gui/entryeditor/ImportantOptionalFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/ImportantOptionalFieldsTab.java
@@ -3,15 +3,16 @@
 import javax.swing.undo.UndoManager;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
+import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.pdf.search.IndexingTaskManager;
+import org.jabref.logic.search.SearchQuery;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.preferences.PreferencesService;
@@ -27,12 +28,12 @@ public ImportantOptionalFieldsTab(BibDatabaseContext databaseContext,
                                       RedoAction redoAction,
                                       DialogService dialogService,
                                       PreferencesService preferences,
-                                      StateManager stateManager,
                                       ThemeManager themeManager,
                                       IndexingTaskManager indexingTaskManager,
                                       BibEntryTypesManager entryTypesManager,
                                       TaskExecutor taskExecutor,
-                                      JournalAbbreviationRepository journalAbbreviationRepository) {
+                                      JournalAbbreviationRepository journalAbbreviationRepository,
+                                      OptionalObjectProperty<SearchQuery> searchQueryProperty) {
         super(
                 Localization.lang("Optional fields"),
                 true,
@@ -43,12 +44,12 @@ public ImportantOptionalFieldsTab(BibDatabaseContext databaseContext,
                 redoAction,
                 dialogService,
                 preferences,
-                stateManager,
                 themeManager,
                 indexingTaskManager,
                 entryTypesManager,
                 taskExecutor,
-                journalAbbreviationRepository
+                journalAbbreviationRepository,
+                searchQueryProperty
         );
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
index d5818c08af9..1cc29e9957c 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
@@ -9,16 +9,17 @@
 import javafx.scene.control.Tooltip;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
+import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.pdf.search.IndexingTaskManager;
+import org.jabref.logic.search.SearchQuery;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
@@ -40,12 +41,12 @@ public OptionalFieldsTabBase(String title,
                                  RedoAction redoAction,
                                  DialogService dialogService,
                                  PreferencesService preferences,
-                                 StateManager stateManager,
                                  ThemeManager themeManager,
                                  IndexingTaskManager indexingTaskManager,
                                  BibEntryTypesManager entryTypesManager,
                                  TaskExecutor taskExecutor,
-                                 JournalAbbreviationRepository journalAbbreviationRepository) {
+                                 JournalAbbreviationRepository journalAbbreviationRepository,
+                                 OptionalObjectProperty<SearchQuery> searchQueryProperty) {
         super(true,
                 databaseContext,
                 suggestionProviders,
@@ -54,11 +55,11 @@ public OptionalFieldsTabBase(String title,
                 redoAction,
                 dialogService,
                 preferences,
-                stateManager,
                 themeManager,
                 taskExecutor,
                 journalAbbreviationRepository,
-                indexingTaskManager);
+                indexingTaskManager,
+                searchQueryProperty);
         this.entryTypesManager = entryTypesManager;
         this.isImportantOptionalFields = isImportantOptionalFields;
         setText(title);
diff --git a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
index 77064804441..b5092f06857 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
@@ -13,16 +13,17 @@
 import javafx.scene.control.Tooltip;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
+import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.pdf.search.IndexingTaskManager;
+import org.jabref.logic.search.SearchQuery;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
@@ -47,12 +48,12 @@ public OtherFieldsTab(BibDatabaseContext databaseContext,
                           RedoAction redoAction,
                           DialogService dialogService,
                           PreferencesService preferences,
-                          StateManager stateManager,
                           ThemeManager themeManager,
                           IndexingTaskManager indexingTaskManager,
                           BibEntryTypesManager entryTypesManager,
                           TaskExecutor taskExecutor,
-                          JournalAbbreviationRepository journalAbbreviationRepository) {
+                          JournalAbbreviationRepository journalAbbreviationRepository,
+                          OptionalObjectProperty<SearchQuery> searchQueryProperty) {
         super(false,
                 databaseContext,
                 suggestionProviders,
@@ -61,11 +62,11 @@ public OtherFieldsTab(BibDatabaseContext databaseContext,
                 redoAction,
                 dialogService,
                 preferences,
-                stateManager,
                 themeManager,
                 taskExecutor,
                 journalAbbreviationRepository,
-                indexingTaskManager);
+                indexingTaskManager,
+                searchQueryProperty);
 
         this.entryTypesManager = entryTypesManager;
         this.customTabsFieldNames = new ArrayList<>();
diff --git a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
index bd0fef9c980..bb1ac3c5fe7 100644
--- a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
@@ -1,13 +1,14 @@
 package org.jabref.gui.entryeditor;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.preview.PreviewPanel;
 import org.jabref.gui.theme.ThemeManager;
+import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.pdf.search.IndexingTaskManager;
+import org.jabref.logic.search.SearchQuery;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
@@ -17,26 +18,26 @@ public class PreviewTab extends EntryEditorTab implements OffersPreview {
     private final DialogService dialogService;
     private final BibDatabaseContext databaseContext;
     private final PreferencesService preferences;
-    private final StateManager stateManager;
     private final ThemeManager themeManager;
     private final IndexingTaskManager indexingTaskManager;
     private final TaskExecutor taskExecutor;
+    private final OptionalObjectProperty<SearchQuery> searchQueryProperty;
     private PreviewPanel previewPanel;
 
     public PreviewTab(BibDatabaseContext databaseContext,
                       DialogService dialogService,
                       PreferencesService preferences,
-                      StateManager stateManager,
                       ThemeManager themeManager,
                       IndexingTaskManager indexingTaskManager,
-                      TaskExecutor taskExecutor) {
+                      TaskExecutor taskExecutor,
+                      OptionalObjectProperty<SearchQuery> searchQueryProperty) {
         this.databaseContext = databaseContext;
         this.dialogService = dialogService;
         this.preferences = preferences;
-        this.stateManager = stateManager;
         this.themeManager = themeManager;
         this.indexingTaskManager = indexingTaskManager;
         this.taskExecutor = taskExecutor;
+        this.searchQueryProperty = searchQueryProperty;
 
         setGraphic(IconTheme.JabRefIcons.TOGGLE_ENTRY_PREVIEW.getGraphicNode());
         setText(Localization.lang("Preview"));
@@ -64,7 +65,7 @@ public boolean shouldShow(BibEntry entry) {
     @Override
     protected void bindToEntry(BibEntry entry) {
         if (previewPanel == null) {
-            previewPanel = new PreviewPanel(databaseContext, dialogService, preferences.getKeyBindingRepository(), preferences, stateManager, themeManager, indexingTaskManager, taskExecutor);
+            previewPanel = new PreviewPanel(databaseContext, dialogService, preferences.getKeyBindingRepository(), preferences, themeManager, indexingTaskManager, taskExecutor, searchQueryProperty);
             setContent(previewPanel);
         }
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
index a9f49de7d1b..252942d9934 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
@@ -9,16 +9,17 @@
 import javafx.scene.control.Tooltip;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
+import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.pdf.search.IndexingTaskManager;
+import org.jabref.logic.search.SearchQuery;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryType;
@@ -40,14 +41,14 @@ public RequiredFieldsTab(BibDatabaseContext databaseContext,
                              RedoAction redoAction,
                              DialogService dialogService,
                              PreferencesService preferences,
-                             StateManager stateManager,
                              ThemeManager themeManager,
                              IndexingTaskManager indexingTaskManager,
                              BibEntryTypesManager entryTypesManager,
                              TaskExecutor taskExecutor,
-                             JournalAbbreviationRepository journalAbbreviationRepository) {
+                             JournalAbbreviationRepository journalAbbreviationRepository,
+                             OptionalObjectProperty<SearchQuery> searchQueryProperty) {
         super(false, databaseContext, suggestionProviders, undoManager, undoAction, redoAction, dialogService,
-                preferences, stateManager, themeManager, taskExecutor, journalAbbreviationRepository, indexingTaskManager);
+                preferences, themeManager, taskExecutor, journalAbbreviationRepository, indexingTaskManager, searchQueryProperty);
         this.entryTypesManager = entryTypesManager;
         setText(Localization.lang("Required fields"));
         setTooltip(new Tooltip(Localization.lang("Show required fields")));
diff --git a/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
index 34bbb9c2ab9..2b3c9eda84d 100644
--- a/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
@@ -7,15 +7,16 @@
 import javax.swing.undo.UndoManager;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
+import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.pdf.search.IndexingTaskManager;
+import org.jabref.logic.search.SearchQuery;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
@@ -33,12 +34,12 @@ public UserDefinedFieldsTab(String name,
                                 RedoAction redoAction,
                                 DialogService dialogService,
                                 PreferencesService preferences,
-                                StateManager stateManager,
                                 ThemeManager themeManager,
                                 IndexingTaskManager indexingTaskManager,
                                 TaskExecutor taskExecutor,
-                                JournalAbbreviationRepository journalAbbreviationRepository) {
-        super(false, databaseContext, suggestionProviders, undoManager, undoAction, redoAction, dialogService, preferences, stateManager, themeManager, taskExecutor, journalAbbreviationRepository, indexingTaskManager);
+                                JournalAbbreviationRepository journalAbbreviationRepository,
+                                OptionalObjectProperty<SearchQuery> searchQueryProperty) {
+        super(false, databaseContext, suggestionProviders, undoManager, undoAction, redoAction, dialogService, preferences, themeManager, taskExecutor, journalAbbreviationRepository, indexingTaskManager, searchQueryProperty);
 
         this.fields = new LinkedHashSet<>(fields);
 
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
index 39a38d9bee6..368a48aa004 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
@@ -81,7 +81,7 @@ public MainTableColumnFactory(BibDatabaseContext database,
         this.undoManager = undoManager;
         this.stateManager = stateManager;
         ThemeManager themeManager = Injector.instantiateModelOrService(ThemeManager.class);
-        this.tooltip = new MainTableTooltip(database, dialogService, preferencesService, stateManager, themeManager, taskExecutor);
+        this.tooltip = new MainTableTooltip(database, dialogService, preferencesService, themeManager, taskExecutor);
     }
 
     public TableColumn<BibEntryTableViewModel, ?> createColumn(MainTableColumnModel column) {
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableTooltip.java b/src/main/java/org/jabref/gui/maintable/MainTableTooltip.java
index 0dee796ca40..73bb0bdced7 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableTooltip.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableTooltip.java
@@ -6,7 +6,6 @@
 import javafx.util.Duration;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
 import org.jabref.gui.preview.PreviewViewer;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.TaskExecutor;
@@ -19,11 +18,9 @@ public class MainTableTooltip extends Tooltip {
     private final PreviewViewer preview;
     private final PreferencesService preferences;
 
-    public MainTableTooltip(BibDatabaseContext databaseContext, DialogService dialogService, PreferencesService preferences,
-                            StateManager stateManager, ThemeManager themeManager, TaskExecutor taskExecutor) {
-
+    public MainTableTooltip(BibDatabaseContext databaseContext, DialogService dialogService, PreferencesService preferences, ThemeManager themeManager, TaskExecutor taskExecutor) {
         this.preferences = preferences;
-        this.preview = new PreviewViewer(databaseContext, dialogService, preferences, stateManager, themeManager, taskExecutor);
+        this.preview = new PreviewViewer(databaseContext, dialogService, preferences, themeManager, taskExecutor);
     }
 
     public Tooltip createTooltip(BibEntry entry, String fieldValue) {
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
index 00c47467bd3..8591c121b0c 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
@@ -20,7 +20,6 @@
 import javafx.scene.layout.VBox;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.preview.PreviewViewer;
 import org.jabref.gui.theme.ThemeManager;
@@ -70,7 +69,6 @@ public class StyleSelectDialogView extends BaseDialog<OOStyle> {
 
     @Inject private PreferencesService preferencesService;
     @Inject private DialogService dialogService;
-    @Inject private StateManager stateManager;
     @Inject private ThemeManager themeManager;
     @Inject private TaskExecutor taskExecutor;
     @Inject private BibEntryTypesManager bibEntryTypesManager;
@@ -78,7 +76,6 @@ public class StyleSelectDialogView extends BaseDialog<OOStyle> {
     private StyleSelectDialogViewModel viewModel;
     private PreviewViewer previewArticle;
     private PreviewViewer previewBook;
-    private PreviewViewer cslPreviewViewer;
 
     public StyleSelectDialogView(StyleLoader loader) {
         this.loader = loader;
@@ -117,7 +114,7 @@ private void initialize() {
         availableListView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) ->
                 viewModel.selectedLayoutProperty().set(newValue));
 
-        cslPreviewViewer = initializePreviewViewer(TestEntry.getTestEntry());
+        PreviewViewer cslPreviewViewer = initializePreviewViewer(TestEntry.getTestEntry());
         EasyBind.subscribe(viewModel.selectedLayoutProperty(), cslPreviewViewer::setLayout);
         cslPreviewBox.getChildren().add(cslPreviewViewer);
 
@@ -218,7 +215,7 @@ private void addStyleFile() {
     }
 
     private PreviewViewer initializePreviewViewer(BibEntry entry) {
-        PreviewViewer viewer = new PreviewViewer(new BibDatabaseContext(), dialogService, preferencesService, stateManager, themeManager, taskExecutor);
+        PreviewViewer viewer = new PreviewViewer(new BibDatabaseContext(), dialogService, preferencesService, themeManager, taskExecutor);
         viewer.setEntry(entry);
         return viewer;
     }
diff --git a/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java b/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
index 2237862afb8..059b9db23ee 100644
--- a/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
+++ b/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
@@ -177,7 +177,7 @@ public void initialize() {
         sortUpButton.disableProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull());
         sortDownButton.disableProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull());
 
-        PreviewViewer previewViewer = new PreviewViewer(new BibDatabaseContext(), dialogService, preferencesService, stateManager, themeManager, taskExecutor);
+        PreviewViewer previewViewer = new PreviewViewer(new BibDatabaseContext(), dialogService, preferencesService, themeManager, taskExecutor);
         previewViewer.setEntry(TestEntry.getTestEntry());
         EasyBind.subscribe(viewModel.selectedLayoutProperty(), previewViewer::setLayout);
         previewViewer.visibleProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNotNull()
diff --git a/src/main/java/org/jabref/gui/preview/PreviewPanel.java b/src/main/java/org/jabref/gui/preview/PreviewPanel.java
index e2c6d3c4ada..d86dd3b84c9 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewPanel.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewPanel.java
@@ -17,16 +17,17 @@
 import javafx.scene.layout.VBox;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
 import org.jabref.gui.externalfiles.ExternalFilesEntryLinker;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.theme.ThemeManager;
+import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.pdf.search.IndexingTaskManager;
 import org.jabref.logic.preview.PreviewLayout;
+import org.jabref.logic.search.SearchQuery;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
@@ -44,27 +45,23 @@ public class PreviewPanel extends VBox {
     private final PreviewViewer previewView;
     private final PreviewPreferences previewPreferences;
     private final DialogService dialogService;
-    private final StateManager stateManager;
-    private final IndexingTaskManager indexingTaskManager;
     private BibEntry entry;
 
     public PreviewPanel(BibDatabaseContext database,
                         DialogService dialogService,
                         KeyBindingRepository keyBindingRepository,
                         PreferencesService preferencesService,
-                        StateManager stateManager,
                         ThemeManager themeManager,
                         IndexingTaskManager indexingTaskManager,
-                        TaskExecutor taskExecutor) {
+                        TaskExecutor taskExecutor,
+                        OptionalObjectProperty<SearchQuery> searchQueryProperty) {
         this.keyBindingRepository = keyBindingRepository;
         this.dialogService = dialogService;
-        this.stateManager = stateManager;
         this.previewPreferences = preferencesService.getPreviewPreferences();
-        this.indexingTaskManager = indexingTaskManager;
         this.fileLinker = new ExternalFilesEntryLinker(preferencesService.getFilePreferences(), database, dialogService);
 
         PreviewPreferences previewPreferences = preferencesService.getPreviewPreferences();
-        previewView = new PreviewViewer(database, dialogService, preferencesService, stateManager, themeManager, taskExecutor);
+        previewView = new PreviewViewer(database, dialogService, preferencesService, themeManager, taskExecutor, searchQueryProperty);
         previewView.setLayout(previewPreferences.getSelectedPreviewLayout());
         previewView.setContextMenu(createPopupMenu());
         previewView.setOnDragDetected(event -> {
diff --git a/src/main/java/org/jabref/gui/preview/PreviewViewer.java b/src/main/java/org/jabref/gui/preview/PreviewViewer.java
index b8e260f1d89..af5557b16ec 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewViewer.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewViewer.java
@@ -19,11 +19,10 @@
 
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
 import org.jabref.gui.desktop.JabRefDesktop;
-import org.jabref.gui.search.SearchType;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BackgroundTask;
+import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.layout.format.Number;
@@ -123,38 +122,33 @@ function getSelectionHtml() {
 
     private final ClipBoardManager clipBoardManager;
     private final DialogService dialogService;
-    private final PreferencesService preferencesService;
-
     private final TaskExecutor taskExecutor;
     private final WebView previewView;
-    private PreviewLayout layout;
+    private final BibDatabaseContext database;
+    private final ChangeListener<Optional<SearchQuery>> listener = (queryObservable, queryOldValue, queryNewValue) -> {
+        searchHighlightPattern = queryNewValue.flatMap(SearchQuery::getJavaScriptPatternForWords);
+        highlightSearchPattern();
+    };
 
     /**
      * The entry currently shown
      */
     private Optional<BibEntry> entry = Optional.empty();
     private Optional<Pattern> searchHighlightPattern = Optional.empty();
-
-    private final BibDatabaseContext database;
+    private PreviewLayout layout;
     private boolean registered;
 
-    private final ChangeListener<Optional<SearchQuery>> listener = (queryObservable, queryOldValue, queryNewValue) -> {
-        searchHighlightPattern = queryNewValue.flatMap(SearchQuery::getJavaScriptPatternForWords);
-        highlightSearchPattern();
-    };
-
     /**
      * @param database Used for resolving strings and pdf directories for links.
      */
     public PreviewViewer(BibDatabaseContext database,
                          DialogService dialogService,
                          PreferencesService preferencesService,
-                         StateManager stateManager,
                          ThemeManager themeManager,
-                         TaskExecutor taskExecutor) {
+                         TaskExecutor taskExecutor,
+                         OptionalObjectProperty<SearchQuery> searchQueryProperty) {
         this.database = Objects.requireNonNull(database);
         this.dialogService = dialogService;
-        this.preferencesService = preferencesService;
         this.clipBoardManager = Injector.instantiateModelOrService(ClipBoardManager.class);
         this.taskExecutor = taskExecutor;
 
@@ -165,13 +159,13 @@ public PreviewViewer(BibDatabaseContext database,
         previewView.setContextMenuEnabled(false);
 
         previewView.getEngine().getLoadWorker().stateProperty().addListener((observable, oldValue, newValue) -> {
-
             if (newValue != Worker.State.SUCCEEDED) {
                 return;
             }
+
             if (!registered) {
-                stateManager.activeSearchQuery(SearchType.NORMAL_SEARCH).addListener(listener);
-                stateManager.activeSearchQuery(SearchType.GLOBAL_SEARCH).addListener(listener);
+                searchHighlightPattern = searchQueryProperty.get().flatMap(SearchQuery::getJavaScriptPatternForWords);
+                searchQueryProperty.addListener(listener);
                 registered = true;
             }
             highlightSearchPattern();
@@ -202,6 +196,14 @@ public PreviewViewer(BibDatabaseContext database,
         themeManager.installCss(previewView.getEngine());
     }
 
+    public PreviewViewer(BibDatabaseContext database,
+                         DialogService dialogService,
+                         PreferencesService preferencesService,
+                         ThemeManager themeManager,
+                         TaskExecutor taskExecutor) {
+        this(database, dialogService, preferencesService, themeManager, taskExecutor, OptionalObjectProperty.empty());
+    }
+
     private void highlightSearchPattern() {
         String callbackForUnmark = "";
         if (searchHighlightPattern.isPresent()) {
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
index ed529ed5849..7dd935ab2b5 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
@@ -65,7 +65,7 @@ private void initialize() {
         searchBarContainer.getChildren().addFirst(searchBar);
         HBox.setHgrow(searchBar, Priority.ALWAYS);
 
-        PreviewViewer previewViewer = new PreviewViewer(viewModel.getSearchDatabaseContext(), dialogService, preferencesService, stateManager, themeManager, taskExecutor);
+        PreviewViewer previewViewer = new PreviewViewer(viewModel.getSearchDatabaseContext(), dialogService, preferencesService, themeManager, taskExecutor, stateManager.activeSearchQuery(SearchType.GLOBAL_SEARCH));
         previewViewer.setLayout(preferencesService.getPreviewPreferences().getSelectedPreviewLayout());
 
         SearchResultsTableDataModel model = new SearchResultsTableDataModel(viewModel.getSearchDatabaseContext(), preferencesService, stateManager, taskExecutor);

From 244780c42b0235216abd6d608e7abbe204ff11f8 Mon Sep 17 00:00:00 2001
From: Loay Ghreeb <loayahmed655@gmail.com>
Date: Thu, 15 Aug 2024 19:22:03 +0300
Subject: [PATCH 2/5] unnecessary updates in PreviewViewer when hovering over
 entries

---
 .../gui/maintable/MainTableTooltip.java       | 22 +++++++++----------
 .../org/jabref/gui/preview/PreviewPanel.java  |  9 +++-----
 .../org/jabref/gui/preview/PreviewViewer.java |  6 ++++-
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/jabref/gui/maintable/MainTableTooltip.java b/src/main/java/org/jabref/gui/maintable/MainTableTooltip.java
index 73bb0bdced7..44f64e0fd44 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableTooltip.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableTooltip.java
@@ -17,26 +17,24 @@ public class MainTableTooltip extends Tooltip {
 
     private final PreviewViewer preview;
     private final PreferencesService preferences;
+    private final VBox tooltipContent = new VBox();
+    private final Label fieldValueLabel = new Label();
 
     public MainTableTooltip(BibDatabaseContext databaseContext, DialogService dialogService, PreferencesService preferences, ThemeManager themeManager, TaskExecutor taskExecutor) {
         this.preferences = preferences;
         this.preview = new PreviewViewer(databaseContext, dialogService, preferences, themeManager, taskExecutor);
+        this.setShowDelay(Duration.seconds(1));
+        this.tooltipContent.getChildren().addAll(fieldValueLabel, preview);
     }
 
     public Tooltip createTooltip(BibEntry entry, String fieldValue) {
-        preview.setLayout(preferences.getPreviewPreferences().getSelectedPreviewLayout());
-        preview.setEntry(entry);
-        this.setShowDelay(Duration.seconds(1));
-        Label label = new Label(fieldValue);
-
-        if (preferences.getPreviewPreferences().shouldShowPreviewEntryTableTooltip()) {
-            VBox vBox = new VBox();
-            label.setText(label.getText() + "\n ");
-            vBox.getChildren().add(label);
-            vBox.getChildren().add(preview);
-           this.setGraphic(vBox);
+        fieldValueLabel.setText(fieldValue + "\n");
+        if (!preferences.getPreviewPreferences().shouldShowPreviewEntryTableTooltip()) {
+            this.setGraphic(fieldValueLabel);
         } else {
-            this.setGraphic(label);
+            preview.setLayout(preferences.getPreviewPreferences().getSelectedPreviewLayout());
+            preview.setEntry(entry);
+           this.setGraphic(tooltipContent);
         }
         return this;
     }
diff --git a/src/main/java/org/jabref/gui/preview/PreviewPanel.java b/src/main/java/org/jabref/gui/preview/PreviewPanel.java
index d86dd3b84c9..2a0225198d9 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewPanel.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewPanel.java
@@ -115,12 +115,9 @@ private void createKeyBindings() {
         previewView.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
             Optional<KeyBinding> keyBinding = keyBindingRepository.mapToKeyBinding(event);
             if (keyBinding.isPresent()) {
-                switch (keyBinding.get()) {
-                    case COPY_PREVIEW:
-                        previewView.copyPreviewToClipBoard();
-                        event.consume();
-                        break;
-                    default:
+                if (keyBinding.get() == KeyBinding.COPY_PREVIEW) {
+                    previewView.copyPreviewToClipBoard();
+                    event.consume();
                 }
             }
         });
diff --git a/src/main/java/org/jabref/gui/preview/PreviewViewer.java b/src/main/java/org/jabref/gui/preview/PreviewViewer.java
index af5557b16ec..3b9016abd4f 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewViewer.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewViewer.java
@@ -230,7 +230,7 @@ private static String createJavaScriptRegex(Pattern regex) {
 
     public void setLayout(PreviewLayout newLayout) {
         // Change listeners might set the layout to null while the update method is executing, therefore we need to prevent this here
-        if (newLayout == null) {
+        if (newLayout == null || newLayout.equals(layout)) {
             return;
         }
         layout = newLayout;
@@ -238,6 +238,10 @@ public void setLayout(PreviewLayout newLayout) {
     }
 
     public void setEntry(BibEntry newEntry) {
+        if (newEntry.equals(entry.orElse(null))) {
+            return;
+        }
+
         // Remove update listener for old entry
         entry.ifPresent(oldEntry -> {
             for (Observable observable : oldEntry.getObservables()) {

From f9fa385c3622f718a2d574af3a10d43573ece398 Mon Sep 17 00:00:00 2001
From: Loay Ghreeb <loayahmed655@gmail.com>
Date: Wed, 21 Aug 2024 02:52:33 +0300
Subject: [PATCH 3/5] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ebbe929c6a..5463d2efe63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We fixed an issue with query transformers (JStor and others). [#11643](https://github.com/JabRef/jabref/pull/11643)
 - We fixed an issue where a new unsaved library was not marked with an asterisk. [#11519](https://github.com/JabRef/jabref/pull/11519)
 - We fixed an issue where JabRef starts without window decorations. [#11440](https://github.com/JabRef/jabref/pull/11440)
+- We fixed an issue where the entry preview highlight was not working when searching before opening the entry editor. [#11659](https://github.com/JabRef/jabref/pull/11659)
 
 ### Removed
 

From 993d501a701b41d19e469ab4d8c9104e1201af28 Mon Sep 17 00:00:00 2001
From: Loay Ghreeb <loayahmed655@gmail.com>
Date: Wed, 21 Aug 2024 03:09:43 +0300
Subject: [PATCH 4/5] Update CommentsTabTest.java

---
 .../java/org/jabref/gui/entryeditor/CommentsTabTest.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java b/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
index f2c87edfb76..097a6681a16 100644
--- a/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
@@ -12,6 +12,7 @@
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
+import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.pdf.search.IndexingTaskManager;
@@ -99,11 +100,11 @@ void setUp() {
                 mock(UndoAction.class),
                 mock(RedoAction.class),
                 dialogService,
-                stateManager,
                 themeManager,
                 indexingTaskManager,
                 taskExecutor,
-                journalAbbreviationRepository
+                journalAbbreviationRepository,
+                OptionalObjectProperty.empty()
         );
     }
 

From d78e1a806a489c142bdf977074f051b4048eb08b Mon Sep 17 00:00:00 2001
From: Loay Ghreeb <loayahmed655@gmail.com>
Date: Wed, 21 Aug 2024 04:50:26 +0300
Subject: [PATCH 5/5] Invert "if" condition

---
 .../java/org/jabref/gui/maintable/MainTableTooltip.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jabref/gui/maintable/MainTableTooltip.java b/src/main/java/org/jabref/gui/maintable/MainTableTooltip.java
index 44f64e0fd44..5f50ca0ae4e 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableTooltip.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableTooltip.java
@@ -29,12 +29,12 @@ public MainTableTooltip(BibDatabaseContext databaseContext, DialogService dialog
 
     public Tooltip createTooltip(BibEntry entry, String fieldValue) {
         fieldValueLabel.setText(fieldValue + "\n");
-        if (!preferences.getPreviewPreferences().shouldShowPreviewEntryTableTooltip()) {
-            this.setGraphic(fieldValueLabel);
-        } else {
+        if (preferences.getPreviewPreferences().shouldShowPreviewEntryTableTooltip()) {
             preview.setLayout(preferences.getPreviewPreferences().getSelectedPreviewLayout());
             preview.setEntry(entry);
-           this.setGraphic(tooltipContent);
+            this.setGraphic(tooltipContent);
+        } else {
+            this.setGraphic(fieldValueLabel);
         }
         return this;
     }