From 3448954ddca1de08e1ff646c34248ef85133443f Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Mon, 29 Jan 2024 15:07:31 -0600 Subject: [PATCH] updated reset() Signed-off-by: Matt Bruce --- .../Buttons/ButtonGroup/ButtonGroup.swift | 13 ++++++++++++- VDS/Components/Checkbox/CheckboxGroup.swift | 5 +++++ .../RadioButton/RadioButtonGroup.swift | 5 +++++ VDS/Components/Tabs/Tabs.swift | 18 ++++++++++++++++++ 4 files changed, 40 insertions(+), 1 deletion(-) diff --git a/VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift b/VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift index 9cf82696..1fdbc56d 100644 --- a/VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift +++ b/VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift @@ -99,7 +99,7 @@ open class ButtonGroup: View { buttons.forEach { $0.surface = surface } } } - + //-------------------------------------------------- // MARK: - Private Properties //-------------------------------------------------- @@ -167,6 +167,17 @@ open class ButtonGroup: View { collectionView.reloadData() } + open override func reset() { + super.reset() + shouldUpdateView = false + rowQuantityPhone = 0 + rowQuantityTablet = 0 + alignment = .center + buttons.forEach { $0.reset() } + shouldUpdateView = true + setNeedsUpdate() + } + open override func layoutSubviews() { super.layoutSubviews() // Accounts for any collection size changes diff --git a/VDS/Components/Checkbox/CheckboxGroup.swift b/VDS/Components/Checkbox/CheckboxGroup.swift index 34fc657d..ef9b5405 100644 --- a/VDS/Components/Checkbox/CheckboxGroup.swift +++ b/VDS/Components/Checkbox/CheckboxGroup.swift @@ -88,6 +88,11 @@ open class CheckboxGroup: SelectorGroupBase, SelectorGroupMultiSel } valueChanged() } + + open override func reset() { + super.reset() + showError = false + } } extension CheckboxGroup { diff --git a/VDS/Components/RadioButton/RadioButtonGroup.swift b/VDS/Components/RadioButton/RadioButtonGroup.swift index c33a376e..6b12f60a 100644 --- a/VDS/Components/RadioButton/RadioButtonGroup.swift +++ b/VDS/Components/RadioButton/RadioButtonGroup.swift @@ -73,6 +73,11 @@ open class RadioButtonGroup: SelectorGroupBase, SelectorGroupSi } } + open override func reset() { + super.reset() + showError = false + } + public override func didSelect(_ selectedControl: RadioButtonItem) { if let selectedItem { updateToggle(selectedItem) diff --git a/VDS/Components/Tabs/Tabs.swift b/VDS/Components/Tabs/Tabs.swift index 0b6b8fac..d6273771 100644 --- a/VDS/Components/Tabs/Tabs.swift +++ b/VDS/Components/Tabs/Tabs.swift @@ -219,6 +219,24 @@ open class Tabs: View { updateContentView() } + open override func reset() { + super.reset() + shouldUpdateView = false + orientation = .horizontal + borderLine = true + fillContainer = false + indicatorFillTab = false + indicatorPosition = .bottom + minWidth = 44.0 + overflow = .scroll + selectedIndex = 0 + size = .medium + sticky = false + tabViews.forEach{ $0.reset() } + shouldUpdateView = true + setNeedsUpdate() + } + //-------------------------------------------------- // MARK: - Private Methods //--------------------------------------------------