Commit72b1809

authored

Merge pull request#18 from avgx/master

fix height when bottom sheet is larger then screen

2 parentsbe3db0a +a078e3f commit72b1809Copy full SHA for 72b1809

File tree

-2

lines changed

-2

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,15 +61,19 @@ public struct BottomSheet<Content: View>: View {`
`61`	`61`	`Spacer()`
`62`	`62`	`}`
`63`	`63`	`}`
`64`		`-.frame(height:self.height- min(self.draggedOffset*2,0))`
	`64`	`+.frame(height:sheetHeight(in: geometry)- min(self.draggedOffset*2,0))`
`65`	`65`	`.background(self.contentBackgroundColor)`
`66`	`66`	`.cornerRadius(self.topBarCornerRadius, corners:[.topLeft,.topRight])`
`67`	`67`	`.animation(.interactiveSpring())`
`68`		`-.offset(y:self.isPresented?(geometry.size.height/2-self.height/2+ geometry.safeAreaInsets.bottom+self.draggedOffset):(geometry.size.height/2+self.height/2+ geometry.safeAreaInsets.bottom))`
	`68`	`+.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))`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
	`73`	`+fileprivatefunc sheetHeight(geometry in:GeometryProxy)->CGFloat{`
	`74`	`+returnmin(self.height, geometry.size.height)`
	`75`	`+}`
	`76`	`+`
`73`	`77`	`fileprivatefunc fullScreenLightGrayOverlay()->someView{`
`74`	`78`	`Color`
`75`	`79`	`.black`

Comments

(0)