From b2fee17d8ae228d262fd8831661b52e760b06012 Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Fri, 17 Apr 2020 16:58:07 -0400
Subject: [PATCH] changes made to resolve VO issues

---
 .../Templates/ModalMoleculeListTemplate.swift |  3 +++
 .../ThreeLayerTableViewController.swift       |  1 +
 .../Views/Container/ContainerHelper.swift     | 20 +++++++++++++++++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift b/MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift
index eda35d6b..eb85d80b 100644
--- a/MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift
+++ b/MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift
@@ -17,5 +17,8 @@ open class ModalMoleculeListTemplate: MoleculeListTemplate {
         closeButton = MVMCoreUICommonViewsUtility.addCloseButton(to: view, action: { _ in
             MVMCoreNavigationHandler.shared()?.removeCurrentViewController()
         }, verticalCentered: false)
+        
+        accessibilityElements = [closeButton as Any, tableView as Any]
+        UIAccessibility.post(notification: .layoutChanged, argument: closeButton)
     }
 }
diff --git a/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift b/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift
index 000f2e7f..bc5778b7 100644
--- a/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift
+++ b/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift
@@ -41,6 +41,7 @@ open class ThreeLayerTableViewController: ProgrammaticTableViewController {
         createViewForTableHeader()
         createViewForTableFooter()
         tableView?.reloadData()
+        accessibilityElements = [tableView as Any]
     }
     
     override open func viewDidLoad() {
diff --git a/MVMCoreUI/Containers/Views/Container/ContainerHelper.swift b/MVMCoreUI/Containers/Views/Container/ContainerHelper.swift
index 223589fe..fcb8877e 100644
--- a/MVMCoreUI/Containers/Views/Container/ContainerHelper.swift
+++ b/MVMCoreUI/Containers/Views/Container/ContainerHelper.swift
@@ -9,7 +9,12 @@
 
 import Foundation
 
+
 open class ContainerHelper: NSObject {
+    //--------------------------------------------------
+    // MARK: - Constraints
+    //--------------------------------------------------
+    
     var leftConstraint: NSLayoutConstraint?
     var topConstraint: NSLayoutConstraint?
     var bottomConstraint: NSLayoutConstraint?
@@ -28,17 +33,26 @@ open class ContainerHelper: NSObject {
     var bottomLowConstraint: NSLayoutConstraint?
     var rightLowConstraint: NSLayoutConstraint?
     
+    //--------------------------------------------------
+    // MARK: - Methods
+    //--------------------------------------------------
+    
     open func constrainView(_ view: UIView) {
         guard let margins = view.superview?.layoutMarginsGuide else { return }
+        
+        leftConstraint?.isActive = false
         leftConstraint = view.leftAnchor.constraint(equalTo: margins.leftAnchor)
         leftConstraint?.isActive = true
         
+        topConstraint?.isActive = false
         topConstraint = view.topAnchor.constraint(equalTo: margins.topAnchor)
         topConstraint?.isActive = true
         
+        rightConstraint?.isActive = false
         rightConstraint = margins.rightAnchor.constraint(equalTo: view.rightAnchor)
         rightConstraint?.isActive = true
         
+        bottomConstraint?.isActive = false
         bottomConstraint = margins.bottomAnchor.constraint(equalTo: view.bottomAnchor)
         bottomConstraint?.isActive = true
         
@@ -50,23 +64,25 @@ open class ContainerHelper: NSObject {
         alignCenterTopConstraint = view.topAnchor.constraint(greaterThanOrEqualTo: margins.topAnchor)
         alignCenterBottomConstraint = margins.bottomAnchor.constraint(greaterThanOrEqualTo: view.bottomAnchor)
         
+        leftLowConstraint?.isActive = false
         leftLowConstraint = view.leftAnchor.constraint(equalTo: margins.leftAnchor)
         leftLowConstraint?.priority = UILayoutPriority(rawValue: 200)
         leftLowConstraint?.isActive = true
         
+        topLowConstraint?.isActive = false
         topLowConstraint = view.topAnchor.constraint(equalTo: margins.topAnchor)
         topLowConstraint?.priority = UILayoutPriority(rawValue: 200)
         topLowConstraint?.isActive = true
         
+        rightLowConstraint?.isActive = false
         rightLowConstraint = margins.rightAnchor.constraint(equalTo: view.rightAnchor)
         rightLowConstraint?.priority = UILayoutPriority(rawValue: 200)
         rightLowConstraint?.isActive = true
         
+        bottomLowConstraint?.isActive = false
         bottomLowConstraint = margins.bottomAnchor.constraint(equalTo: view.bottomAnchor)
         bottomLowConstraint?.priority = UILayoutPriority(rawValue: 200)
         bottomLowConstraint?.isActive = true
-        
-        setAccessibility(view)
     }
     
     open func setAccessibility(_ view: UIView) {