From f002907c2fda9a69e40ed283a506773c7f67ae9a Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Thu, 11 Aug 2022 14:20:12 -0500 Subject: [PATCH] moved shouldUpdate to SelectorBase Signed-off-by: Matt Bruce --- VDS/Components/Checkbox/Checkbox.swift | 6 +++--- VDS/Components/RadioButton/RadioButton.swift | 10 +--------- VDS/Components/Selector/SelectorBase.swift | 7 ++++++- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/VDS/Components/Checkbox/Checkbox.swift b/VDS/Components/Checkbox/Checkbox.swift index b5df30ee..ee9bea06 100644 --- a/VDS/Components/Checkbox/Checkbox.swift +++ b/VDS/Components/Checkbox/Checkbox.swift @@ -118,8 +118,7 @@ open class CheckboxBase: SelectorBase { } } } - - + //-------------------------------------------------- // MARK: - Color Class Configurations //-------------------------------------------------- @@ -135,6 +134,7 @@ open class CheckboxBase: SelectorBase { return super.getColor(viewModel) } } - } + } + } diff --git a/VDS/Components/RadioButton/RadioButton.swift b/VDS/Components/RadioButton/RadioButton.swift index 19ac376e..bb863e10 100644 --- a/VDS/Components/RadioButton/RadioButton.swift +++ b/VDS/Components/RadioButton/RadioButton.swift @@ -116,13 +116,5 @@ open class RadioButtonBase: SelectorBase } } } - - open override func shouldUpdateView(viewModel: ModelType) -> Bool { - return viewModel.selected != model.selected - || viewModel.labelText != model.labelText - || viewModel.childText != model.childText - || viewModel.showError != model.showError - || viewModel.surface != model.surface - || viewModel.disabled != model.disabled - } + } diff --git a/VDS/Components/Selector/SelectorBase.swift b/VDS/Components/Selector/SelectorBase.swift index 8a1c4fa2..eb3c66d0 100644 --- a/VDS/Components/Selector/SelectorBase.swift +++ b/VDS/Components/Selector/SelectorBase.swift @@ -286,7 +286,12 @@ open class SelectorBase: Control, Changable /// Follow the SwiftUI View paradigm /// - Parameter viewModel: state open override func shouldUpdateView(viewModel: ModelType) -> Bool { - fatalError("Must Override") + return viewModel.selected != model.selected + || viewModel.labelText != model.labelText + || viewModel.childText != model.childText + || viewModel.showError != model.showError + || viewModel.surface != model.surface + || viewModel.disabled != model.disabled } open override func updateView(viewModel: ModelType) {