diff options
| -rw-r--r-- | ios/MullvadVPN/AutomaticKeyboardResponder.swift | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/ios/MullvadVPN/AutomaticKeyboardResponder.swift b/ios/MullvadVPN/AutomaticKeyboardResponder.swift index 04518a40ef..eef063261d 100644 --- a/ios/MullvadVPN/AutomaticKeyboardResponder.swift +++ b/ios/MullvadVPN/AutomaticKeyboardResponder.swift @@ -111,8 +111,24 @@ class AutomaticKeyboardResponder { } private var isFormSheetPresentation: Bool { - return UIDevice.current.userInterfaceIdiom == .pad && - parentViewController?.modalPresentationStyle == .formSheet + // Form sheet is only supported on iPad + guard UIDevice.current.userInterfaceIdiom == .pad else { return false } + + // Find the parent controller holding the view + guard let parent = parentViewController else { return false } + + // Determine presentation style within the context + let presentationStyle: UIModalPresentationStyle + + // Use the presentation style of a presented controller when parent controller is being presented as a child of + // other modal controller. + if let presented = parent.presentingViewController?.presentedViewController { + presentationStyle = presented.modalPresentationStyle + } else { + presentationStyle = parent.modalPresentationStyle + } + + return presentationStyle == .formSheet } private func adjustContentInsets(keyboardRect: CGRect) { |