rebase and requested changes

Author: viciscat

src/main/java/dev/isxander/yacl3/gui/YACLScreen.java

@@ -21,6 +21,7 @@
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.MultiLineLabel;
 import net.minecraft.client.gui.components.Tooltip;
+import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.components.tabs.Tab;
 import net.minecraft.client.gui.components.tabs.TabManager;
 import net.minecraft.client.gui.navigation.ScreenRectangle;
@@ -214,7 +215,6 @@ public boolean mouseClicked(MouseButtonEvent mouseButtonEvent, boolean bl) {
     //?} else {
     /*@Override
     public boolean mouseClicked(double mouseX, double mouseY, int button) {
-        preferredTab = null;
         if (super.mouseClicked(mouseX, mouseY, button)) {
             this.setDragging(true);
             return true;
@@ -324,7 +324,7 @@ public static void renderMultilineTooltip(GuiGraphics graphics, Font font, Multi
     public void updateGlobalSearch(String search) {
         Tab nextTabWithSearch = null;
         if (preferredTab != null) {
-            preferredTab.optionList.getList().updateSearchQuery(search);
+            preferredTab.optionList.getType().updateSearchQuery(search);
             if (preferredTab.hasSearch()) nextTabWithSearch = preferredTab;
         }
         Tab currentTab = tabNavigationBar.getTabManager().getCurrentTab();
@@ -334,7 +334,7 @@ public void updateGlobalSearch(String search) {
             Tab tab = tabNavigationBar.getTabs().get(i);
             if (tab == preferredTab) continue;
             if (tab instanceof CategoryTab categoryTab) {
-                categoryTab.optionList.getList().updateSearchQuery(search);
+                categoryTab.optionList.getType().updateSearchQuery(search);
                 categoryTab.searchField.setValueDoNotUpdate(search);
                 if (cursorPos != -1) categoryTab.searchField.setCursorPosition(cursorPos);
                 if (nextTabWithSearch == null && categoryTab.hasSearch()) {
@@ -352,6 +352,12 @@ public void updateGlobalSearch(String search) {
         tabNavigationBar.updateTabNames();
     }
 
+    @Override
+    public void setFocused(@Nullable GuiEventListener focused) {
+        super.setFocused(focused);
+        if (focused != null && !(focused instanceof SearchFieldWidget)) preferredTab = null;
+    }
+
     public static class CategoryTab implements TabExt {
         private static final ResourceLocation DARKER_BG = YACLPlatform.mcRl("textures/gui/menu_list_background.png");
 
@@ -433,7 +439,7 @@ public CategoryTab(YACLScreen screen, ConfigCategory category, ScreenRectangle t
         }
 
         public boolean hasSearch() {
-            return !optionList.getList().children().isEmpty();
+            return optionList.getType().children().stream().anyMatch(o -> o.searchQueryMatches);
         }
 
         @Override