Skip to content

Bugfix: Prevent double horizontal padding for search bar in LazyVGrid #324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fhasse95 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bugfix: Prevent double horizontal padding for search bar in LazyVGrid #324

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions Sources/SkipUI/SkipUI/Containers/LazyVGrid.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.layout.layout
import kotlinx.coroutines.launch
#elseif canImport(CoreGraphics)
import struct CoreGraphics.CGFloat
Expand Down Expand Up @@ -102,7 +104,8 @@ public struct LazyVGrid: View, Renderable {
$0.set_scrollTargetBehavior(nil)
return ComposeResult.ok
} in: {
LazyVerticalGrid(state: gridState, modifier: Modifier.fillMaxWidth(), columns: gridCells, horizontalArrangement: horizontalArrangement, verticalArrangement: verticalArrangement, contentPadding: EnvironmentValues.shared._contentPadding.asPaddingValues(), userScrollEnabled: isScrollEnabled, flingBehavior: flingBehavior) {
let contentPadding = EnvironmentValues.shared._contentPadding.asPaddingValues()
LazyVerticalGrid(state: gridState, modifier: Modifier.fillMaxWidth(), columns: gridCells, horizontalArrangement: horizontalArrangement, verticalArrangement: verticalArrangement, contentPadding: contentPadding, userScrollEnabled: isScrollEnabled, flingBehavior: flingBehavior) {
itemCollector.value.initialize(
startItemIndex: isSearchable ? 1 : 0,
item: { renderable, _ in
Expand Down Expand Up @@ -157,7 +160,13 @@ public struct LazyVGrid: View, Renderable {
)
if isSearchable {
item(span: { GridItemSpan(maxLineSpan) }) {
let modifier = Modifier.padding(start: 16.dp, end: 16.dp, top: 16.dp, bottom: 8.dp).fillMaxWidth()
let modifier = Modifier
.ignoreHorizontalContentPadding(
start: contentPadding.asEdgeInsets().leading.dp,
end: contentPadding.asEdgeInsets().trailing.dp
)
.padding(start: 16.dp, end: 16.dp, top: 16.dp, bottom: 8.dp)
.fillMaxWidth()
SearchField(state: searchableState!, context: context.content(modifier: modifier, scope: self))
}
}
Expand All @@ -180,4 +189,17 @@ public struct LazyVGrid: View, Renderable {
#endif
}

#if SKIP
private extension Modifier {
func ignoreHorizontalContentPadding(start leadingPadding: Dp, end trailingPadding: Dp) -> Modifier {
self.layout { measurable, constraints in
let overriddenWidth = constraints.maxWidth + leadingPadding.roundToPx() + trailingPadding.roundToPx()
let placeable = measurable.measure(constraints.copy(maxWidth: overriddenWidth))
return layout(width: placeable.width, height: placeable.height) {
placeable.place(x: 0, y: 0)
}
}
}
}
#endif
#endif