Revise API

FluidGroup · Oct 26, 2019 · 8042121 · 8042121
1 parent 1e8db76
commit 8042121
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 8 deletions.
diff --git a/Rideau/RideauContainerBodyType.swift b/Rideau/RideauContainerBodyType.swift
@@ -29,15 +29,35 @@ public protocol RideauContainerBodyType {
 extension RideauContainerBodyType where Self : UIView {
 
   public func requestUpdateLayout() {
-    guard let containerView = self.superview as? RideauContainerView else { return }
-    containerView.requestUpdateLayout()
+
+    var view: UIView? = superview
+
+    while view != nil {
+      guard let containerView = view as? RideauContainerView else {
+        view = view?.superview
+        continue
+      }
+      containerView.requestUpdateLayout()
+      return
+    }
+
   }
 }
 
 extension RideauContainerBodyType where Self : UIViewController {
 
   public func requestUpdateLayout() {
-    guard let containerView = self.view.superview as? RideauContainerView else { return }
-    containerView.requestUpdateLayout()
+
+    var view: UIView? = self.view.superview
+
+    while view != nil {
+      guard let containerView = view as? RideauContainerView else {
+        view = view?.superview
+        continue
+      }
+      containerView.requestUpdateLayout()
+      return
+    }
+
   }
 }
diff --git a/Rideau/RideauMaskedCornerRoundedViewController.swift b/Rideau/RideauMaskedCornerRoundedViewController.swift
@@ -80,7 +80,8 @@ open class RideauMaskedCornerRoundedViewController : UIViewController {
 
     headerView.translatesAutoresizingMaskIntoConstraints = false
     headerView.setContentHuggingPriority(.required, for: .vertical)
-
+    headerView.setContentCompressionResistancePriority(.required, for: .vertical)
+
     NSLayoutConstraint.activate([
       headerView.topAnchor.constraint(equalTo: contentView.topAnchor),
       headerView.rightAnchor.constraint(equalTo: contentView.rightAnchor),
@@ -114,7 +115,7 @@ open class RideauMaskedCornerRoundedViewController : UIViewController {
 
   }
 
-  public func set(viewController: UIViewController) {
+  public func setBodyViewController(_ viewController: UIViewController) {
 
     viewController.willMove(toParent: self)
     addChild(viewController)
@@ -126,8 +127,12 @@ open class RideauMaskedCornerRoundedViewController : UIViewController {
       viewController.view.rightAnchor.constraint(equalTo: contentView.rightAnchor),
       viewController.view.leftAnchor.constraint(equalTo: contentView.leftAnchor),
       viewController.view.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
-      ])
-
+    ])
+  }
+
+  @available(*, deprecated, renamed: "setBodyViewController")
+  public func set(viewController: UIViewController) {
+    setBodyViewController(viewController)
   }
 }