Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitde09fed

Browse files
authored
Merge pull request#22 from joncottrell/master
🐛 Use EmptyView when geometry reader is still sized at 0
2 parents4e074d4 +52e6c51 commitde09fed

File tree

1 file changed

+17
-13
lines changed

1 file changed

+17
-13
lines changed

‎Sources/BottomSheet/BottomSheet.swift‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,25 @@ public struct BottomSheet<Content: View>: View {
5252

5353
publicvarbody:someView{
5454
GeometryReader{ geometryin
55-
ZStack{
56-
self.fullScreenLightGrayOverlay()
57-
VStack(spacing:0){
58-
self.topBar(geometry: geometry)
59-
VStack(spacing:-8){
60-
Spacer()
61-
self.content.padding(.bottom, geometry.safeAreaInsets.bottom)
62-
Spacer()
55+
if geometry.size!=.zero{
56+
ZStack{
57+
self.fullScreenLightGrayOverlay()
58+
VStack(spacing:0){
59+
self.topBar(geometry: geometry)
60+
VStack(spacing:-8){
61+
Spacer()
62+
self.content.padding(.bottom, geometry.safeAreaInsets.bottom)
63+
Spacer()
64+
}
6365
}
66+
.frame(height:sheetHeight(in: geometry)- min(self.draggedOffset*2,0))
67+
.background(self.contentBackgroundColor)
68+
.cornerRadius(self.topBarCornerRadius, corners:[.topLeft,.topRight])
69+
.animation(.interactiveSpring())
70+
.offset(y:self.isPresented?(geometry.size.height/2- sheetHeight(in: geometry)/2+ geometry.safeAreaInsets.bottom+self.draggedOffset):(geometry.size.height/2+ sheetHeight(in: geometry)/2+ geometry.safeAreaInsets.bottom))
6471
}
65-
.frame(height:sheetHeight(in: geometry)- min(self.draggedOffset*2,0))
66-
.background(self.contentBackgroundColor)
67-
.cornerRadius(self.topBarCornerRadius, corners:[.topLeft,.topRight])
68-
.animation(.interactiveSpring())
69-
.offset(y:self.isPresented?(geometry.size.height/2- sheetHeight(in: geometry)/2+ geometry.safeAreaInsets.bottom+self.draggedOffset):(geometry.size.height/2+ sheetHeight(in: geometry)/2+ geometry.safeAreaInsets.bottom))
72+
}else{
73+
EmptyView()
7074
}
7175
}
7276
}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp