From 185efa547e98df67bd8fab1c1a07e09d3f7bbc9f Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Fri, 10 Apr 2020 09:38:00 -0400
Subject: [PATCH] Feedback push

---
 .../BaseClasses/CollectionViewCell.swift      | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/MVMCoreUI/BaseClasses/CollectionViewCell.swift b/MVMCoreUI/BaseClasses/CollectionViewCell.swift
index 58bd06ff..e11b350c 100644
--- a/MVMCoreUI/BaseClasses/CollectionViewCell.swift
+++ b/MVMCoreUI/BaseClasses/CollectionViewCell.swift
@@ -15,7 +15,9 @@ open class CollectionViewCell: UICollectionViewCell, MoleculeViewProtocol, MVMCo
     open var molecule: MoleculeViewProtocol?
     public let containerHelper = ContainerHelper()
     open var model: CollectionItemModelProtocol?
-    open var widthConstraint: NSLayoutConstraint?
+    
+    /// The width, used for establishing columns
+    open var width: CGFloat?
 
     private var initialSetupPerformed = false
 
@@ -57,7 +59,7 @@ open class CollectionViewCell: UICollectionViewCell, MoleculeViewProtocol, MVMCo
     open func reset() {
         molecule?.reset()
         backgroundColor = .white
-        widthConstraint?.isActive = false
+        width = nil
     }
     
     // MARK: - MoleculeViewProtocol
@@ -85,12 +87,18 @@ open class CollectionViewCell: UICollectionViewCell, MoleculeViewProtocol, MVMCo
 
     // MARK: - CollectionTemplateItemProtocol
     public func set(width: CGFloat) {
-        if let widthConstraint = widthConstraint {
-            widthConstraint.constant = width
-            widthConstraint.isActive = true
-        } else {
-            widthConstraint = contentView.widthAnchor.constraint(equalToConstant: width)
-            widthConstraint?.isActive = true
-        }
+        self.width = width
     }
+    
+    // Column logic, set width.
+    override open func preferredLayoutAttributesFitting(_ layoutAttributes: UICollectionViewLayoutAttributes) -> UICollectionViewLayoutAttributes {
+        let autoLayoutAttributes = super.preferredLayoutAttributesFitting(layoutAttributes)
+        guard let width = width else { return autoLayoutAttributes }
+
+        let targetSize = CGSize(width: width, height: 0)
+        let newSize = contentView.systemLayoutSizeFitting(targetSize, withHorizontalFittingPriority: UILayoutPriority.required, verticalFittingPriority: UILayoutPriority.defaultLow)
+        let newFrame = CGRect(origin: autoLayoutAttributes.frame.origin, size: newSize)
+        autoLayoutAttributes.frame = newFrame
+        return autoLayoutAttributes
+   }
 }