Merge branch 'main' into hailey/79fab

This commit is contained in:
Hailey
2025-05-08 10:59:12 -07:00
66 changed files with 3034 additions and 1044 deletions
+9 -3
View File
@@ -146,7 +146,7 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
func updateLayout() {
// Allow updates either when identifiers match OR when prevLayoutDetentIdentifier is nil (first real content update)
if (self.prevLayoutDetentIdentifier == self.selectedDetentIdentifier || self.prevLayoutDetentIdentifier == nil),
if self.prevLayoutDetentIdentifier == self.selectedDetentIdentifier || self.prevLayoutDetentIdentifier == nil,
let contentHeight = self.innerView?.subviews.first?.frame.size.height {
self.sheetVc?.updateDetents(contentHeight: self.clampHeight(contentHeight),
preventExpansion: self.preventExpansion)
@@ -156,9 +156,15 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
}
func dismiss() {
guard let sheetVc = self.sheetVc else {
return
}
self.isClosing = true
self.sheetVc?.dismiss(animated: true) { [weak self] in
self?.destroy()
DispatchQueue.main.async {
sheetVc.dismiss(animated: true) { [weak self] in
self?.destroy()
}
}
}