From 9e241e6d8e2a69d51e1d3bd6c68c95227272e845 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Fri, 3 Apr 2020 11:03:12 -0400
Subject: [PATCH] Molecule stack fix

---
 .../Atomic/Molecules/Items/StackItemModelProtocol.swift     | 2 +-
 MVMCoreUI/Atomic/Organisms/Stack.swift                      | 2 +-
 MVMCoreUI/Atomic/Organisms/StackModel.swift                 | 6 +++---
 MVMCoreUI/Atomic/Organisms/StackModelProtocol.swift         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/Items/StackItemModelProtocol.swift b/MVMCoreUI/Atomic/Molecules/Items/StackItemModelProtocol.swift
index 170fce69..2223ed39 100644
--- a/MVMCoreUI/Atomic/Molecules/Items/StackItemModelProtocol.swift
+++ b/MVMCoreUI/Atomic/Molecules/Items/StackItemModelProtocol.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public protocol StackItemModelProtocol: MoleculeModelProtocol {
+public protocol StackItemModelProtocol {
     var spacing: CGFloat? { get set }
     var percent: Int? { get set }
     var gone: Bool { get set }
diff --git a/MVMCoreUI/Atomic/Organisms/Stack.swift b/MVMCoreUI/Atomic/Organisms/Stack.swift
index d1c127fd..ab17be3b 100644
--- a/MVMCoreUI/Atomic/Organisms/Stack.swift
+++ b/MVMCoreUI/Atomic/Organisms/Stack.swift
@@ -220,7 +220,7 @@ open class Stack<T>: Container where T: (StackModelProtocol & MoleculeModelProto
     open func createStackItemsFromModel(_ model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         guard let stackItemModels = (model as? StackModelProtocol)?.molecules else { return }
         for model in stackItemModels {
-            if let stackItem = MoleculeObjectMapping.shared()?.createMolecule(model, delegateObject: delegateObject, additionalData: additionalData) as? (MoleculeViewProtocol & StackModelProtocol) {
+            if let stackItem = MoleculeObjectMapping.shared()?.createMolecule(model, delegateObject: delegateObject, additionalData: additionalData) {
                 stackItems.append(stackItem)
             }
         }
diff --git a/MVMCoreUI/Atomic/Organisms/StackModel.swift b/MVMCoreUI/Atomic/Organisms/StackModel.swift
index 43dd7058..cc8f7d0e 100644
--- a/MVMCoreUI/Atomic/Organisms/StackModel.swift
+++ b/MVMCoreUI/Atomic/Organisms/StackModel.swift
@@ -15,12 +15,12 @@ import Foundation
         return "stack"
     }
     public var backgroundColor: Color?
-    public var molecules: [StackItemModelProtocol]
+    public var molecules: [StackItemModelProtocol & MoleculeModelProtocol]
     public var axis: NSLayoutConstraint.Axis = .vertical
     public var spacing: CGFloat = StackModel.defaultSpacing
     public var useStackSpacingBeforeFirstItem = false
     
-    public init(molecules: [StackItemModelProtocol], axis: NSLayoutConstraint.Axis? = nil, spacing: CGFloat? = nil) {
+    public init(molecules: [StackItemModelProtocol & MoleculeModelProtocol], axis: NSLayoutConstraint.Axis? = nil, spacing: CGFloat? = nil) {
         self.molecules = molecules
         if let axis = axis {
             self.axis = axis
@@ -41,7 +41,7 @@ import Foundation
 
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        molecules = try typeContainer.decodeModel(codingKey: .molecules)
+        molecules = try typeContainer.decodeModels(codingKey: .molecules)
         if let axisString = try typeContainer.decodeIfPresent(String.self, forKey: .axis), let optionalAxis = NSLayoutConstraint.Axis(rawValue: axisString) {
             axis = optionalAxis
         }
diff --git a/MVMCoreUI/Atomic/Organisms/StackModelProtocol.swift b/MVMCoreUI/Atomic/Organisms/StackModelProtocol.swift
index 75c29a3e..54f6c9d0 100644
--- a/MVMCoreUI/Atomic/Organisms/StackModelProtocol.swift
+++ b/MVMCoreUI/Atomic/Organisms/StackModelProtocol.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 public protocol StackModelProtocol {
-    var molecules: [StackItemModelProtocol] { get set }
+    var molecules: [StackItemModelProtocol & MoleculeModelProtocol] { get set }
     var axis: NSLayoutConstraint.Axis { get set }
     var spacing: CGFloat { get set }
     var useStackSpacingBeforeFirstItem: Bool { get set }