@@ -267,7 +267,7 @@ fun PagerScaffold(
267
267
val density = LocalDensity .current
268
268
val maxSearchBarOffset = with (density) { 128 .dp.toPx() }
269
269
270
- val nestedScrollConnection = remember {
270
+ val pagerNestedScrollConnection = remember {
271
271
object : NestedScrollConnection {
272
272
override fun onPreScroll (available : Offset , source : NestedScrollSource ): Offset {
273
273
val drag = gestureManager.currentDrag
@@ -305,6 +305,10 @@ fun PagerScaffold(
305
305
}
306
306
}
307
307
308
+ val innerNestedScrollConnection = remember {
309
+ object : NestedScrollConnection {}
310
+ }
311
+
308
312
LaunchedEffect (pagerState.currentPage) {
309
313
searchBarOffset.animateTo(0f )
310
314
}
@@ -342,7 +346,9 @@ fun PagerScaffold(
342
346
) {
343
347
344
348
HorizontalPager (
345
- modifier = Modifier .fillMaxSize(),
349
+ modifier = Modifier
350
+ .fillMaxSize()
351
+ .nestedScroll(pagerNestedScrollConnection),
346
352
beyondBoundsPageCount = 1 ,
347
353
reverseLayout = reverse,
348
354
state = pagerState,
@@ -353,8 +359,7 @@ fun PagerScaffold(
353
359
stiffness = Spring .StiffnessMediumLow ,
354
360
),
355
361
),
356
- // FIXME: Workaround https://issuetracker.google.com/issues/276738324
357
- pageNestedScrollConnection = nestedScrollConnection
362
+ pageNestedScrollConnection = innerNestedScrollConnection,
358
363
) {
359
364
when (it) {
360
365
0 -> {
@@ -568,8 +573,3 @@ fun PagerScaffold(
568
573
onHomeButtonPress = handleBackOrHomeEvent,
569
574
)
570
575
}
571
-
572
- private enum class Page {
573
- Widgets ,
574
- Search
575
- }
0 commit comments