From 0842c35e341f11ae7ae08a3e5bf2baf0f71107a5 Mon Sep 17 00:00:00 2001
From: Justin Caveda <justincaveda11031@gmail.com>
Date: Fri, 5 Jun 2026 08:54:06 -0500
Subject: [PATCH] Fix combined search results losing keyboard focus when typing
 (#1524)

## Description
Minor tweak to prevent the keyboard from losing focus when typing search
queries when "combine search results" is enabled

### Related issues
Fixes #1523

### Testing
Emulator only

## Screenshots
N/A

## AI or LLM usage
None

---------

Co-authored-by: Damontecres <damontecres@gmail.com>
---
 .../com/github/damontecres/wholphin/ui/main/SearchPage.kt     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/main/SearchPage.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/main/SearchPage.kt
index 6b4df7e1..c3ff42da 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/main/SearchPage.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/main/SearchPage.kt
@@ -77,7 +77,6 @@ import com.github.damontecres.wholphin.services.SeerrService
 import com.github.damontecres.wholphin.services.UserPreferencesService
 import com.github.damontecres.wholphin.ui.AspectRatios
 import com.github.damontecres.wholphin.ui.Cards
-import com.github.damontecres.wholphin.ui.RequestOrRestoreFocus
 import com.github.damontecres.wholphin.ui.SlimItemFields
 import com.github.damontecres.wholphin.ui.cards.DiscoverItemCard
 import com.github.damontecres.wholphin.ui.cards.EpisodeCard
@@ -405,7 +404,7 @@ fun SearchPage(
     var showViewOptions by rememberSaveable { mutableStateOf(false) }
 
     var position by rememberPosition(0, 0)
-    var searchClicked by rememberSaveable { mutableStateOf(false) }
+    var searchClicked by rememberSaveable(query) { mutableStateOf(false) }
     var immediateSearchQuery by rememberSaveable { mutableStateOf<String?>(null) }
 
     LifecycleResumeEffect(Unit) {
@@ -1017,7 +1016,6 @@ private fun <T : CardGridItem> SearchGrid(
     positionCallback: (columns: Int, position: Int) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    RequestOrRestoreFocus(focusRequester)
     Column(
         verticalArrangement = Arrangement.spacedBy(0.dp),
         modifier = modifier,