From 4b23a63823f8440fd45172f424e0149b3ddf4b80 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Thu, 23 Apr 2020 12:30:07 -0400
Subject: [PATCH] update others

---
 ...neColumnFullWidthTextAllTextAndLinks.swift | 20 +++++++------------
 .../EyebrowHeadlineBodyLink.swift             | 18 ++++++-----------
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
index 1ea1a4a9..ad74039a 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
@@ -40,24 +40,18 @@ import Foundation
     override open func setupView() {
         super.setupView()
         addMolecule(stack)
+        stack.restack()
     }
     
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?){
         super.set(with: model, delegateObject, additionalData)
         guard let model = model as? ListOneColumnFullWidthTextAllTextAndLinksModel else { return }
-        eyebrow.setOptional(with: model.eyebrow, delegateObject, additionalData)
-        headline.setOptional(with: model.headline, delegateObject, additionalData)
-        subHeadline.setOptional(with: model.subHeadline, delegateObject, additionalData)
-        body.setOptional(with: model.body, delegateObject, additionalData)
-        link.setOptional(with: model.link, delegateObject, additionalData)
-        
-        // Hide labels if neeeded.
-        stack.stackModel?.molecules[0].gone = !eyebrow.hasText
-        stack.stackModel?.molecules[1].gone = !headline.hasText
-        stack.stackModel?.molecules[2].gone = !subHeadline.hasText
-        stack.stackModel?.molecules[3].gone = !body.hasText
-        stack.stackModel?.molecules[4].gone = (link.titleLabel?.text?.count ?? 0) == 0
-        stack.restack()
+        stack.updateContainedMolecules(with: [model.eyebrow,
+                                              model.headline,
+                                              model.subHeadline,
+                                              model.body,
+                                              model.link],
+                                       delegateObject, additionalData)
     }
     
     open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
index 82f83530..dd04140b 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
@@ -33,6 +33,7 @@ import UIKit
         stack.stackModel?.spacing = 0
         addSubview(stack)
         NSLayoutConstraint.constraintPinSubview(toSuperview: stack)
+        stack.restack()
     }
     
     open override func updateView(_ size: CGFloat) {
@@ -58,18 +59,11 @@ import UIKit
     
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         super.set(with: model, delegateObject, additionalData)
-        
-        eyebrow.setOptional(with: castModel?.eyebrow, delegateObject, additionalData)
-        headline.setOptional(with: castModel?.headline, delegateObject, additionalData)
-        body.setOptional(with: castModel?.body, delegateObject, additionalData)
-        link.setOptional(with: castModel?.link, delegateObject, additionalData)
-        
-        // Hide labels if neeeded.
-        stack.stackModel?.molecules[0].gone = !eyebrow.hasText
-        stack.stackModel?.molecules[1].gone = !headline.hasText
-        stack.stackModel?.molecules[2].gone = !body.hasText
-        stack.stackModel?.molecules[3].gone = (link.titleLabel?.text?.count ?? 0) == 0
-        stack.restack()
+        stack.updateContainedMolecules(with: [castModel?.eyebrow,
+                                              castModel?.headline,
+                                              castModel?.body,
+                                              castModel?.link],
+                                       delegateObject, additionalData)
     }
     
     open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {