Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/vds_ios.git into refactor/dispatchQueue

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>

VDS/BaseClasses/Control.swift

@@ -11,7 +11,7 @@ import Combine
 
 /// Base Class use to build Controls.
 @objc(VDSControl)
-open class Control: UIControl, ViewProtocol, UserInfoable, Clickable {
+open class Control: UIControl, ViewProtocol, DispatchQueueViewProtocol, UserInfoable, Clickable {
     //--------------------------------------------------
     // MARK: - Initializers
     //--------------------------------------------------
@@ -46,13 +46,13 @@ open class Control: UIControl, ViewProtocol, UserInfoable, Clickable {
     //--------------------------------------------------
     // MARK: - Private Properties
     //--------------------------------------------------
+    internal var updateWorkItem: DispatchWorkItem?
+
     private var initialSetupPerformed = false
     
     //--------------------------------------------------
     // MARK: - Public Properties
-    //--------------------------------------------------
+    //--------------------------------------------------    
-    open var shouldUpdateView: Bool = true
-    
     open var userInfo = [String: Primitive]()
     
     open var surface: Surface = .light { didSet { setNeedsUpdate() } }

VDS/BaseClasses/Selector/SelectorItemBase.swift

@@ -205,7 +205,6 @@ open class SelectorItemBase<Selector: SelectorControlable>: Control, Errorable,
     /// Resets to default settings.
     open override func reset() {
         super.reset()
-        shouldUpdateView = false
         label.reset()
         childLabel.reset()
         errorLabel.reset()
@@ -225,9 +224,6 @@ open class SelectorItemBase<Selector: SelectorControlable>: Control, Errorable,
         inputId = nil
         value = nil
         isSelected = false
-        
-        shouldUpdateView = true
-        setNeedsUpdate()
     }
     
     //--------------------------------------------------

VDS/BaseClasses/View.swift

@@ -11,7 +11,7 @@ import Combine
 
 /// Base Class used to build Views.
 @objc(VDSView)
-open class View: UIView, ViewProtocol, UserInfoable {
+open class View: UIView, ViewProtocol, DispatchQueueViewProtocol, UserInfoable {
     
     //--------------------------------------------------
     // MARK: - Initializers
@@ -39,13 +39,13 @@ open class View: UIView, ViewProtocol, UserInfoable {
     //--------------------------------------------------
     // MARK: - Private Properties
     //--------------------------------------------------
+    internal var updateWorkItem: DispatchWorkItem?
+
     private var initialSetupPerformed = false
     
     //--------------------------------------------------
     // MARK: - Public Properties
     //--------------------------------------------------
-    open var shouldUpdateView: Bool = true
-    
     /// Dictionary for keeping information for this Control use only Primitives.
     open var userInfo = [String: Primitive]()
     

VDS/Components/Badge/Badge.swift

@@ -150,7 +150,6 @@ open class Badge: View {
     /// Resets to default settings.
     open override func reset() {
         super.reset()
-        shouldUpdateView = false
         label.reset()
         label.lineBreakMode = .byTruncatingTail
         label.textStyle = .boldBodySmall
@@ -158,8 +157,6 @@ open class Badge: View {
         text = ""
         maxWidth = nil
         numberOfLines = 1
-        shouldUpdateView = true
-        setNeedsUpdate()
     }
     
     /// Used to make changes to the View based off a change events or from local properties.

VDS/Components/BadgeIndicator/BadgeIndicator.swift

@@ -296,14 +296,11 @@ open class BadgeIndicator: View {
     /// Resets to default settings.
     open override func reset() {
         super.reset()
-        shouldUpdateView = false
         label.reset()
         label.lineBreakMode = .byTruncatingTail
         label.textAlignment = .center
         fillColor = .red
         number = nil
-        shouldUpdateView = true
-        setNeedsUpdate()
     }
                 
     /// Used to make changes to the View based off a change events or from local properties.

VDS/Components/Buttons/Button/Button.swift

@@ -155,12 +155,9 @@ open class Button: ButtonBase, Useable, Buttonable {
     /// Resets to default settings.
     open override func reset() {
         super.reset()
-        shouldUpdateView = false        
         use = .primary
         width = nil
         size = .large
-        shouldUpdateView = true
-        setNeedsUpdate()
     }
         
     /// Used to make changes to the View based off a change events or from local properties.

VDS/Components/Buttons/ButtonBase.swift

@@ -25,7 +25,7 @@ public protocol Buttonable: UIControl, Surfaceable, Enabling {
 
 /// Base class used for UIButton type classes.
 @objc(VDSButtonBase)
-open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable {
+open class ButtonBase: UIButton, ViewProtocol, DispatchQueueViewProtocol, UserInfoable, Clickable {
     
     //--------------------------------------------------
     // MARK: - Initializers
@@ -67,14 +67,13 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable {
     //--------------------------------------------------
     // MARK: - Private Properties
     //--------------------------------------------------
+    internal var updateWorkItem: DispatchWorkItem?
+
     private var initialSetupPerformed = false
 
     //--------------------------------------------------
     // MARK: - Properties
-    //--------------------------------------------------
+    //--------------------------------------------------    
-    /// Key of whether or not updateView() is called in setNeedsUpdate()
-    open var shouldUpdateView: Bool = true 
-    
     /// The ButtonSize available to this type of Buttonable.
     open var availableSizes: [ButtonSize] { [] }
     
@@ -156,13 +155,10 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable {
     }
 
     open func reset() {
-        shouldUpdateView = false
         surface = .light
         isEnabled = true 
         text = nil
         accessibilityCustomActions = []
-        shouldUpdateView = true
-        setNeedsUpdate()
     }
         
     //--------------------------------------------------

VDS/Components/Buttons/TextLink/TextLink.swift

@@ -113,14 +113,11 @@ open class TextLink: ButtonBase, Buttonable {
     /// Resets to default settings.
     open override func reset() {
         super.reset()
-        shouldUpdateView = false
         text = nil
         size = .large
         accessibilityCustomActions = []
         isAccessibilityElement = true
         accessibilityTraits = .link
-        shouldUpdateView = true
-        setNeedsUpdate()
     }
     
 }

VDS/Components/Icon/ButtonIcon/ButtonIcon.swift

@@ -280,7 +280,6 @@ open class ButtonIcon: Control {
     /// Resets to default settings.
     open override func reset() {
         super.reset()
-        shouldUpdateView = false
         kind = .ghost
         surfaceType = .colorFill
         size = .large
@@ -288,8 +287,6 @@ open class ButtonIcon: Control {
         hideBorder = true
         iconOffset = .init(x: 0, y: 0)
         iconName = nil
-        shouldUpdateView = true
-        setNeedsUpdate()
     }
     
     /// Used to make changes to the View based off a change events or from local properties.

VDS/Components/Label/Label.swift

@@ -13,7 +13,7 @@ import Combine
 /// Label is a standard view used to draw text with applying Typography through ``TextStyle`` as well
 /// as other attributes using any implemetation of ``LabelAttributeModel``.
 @objc(VDSLabel)
-open class Label: UILabel, ViewProtocol, UserInfoable {
+open class Label: UILabel, ViewProtocol, DispatchQueueViewProtocol, UserInfoable {
     
     //--------------------------------------------------
     // MARK: - Initializers
@@ -42,6 +42,8 @@ open class Label: UILabel, ViewProtocol, UserInfoable {
     //--------------------------------------------------
     // MARK: - Private Properties
     //--------------------------------------------------
+    internal var updateWorkItem: DispatchWorkItem?
+
     private var initialSetupPerformed = false
     
     private var edgeInsets: UIEdgeInsets { textStyle.edgeInsets }
@@ -100,9 +102,6 @@ open class Label: UILabel, ViewProtocol, UserInfoable {
     //--------------------------------------------------
     // MARK: - Public Properties
     //--------------------------------------------------
-    /// Key of whether or not updateView() is called in setNeedsUpdate()
-    open var shouldUpdateView: Bool = true 
-    
     /// Determines if the label should use its own attributedText property instead of rendering the attributedText propert
     /// based of other local properties, such as textStyle, textColor, surface, etc... The default  value is false.
     open var useAttributedText: Bool = false
@@ -184,7 +183,6 @@ open class Label: UILabel, ViewProtocol, UserInfoable {
     open func setup() {}
     
     open func reset() {
-        shouldUpdateView = false
         surface = .light
         isEnabled = true
         attributes = nil
@@ -194,8 +192,6 @@ open class Label: UILabel, ViewProtocol, UserInfoable {
         attributedText = nil
         numberOfLines = 0
         backgroundColor = .clear
-        shouldUpdateView = true
-        setNeedsUpdate()
     }
     
     open func updateView() {

VDS/Components/Notification/Notification.swift

@@ -255,8 +255,6 @@ open class Notification: View {
     open override func reset() {
         super.reset()
         
-        shouldUpdateView = false
-        
         titleLabel.reset()
         titleLabel.text = ""
         titleLabel.textStyle = UIDevice.isIPad ? .boldBodyLarge : .boldBodySmall
@@ -280,9 +278,6 @@ open class Notification: View {
         
         layout = .vertical
         hideCloseButton = false
-        
-        shouldUpdateView = true
-        setNeedsUpdate()
     }
     
     /// Used to make changes to the View based off a change events or from local properties.

VDS/Components/RadioBox/RadioBoxItem.swift

@@ -206,7 +206,6 @@ open class RadioBoxItem: Control, Changeable, FormFieldable {
     /// Resets to default settings.
     open override func reset() {
         super.reset()
-        shouldUpdateView = false
         textLabel.reset()
         subTextLabel.reset()
         subTextRightLabel.reset()
@@ -229,9 +228,6 @@ open class RadioBoxItem: Control, Changeable, FormFieldable {
         value = nil
         
         isSelected = false
-        
-        shouldUpdateView = true
-        setNeedsUpdate()
     }
             
     /// This will change the state of the Selector and execute the actionBlock if provided.

VDS/Components/TileContainer/TileContainer.swift

@@ -234,7 +234,6 @@ open class TileContainer: Control {
     /// Resets to default settings.
     open override func reset() {
         super.reset()
-        shouldUpdateView = false
         color = .white
         padding = .padding4X
         aspectRatio = .ratio1x1
@@ -243,8 +242,6 @@ open class TileContainer: Control {
         height = nil
         showBorder = false
         showDropShadows = false
-        shouldUpdateView = true
-        setNeedsUpdate()
     }
     
     /// Used to make changes to the View based off a change events or from local properties.

VDS/Components/Tilelet/Tilelet.swift

@@ -253,7 +253,6 @@ open class Tilelet: TileContainer {
     
     /// Resets to default settings.
     open override func reset() {
-        shouldUpdateView = false
         aspectRatio = .none
         color = .black
         //models
@@ -262,8 +261,6 @@ open class Tilelet: TileContainer {
         subTitleModel = nil
         descriptiveIconModel = nil
         directionalIconModel = nil        
-        shouldUpdateView = true
-        setNeedsUpdate()
     }
     
     /// Used to make changes to the View based off a change events or from local properties.

VDS/Components/TitleLockup/TitleLockup.swift

@@ -274,12 +274,9 @@ open class TitleLockup: View {
     /// Resets to default settings.
     open override func reset() {
         super.reset()
-        shouldUpdateView = false
         eyebrowModel = nil
         titleModel = nil
         subTitleModel = nil
-        shouldUpdateView = true
-        setNeedsUpdate()
     }
     
     var labelViews = [UIView]()

VDS/Components/Toggle/Toggle.swift

@@ -216,7 +216,6 @@ open class Toggle: Control, Changeable, FormFieldable {
     /// Resets to default settings.
     open override func reset() {
         super.reset()
-        shouldUpdateView = false
         label.reset()
         isEnabled = true
         isOn = false
@@ -229,8 +228,6 @@ open class Toggle: Control, Changeable, FormFieldable {
         textPosition = .left
         inputId = nil
         value = nil
-        shouldUpdateView = true
-        setNeedsUpdate()
     }
   
     /// Used to make changes to the View based off a change events or from local properties.

VDS/Components/Toggle/ToggleView.swift

@@ -155,15 +155,12 @@ open class ToggleView: Control, Changeable, FormFieldable {
     /// Resets to default settings.
     open override func reset() {
         super.reset()
-        shouldUpdateView = false
         isOn = false
         isAnimated = true
         inputId = nil
         value = nil
         toggleView.backgroundColor = toggleColorConfiguration.getColor(self)
         knobView.backgroundColor = knobColorConfiguration.getColor(self)
-        shouldUpdateView = true
-        setNeedsUpdate()
     }
   
     /// Used to make changes to the View based off a change events or from local properties.

VDS/Components/Tooltip/Tooltip.swift

@@ -145,14 +145,11 @@ open class Tooltip: Control, TooltipLaunchable {
     /// Resets to default settings.
     open override func reset() {
         super.reset()
-        shouldUpdateView = false
         size = .medium
         title = ""
         content = ""
         fillColor = .primary
         closeButtonText = "Close"
-        shouldUpdateView = true
-        setNeedsUpdate()
     }
     
     /// Used to make changes to the View based off a change events or from local properties.

VDS/Components/Tooltip/TrailingTooltipLabel.swift

@@ -110,7 +110,6 @@ open class TrailingTooltipLabel: View, TooltipLaunchable {
     /// Resets to default settings.
     open override func reset() {
         super.reset()
-        shouldUpdateView = false
         labelText = nil
         labelAttributes = nil
         labelTextStyle = .defaultStyle
@@ -118,8 +117,6 @@ open class TrailingTooltipLabel: View, TooltipLaunchable {
         tooltipCloseButtonText = "Close"
         tooltipTitle = ""
         tooltipContent = ""
-        shouldUpdateView = true
-        setNeedsUpdate()
     }
 }
 

VDS/Protocols/ViewProtocol.swift

@@ -9,13 +9,14 @@ import Foundation
 import UIKit
 import Combine
 
+internal protocol DispatchQueueViewProtocol: AnyObject {
+    var updateWorkItem: DispatchWorkItem? { get set }
+}
+
 public protocol ViewProtocol: AnyObject, Initable, Resettable, Enabling, Surfaceable {
     /// Set of Subscribers for any Publishers for this Control.
     var subscribers: Set<AnyCancellable> { get set }
     
-    /// Key of whether or not updateView() is called in setNeedsUpdate()
-    var shouldUpdateView: Bool { get set }
-
     /// Executed on initialization for this View.
     func initialSetup()
     
@@ -27,17 +28,28 @@ public protocol ViewProtocol: AnyObject, Initable, Resettable, Enabling, Surface
     
     /// Used to update any Accessibility properties.
     func updateAccessibility()
+    
+    /// Called when there are changes in a View based off a change events or from local properties.
+    func setNeedsUpdate()
 }
 
 extension ViewProtocol {
-    /// Called when there are changes in a View based off a change events or from local properties.
+    private func doUpdate() {
+        updateView()
+        updateAccessibility()
+    }
+
     public func setNeedsUpdate() {
-        if shouldUpdateView {
+        guard let dispatchQueueSelf = self as? DispatchQueueViewProtocol else {
-            shouldUpdateView = false
+            doUpdate()
-            updateView()
+            return
-            updateAccessibility()
-            shouldUpdateView = true
         }
+        dispatchQueueSelf.updateWorkItem?.cancel()
+        let workItem = DispatchWorkItem { [weak self] in
+            self?.doUpdate()
+        }
+        DispatchQueue.main.async(execute: workItem)
+        dispatchQueueSelf.updateWorkItem = workItem
     }
 }