From 7b36f466fa862960742ecebca6871f8f8bbbc671 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 23 Mar 2020 15:01:31 -0400
Subject: [PATCH] navigation item update to fix crash

---
 MVMCoreUI/Models/ModelProtocols/PageModelProtocol.swift  | 2 +-
 MVMCoreUI/Molecules/NavigationItemModelProtocol.swift    | 4 ++--
 MVMCoreUI/Templates/ListPageTemplateModel.swift          | 2 +-
 MVMCoreUI/Templates/StackCenteredPageTemplateModel.swift | 2 +-
 MVMCoreUI/Templates/TemplateModel.swift                  | 2 +-
 MVMCoreUI/Templates/ThreeLayerPageTemplateModel.swift    | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/MVMCoreUI/Models/ModelProtocols/PageModelProtocol.swift b/MVMCoreUI/Models/ModelProtocols/PageModelProtocol.swift
index 7f50873e..5c53ea4e 100644
--- a/MVMCoreUI/Models/ModelProtocols/PageModelProtocol.swift
+++ b/MVMCoreUI/Models/ModelProtocols/PageModelProtocol.swift
@@ -13,5 +13,5 @@ public protocol PageModelProtocol {
     var pageType: String { get set }
     var screenHeading: String? { get set }
     var isAtomicTabs: Bool? { get set }
-    var navigationItem: NavigationItemModelProtocol? { get set }
+    var navigationItem: (NavigationItemModelProtocol & MoleculeModelProtocol)? { get set }
 }
diff --git a/MVMCoreUI/Molecules/NavigationItemModelProtocol.swift b/MVMCoreUI/Molecules/NavigationItemModelProtocol.swift
index 605b6e5e..d7df7cc9 100644
--- a/MVMCoreUI/Molecules/NavigationItemModelProtocol.swift
+++ b/MVMCoreUI/Molecules/NavigationItemModelProtocol.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public protocol NavigationItemModelProtocol: MoleculeModelProtocol {
+public protocol NavigationItemModelProtocol {
     var title: String? { get set }
     var titleView: MoleculeModelProtocol? { get set }
     var hidden: Bool { get set }
@@ -50,7 +50,7 @@ public class NavigationItemButtonModel: Codable {
     }
 }
 
-public class NavigationItemModel: NavigationItemModelProtocol {
+public class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtocol {
     public class var identifier: String {
         return "navigationItem"
     }
diff --git a/MVMCoreUI/Templates/ListPageTemplateModel.swift b/MVMCoreUI/Templates/ListPageTemplateModel.swift
index 57d99f26..0188a434 100644
--- a/MVMCoreUI/Templates/ListPageTemplateModel.swift
+++ b/MVMCoreUI/Templates/ListPageTemplateModel.swift
@@ -22,7 +22,7 @@ import Foundation
     public var pageType: String
     public var screenHeading: String?
     public var isAtomicTabs: Bool?
-    public var navigationItem: NavigationItemModelProtocol?
+    public var navigationItem: (NavigationItemModelProtocol & MoleculeModelProtocol)?
 
     public var header: MoleculeModelProtocol?
     public var molecules: [ListItemModelProtocol & MoleculeModelProtocol]?
diff --git a/MVMCoreUI/Templates/StackCenteredPageTemplateModel.swift b/MVMCoreUI/Templates/StackCenteredPageTemplateModel.swift
index c3a4b64e..22934239 100644
--- a/MVMCoreUI/Templates/StackCenteredPageTemplateModel.swift
+++ b/MVMCoreUI/Templates/StackCenteredPageTemplateModel.swift
@@ -17,7 +17,7 @@ import Foundation
     public var pageType: String
     public var screenHeading: String?
     public var isAtomicTabs: Bool?
-    public var navigationItem: NavigationItemModelProtocol?
+    public var navigationItem: (NavigationItemModelProtocol & MoleculeModelProtocol)?
 
     public init(pageType: String) {
         self.pageType = pageType
diff --git a/MVMCoreUI/Templates/TemplateModel.swift b/MVMCoreUI/Templates/TemplateModel.swift
index 053d45fc..786068d0 100644
--- a/MVMCoreUI/Templates/TemplateModel.swift
+++ b/MVMCoreUI/Templates/TemplateModel.swift
@@ -15,7 +15,7 @@ import Foundation
     public var pageType: String
     public var screenHeading: String?
     public var isAtomicTabs: Bool?
-    public var navigationItem: NavigationItemModelProtocol?
+    public var navigationItem: (NavigationItemModelProtocol & MoleculeModelProtocol)?
     public var formRules: [FormGroupRule]?
 
     public init(pageType: String) {
diff --git a/MVMCoreUI/Templates/ThreeLayerPageTemplateModel.swift b/MVMCoreUI/Templates/ThreeLayerPageTemplateModel.swift
index c45e7fb7..9ee830e2 100644
--- a/MVMCoreUI/Templates/ThreeLayerPageTemplateModel.swift
+++ b/MVMCoreUI/Templates/ThreeLayerPageTemplateModel.swift
@@ -18,7 +18,7 @@ import Foundation
     public var pageType: String
     public var screenHeading: String?
     public var isAtomicTabs: Bool?
-    public var navigationItem: NavigationItemModelProtocol?
+    public var navigationItem: (NavigationItemModelProtocol & MoleculeModelProtocol)?
 
     public var header: MoleculeModelProtocol?
     public var middle: MoleculeModelProtocol?