@@ -64,7 +64,6 @@ public struct ScrollView<Content: View>: TypeSafeView, View {
64
64
axes. contains ( . horizontal) && contentSize. idealWidthForProposedHeight > proposedSize. x
65
65
let hasVerticalScrollBar =
66
66
axes. contains ( . vertical) && contentSize. idealHeightForProposedWidth > proposedSize. y
67
- print ( contentSize. idealHeightForProposedWidth)
68
67
69
68
let verticalScrollBarWidth = hasVerticalScrollBar ? scrollBarWidth : 0
70
69
let horizontalScrollBarHeight = hasHorizontalScrollBar ? scrollBarWidth : 0
@@ -77,14 +76,20 @@ public struct ScrollView<Content: View>: TypeSafeView, View {
77
76
scrollViewWidth = max ( proposedSize. x, verticalScrollBarWidth)
78
77
minimumWidth = verticalScrollBarWidth
79
78
} else {
80
- scrollViewWidth = contentSize. size. x + verticalScrollBarWidth
79
+ scrollViewWidth = min (
80
+ contentSize. size. x + verticalScrollBarWidth,
81
+ max ( proposedSize. x, contentSize. minimumWidth + verticalScrollBarWidth)
82
+ )
81
83
minimumWidth = contentSize. minimumWidth + verticalScrollBarWidth
82
84
}
83
85
if axes. contains ( . vertical) {
84
86
scrollViewHeight = max ( proposedSize. y, horizontalScrollBarHeight)
85
87
minimumHeight = horizontalScrollBarHeight
86
88
} else {
87
- scrollViewHeight = contentSize. size. y + horizontalScrollBarHeight
89
+ scrollViewHeight = min (
90
+ contentSize. size. y + horizontalScrollBarHeight,
91
+ max ( proposedSize. y, contentSize. minimumHeight + horizontalScrollBarHeight)
92
+ )
88
93
minimumHeight = contentSize. minimumHeight + horizontalScrollBarHeight
89
94
}
90
95
@@ -142,8 +147,6 @@ public struct ScrollView<Content: View>: TypeSafeView, View {
142
147
finalResult = childResult
143
148
}
144
149
145
- print ( finalResult. size)
146
-
147
150
return ViewUpdateResult (
148
151
size: ViewSize (
149
152
size: scrollViewSize,
0 commit comments