Merge branch 'release/1.3.2'

Author: malcommac

ScrollStackController.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "ScrollStackController"
-  s.version      = "1.3.1"
+  s.version      = "1.3.2"
   s.summary      = "Create complex scrollable layout using UIViewController and simplify your code"
   s.homepage     = "https://github.com/malcommac/ScrollStackController"
   s.license      = { :type => "MIT", :file => "LICENSE" }

ScrollStackController.xcodeproj/project.pbxproj

@@ -544,7 +544,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 1.3.0;
+				MARKETING_VERSION = 1.3.2;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.ScrollStackController.ScrollStackController-iOS";
 				PRODUCT_NAME = ScrollStackController;
@@ -569,7 +569,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 1.3.0;
+				MARKETING_VERSION = 1.3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.ScrollStackController.ScrollStackController-iOS";
 				PRODUCT_NAME = ScrollStackController;
 				SKIP_INSTALL = YES;

ScrollStackController.xcodeproj/project.xcworkspace/xcuserdata/daniele.xcuserdatad/UserInterfaceState.xcuserstate

@@ -58,7 +58,7 @@ class ViewController: UIViewController, ScrollStackControllerDelegate {
          stackView.addRow(view: plainView)
         */
 
-        stackView.addRows(controllers: [welcomeVC, notesVC, tagsVC, galleryVC,pricingVC], animated: false)
+        stackView.addRows(controllers: [welcomeVC, notesVC, tagsVC, galleryVC, pricingVC], animated: false)
     }
 
     @IBAction public func addNewRow() {

ScrollStackControllerDemo/ViewController.swift

@@ -809,20 +809,21 @@ open class ScrollStack: UIScrollView, UIScrollViewDelegate {
         // Animate visibility
         let removedController = row.controller
         animateCellVisibility(row, animated: animated, hide: true, completion: { [weak self] in
-            guard let `self` = self else {
-                return
-            }
+            guard let self = self else { return }
 
-            // remove row
-            row.removeFromSuperview()
+            self.onChangeRow?(row, true)
+
+            row.removeFromStackView()
 
             // When removing a cell the cell above is the only cell whose separator visibility
             // will be affected, so we need to update its visibility.
             self.updateRowSeparatorVisibility(previousRow)
 
-            self.onChangeRow?(row, true)
+            // Remove from the status
+            self.prevVisibilityState.removeValue(forKey: row)
         })
-                
+
+        self.stackDelegate?.scrollStackRowDidBecomeHidden(self, row: row, index: row.index!, state: .removed)
         return removedController
     }
 

Sources/ScrollStackController/ScrollStack.swift

@@ -104,12 +104,12 @@ open class ScrollStackRow: UIView, UIGestureRecognizerDelegate {
     /// NOTE:
     /// This value is strongly retained so you don't need to
     /// save it anywhere in your parent controller in order to avoid releases.
-    public let controller: UIViewController?
+    public private(set) var controller: UIViewController?
 
     /// Content view controller (if controller is used) or just the view addded.
     ///
     /// NOTE: This value is strongly retained.
-    public let contentView: UIView
+    public private(set) var contentView: UIView?
 
     // MARK: - Manage Separator
 
@@ -138,7 +138,7 @@ open class ScrollStackRow: UIView, UIGestureRecognizerDelegate {
     // MARK: Private Properties
 
     @objc private func handleTap(_ tapGestureRecognizer: UITapGestureRecognizer) {
-        guard contentView.isUserInteractionEnabled else {
+        guard contentView?.isUserInteractionEnabled ?? false else {
             return
         }
         onTap?(self)
@@ -196,8 +196,21 @@ open class ScrollStackRow: UIView, UIGestureRecognizerDelegate {
     }
 
     // MARK: - Setup UI
+
+    public func removeFromStackView() {
+        contentView?.removeFromSuperview()
+        contentView = nil
+        controller = nil
+        
+        stackView?.stackView.removeArrangedSubview(self)
+        removeFromSuperview()
+    }
 
     private func setupPostInit() {
+        guard let contentView = contentView else {
+            return
+        }
+        
         clipsToBounds = true
         insetsLayoutMarginsFromSafeArea = false
         contentView.translatesAutoresizingMaskIntoConstraints = false
@@ -207,6 +220,10 @@ open class ScrollStackRow: UIView, UIGestureRecognizerDelegate {
     }
 
     internal func layoutUI() {
+        guard let contentView = contentView else {
+            return
+        }
+        
         contentView.removeFromSuperview()
         contentView.removeFromSuperview()
 
@@ -243,6 +260,10 @@ open class ScrollStackRow: UIView, UIGestureRecognizerDelegate {
     // MARK: - Manage Separator
 
     private func didUpdateContentViewContraints() {
+        guard let contentView = contentView else {
+            return
+        }
+        
         let bottomConstraint = contentView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor, constant: rowPadding.bottom)
         bottomConstraint.priority = UILayoutPriority(rawValue: UILayoutPriority.required.rawValue - 1)
 
@@ -305,7 +326,7 @@ open class ScrollStackRow: UIView, UIGestureRecognizerDelegate {
     }
 
     private func setupRowToFixedValue(_ value: CGFloat) {
-        guard let stackView = stackView else { return }
+        guard let stackView = stackView, let contentView = contentView else { return }
 
         if stackView.axis == .vertical {
             contentView.width(constant: nil)
@@ -317,8 +338,8 @@ open class ScrollStackRow: UIView, UIGestureRecognizerDelegate {
     }
 
     private func setupRowSizeToFitLayout()  {
-        guard let stackView = stackView else { return }
-        
+        guard let stackView = stackView, let contentView = contentView else { return }
+
         var bestSize: CGSize!
         if stackView.axis == .vertical {
             let maxAllowedSize = CGSize(width: stackView.bounds.size.width, height: CGFloat.greatestFiniteMagnitude)
@@ -355,7 +376,7 @@ open class ScrollStackRow: UIView, UIGestureRecognizerDelegate {
 
     open override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesBegan(touches, with: event)
-        guard contentView.isUserInteractionEnabled else {
+        guard contentView?.isUserInteractionEnabled ?? false else {
             return
         }
 
@@ -367,7 +388,7 @@ open class ScrollStackRow: UIView, UIGestureRecognizerDelegate {
 
     open override func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesMoved(touches, with: event)
-        guard contentView.isUserInteractionEnabled, let touch = touches.first else {
+        guard contentView?.isUserInteractionEnabled ?? false, let touch = touches.first else {
             return
         }
 
@@ -382,7 +403,7 @@ open class ScrollStackRow: UIView, UIGestureRecognizerDelegate {
 
     open override func touchesCancelled(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesCancelled(touches, with: event)
-        guard contentView.isUserInteractionEnabled else {
+        guard contentView?.isUserInteractionEnabled ?? false else {
             return
         }
 
@@ -394,7 +415,7 @@ open class ScrollStackRow: UIView, UIGestureRecognizerDelegate {
 
     open override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesEnded(touches, with: event)
-        guard contentView.isUserInteractionEnabled else {
+        guard contentView?.isUserInteractionEnabled ?? false else {
             return
         }
 

Sources/ScrollStackController/ScrollStackRow.swift

@@ -58,7 +58,7 @@ open class ScrollStackViewController: UIViewController {
         view = scrollStack
         // monitor remove or add of a row to manage the view controller's hierarchy
         scrollStack.onChangeRow = { [weak self] (row, isRemoved) in
-            guard let `self` = self else {
+            guard let self = self else {
                 return
             }
             self.didAddOrRemoveRow(row, isRemoved: isRemoved)

Sources/ScrollStackController/ScrollStackViewController.swift

@@ -176,16 +176,18 @@ public extension ScrollStack {
     /// - `entire`: row is entirely visible.
     /// - `hidden`: row is invisible and hidden.
     /// - `offscreen`: row is not hidden but currently offscreen due to scroll position.
+    /// - `removed`: row is removed manually.
     enum RowVisibility {
         case hidden
         case partial
         case entire
         case offscreen
+        case removed
 
         /// Return if row is visible.
         public var isVisible: Bool {
             switch self {
-            case .hidden, .offscreen:
+            case .hidden, .offscreen, .removed:
                 return false
             default:
                 return true