Merge branch 'develop'

Author: malcommac

Sources/ScrollStackController/ScrollStackRow.swift

@@ -230,28 +230,24 @@ open class ScrollStackRow: UIView, UIGestureRecognizerDelegate {
             return
         }
 
-        contentView.removeFromSuperview()
         contentView.removeFromSuperview()
 
         addSubview(contentView)
         addSubview(separatorView)
-        
-        askForCutomizedSizeOfContentView(animated: false)
-        
+                
         didUpdateContentViewContraints()
         didUpdateSeparatorViewContraintsIfNeeded()
         didUpdateSeparatorAxis()
 
         applyParentStackAttributes()
 
         separatorView.isHidden = isSeparatorHidden
+        setNeedsUpdateConstraints()
     }
 
-    open override func layoutSubviews() {
-        super.layoutSubviews()
-        
-        // called the event to update the height of the row.
+    open override func updateConstraints() {
         askForCutomizedSizeOfContentView(animated: false)
+        super.updateConstraints()
     }
 
     private func applyParentStackAttributes() {

Sources/ScrollStackController/Support/ScrollStackRowAnimator.swift

@@ -116,7 +116,7 @@ internal class ScrollStackRowAnimator {
 
     /// Target row if animatable.
     private var animatableRow: ScrollStackRowAnimatable? {
-        return targetRow.controller as? ScrollStackRowAnimatable
+        return (targetRow.controller as? ScrollStackRowAnimatable) ?? (targetRow.contentView as? ScrollStackRowAnimatable)
     }
 
     // MARK: - Initialization