Made header title clickable as well, made updates count in header be …

…filtered by search query (cherry picked from commit 7c1ece2)
JetBrains · Dec 8, 2023 · 69469b0 · 69469b0
1 parent c0bc1f6
commit 69469b0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/...ain/kotlin/com/jetbrains/packagesearch/plugin/ui/model/packageslist/PackageListBuilder.kt b/...ain/kotlin/com/jetbrains/packagesearch/plugin/ui/model/packageslist/PackageListBuilder.kt
@@ -35,12 +35,8 @@ class PackageListBuilder(
         }
 
     private fun List<PackageSearchDeclaredPackage>.getUpdatesAvailableAdditionalContent() =
-        count { it.hasUpdates(onlyStable) }
-            .takeIf { it > 0 }
-            ?.let { PackageListItem.Header.AdditionalContent.UpdatesAvailableCount(it) }
-
-    private fun PackageSearchModuleVariant.getUpdatesAvailableAdditionalContent() =
-        declaredDependencies.count { it.hasUpdates(onlyStable) }
+        filter { it.matchesSearchQuery() }
+            .count { it.hasUpdates(onlyStable) }
             .takeIf { it > 0 }
             ?.let { PackageListItem.Header.AdditionalContent.UpdatesAvailableCount(it) }
 
@@ -189,7 +185,7 @@ class PackageListBuilder(
                     attributes = variant.attributes.map { it.value },
                     additionalContent = when (id) {
                         in headerLoadingStates -> PackageListItem.Header.AdditionalContent.Loading
-                        else -> variant.getUpdatesAvailableAdditionalContent()
+                        else -> variant.declaredDependencies.getUpdatesAvailableAdditionalContent()
                     }
                 )
                 if (state == PackageListItem.Header.State.OPEN) {

diff --git a/.../kotlin/com/jetbrains/packagesearch/plugin/ui/panels/packages/items/PackageGroupHeader.kt b/.../kotlin/com/jetbrains/packagesearch/plugin/ui/panels/packages/items/PackageGroupHeader.kt
@@ -1,6 +1,7 @@
 package com.jetbrains.packagesearch.plugin.ui.panels.packages.items
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Arrangement.SpaceBetween
 import androidx.compose.foundation.layout.Box
@@ -54,7 +55,7 @@ fun PackageListHeader(
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-            Box(
+            Row(
                 modifier = Modifier.onClick(enabled = content.state != State.LOADING) {
                     onEvent(
                         PackageListItemEvent.SetHeaderState(
@@ -65,6 +66,8 @@ fun PackageListHeader(
                         )
                     )
                 }
+                    .pointerHoverIcon(PointerIcon(Cursor(Cursor.HAND_CURSOR))),
+                horizontalArrangement = Arrangement.spacedBy(8.dp)
             ) {
                 when (content.state) {
                     State.OPEN -> Icon(
@@ -83,12 +86,13 @@ fun PackageListHeader(
 
                     State.LOADING -> CircularProgressIndicator()
                 }
+
+                Text(
+                    fontWeight = FontWeight(600),
+                    text = content.title,
+                    maxLines = 1
+                )
             }
-            Text(
-                fontWeight = FontWeight(600),
-                text = content.title,
-                maxLines = 1
-            )
             if (content.attributes.isNotEmpty()) {
                 Box(
                     modifier = Modifier