Fixed UnittoSearchBar

core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoSearchBar.kt

@@ -75,25 +75,20 @@ fun UnittoSearchBar(
     var showSearchInput by remember { mutableStateOf(false) }
     val focusRequester = remember { FocusRequester() }
 
-    fun stagedNavigateUp() {
+     LaunchedEffect(showSearchInput) {
-        if (showSearchInput) {
+         if (showSearchInput) focusRequester.requestFocus() else onQueryChange(TextFieldValue())
-            // Search text field is open, need to close it and clear search query
-            showSearchInput = false
-            // focusManager.clearFocus()
-            onQueryChange(TextFieldValue())
-        } else {
-            // No search text field is shown, can go back as usual
-            navigateUp()
-        }
      }
 
-    TopAppBar(
+    BackHandler(showSearchInput) { showSearchInput = false }
+
+    Crossfade(
         modifier = modifier,
-        title = {
+        targetState = showSearchInput,
-            Crossfade(showSearchInput, label = "Search input") { showSearch ->
+        label = "Search input"
+    ) { showSearch ->
         if (showSearch) {
-                    LaunchedEffect(Unit) { focusRequester.requestFocus() }
+            TopAppBar(
-
+                title = {
                     SearchTextField(
                         modifier = Modifier
                             .focusRequester(focusRequester)
@@ -103,36 +98,42 @@ fun UnittoSearchBar(
                         onValueChange = onQueryChange,
                         onSearch = {}
                     )
-                } else {
-                    Text(
-                        text = title,
-                        modifier = Modifier.fillMaxWidth(),
-                        style = MaterialTheme.typography.titleLarge
-                    )
-                }
-            }
                 },
                 navigationIcon = {
-            NavigateUpButton { stagedNavigateUp() }
+                    NavigateUpButton { showSearchInput = false }
                 },
                 actions = {
-            Crossfade(showSearchInput, label = "Search unit") { showSearch ->
                     Row(verticalAlignment = Alignment.CenterVertically) {
-                    if (showSearch) {
                         ClearButton(visible = query.text.isNotEmpty()) { onQueryChange(TextFieldValue()) }
                         searchActions()
-                    } else {
-                        SearchButton { showSearchInput = true }
-                        noSearchActions()
-                    }
-                }
                     }
                 },
                 scrollBehavior = scrollBehavior,
                 colors = colors,
             )
-
+        } else {
-    BackHandler { stagedNavigateUp() }
+            TopAppBar(
+                title = {
+                    Text(
+                        text = title,
+                        modifier = Modifier.fillMaxWidth(),
+                        style = MaterialTheme.typography.titleLarge
+                    )
+                },
+                navigationIcon = {
+                    NavigateUpButton { navigateUp() }
+                },
+                actions = {
+                    Row(verticalAlignment = Alignment.CenterVertically) {
+                        SearchButton { showSearchInput = true }
+                        noSearchActions()
+                    }
+                },
+                scrollBehavior = scrollBehavior,
+                colors = colors,
+            )
+        }
+    }
 }
 
 @Composable