Fritz2 Rework

Search clear fix
mpetuska · Mar 8, 2021 · 407a9b5 · 407a9b5
1 parent d3fb093
commit 407a9b5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/src/jsMain/kotlin/app/store/thunk/appThunk.kt b/app/src/jsMain/kotlin/app/store/thunk/appThunk.kt
@@ -8,7 +8,7 @@ import org.kodein.di.*
 
 
 fun fetchLibraryPage(page: Int, size: Int = 12, search: String? = null, targets: Set<String>? = null) = LibraryStore.handle { state ->
-  val theSearch = search ?: state.search
+  val theSearch = (search ?: state.search)?.takeIf(String::isNotEmpty)
   val theTargets = targets ?: state.targets
 
   val service by di.instance<LibraryService>()
@@ -22,7 +22,7 @@ fun fetchLibraryPage(page: Int, size: Int = 12, search: String? = null, targets:
 }
 
 fun fetchLibraryCount(search: String? = null, targets: Set<String>? = null) = LibraryStore.handle { state ->
-  val theSearch = search ?: state.search
+  val theSearch = (search ?: state.search)?.takeIf(String::isNotEmpty)
   val theTargets = targets ?: state.targets
 
   val service by di.instance<LibraryService>()

diff --git a/app/src/jsMain/kotlin/app/view/Header.kt b/app/src/jsMain/kotlin/app/view/Header.kt
@@ -204,11 +204,11 @@ private fun RenderContext.SearchModal() = modal({
       }.map {}.onEach {
         fetchLibraryPage(
           page = 1,
-          search = searchStore.current.takeIf(String::isNotEmpty),
+          search = searchStore.current,
           targets = targetsStore.current.takeIf(Set<String>::isNotEmpty)
         )()
         fetchLibraryCount(
-          search = searchStore.current.takeIf(String::isNotEmpty),
+          search = searchStore.current,
           targets = targetsStore.current.takeIf(Set<String>::isNotEmpty)
         )()
       } handledBy close