From 55cebefa82bc050e3dc04502a758cf7394d2e249 Mon Sep 17 00:00:00 2001 From: Abe White Date: Mon, 26 Aug 2024 14:58:04 -0500 Subject: [PATCH] Fix interaction between ScrollView and PTR --- Sources/SkipUI/SkipUI/Containers/ScrollView.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/SkipUI/SkipUI/Containers/ScrollView.swift b/Sources/SkipUI/SkipUI/Containers/ScrollView.swift index c7a3da57..bc58eed2 100644 --- a/Sources/SkipUI/SkipUI/Containers/ScrollView.swift +++ b/Sources/SkipUI/SkipUI/Containers/ScrollView.swift @@ -70,7 +70,7 @@ public struct ScrollView : View { effectiveScrollAxes.insert(Axis.Set.horizontal) } let contentContext = context.content() - ComposeContainer(scrollAxes: effectiveScrollAxes, modifier: context.modifier, fillWidth: axes.contains(.horizontal), fillHeight: axes.contains(.vertical), then: scrollModifier) { modifier in + ComposeContainer(scrollAxes: effectiveScrollAxes, modifier: context.modifier, fillWidth: axes.contains(.horizontal), fillHeight: axes.contains(.vertical)) { modifier in let containerModifier: Modifier let refreshing = remember { mutableStateOf(false) } let refreshAction = EnvironmentValues.shared.refresh @@ -91,7 +91,7 @@ public struct ScrollView : View { } Box(modifier: containerModifier) { - Column { + Column(modifier: scrollModifier) { if isVerticalScroll { let searchableState = EnvironmentValues.shared._searchableState let isSearchable = searchableState?.isModifierOnNavigationStack == false