🤔WIP [ci skip]

Author: muukii

StackScrollView-Demo/ViewController.swift

@@ -87,7 +87,7 @@ class ViewController: UIViewController {
         // Dispose of any resources that can be recreated.
     }
 
-    private var stackScrollView = BetaStackScrollView()
+    private var stackScrollView = StackScrollView()
 }
 
 class LabelStackViewCell: UIView {
@@ -121,7 +121,7 @@ class LabelStackViewCell: UIView {
     let detailLabel = UILabel()
 }
 
-class SwitchStackViewCell: UIView, BetaStackScrollViewCellType {
+class SwitchStackViewCell: UIView, StackScrollViewCellType {
 
     var valueChanged: (Bool) -> Void = { _ in }
 
@@ -158,7 +158,7 @@ class SwitchStackViewCell: UIView, BetaStackScrollViewCellType {
 
     @objc fileprivate func switchValueChanged() {
 
-        valueChanged(switchView.isOn)
+        valueChanged(switchView.isOn)        
         updateLayout(animated: true)
     }
 }

StackScrollView.xcodeproj/project.pbxproj

@@ -16,7 +16,6 @@
 		4B6C2DB71D8DA68E003D3A46 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4B6C2DB51D8DA68E003D3A46 /* Main.storyboard */; };
 		4B6C2DB91D8DA68E003D3A46 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4B6C2DB81D8DA68E003D3A46 /* Assets.xcassets */; };
 		4B6C2DBC1D8DA68E003D3A46 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4B6C2DBA1D8DA68E003D3A46 /* LaunchScreen.storyboard */; };
-		4BDB87D71DBFB49500E70D5B /* BetaStackScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BDB87D61DBFB49500E70D5B /* BetaStackScrollView.swift */; };
 		4BDB87D91DBFBC8F00E70D5B /* RevealServer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BDB87D81DBFBC8800E70D5B /* RevealServer.framework */; };
 		4BDB87DA1DBFBC8F00E70D5B /* RevealServer.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BDB87D81DBFBC8800E70D5B /* RevealServer.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		4BE8B6ED1D8E5A9700A4DC33 /* StackScrollView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B6C2D991D8DA3FB003D3A46 /* StackScrollView.framework */; };
@@ -270,7 +269,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				4B6C2DA71D8DA42A003D3A46 /* StackScrollViewCellType.swift in Sources */,
-				4BDB87D71DBFB49500E70D5B /* BetaStackScrollView.swift in Sources */,
 				4B6C2DA61D8DA42A003D3A46 /* StackScrollView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

StackScrollView/BetaStackScrollView.swift

@@ -27,6 +27,7 @@ extension BetaStackScrollViewCellType where Self: UIView {
     }
 
     public func updateLayout(animated: Bool) {
+        // invalidateIntrinsicContentSize()
         stackScrollView.updateLayout(animated: animated)
     }
 
@@ -130,14 +131,20 @@ open class BetaStackScrollView: UIView, UITableViewDataSource, UITableViewDelega
     private let tableView = UITableView(frame: .zero, style: .plain)
 
     public func updateLayout(animated: Bool) {
+            
+        cells.forEach {
+            $0.contentView.subviews.first?.invalidateIntrinsicContentSize()
+        }
+        
         if animated {
-            UIView.animate(withDuration: 0.3, animations: {
-                self.tableView.beginUpdates()
-                self.tableView.endUpdates()
-            })
+            self.tableView.beginUpdates()
+            self.tableView.endUpdates()
+           
         }else {
-            tableView.beginUpdates()
-            tableView.endUpdates()
+            UIView.performWithoutAnimation {
+                tableView.beginUpdates()
+                tableView.endUpdates()
+            }
         }
     }
 
@@ -181,7 +188,6 @@ open class BetaStackScrollView: UIView, UITableViewDataSource, UITableViewDelega
         let cell = cells[indexPath.row]
 
         let contentView = cell.contentView
-        contentView.invalidateIntrinsicContentSize()
 
         guard contentView.subviews.first?.isHidden == false else {
             return 0

StackScrollView/StackScrollViewCellType.swift

@@ -48,4 +48,22 @@ extension StackScrollViewCellType where Self: UIView {
 
         stackScrollView.scroll(to: self, animated: animated)
     }
+    
+    public func updateLayout(animated: Bool) {
+        invalidateIntrinsicContentSize()
+        
+        if animated {
+            UIView.animate(withDuration: 0.3, delay: 0, options: [], animations: {
+                self.stackScrollView.setNeedsLayout()
+                self.stackScrollView.layoutIfNeeded()
+            }) { (finish) in
+                
+            }
+        } else {
+            UIView.performWithoutAnimation {
+                stackScrollView.setNeedsLayout()
+                stackScrollView.layoutIfNeeded()
+            }
+        }
+    }
 }