#88 - choose the presented controller if available as source vc

michaelhenry · michaelhenry · commit f1845dafd34b · 2020-01-16T20:26:09.000+09:00
diff --git a/Sources/UIImageView_Extensions.swift b/Sources/UIImageView_Extensions.swift
@@ -10,7 +10,9 @@ extension UIImageView {
     }
     
     private var vc:UIViewController? {
-        return UIApplication.shared.keyWindow?.rootViewController
+        guard let rootVC = UIApplication.shared.keyWindow?.rootViewController
+            else { return nil }
+        return rootVC.presentedViewController != nil ? rootVC.presentedViewController : rootVC
     }
     
     public func setupImageViewer(

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,9 @@ extension UIImageView {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`private var vc:UIViewController? {`
`13`		`- return UIApplication.shared.keyWindow?.rootViewController`
	`13`	`+ guard let rootVC = UIApplication.shared.keyWindow?.rootViewController`
	`14`	`+ else { return nil }`
	`15`	`+ return rootVC.presentedViewController != nil ? rootVC.presentedViewController : rootVC`
`14`	`16`	`}`
`15`	`17`
`16`	`18`	`public func setupImageViewer(`