Fix selection background appearance in PackageSearchpackageList

JetBrains · Jan 26, 2024 · 1bb943b · 1bb943b
1 parent 33a5cb7
commit 1bb943b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/PackageSearchMetrics.kt b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/PackageSearchMetrics.kt
@@ -55,10 +55,12 @@ object PackageSearchMetrics {
         val header = PaddingValues(bottom = 1.dp)
 
         object Package {
+            @Composable
             fun paddingFor(isFirstItem: Boolean, isLastItem: Boolean): PaddingValues {
                 val top = if (isFirstItem) 4.dp else 0.dp
                 val bottom = if (isLastItem) 4.dp else 0.dp
-                return PaddingValues(top = top, bottom = bottom)
+                val end = scrollbarWidth
+                return PaddingValues(top = top, bottom = bottom, end = end)
             }
         }
     }

diff --git a/.../kotlin/com/jetbrains/packagesearch/plugin/ui/panels/packages/PackageSearchPackageList.kt b/.../kotlin/com/jetbrains/packagesearch/plugin/ui/panels/packages/PackageSearchPackageList.kt
@@ -85,15 +85,15 @@ fun PackageSearchPackageList(
             when (item) {
                 is PackageListItem.Header -> stickyHeader(key = item.id, contentType = "header") {
                     PackageListHeader(
-                        additionalContentModifier = Modifier.padding(end = PackageSearchMetrics.scrollbarWidth),
+                        additionalContentModifier = Modifier,
                         content = item,
                         onEvent = onPackageEvent
                     )
                 }
 
                 is PackageListItem.Package -> item(key = item.id, contentType = item.contentType()) {
                     PackageListItem(
-                        modifier = Modifier.padding(end = PackageSearchMetrics.scrollbarWidth),
+                        modifier = Modifier,
                         content = item,
                         packagesList = packagesList,
                         index = index,
@@ -127,6 +127,13 @@ internal fun SelectableLazyItemScope.PackageListItem(
     )
     Box(
         modifier = modifier
+            .background(
+                when {
+                    isSelected && isActive -> LocalLazyTreeStyle.current.colors.elementBackgroundSelectedFocused
+                    isSelected && !isActive -> LocalLazyTreeStyle.current.colors.elementBackgroundSelected
+                    else -> Color.Transparent
+                },
+            )
             .padding(itemPaddings)
             .onClick(
                 interactionSource = remember { MutableInteractionSource() },
@@ -143,13 +150,7 @@ internal fun SelectableLazyItemScope.PackageListItem(
             modifier = Modifier
                 .fillMaxWidth()
                 .height(PackageSearchMetrics.PackageList.Item.height)
-                .background(
-                    when {
-                        isSelected && isActive -> LocalLazyTreeStyle.current.colors.elementBackgroundSelectedFocused
-                        isSelected && !isActive -> LocalLazyTreeStyle.current.colors.elementBackgroundSelected
-                        else -> Color.Transparent
-                    },
-                ).padding(start = PackageSearchMetrics.PackageList.Item.padding),
+                .padding(start = PackageSearchMetrics.PackageList.Item.padding),
             verticalAlignment = Alignment.CenterVertically,
             horizontalArrangement = Arrangement.SpaceBetween,
         ) {