Fixes contextual menu iPad presentation crashes (#757)

etoledom · web-flow · commit cbc59adffaa3 · 2025-05-21T12:14:14.000+02:00
diff --git a/Demo/Demo/Gravatar-Demo/DemoAvatarDownloadViewController.swift b/Demo/Demo/Gravatar-Demo/DemoAvatarDownloadViewController.swift
@@ -23,8 +23,8 @@ class DemoAvatarDownloadViewController: BaseFormViewController {
         title: "Default Avatar Option:",
         subtitle: "Backend driven",
         buttonTitle: "Select"
-    ) { [weak self] _ in
-        self?.selectImageDefault()
+    ) { [weak self] action in
+        self?.selectImageDefault(sender: action.sender as? UIView)
     }
 
     lazy var fetchButton = ButtonField(
@@ -105,7 +105,7 @@ class DemoAvatarDownloadViewController: BaseFormViewController {
 
     private var preferredDefaultAvatar: DefaultAvatarOption? = nil
 
-    @objc private func selectImageDefault() {
+    @objc private func selectImageDefault(sender: UIView?) {
         let controller = UIAlertController(title: "Default Avatar Option", message: nil, preferredStyle: .actionSheet)
 
         DefaultAvatarOption.allCases.forEach { option in
@@ -119,6 +119,7 @@ class DemoAvatarDownloadViewController: BaseFormViewController {
         }
 
         controller.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+        controller.popoverPresentationController?.sourceView = sender
 
         present(controller, animated: true)
     }
diff --git a/Demo/Demo/Gravatar-Demo/DemoBaseProfileViewController.swift b/Demo/Demo/Gravatar-Demo/DemoBaseProfileViewController.swift
@@ -82,7 +82,7 @@ open class DemoBaseProfileViewController: UIViewController {
         ])
     }
     
-    @objc private func selectPalette() {
+    @objc private func selectPalette(sender: UIView?) {
         let controller = UIAlertController(title: "Palette", message: nil, preferredStyle: .actionSheet)
 
         paletteTypes.forEach { option in
@@ -102,10 +102,11 @@ open class DemoBaseProfileViewController: UIViewController {
             })
         }
         controller.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+        controller.popoverPresentationController?.sourceView = sender
         present(controller, animated: true)
     }
     
-    @objc private func selectProfileStyle() {
+    @objc private func selectProfileStyle(sender: UIView?) {
         let controller = UIAlertController(title: "Layout Styles", message: nil, preferredStyle: .actionSheet)
         ProfileViewConfiguration.Style.allCases.forEach { option in
             controller.addAction(UIAlertAction(title: "\(option.rawValue)", style: .default) { [weak self] action in
@@ -115,6 +116,7 @@ open class DemoBaseProfileViewController: UIViewController {
             })
         }
         controller.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+        controller.popoverPresentationController?.sourceView = sender
         present(controller, animated: true)
     }
 }
diff --git a/Demo/Demo/Gravatar-Demo/DemoRemoteSVGViewController.swift b/Demo/Demo/Gravatar-Demo/DemoRemoteSVGViewController.swift
@@ -82,7 +82,7 @@ class DemoRemoteSVGViewController: UITableViewController {
         return cell
     }
     
-    @objc private func selectPalette() {
+    @objc private func selectPalette(sender: UIView?) {
         let controller = UIAlertController(title: "Palette", message: nil, preferredStyle: .actionSheet)
 
         paletteTypes.forEach { option in
@@ -102,6 +102,8 @@ class DemoRemoteSVGViewController: UITableViewController {
             })
         }
         controller.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+        controller.popoverPresentationController?.sourceView = sender
+
         present(controller, animated: true)
     }
 }
diff --git a/Demo/Demo/Gravatar-Demo/DemoUIImageViewExtensionViewController.swift b/Demo/Demo/Gravatar-Demo/DemoUIImageViewExtensionViewController.swift
@@ -23,8 +23,8 @@ class DemoUIImageViewExtensionViewController: BaseFormViewController {
         title: "Default Avatar:",
         subtitle: "Backend driven",
         buttonTitle: "Select"
-    ) { [weak self] _ in
-        self?.selectImageDefault()
+    ) { [weak self] action in
+        self?.selectImageDefault(sender: action.sender as? UIView)
     }
 
     lazy var cancelOngoingButtonField = ButtonField(title: "Cancel") { [weak self] _ in
@@ -60,7 +60,7 @@ class DemoUIImageViewExtensionViewController: BaseFormViewController {
 
     private var preferredDefaultAvatar: DefaultAvatarOption? = nil
 
-    @objc private func selectImageDefault() {
+    @objc private func selectImageDefault(sender: UIView?) {
         let controller = UIAlertController(title: "Default Avatar", message: nil, preferredStyle: .actionSheet)
 
         DefaultAvatarOption.allCases.forEach { option in
@@ -71,6 +71,7 @@ class DemoUIImageViewExtensionViewController: BaseFormViewController {
         }
 
         controller.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+        controller.popoverPresentationController?.sourceView = sender
 
         present(controller, animated: true)
     }
diff --git a/Demo/Demo/Gravatar-Demo/DemoUploadImageViewController.swift b/Demo/Demo/Gravatar-Demo/DemoUploadImageViewController.swift
@@ -12,8 +12,8 @@ class DemoUploadImageViewController: BaseFormViewController {
         title: "Backend selection behavior",
         subtitle: "Preserve selection",
         buttonTitle: "Select"
-    ) { [weak self] _ in
-        self?.avatarSelectionTapped()
+    ) { [weak self] action in
+        self?.avatarSelectionTapped(sender: action.sender as? UIView)
     }
 
     lazy var selectAvatarButtonField = ButtonField(title: "Select Image") { [weak self] _ in
@@ -129,11 +129,11 @@ extension DemoUploadImageViewController: UIImagePickerControllerDelegate, UINavi
         }
     }
 
-    @objc private func avatarSelectionTapped() {
-        setAvatarSelectionMethod(with: emailFormField.text)
+    @objc private func avatarSelectionTapped(sender: UIView?) {
+        setAvatarSelectionMethod(with: emailFormField.text, sender: sender)
     }
 
-    @objc private func setAvatarSelectionMethod(with email: String) {
+    @objc private func setAvatarSelectionMethod(with email: String, sender: UIView?) {
         let controller = UIAlertController(title: "Avatar selection behavior:", message: nil, preferredStyle: .actionSheet)
 
 
@@ -147,6 +147,7 @@ extension DemoUploadImageViewController: UIImagePickerControllerDelegate, UINavi
         }
 
         controller.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+        controller.popoverPresentationController?.sourceView = sender
 
         present(controller, animated: true)
     }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ open class DemoBaseProfileViewController: UIViewController {`
`82`	`82`	`])`
`83`	`83`	`}`
`84`	`84`
`85`		`- @objc private func selectPalette() {`
	`85`	`+ @objc private func selectPalette(sender: UIView?) {`
`86`	`86`	`let controller = UIAlertController(title: "Palette", message: nil, preferredStyle: .actionSheet)`
`87`	`87`
`88`	`88`	`paletteTypes.forEach { option in`
`@@ -102,10 +102,11 @@ open class DemoBaseProfileViewController: UIViewController {`
`102`	`102`	`})`
`103`	`103`	`}`
`104`	`104`	`controller.addAction(UIAlertAction(title: "Cancel", style: .cancel))`
	`105`	`+ controller.popoverPresentationController?.sourceView = sender`
`105`	`106`	`present(controller, animated: true)`
`106`	`107`	`}`
`107`	`108`
`108`		`- @objc private func selectProfileStyle() {`
	`109`	`+ @objc private func selectProfileStyle(sender: UIView?) {`
`109`	`110`	`let controller = UIAlertController(title: "Layout Styles", message: nil, preferredStyle: .actionSheet)`
`110`	`111`	`ProfileViewConfiguration.Style.allCases.forEach { option in`
`111`	`112`	`controller.addAction(UIAlertAction(title: "\(option.rawValue)", style: .default) { [weak self] action in`
`@@ -115,6 +116,7 @@ open class DemoBaseProfileViewController: UIViewController {`
`115`	`116`	`})`
`116`	`117`	`}`
`117`	`118`	`controller.addAction(UIAlertAction(title: "Cancel", style: .cancel))`
	`119`	`+ controller.popoverPresentationController?.sourceView = sender`
`118`	`120`	`present(controller, animated: true)`
`119`	`121`	`}`
`120`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ class DemoRemoteSVGViewController: UITableViewController {`
`82`	`82`	`return cell`
`83`	`83`	`}`
`84`	`84`
`85`		`- @objc private func selectPalette() {`
	`85`	`+ @objc private func selectPalette(sender: UIView?) {`
`86`	`86`	`let controller = UIAlertController(title: "Palette", message: nil, preferredStyle: .actionSheet)`
`87`	`87`
`88`	`88`	`paletteTypes.forEach { option in`
`@@ -102,6 +102,8 @@ class DemoRemoteSVGViewController: UITableViewController {`
`102`	`102`	`})`
`103`	`103`	`}`
`104`	`104`	`controller.addAction(UIAlertAction(title: "Cancel", style: .cancel))`
	`105`	`+ controller.popoverPresentationController?.sourceView = sender`
	`106`	`+`
`105`	`107`	`present(controller, animated: true)`
`106`	`108`	`}`
`107`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ class DemoUploadImageViewController: BaseFormViewController {`
`12`	`12`	`title: "Backend selection behavior",`
`13`	`13`	`subtitle: "Preserve selection",`
`14`	`14`	`buttonTitle: "Select"`
`15`		`- ) { [weak self] _ in`
`16`		`- self?.avatarSelectionTapped()`
	`15`	`+ ) { [weak self] action in`
	`16`	`+ self?.avatarSelectionTapped(sender: action.sender as? UIView)`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`lazy var selectAvatarButtonField = ButtonField(title: "Select Image") { [weak self] _ in`
`@@ -129,11 +129,11 @@ extension DemoUploadImageViewController: UIImagePickerControllerDelegate, UINavi`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`
`132`		`- @objc private func avatarSelectionTapped() {`
`133`		`- setAvatarSelectionMethod(with: emailFormField.text)`
	`132`	`+ @objc private func avatarSelectionTapped(sender: UIView?) {`
	`133`	`+ setAvatarSelectionMethod(with: emailFormField.text, sender: sender)`
`134`	`134`	`}`
`135`	`135`
`136`		`- @objc private func setAvatarSelectionMethod(with email: String) {`
	`136`	`+ @objc private func setAvatarSelectionMethod(with email: String, sender: UIView?) {`
`137`	`137`	`let controller = UIAlertController(title: "Avatar selection behavior:", message: nil, preferredStyle: .actionSheet)`
`138`	`138`
`139`	`139`
`@@ -147,6 +147,7 @@ extension DemoUploadImageViewController: UIImagePickerControllerDelegate, UINavi`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`controller.addAction(UIAlertAction(title: "Cancel", style: .cancel))`
	`150`	`+ controller.popoverPresentationController?.sourceView = sender`
`150`	`151`
`151`	`152`	`present(controller, animated: true)`
`152`	`153`	`}`