From 88f326b37f6ca35efbb8e5133cd99104d8855bf0 Mon Sep 17 00:00:00 2001 From: Hailey Date: Thu, 10 Oct 2024 18:16:25 -0700 Subject: Fix sheets to work nicely on ios 15 (#5685) --- modules/bottom-sheet/ios/SheetViewController.swift | 34 ++++++++++++++-------- 1 file changed, 22 insertions(+), 12 deletions(-) (limited to 'modules/bottom-sheet/ios/SheetViewController.swift') diff --git a/modules/bottom-sheet/ios/SheetViewController.swift b/modules/bottom-sheet/ios/SheetViewController.swift index 7b6606980..a8b8f0c05 100644 --- a/modules/bottom-sheet/ios/SheetViewController.swift +++ b/modules/bottom-sheet/ios/SheetViewController.swift @@ -27,28 +27,38 @@ class SheetViewController: UIViewController { return } - if contentHeight > screenHeight - 100 { - sheet.detents = [ - .large() - ] - sheet.selectedDetentIdentifier = .large - } else { - if #available(iOS 16.0, *) { + if #available(iOS 16.0, *) { + if contentHeight > screenHeight - 100 { + sheet.detents = [ + .large() + ] + sheet.selectedDetentIdentifier = .large + } else { sheet.detents = [ .custom { _ in return contentHeight } ] + if !preventExpansion { + sheet.detents.append(.large()) + } + sheet.selectedDetentIdentifier = .medium + } + } else { + if contentHeight > screenHeight / 2 { + sheet.detents = [ + .large() + ] + sheet.selectedDetentIdentifier = .large } else { sheet.detents = [ .medium() ] + if !preventExpansion { + sheet.detents.append(.large()) + } + sheet.selectedDetentIdentifier = .medium } - - if !preventExpansion { - sheet.detents.append(.large()) - } - sheet.selectedDetentIdentifier = .medium } } -- cgit 1.4.1