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

# Conflicts:
#	VDS/Components/TextFields/EntryFieldBase.swift

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

VDS/BaseClasses/Control.swift

@@ -78,20 +78,30 @@ open class Control: UIControl, ViewProtocol, UserInfoable, Clickable {
     //--------------------------------------------------
     // MARK: - Lifecycle
     //--------------------------------------------------
-    open func initialSetup() {
+    private func initialSetup() {
         if !initialSetupPerformed {
             initialSetupPerformed = true
+            shouldUpdateView = false
             setup()
+            setDefaults()
+            shouldUpdateView = true
             setNeedsUpdate()
         }
     }
     
     open func setup() {
-        backgroundColor = .clear
         translatesAutoresizingMaskIntoConstraints = false
         insetsLayoutMarginsFromSafeArea = false
     }
-            
+    
+    open func setDefaults() {
+        backgroundColor = .clear
+        surface = .light
+        isEnabled = true
+        onClick = nil
+        userInfo.removeAll()
+    }
+
     open func updateView() { }
     
     open func updateAccessibility() {
@@ -108,13 +118,12 @@ open class Control: UIControl, ViewProtocol, UserInfoable, Clickable {
         }
 
     }
-    
+        
     open func reset() {
-        backgroundColor = .clear
+        shouldUpdateView = false
-        surface = .light
+        setDefaults()
-        isEnabled = true
+        shouldUpdateView = true
-        onClick = nil
+        setNeedsUpdate()
-        userInfo.removeAll()
     }
     
     //--------------------------------------------------

VDS/BaseClasses/Selector/SelectorBase.swift

@@ -100,13 +100,21 @@ open class SelectorBase: Control, SelectorControlable {
     //--------------------------------------------------
     // MARK: - Overrides
     //--------------------------------------------------
-    /// Executed on initialization for this View.
+    
-    open override func initialSetup() {
+    /// Called once when a view is initialized and is used to Setup additional UI or other constants and configurations.
-        super.initialSetup()
+    open override func setup() {
+        super.setup()
+        isAccessibilityElement = true
+        accessibilityTraits = .button
+    }
+    
+    open override func setDefaults() {
+        super.setDefaults()
+        
         onClick = { control in
             control.toggle()
         }
-        
+
         bridge_accessibilityLabelBlock = { [weak self] in
             guard let self else { return "" }
             return "\(Self.self)\(showError ? ", error" : "")"
@@ -118,14 +126,6 @@ open class SelectorBase: Control, SelectorControlable {
         }
     }
     
-    /// Called once when a view is initialized and is used to Setup additional UI or other constants and configurations.
-    open override func setup() {
-        super.setup()
-        
-        isAccessibilityElement = true
-        accessibilityTraits = .button
-    }
-    
     open override func updateView() {
         super.updateView()
         setNeedsLayout()

VDS/BaseClasses/Selector/SelectorGroupBase.swift

@@ -65,25 +65,30 @@ open class SelectorGroupBase<SelectorItemType: Groupable>: Control, SelectorGrou
         }
         
         didSet {
+            setItemsActions()
             for selector in items {
-                selector.onClick = { [weak self] handler in
-                    self?.didSelect(handler)
-                    self?.setNeedsUpdate()
-                }
-                
-                selector.accessibilityAction =  { [weak self] handler in
-                    guard let handler = handler as? SelectorItemType else { return }
-                    self?.didSelect(handler)
-                    self?.setNeedsUpdate()
-                }
-                
                 mainStackView.addArrangedSubview(selector)
             }
         }
     }
 
     open var onChangeSubscriber: AnyCancellable? 
-        
+    
+    private func setItemsActions() {
+        for selector in items {
+            selector.onClick = { [weak self] handler in
+                self?.didSelect(handler)
+                self?.setNeedsUpdate()
+            }
+            
+            selector.accessibilityAction =  { [weak self] handler in
+                guard let handler = handler as? SelectorItemType else { return }
+                self?.didSelect(handler)
+                self?.setNeedsUpdate()
+            }
+        }
+    }
+    
     /// Whether the Control is enabled or not.
     override open var isEnabled: Bool {
         didSet {
@@ -115,6 +120,11 @@ open class SelectorGroupBase<SelectorItemType: Groupable>: Control, SelectorGrou
             .pinBottom(0, .defaultHigh)
     }
     
+    open override func setDefaults() {
+        super.setDefaults()
+        onChange = nil
+    }
+    
     /// Handler for the Group to override on a select event.
     /// - Parameter selectedControl: Selected Control the user interacted.
     open func didSelect(_ selectedControl: SelectorItemType) {
@@ -131,8 +141,8 @@ open class SelectorGroupBase<SelectorItemType: Groupable>: Control, SelectorGrou
     /// Resets to default settings.
     open override func reset() {
         super.reset()
-        onChange = nil
         items.forEach{ $0.reset() }
+        setItemsActions()
     }
 }
 

VDS/BaseClasses/Selector/SelectorItemBase.swift

@@ -160,9 +160,32 @@ open class SelectorItemBase<Selector: SelectorBase>: Control, Errorable, Changea
     //--------------------------------------------------
     // MARK: - Overrides
     //--------------------------------------------------
-    /// Executed on initialization for this View.
+
-    open override func initialSetup() {
+    /// Called once when a view is initialized and is used to Setup additional UI or other constants and configurations.
-        super.initialSetup()
+    open override func setup() {
+        super.setup()
+                
+        selectorView.isAccessibilityElement = true
+        isAccessibilityElement = false
+        addSubview(mainStackView)
+        
+        mainStackView.isUserInteractionEnabled = false 
+        mainStackView.addArrangedSubview(selectorStackView)
+        mainStackView.addArrangedSubview(errorLabel)
+        selectorStackView.addArrangedSubview(selectorView)
+        selectorStackView.addArrangedSubview(selectorLabelStackView)
+        selectorLabelStackView.addArrangedSubview(label)
+        selectorLabelStackView.addArrangedSubview(childLabel)
+        mainStackView
+            .pinTop()
+            .pinLeading()
+            .pinTrailing()
+            .pinBottom(0, .defaultHigh)
+    }
+    
+    open override func setDefaults() {
+        super.setDefaults()
+        
         onClick = { [weak self] control in
             guard let self, isEnabled else { return }
             toggle()
@@ -206,29 +229,23 @@ open class SelectorItemBase<Selector: SelectorBase>: Control, Errorable, Changea
             guard let self else { return "" }
             return !isEnabled ? "" : "Double tap to activate."
         }
-        
-    }
 
-    /// Called once when a view is initialized and is used to Setup additional UI or other constants and configurations.
+        label.textStyle = .boldBodyLarge
-    open override func setup() {
+        childLabel.textStyle = .bodyLarge
-        super.setup()
+        errorLabel.textStyle = .bodyMedium
         
-        selectorView.isAccessibilityElement = true        
+        labelText = nil
-        isAccessibilityElement = false
+        labelTextAttributes = nil
-        addSubview(mainStackView)
+        labelAttributedText = nil
+        childText = nil
+        childTextAttributes = nil
+        childAttributedText = nil
+        showError = false
+        errorText = nil
+        inputId = nil
+        isSelected = false
         
-        mainStackView.isUserInteractionEnabled = false 
+        onChange = nil
-        mainStackView.addArrangedSubview(selectorStackView)
-        mainStackView.addArrangedSubview(errorLabel)
-        selectorStackView.addArrangedSubview(selectorView)
-        selectorStackView.addArrangedSubview(selectorLabelStackView)
-        selectorLabelStackView.addArrangedSubview(label)
-        selectorLabelStackView.addArrangedSubview(childLabel)
-        mainStackView
-            .pinTop()
-            .pinLeading()
-            .pinTrailing()
-            .pinBottom(0, .defaultHigh)
     }
             
     /// Used to make changes to the View based off a change events or from local properties.
@@ -284,30 +301,10 @@ open class SelectorItemBase<Selector: SelectorBase>: Control, Errorable, Changea
             
     /// Resets to default settings.
     open override func reset() {
-        super.reset()
-        shouldUpdateView = false
         label.reset()
         childLabel.reset()
         errorLabel.reset()
-        
+        super.reset()
-        label.textStyle = .boldBodyLarge
-        childLabel.textStyle = .bodyLarge
-        errorLabel.textStyle = .bodyMedium
-        
-        labelText = nil
-        labelTextAttributes = nil
-        labelAttributedText = nil
-        childText = nil
-        childTextAttributes = nil
-        childAttributedText = nil
-        showError = false
-        errorText = nil
-        inputId = nil
-        isSelected = false
-        
-        onChange = nil
-        shouldUpdateView = true
-        setNeedsUpdate()
     }
     
     //--------------------------------------------------

VDS/BaseClasses/View.swift

@@ -58,20 +58,30 @@ open class View: UIView, ViewProtocol, UserInfoable, Clickable {
     //--------------------------------------------------
     // MARK: - Lifecycle
     //--------------------------------------------------
-    open func initialSetup() {
+    private func initialSetup() {
         if !initialSetupPerformed {
             initialSetupPerformed = true
+            shouldUpdateView = false
             setup()
+            setDefaults()
+            shouldUpdateView = true
             setNeedsUpdate()
        }
     }
     
     open func setup() {
-        backgroundColor = .clear
         translatesAutoresizingMaskIntoConstraints = false
         insetsLayoutMarginsFromSafeArea = false
     }
     
+    open func setDefaults() {
+        backgroundColor = .clear
+        surface = .light
+        isEnabled = true
+        onClick = nil
+        userInfo.removeAll()
+    }
+    
     open func updateView() { }
     
     open func updateAccessibility() {
@@ -83,9 +93,10 @@ open class View: UIView, ViewProtocol, UserInfoable, Clickable {
     }
         
     open func reset() {
-        backgroundColor = .clear
+        shouldUpdateView = false
-        surface = .light
+        setDefaults()
-        isEnabled = true
+        shouldUpdateView = true
+        setNeedsUpdate()
     }
     
     open override func layoutSubviews() {

VDS/Components/Badge/Badge.swift

@@ -149,25 +149,28 @@ open class Badge: View {
         maxWidthConstraint = label.widthLessThanEqualTo(constant: 0).with { $0.isActive = false }
         clipsToBounds = true
         
+    }
+    
+    open override func setDefaults() {
+        super.setDefaults()
+        
         bridge_accessibilityLabelBlock = {  [weak self] in
             guard let self else { return "" }
             return text
         }
-    }
+        
-    
-    /// Resets to default settings.
-    open override func reset() {
-        super.reset()
-        shouldUpdateView = false
-        label.reset()
         label.lineBreakMode = .byTruncatingTail
         label.textStyle = .boldBodySmall
         fillColor = .red
         text = ""
         maxWidth = nil
         numberOfLines = 1
-        shouldUpdateView = true
+    }
-        setNeedsUpdate()
+    
+    /// Resets to default settings.
+    open override func reset() {
+        label.reset()
+        super.reset()
     }
     
     /// Used to make changes to the View based off a change events or from local properties.

VDS/Components/BadgeIndicator/BadgeIndicator.swift

@@ -305,17 +305,31 @@ open class BadgeIndicator: View {
         }
     }
     
-    /// Resets to default settings.
+    open override func setDefaults() {
-    open override func reset() {
+        super.setDefaults()
-        super.reset()
-        shouldUpdateView = false
-        label.reset()
         label.lineBreakMode = .byTruncatingTail
         label.textAlignment = .center
         fillColor = .red
         number = nil
-        shouldUpdateView = true
+        kind = .simple
-        setNeedsUpdate()
+        leadingCharacter = nil
+        trailingText = nil
+        size = .xxlarge
+        dotSize = nil
+        verticalPadding = nil
+        horizontalPadding = nil
+        hideDot = false
+        hideBorder = false
+        width = nil
+        height = nil
+        accessibilityText = nil
+        maximumDigits = .two
+    }
+    
+    /// Resets to default settings.
+    open override func reset() {
+        label.reset()
+        super.reset()
     }
                 
     /// Used to make changes to the View based off a change events or from local properties.

VDS/Components/Breadcrumbs/BreadcrumbItem.swift

@@ -72,17 +72,15 @@ open class BreadcrumbItem: ButtonBase {
     //--------------------------------------------------
     // MARK: - Overrides
     //--------------------------------------------------
-    /// Called once when a view is initialized and is used to Setup additional UI or other constants and configurations.
+    open override func setDefaults() {
-    open override func setup() {
+        super.setDefaults()
-        super.setup()
+        isAccessibilityElement = true
-
+        accessibilityTraits = .link
+        
         titleLabel?.numberOfLines = 0
         titleLabel?.lineBreakMode = .byWordWrapping
         contentHorizontalAlignment = .left
         
-        isAccessibilityElement = true
-        accessibilityTraits = .link
-        
         bridge_accessibilityHintBlock = { [weak self] in
             guard let self else { return "" }
             return !isEnabled ? "" : "Double tap to open."
@@ -131,17 +129,4 @@ open class BreadcrumbItem: ButtonBase {
         }
 
     }
-
-    /// Resets to default settings.
-    open override func reset() {
-        super.reset()
-        shouldUpdateView = false
-        text = nil
-        accessibilityCustomActions = []
-        isAccessibilityElement = true
-        accessibilityTraits = .button
-        shouldUpdateView = true
-        setNeedsUpdate()
-    }
-    
 }

VDS/Components/Breadcrumbs/Breadcrumbs.swift

@@ -109,21 +109,18 @@ open class Breadcrumbs: View {
     // MARK: - Overrides
     //--------------------------------------------------
     /// Executed on initialization for this View.
-    open override func initialSetup() {
+    open override func setup() {
-        super.initialSetup()
+        super.setup()
         containerView.addSubview(collectionView)
         collectionView.pinToSuperView()
         addSubview(containerView)
         containerView.pinToSuperView()
     }
-
+    
     /// Resets to default settings.
     open override func reset() {
         super.reset()
-        shouldUpdateView = false
         breadcrumbs.forEach { $0.reset() }
-        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

@@ -223,16 +223,12 @@ open class Button: ButtonBase, Useable {
         isAccessibilityElement = true
         accessibilityTraits = .button
     }
-
+    
-    /// Resets to default settings.
+    open override func setDefaults() {
-    open override func reset() {
+        super.setDefaults()
-        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

@@ -97,13 +97,13 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable {
     //--------------------------------------------------
     // MARK: - Lifecycle
     //--------------------------------------------------
-    open func initialSetup() {
+    private func initialSetup() {
         if !initialSetupPerformed {
             initialSetupPerformed = true 
-            backgroundColor = .clear
+            shouldUpdateView = false
-            translatesAutoresizingMaskIntoConstraints = false
-            accessibilityCustomActions = []
             setup()
+            setDefaults()
+            shouldUpdateView = true
             setNeedsUpdate()
         }
     }
@@ -111,10 +111,19 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable {
     
     open func setup() {
         translatesAutoresizingMaskIntoConstraints = false
-        
+    }
+    
+    open func setDefaults() {
+        backgroundColor = .clear
+        accessibilityCustomActions = []
         titleLabel?.adjustsFontSizeToFitWidth = false
         titleLabel?.lineBreakMode = .byTruncatingTail
         titleLabel?.numberOfLines = 1
+        surface = .light
+        isEnabled = true
+        text = nil
+        onClick = nil
+        userInfo.removeAll()
     }
     
     open func updateView() {
@@ -131,12 +140,7 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable {
 
     open func reset() {
         shouldUpdateView = false
-        surface = .light
+        setDefaults()
-        isEnabled = true 
-        text = nil
-        accessibilityCustomActions = []
-        onClick = nil
-        userInfo.removeAll()
         shouldUpdateView = true
         setNeedsUpdate()
     }

VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift

@@ -167,15 +167,17 @@ open class ButtonGroup: View {
         collectionView.reloadData()
     }
     
-    open override func reset() {
+    open override func setDefaults() {
-        super.reset()
+        super.setDefaults()
-        shouldUpdateView = false
         rowQuantityPhone = 0
         rowQuantityTablet = 0
         alignment = .center
+        childWidth = nil
+    }
+    
+    open override func reset() {
         buttons.forEach { $0.reset() }
-        shouldUpdateView = true
+        super.reset()
-        setNeedsUpdate()
     }
 
     open override func layoutSubviews() {

VDS/Components/Buttons/TextLink/TextLink.swift

@@ -91,12 +91,7 @@ open class TextLink: ButtonBase {
     open override func setup() {
         super.setup()
         isAccessibilityElement = true
-        accessibilityTraits = .link
+                
-        
-        //left align titleLabel in case this is pinned leading/trailing
-        //default is always set to center
-        contentHorizontalAlignment = .left
-        
         if let titleLabel {
             addSubview(line)
             line.pinLeading(titleLabel.leadingAnchor)
@@ -106,12 +101,21 @@ open class TextLink: ButtonBase {
             lineHeightConstraint = line.height(constant: 1)
             lineHeightConstraint?.isActive = true
         }
+    }
+    
+    open override func setDefaults() {
+        super.setDefaults()
+        size = .large
+        accessibilityTraits = .link
         
+        //left align titleLabel in case this is pinned leading/trailing
+        //default is always set to center
+        contentHorizontalAlignment = .left
+
         bridge_accessibilityHintBlock = { [weak self] in
             guard let self else { return "" }
             return !isEnabled ? "" : "Double tap to open."
         }
-        
     }
 
     /// Used to make changes to the View based off a change events or from local properties.
@@ -123,18 +127,5 @@ open class TextLink: ButtonBase {
         //always call last so the label is rendered
         super.updateView()
     }
-    
+        
-    /// 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/Buttons/TextLinkCaret/TextLinkCaret.swift

@@ -76,10 +76,8 @@ open class TextLinkCaret: ButtonBase {
     //--------------------------------------------------
     // MARK: - Overrides
     //--------------------------------------------------
-    /// Called once when a view is initialized and is used to Setup additional UI or other constants and configurations.
+    open override func setDefaults() {
-    open override func setup() {
+        super.setDefaults()
-        super.setup()
-        
         //left align titleLabel in case this is pinned leading/trailing
         //default is always set to center
         contentHorizontalAlignment = .left
@@ -88,11 +86,12 @@ open class TextLinkCaret: ButtonBase {
         titleLabel?.numberOfLines = 0
         titleLabel?.lineBreakMode = .byWordWrapping
         
+        iconPosition = .right
+
         bridge_accessibilityHintBlock = { [weak self] in
             guard let self else { return "" }
             return !isEnabled ? "" : "Double tap to open."
         }
-    
     }
     
     /// Used to make changes to the View based off a change events or from local properties.
@@ -100,14 +99,7 @@ open class TextLinkCaret: ButtonBase {
         imageAttribute = CaretLabelAttribute(tintColor: textColor, position: iconPosition)
         super.updateView()
     }
-    
+ 
-    /// Resets to default settings.
-    open override func reset() {
-        super.reset()
-        iconPosition = .right
-        text = nil
-    }
-    
     /// The natural size for the receiving view, considering only properties of the view itself.
     open override var intrinsicContentSize: CGSize {
         guard let titleLabel else { return super.intrinsicContentSize }

VDS/Components/Calendar/Calendar.swift

@@ -125,10 +125,6 @@ open class CalendarBase: Control, Changeable {
     //--------------------------------------------------
     // MARK: - Overrides
     //--------------------------------------------------
-    open override func initialSetup() {
-        super.initialSetup()
-    }
-    
     /// Called once when a view is initialized and is used to Setup additional UI or other constants and configurations.
     open override func setup() {
         super.setup()
@@ -154,6 +150,19 @@ open class CalendarBase: Control, Changeable {
         
         collectionView.pinCenterX(anchor: containerView.centerXAnchor)
     }
+    
+    open override func setDefaults() {
+        super.setDefaults()
+        hideContainerBorder = false
+        hideCurrentDateIndicator = false
+        transparentBackground = false
+        activeDates = []
+        inactiveDates = []
+        indicators = []
+        minDate = Date()
+        maxDate = Date()
+        selectedDate = Date()
+    }
 
     open override func updateView() {
         super.updateView()
@@ -174,17 +183,6 @@ open class CalendarBase: Control, Changeable {
             containerView.layer.borderWidth = VDSFormControls.borderWidth
         }
     }
-        
-    /// Resets to default settings.
-    open override func reset() {
-        super.reset()
-        hideContainerBorder = false
-        hideCurrentDateIndicator = false
-        transparentBackground = false
-        activeDates = []
-        inactiveDates = []
-        indicators = []
-    }
     
     //--------------------------------------------------
     // MARK: - Private Methods

VDS/Components/Carousel/Carousel.swift

@@ -196,11 +196,6 @@ open class Carousel: View {
     //--------------------------------------------------
     // MARK: - Lifecycle
     //--------------------------------------------------
-    /// Executed on initialization for this View.
-    open override func initialSetup() {
-        super.initialSetup()
-    }
-    
     /// Called once when a view is initialized and is used to Setup additional UI or other constants and configurations.
     open override func setup() {
         super.setup()
@@ -249,6 +244,18 @@ open class Carousel: View {
         updatePaginationInset()
     }
     
+    open override func setDefaults() {
+        super.setDefaults()
+        gutter = UIDevice.isIPad ? .gutter6X : .gutter3X
+        layout = UIDevice.isIPad ? .threeUP : .oneUP
+        onChange = nil
+        pagination = .init(kind: .lowContrast, floating: true)
+        paginationDisplay = .none
+        paginationInset =  UIDevice.isIPad ? VDSLayout.space3X : VDSLayout.space2X
+        peek = .standard
+        groupIndex = 0
+    }
+    
     /// Used to make changes to the View based off a change events or from local properties.
     open override func updateView() {
         super.updateView()
@@ -279,19 +286,7 @@ open class Carousel: View {
         updatePaginationControls()
         addCarouselSlots()
     }
-    
+        
-    /// Resets to default settings.
-    open override func reset() {
-        super.reset()
-        shouldUpdateView = false
-        layout = UIDevice.isIPad ? .threeUP : .oneUP
-        pagination = .init(kind: .lowContrast, floating: true)
-        paginationDisplay = .none
-        paginationInset =  UIDevice.isIPad ? VDSLayout.space3X : VDSLayout.space2X
-        gutter = UIDevice.isIPad ? .gutter6X : .gutter3X
-        peek = .standard
-    }
-    
     //--------------------------------------------------
     // MARK: - Private Methods
     //--------------------------------------------------

VDS/Components/CarouselScrollbar/CarouselScrollbar.swift

@@ -235,10 +235,6 @@ open class CarouselScrollbar: View {
     //--------------------------------------------------
     // MARK: - Lifecycle
     //--------------------------------------------------
-    open override func initialSetup() {
-        super.initialSetup()
-    }
-    
     open override func setup() {
         super.setup()
         isAccessibilityElement = false

VDS/Components/DatePicker/DatePicker.swift

@@ -171,6 +171,14 @@ open class DatePicker: EntryFieldBase<String> {
         popoverOverlayView.isHidden = true
     }
     
+    open override func setDefaults() {
+        super.setDefaults()
+        selectedDate = nil
+        calendarModel = .init()
+        dateFormat = .shortNumeric
+        selectedDateLabel.textStyle = .bodyLarge
+    }
+    
     open override func getFieldContainer() -> UIView {
         // stackview for controls in EntryFieldBase.controlContainerView
         let controlStackView = UIStackView().with {
@@ -197,12 +205,6 @@ open class DatePicker: EntryFieldBase<String> {
         calendarIcon.color = iconColorConfiguration.getColor(self)
     }
     
-    /// Resets to default settings.
-    open override func reset() {
-        super.reset()
-        selectedDateLabel.textStyle = .bodyLarge
-    }
-    
     internal func formatDate(_ date: Date) {
         let formatter = DateFormatter()
         formatter.dateFormat = dateFormat.format

VDS/Components/DropdownSelect/DropdownSelect.swift

@@ -159,6 +159,17 @@ open class DropdownSelect: EntryFieldBase<String> {
         containerView.height(44)
     }
     
+    open override func setDefaults() {
+        super.setDefaults()
+        showInlineLabel = false
+        selectId = nil
+        inlineDisplayLabel.textStyle = .boldBodyLarge
+        selectedOptionLabel.textStyle = .bodyLarge
+        showInlineLabel = false
+        options = []
+        selectId = nil
+    }
+    
     open override func getFieldContainer() -> UIView {
         let controlStackView = UIStackView().with {
             $0.translatesAutoresizingMaskIntoConstraints = false
@@ -185,17 +196,6 @@ open class DropdownSelect: EntryFieldBase<String> {
         selectedOptionLabel.surface = surface
         selectedOptionLabel.isEnabled = isEnabled
     }
-        
-    /// Resets to default settings.
-    open override func reset() {
-        super.reset()
-        
-        inlineDisplayLabel.textStyle = .boldBodyLarge
-        selectedOptionLabel.textStyle = .bodyLarge
-        showInlineLabel = false
-        options = []
-        selectId = nil
-    }
     
     //--------------------------------------------------
     // MARK: - Public Methods

VDS/Components/Icon/ButtonIcon/ButtonIcon.swift

@@ -402,17 +402,36 @@ open class ButtonIcon: Control, Changeable {
         centerXConstraint?.activate()
         centerYConstraint = icon.centerYAnchor.constraint(equalTo: iconLayoutGuide.centerYAnchor, constant: 0)
         centerYConstraint?.activate()
+
+        publisher(for: .touchUpInside)
+            .sink(receiveValue: { [weak self] _ in
+                guard let self, isEnabled, 
+                        selectedIconName != nil,
+                        selectable else { return }
+                toggle()
+            })
+            .store(in: &subscribers)
     }
     
-    /// Executed on initialization for this View.
+    open override func setDefaults() {
-    open override func initialSetup() {
+        super.setDefaults()
-        super.initialSetup()
+        badgeIndicatorModel = nil
-        onClick = { control in
+        kind = .ghost
-            guard control.isEnabled else { return }
+        surfaceType = .colorFill
-            if control.selectedIconName != nil && control.selectable {
+        iconName = nil
-                control.toggle()
+        selectedIconName = nil
-            }
+        selectedIconColorConfiguration = nil
-        }
+        size = .large
+        floating = false
+        fitToIcon = false
+        hideBorder = true
+        showBadgeIndicator = false
+        selectable = false
+        iconOffset = .init(x: 0, y: 0)
+        customContainerSize = nil
+        customIconSize = nil
+        customBadgeIndicatorOffset = nil
+        onChange = nil
     }
     
     /// This will change the state of the Selector and execute the actionBlock if provided.
@@ -422,26 +441,6 @@ open class ButtonIcon: Control, Changeable {
         sendActions(for: .valueChanged)
     }
     
-    /// Resets to default settings.
-    open override func reset() {
-        super.reset()
-        shouldUpdateView = false
-        kind = .ghost
-        surfaceType = .colorFill
-        size = .large
-        floating = false
-        hideBorder = true
-        iconOffset = .init(x: 0, y: 0)
-        iconName = nil
-        selectedIconName = nil
-        showBadgeIndicator = false
-        selectable = false
-        badgeIndicatorModel = nil
-        onChange = nil
-        shouldUpdateView = true
-        setNeedsUpdate()
-    }
-    
     /// Used to make changes to the View based off a change events or from local properties.
     open override func updateView() {
         super.updateView()

VDS/Components/Icon/Icon.swift

@@ -90,22 +90,29 @@ open class Icon: View {
 
         addSubview(imageView)
         imageView.pinToSuperView()
-        
+                
-        backgroundColor = .clear
-        
         isAccessibilityElement = true
         accessibilityTraits = .none
-        accessibilityHint = "image"
+
+    }
+    
+    open override func setDefaults() {
+        super.setDefaults()
+        backgroundColor = .clear
+        color = VDSColor.paletteBlack
+        size = .medium
+        name = nil
+        customSize = nil
+        imageView.image = nil
         
+        accessibilityHint = "image"
         bridge_accessibilityLabelBlock = {  [weak self] in
             guard let self else { return "" }
             return name?.rawValue ?? "icon"
         }
-        
-        
-
     }
     
+    
     /// Used to make changes to the View based off a change events or from local properties.
     open override func updateView() {
         super.updateView()
@@ -123,12 +130,6 @@ open class Icon: View {
         invalidateIntrinsicContentSize()
     }
         
-    /// Resets to default settings.
-    open override func reset() {
-        super.reset()
-        color = VDSColor.paletteBlack
-        imageView.image = nil
-    }    
 }
 
 extension UIImage {

VDS/Components/Label/Label.swift

@@ -192,42 +192,46 @@ open class Label: UILabel, ViewProtocol, UserInfoable {
     //--------------------------------------------------
     // MARK: - Lifecycle
     //--------------------------------------------------
-    open func initialSetup() {
+    private func initialSetup() {
         if !initialSetupPerformed {
             initialSetupPerformed = true
-            //register for ContentSizeChanges
+            shouldUpdateView = false
-            NotificationCenter
-                .Publisher(center: .default, name: UIContentSizeCategory.didChangeNotification)
-                .sink { [weak self] notification in
-                    self?.setNeedsUpdate()
-                }.store(in: &subscribers)
-            backgroundColor = .clear
-            numberOfLines = 0
-            lineBreakMode = .byTruncatingTail
-            translatesAutoresizingMaskIntoConstraints = false
-            accessibilityCustomActions = []
-            isAccessibilityElement = true
-            accessibilityTraits = .staticText
-            textAlignment = .left
             setup()
+            setDefaults()
+            shouldUpdateView = true
             setNeedsUpdate()
        }
     }
    
     open func setup() {
+        //register for ContentSizeChanges
+        NotificationCenter
+            .Publisher(center: .default, name: UIContentSizeCategory.didChangeNotification)
+            .sink { [weak self] notification in
+                self?.setNeedsUpdate()
+            }.store(in: &subscribers)
+        translatesAutoresizingMaskIntoConstraints = false
+        isAccessibilityElement = true
     }
     
-    open func reset() {
+    open func setDefaults() {
-        shouldUpdateView = false
+        backgroundColor = .clear
+        accessibilityTraits = .staticText
+        accessibilityCustomActions = []
         surface = .light
         isEnabled = true
         attributes = nil
         textStyle = .defaultStyle
+        lineBreakMode = .byTruncatingTail
         textAlignment = .left
         text = nil
         attributedText = nil
         numberOfLines = 0
-        backgroundColor = .clear
+    }
+    
+    open func reset() {
+        shouldUpdateView = false
+        setDefaults()
         shouldUpdateView = true
         setNeedsUpdate()
     }

VDS/Components/Line/Line.swift

@@ -81,11 +81,6 @@ open class Line: View {
     //--------------------------------------------------
     // MARK: - Overrides
     //--------------------------------------------------
-    /// Called once when a view is initialized and is used to Setup additional UI or other constants and configurations.
-    open override func setup() {
-        super.setup()
-    }
-    
     /// Used to make changes to the View based off a change events or from local properties.
     open override func updateView() {
         super.updateView()
@@ -94,8 +89,8 @@ open class Line: View {
     }
     
     /// Resets to default settings.
-    open override func reset() {
+    open override func setDefaults() {
-        super.reset()
+        super.setDefaults()
         style = .primary
         orientation = .horizontal
     }

VDS/Components/Notification/Notification.swift

@@ -274,20 +274,13 @@ open class Notification: View {
         }
     }
     
-    /// Resets to default settings.
+    open override func setDefaults() {
-    open override func reset() {
+        super.setDefaults()
-        super.reset()
-        
-        shouldUpdateView = false
-        
-        titleLabel.reset()
         titleLabel.text = ""
         titleLabel.textStyle = UIDevice.isIPad ? .boldBodyLarge : .boldBodySmall
         
-        subTitleLabel.reset()
         subTitleLabel.textStyle = UIDevice.isIPad ? .bodyLarge : .bodySmall
         
-        buttonGroup.reset()
         buttonGroup.alignment = .left
         
         primaryButtonModel = nil
@@ -302,9 +295,15 @@ open class Notification: View {
         closeButton.name = .close
         
         hideCloseButton = false
-        
+
-        shouldUpdateView = true
+    }
-        setNeedsUpdate()
+    
+    /// Resets to default settings.
+    open override func reset() {
+        titleLabel.reset()
+        subTitleLabel.reset()
+        buttonGroup.reset()
+        super.reset()
     }
     
     /// Used to make changes to the View based off a change events or from local properties.

VDS/Components/Pagination/Pagination.swift

@@ -95,8 +95,8 @@ open class Pagination: View {
     // MARK: - Overrides
     //--------------------------------------------------
     /// Executed on initialization for this View.
-    open override func initialSetup() {
+    open override func setup() {
-        super.initialSetup()
+        super.setup()
         
         collectionContainerView.addSubview(collectionView)
         containerView.addSubview(previousButton)

VDS/Components/Pagination/PaginationButton.swift

@@ -60,8 +60,8 @@ open class PaginationButton: ButtonBase {
     // MARK: - Overrides
     //--------------------------------------------------
     /// Executed on initialization for this View.
-    open override func initialSetup() {
+    open override func setup() {
-        super.initialSetup()
+        super.setup()
         if #available(iOS 15.0, *) {
             configuration = buttonConfiguration
         } else {

VDS/Components/RadioBox/RadioBoxItem.swift

@@ -165,11 +165,38 @@ open class RadioBoxItem: Control, Changeable, FormFieldable, Groupable {
     //--------------------------------------------------
     // MARK: - Overrides
     //--------------------------------------------------
-    /// Executed on initialization for this View.
+    /// Called once when a view is initialized and is used to Setup additional UI or other constants and configurations.
-    open override func initialSetup() {
+    open override func setup() {
-        super.initialSetup()
+        super.setup()
-        onClick = { control in
+                
-            control.toggle()
+        isAccessibilityElement = false
+        selectorView.isAccessibilityElement = true
+        selectorView.accessibilityTraits = .button
+        addSubview(selectorView)
+        selectorView.isUserInteractionEnabled = false
+        
+        selectorView.addSubview(selectorStackView)
+                
+        selectorStackView.addArrangedSubview(selectorLeftLabelStackView)
+        selectorStackView.addArrangedSubview(subTextRightLabel)
+        selectorLeftLabelStackView.addArrangedSubview(textLabel)
+        selectorLeftLabelStackView.addArrangedSubview(subTextLabel)
+        
+        selectorView
+            .pinTop()
+            .pinLeading()
+            .pinTrailing(0, .defaultHigh)
+            .pinBottom(0, .defaultHigh)
+        
+        selectorStackView.pinToSuperView(.uniform(VDSLayout.space3X))
+    }
+    
+    open override func setDefaults() {
+        super.setDefaults()
+        
+        onClick = { [weak self] _ in
+            guard let self, isEnabled else { return }
+            toggle()
         }
         
         selectorView.bridge_accessibilityLabelBlock = { [weak self] in
@@ -204,43 +231,7 @@ open class RadioBoxItem: Control, Changeable, FormFieldable, Groupable {
                              
             return accessibilityLabels.joined(separator: ", ")
         }
-        
-    }
 
-    /// Called once when a view is initialized and is used to Setup additional UI or other constants and configurations.
-    open override func setup() {
-        super.setup()
-
-        isAccessibilityElement = false
-        selectorView.isAccessibilityElement = true
-        selectorView.accessibilityTraits = .button
-        addSubview(selectorView)
-        selectorView.isUserInteractionEnabled = false
-        
-        selectorView.addSubview(selectorStackView)
-                
-        selectorStackView.addArrangedSubview(selectorLeftLabelStackView)
-        selectorStackView.addArrangedSubview(subTextRightLabel)
-        selectorLeftLabelStackView.addArrangedSubview(textLabel)
-        selectorLeftLabelStackView.addArrangedSubview(subTextLabel)
-        
-        selectorView
-            .pinTop()
-            .pinLeading()
-            .pinTrailing(0, .defaultHigh)
-            .pinBottom(0, .defaultHigh)
-        
-        selectorStackView.pinToSuperView(.uniform(VDSLayout.space3X))
-    }
-        
-    /// Resets to default settings.
-    open override func reset() {
-        super.reset()
-        shouldUpdateView = false
-        textLabel.reset()
-        subTextLabel.reset()
-        subTextRightLabel.reset()
-        
         textLabel.textStyle = .boldBodyLarge
         subTextLabel.textStyle = .bodyLarge
         subTextRightLabel.textStyle = .bodyLarge
@@ -260,9 +251,14 @@ open class RadioBoxItem: Control, Changeable, FormFieldable, Groupable {
         
         isSelected = false
         onChange = nil
+    }
         
-        shouldUpdateView = true
+    /// Resets to default settings.
-        setNeedsUpdate()
+    open override func reset() {
+        textLabel.reset()
+        subTextLabel.reset()
+        subTextRightLabel.reset()
+        super.reset()
     }
             
     /// This will change the state of the Selector and execute the actionBlock if provided.

VDS/Components/RadioButton/RadioButtonGroup.swift

@@ -77,12 +77,13 @@ open class RadioButtonGroup: SelectorGroupBase<RadioButtonItem>, SelectorGroupSi
         }
     }
     
-    open override func reset() {
+    open override func setDefaults() {
-        super.reset()
+        super.setDefaults()
+        inputId = nil
         showError = false
     }
-    
+   
-    public override func didSelect(_ selectedControl: RadioButtonItem) {
+    open override func didSelect(_ selectedControl: RadioButtonItem) {
         if let selectedItem {
             updateToggle(selectedItem)
         }

VDS/Components/Table/Table.swift

@@ -92,8 +92,8 @@ open class Table: View {
     //--------------------------------------------------
     
     ///Called upon initializing the table view
-    open override func initialSetup() {
+    open override func setup() {
-        super.initialSetup()
+        super.setup()
         addSubview(matrixView)
         matrixView.pinToSuperView()
     }
@@ -109,18 +109,16 @@ open class Table: View {
         matrixView.collectionViewLayout.invalidateLayout()
     }
     
-    /// Resets to default settings.
+    open override func setDefaults() {
-    open override func reset() {
+        super.setDefaults()
-        super.reset()
         striped = false
         padding = .standard
         tableHeader = []
         tableRows = []
         fillContainer = true
         columnWidths = nil
-        setNeedsUpdate()
     }
-    
+
     func calculateColumnWidths() -> [CGFloat] {
         guard let noOfColumns = tableData.first?.columnsCount else { return [] }
         let itemWidth = floor(matrixView.safeAreaLayoutGuide.layoutFrame.width / CGFloat(noOfColumns))

VDS/Components/Tabs/Tabs.swift

@@ -221,10 +221,11 @@ open class Tabs: View {
         super.layoutSubviews()
         updateContentView()
     }
-       
+    
-    open override func reset() {
+    open override func setDefaults() {
-        super.reset()
+        super.setDefaults()
-        shouldUpdateView = false
+        onTabDidSelect = nil
+        onTabShouldSelect = nil
         orientation = .horizontal
         borderLine = true
         fillContainer = false
@@ -235,11 +236,9 @@ open class Tabs: View {
         selectedIndex = 0
         size = .medium
         sticky = false
-        tabViews.forEach{ $0.reset() }
+        tabModels = []
-        shouldUpdateView = true
-        setNeedsUpdate()
     }
-    
+
     //--------------------------------------------------
     // MARK: - Private Methods
     //--------------------------------------------------

VDS/Components/TextFields/EntryFieldBase.swift

@@ -313,6 +313,41 @@ open class EntryFieldBase<ValueType>: Control, Changeable, FormFieldInternalVali
         errorLabel.textColorConfiguration = primaryColorConfiguration.eraseToAnyColorable()
         helperLabel.textColorConfiguration = secondaryColorConfiguration.eraseToAnyColorable()
         
+    }
+    
+    /// Updates the UI
+    open override func updateView() {
+        super.updateView()
+        updateRules()
+        updateContainerView()
+        updateContainerWidth()
+        updateTitleLabel()
+        updateErrorLabel()
+        updateHelperLabel()
+    }
+    
+    open override func setDefaults() {
+        super.setDefaults()
+     
+        titleLabel.textStyle = .bodySmall
+        errorLabel.textStyle = .bodySmall
+        helperLabel.textStyle = .bodySmall
+        
+        labelText = nil
+        helperText = nil
+        showError = false
+        errorText = nil
+        tooltipModel = nil
+        transparentBackground = false
+        width = nil
+        inputId = nil
+        defaultValue = nil
+        isRequired = false
+        isReadOnly = false
+        helperTextPlacement = .bottom
+        rules = []
+        onChange = nil
+        
         containerView.bridge_accessibilityLabelBlock = { [weak self] in
             guard let self else { return "" }
             var accessibilityLabels = [String]()
@@ -347,43 +382,15 @@ open class EntryFieldBase<ValueType>: Control, Changeable, FormFieldInternalVali
             guard let self else { return "" }
             return showError || hasInternalError ? "error" : nil
         }
-    }
+
-    
-    /// Updates the UI
-    open override func updateView() {
-        super.updateView()
-        updateRules()
-        updateContainerView()
-        updateContainerWidth()
-        updateTitleLabel()
-        updateErrorLabel()
-        updateHelperLabel()
     }
     
     /// Resets to default settings.
     open override func reset() {
-        super.reset()
         titleLabel.reset()
         errorLabel.reset()
         helperLabel.reset()
-        
+        super.reset()
-        titleLabel.textStyle = .bodySmall
-        errorLabel.textStyle = .bodySmall
-        helperLabel.textStyle = .bodySmall
-        
-        helperTextPlacement = .bottom
-        labelText = nil
-        helperText = nil
-        showError = false
-        errorText = nil
-        tooltipModel = nil
-        transparentBackground = false
-        width = nil
-        inputId = nil
-        defaultValue = nil
-        isRequired = false
-        isReadOnly = false
-        onChange = nil
     }
     
     open override var canBecomeFirstResponder: Bool {

VDS/Components/TextFields/InputField/InputField.swift

@@ -205,6 +205,22 @@ open class InputField: EntryFieldBase<String> {
         
         textField.textColorConfiguration = textFieldTextColorConfiguration
         
+    }
+    
+    open override func getFieldContainer() -> UIView {
+        return textField
+    }
+    
+    open override func setDefaults() {
+        super.setDefaults()
+        textField.text = ""
+        
+        successLabel.textStyle = .bodySmall
+        
+        fieldType = .text
+        showSuccess = false
+        successText = nil
+        
         containerView.bridge_accessibilityLabelBlock = { [weak self] in
             guard let self else { return "" }
             var accessibilityLabels = [String]()
@@ -259,22 +275,10 @@ open class InputField: EntryFieldBase<String> {
         }
     }
     
-    open override func getFieldContainer() -> UIView {
-        return textField
-    }
-    
     /// Resets to default settings.
     open override func reset() {
-        super.reset()
-        textField.text = ""
-        
         successLabel.reset()
-        successLabel.textStyle = .bodySmall
+        super.reset()
-        
-        fieldType = .text
-        showSuccess = false
-        successText = nil
-        helperTextPlacement = .bottom
     }
 
     /// Used to make changes to the View based off a change events or from local properties.

VDS/Components/TextFields/InputField/TextField.swift

@@ -98,19 +98,22 @@ open class TextField: UITextField, ViewProtocol, Errorable {
     //--------------------------------------------------
     // MARK: - Lifecycle
     //--------------------------------------------------
-    open func initialSetup() {
+    private func initialSetup() {
         if !initialSetupPerformed {
             initialSetupPerformed = true
-            backgroundColor = .clear
+            shouldUpdateView = false
-            translatesAutoresizingMaskIntoConstraints = false
-            setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
-            clipsToBounds = true
             setup()
+            setDefaults()
+            shouldUpdateView = true
             setNeedsUpdate()
         }
     }
     
     open func setup() {
+        translatesAutoresizingMaskIntoConstraints = false
+        setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
+        clipsToBounds = true
+
         let accessView = UIView(frame: .init(origin: .zero, size: .init(width: UIScreen.main.bounds.width, height: 44)))
         accessView.backgroundColor = .white
         accessView.addBorder(side: .top, width: 1, color: .lightGray)
@@ -124,6 +127,17 @@ open class TextField: UITextField, ViewProtocol, Errorable {
         inputAccessoryView = accessView
     }
     
+    open func setDefaults() {
+        backgroundColor = .clear
+        surface = .light
+        text = nil
+        formatText = nil
+        useScaledFont = false
+        showError = false
+        errorText = nil
+        textStyle = .defaultStyle
+    }
+    
     @objc func doneButtonAction() {
         // Resigns the first responder status when 'Done' is tapped
         let _ = resignFirstResponder()
@@ -174,8 +188,7 @@ open class TextField: UITextField, ViewProtocol, Errorable {
     
     open func reset() {
         shouldUpdateView = false
-        surface = .light
+        setDefaults()
-        text = nil
         shouldUpdateView = true
         setNeedsUpdate()
     }

VDS/Components/TextFields/TextArea/TextArea.swift

@@ -166,14 +166,19 @@ open class TextArea: EntryFieldBase<String> {
         bottomContainerStackView.spacing = VDSLayout.space2X
         
     }
+
+    open override func setDefaults() {
+        super.setDefaults()
+        minHeight = .twoX
+        maxLength = nil
+        textView.text = ""
+        characterCounterLabel.textStyle = .bodySmall
+    }
     
     /// Resets to default settings.
     open override func reset() {
-        super.reset()
-        textView.text = ""
         characterCounterLabel.reset()
-        characterCounterLabel.textStyle = .bodySmall
+        super.reset()
-        setNeedsUpdate()
     }
         
     /// Used to make changes to the View based off a change events or from local properties.

VDS/Components/TextFields/TextArea/TextView.swift

@@ -107,17 +107,20 @@ open class TextView: UITextView, ViewProtocol, Errorable {
     //--------------------------------------------------
     // MARK: - Lifecycle
     //--------------------------------------------------
-    open func initialSetup() {
+    private func initialSetup() {
         if !initialSetupPerformed {
             initialSetupPerformed = true
-            backgroundColor = .clear
+            shouldUpdateView = false
-            translatesAutoresizingMaskIntoConstraints = false
             setup()
+            setDefaults()
+            shouldUpdateView = true
             setNeedsUpdate()
         }
     }
     
     open func setup() {
+        translatesAutoresizingMaskIntoConstraints = false
+
         let accessView = UIView(frame: .init(origin: .zero, size: .init(width: UIScreen.main.bounds.width, height: 44)))
         accessView.backgroundColor = .white
         accessView.addBorder(side: .top, width: 1, color: .lightGray)
@@ -134,6 +137,15 @@ open class TextView: UITextView, ViewProtocol, Errorable {
         placeholderLabel.pinToSuperView()
     }
     
+    open func setDefaults() {
+        backgroundColor = .clear
+        surface = .light
+        text = nil
+        placeholder = nil 
+        errorText = nil
+        showError = false
+    }
+    
     @objc func doneButtonAction() {
         // Resigns the first responder status when 'Done' is tapped
         resignFirstResponder()
@@ -153,8 +165,7 @@ open class TextView: UITextView, ViewProtocol, Errorable {
 
     open func reset() {
         shouldUpdateView = false
-        surface = .light
+        setDefaults()
-        text = nil
         shouldUpdateView = true
         setNeedsUpdate()
     }

VDS/Components/TileContainer/TileContainer.swift

@@ -281,19 +281,18 @@ open class TileContainerBase<PaddingType: DefaultValuing>: View where PaddingTyp
         return view
     }
     
-    /// Resets to default settings.
+    open override func setDefaults() {
-    open override func reset() {
+        super.setDefaults()
-        super.reset()
+        backgroundImage = nil
-        shouldUpdateView = false
         color = .white
-        aspectRatio = .none
+        backgroundEffect = .none
+        padding = .defaultValue
+        aspectRatio = .ratio1x1
         imageFallbackColor = .light
         width = nil
         height = nil
         showBorder = false
         showDropShadow = 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

@@ -390,20 +390,19 @@ open class Tilelet: TileContainerBase<Tilelet.Padding> {
         }
     }
     
-    /// Resets to default settings.
+    open override func setDefaults() {
-    open override func reset() {
+        super.setDefaults()
-        shouldUpdateView = false
-        super.reset()
         aspectRatio = .none
         color = .black
+        textWidth = nil
+        textPostion = .top
+        
         //models
         badgeModel = nil
         titleModel = nil
         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

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

VDS/Components/Toggle/Toggle.swift

@@ -153,19 +153,11 @@ open class Toggle: Control, Changeable, FormFieldable {
 
     //--------------------------------------------------
     // MARK: - Overrides
-    //--------------------------------------------------
+    //--------------------------------------------------   
-    /// Executed on initialization for this View.
-    open override func initialSetup() {
-        super.initialSetup()
-        onClick = { control in
-            control.toggle()
-        }
-    }
-    
     /// Called once when a view is initialized and is used to Setup additional UI or other constants and configurations.
     open override func setup() {
         super.setup()
-        
+     
         isAccessibilityElement = true
         if #available(iOS 17.0, *) {
             accessibilityTraits = .toggleButton
@@ -240,6 +232,16 @@ open class Toggle: Control, Changeable, FormFieldable {
             label.trailingAnchor.constraint(equalTo: trailingAnchor)
         ]
 
+    }
+    
+    open override func setDefaults() {
+        super.setDefaults()
+
+        onClick = { [weak self] _ in
+            guard let self else { return }
+            toggle()
+        }
+
         bridge_accessibilityValueBlock = { [weak self] in
             guard let self else { return "" }
             if showText {
@@ -248,13 +250,7 @@ open class Toggle: Control, Changeable, FormFieldable {
                 return isSelected ? "On" : "Off"
             }
         }
-    }
+        
-    
-    /// Resets to default settings.
-    open override func reset() {
-        super.reset()
-        shouldUpdateView = false
-        label.reset()
         isEnabled = true
         isOn = false
         isAnimated = true
@@ -266,8 +262,12 @@ open class Toggle: Control, Changeable, FormFieldable {
         textPosition = .left
         inputId = nil
         onChange = nil
-        shouldUpdateView = true
+    }
-        setNeedsUpdate()
+    
+    /// Resets to default settings.
+    open override func reset() {
+        label.reset()
+        super.reset()
     }
   
     /// Used to make changes to the View based off a change events or from local properties.

VDS/Components/Toggle/ToggleView.swift

@@ -105,18 +105,10 @@ open class ToggleView: Control, Changeable, FormFieldable {
     //--------------------------------------------------
     // MARK: - Overrides
     //--------------------------------------------------
-    /// Executed on initialization for this View.
-    open override func initialSetup() {
-        super.initialSetup()
-        onClick = { control in
-            control.toggle()
-        }
-    }
-    
     /// Called once when a view is initialized and is used to Setup additional UI or other constants and configurations.
     open override func setup() {
         super.setup()
-
+        
         isAccessibilityElement = true
         if #available(iOS 17.0, *) {
             accessibilityTraits = .toggleButton
@@ -157,20 +149,21 @@ open class ToggleView: Control, Changeable, FormFieldable {
         accessibilityLabel = "Toggle"
     }
     
-    /// Resets to default settings.
+    open override func setDefaults() {
-    open override func reset() {
+        super.setDefaults()
-        super.reset()
-        shouldUpdateView = false
         isOn = false
         isAnimated = true
         inputId = nil
         toggleView.backgroundColor = toggleColorConfiguration.getColor(self)
         knobView.backgroundColor = knobColorConfiguration.getColor(self)
-        onChange = nil 
+        onChange = nil
-        shouldUpdateView = true
+
-        setNeedsUpdate()
+        onClick = { [weak self] _ in
+            guard let self else { return }
+            toggle()
+        }
     }
-  
+    
     /// Used to make changes to the View based off a change events or from local properties.
     open override func updateView() {
         super.updateView()

VDS/Components/Tooltip/Tooltip.swift

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

VDS/Components/Tooltip/TrailingTooltipLabel.swift

@@ -84,17 +84,13 @@ open class TrailingTooltipLabel: View, TooltipLaunchable {
         }
     }
     
-    /// Resets to default settings.
+    open override func setDefaults() {
-    open override func reset() {
+        super.setDefaults()
-        super.reset()
-        shouldUpdateView = false
         labelText = nil
         labelAttributes = nil
         labelTextStyle = .defaultStyle
         labelTextAlignment = .left
         tooltipModel = nil
-        shouldUpdateView = true
-        setNeedsUpdate()
     }
 }
 

VDS/Protocols/ViewProtocol.swift

@@ -19,12 +19,12 @@ public protocol ViewProtocol: AnyObject, Initable, Resettable, Enabling, Surface
     /// Used for setting an implementation for the default Accessible Action
     var accessibilityAction: ((Self) -> Void)? { get set }
 
-    /// Executed on initialization for this View.
-    func initialSetup()
-    
     /// Called once when a view is initialized and is used to Setup additional UI or other constants and configurations.
     func setup()
-    
+
+    /// Default configurations for values and properties. This is called in the setup() and reset().
+    func setDefaults()
+
     /// Used to make changes to the View based off a change events or from local properties.
     func updateView()