[Change] save options in rootVC, and save semiModalViewController and semiModalDismissBlock in targetVC

Author: tentenlee100

Source/UIViewController+Options.swift

@@ -18,13 +18,24 @@ extension UIViewController {
     }
 
     func registerOptions(_ options: [SemiModalOption: Any]?) {
-        objc_setAssociatedObject(self, &CustomOptions, options, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
+        // options always save in parent viewController
+        var targetVC: UIViewController = self
+        while targetVC.parent != nil {
+            targetVC = targetVC.parent!
+        }
+        
+        objc_setAssociatedObject(targetVC, &CustomOptions, options, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
     }
 
     func optionForKey(_ optionKey: SemiModalOption) -> Any? {
-        guard let options = objc_getAssociatedObject(self, &CustomOptions) as? [SemiModalOption: Any]
+        var targetVC: UIViewController = self
+        while targetVC.parent != nil {
+            targetVC = targetVC.parent!
+        }
+        
+        guard let options = objc_getAssociatedObject(targetVC, &CustomOptions) as? [SemiModalOption: Any]
             , let value = options[optionKey]  else {
-            return defaultOptions[optionKey]
+                return defaultOptions[optionKey]
         }
 
         switch optionKey {

Source/UIViewController+SemiModalViewController.swift

@@ -45,8 +45,8 @@ extension UIViewController {
         targetParentVC.addChildViewController(vc)
         vc.beginAppearanceTransition(true, animated: true)
 
-        objc_setAssociatedObject(self, &semiModalViewController, vc, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
-        objc_setAssociatedObject(self, &semiModalDismissBlock, ClosureWrapper(closure: dismissBlock), .OBJC_ASSOCIATION_COPY_NONATOMIC)
+        objc_setAssociatedObject(targetParentVC, &semiModalViewController, vc, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+        objc_setAssociatedObject(targetParentVC, &semiModalDismissBlock, ClosureWrapper(closure: dismissBlock), .OBJC_ASSOCIATION_COPY_NONATOMIC)
 
         presentSemiView(vc.view, options: options) {
             vc.didMove(toParentViewController: targetParentVC)
@@ -177,15 +177,17 @@ extension UIViewController {
     }
 
     public func dismissSemiModalViewWithCompletion(_ completion: (() -> Void)?) {
-        let targetView = parentTargetView()
-        guard let modal = targetView.viewWithTag(semiModalModalViewTag)
+        let targetVC = parentTargetViewController()
+        
+        guard let targetView = targetVC.view
+            , let modal = targetView.viewWithTag(semiModalModalViewTag)
             , let overlay = targetView.viewWithTag(semiModalOverlayTag)
             , let transitionStyle = optionForKey(.transitionStyle) as? SemiModalTransitionStyle
             , let duration = optionForKey(.animationDuration) as? TimeInterval else { return }
 
 
-        let vc = objc_getAssociatedObject(self, &semiModalViewController) as? UIViewController
-        let dismissBlock = (objc_getAssociatedObject(self, &semiModalDismissBlock) as? ClosureWrapper)?.closure
+        let vc = objc_getAssociatedObject(targetVC, &semiModalViewController) as? UIViewController
+        let dismissBlock = (objc_getAssociatedObject(targetVC, &semiModalDismissBlock) as? ClosureWrapper)?.closure
 
         vc?.willMove(toParentViewController: nil)
         vc?.beginAppearanceTransition(false, animated: true)
@@ -210,8 +212,8 @@ extension UIViewController {
 
             dismissBlock?()
 
-            objc_setAssociatedObject(self, &semiModalDismissBlock, nil, .OBJC_ASSOCIATION_COPY_NONATOMIC)
-            objc_setAssociatedObject(self, &semiModalViewController, nil, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+            objc_setAssociatedObject(targetVC, &semiModalDismissBlock, nil, .OBJC_ASSOCIATION_COPY_NONATOMIC)
+            objc_setAssociatedObject(targetVC, &semiModalViewController, nil, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
 
             NotificationCenter.default.removeObserver(self, name: .UIDeviceOrientationDidChange, object: nil)
         })