From f27e3cd680a1ec473054a5e6ef9cb495ffd67388 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Tue, 22 Jun 2021 15:22:27 -0400 Subject: [PATCH] updated protocol --- MVMCoreUI/Atomic/Atoms/Selectors/CheckboxModel.swift | 8 -------- MVMCoreUI/Atomic/Atoms/Selectors/ToggleModel.swift | 8 -------- MVMCoreUI/Behaviors/SelectAllBoxesBehavior.swift | 5 ++--- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/CheckboxModel.swift b/MVMCoreUI/Atomic/Atoms/Selectors/CheckboxModel.swift index b7d79570..4efa53ec 100644 --- a/MVMCoreUI/Atomic/Atoms/Selectors/CheckboxModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Selectors/CheckboxModel.swift @@ -71,14 +71,6 @@ public func formFieldValue() -> AnyHashable? { selected } - //-------------------------------------------------- - // MARK: - Selectable Protocol - //-------------------------------------------------- - - public func select(as isSelected: Bool) { - selected = isSelected - } - //-------------------------------------------------- // MARK: - Initializer //-------------------------------------------------- diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/ToggleModel.swift b/MVMCoreUI/Atomic/Atoms/Selectors/ToggleModel.swift index 565d8d43..88f193f5 100644 --- a/MVMCoreUI/Atomic/Atoms/Selectors/ToggleModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Selectors/ToggleModel.swift @@ -58,14 +58,6 @@ public class ToggleModel: NSObject, MoleculeModelProtocol, FormFieldProtocol, En public func formFieldValue() -> AnyHashable? { selected } - //-------------------------------------------------- - // MARK: - Selectable Protocol - //-------------------------------------------------- - - public func select(as isSelected: Bool) { - selected = isSelected - } - //-------------------------------------------------- // MARK: - Initializer //-------------------------------------------------- diff --git a/MVMCoreUI/Behaviors/SelectAllBoxesBehavior.swift b/MVMCoreUI/Behaviors/SelectAllBoxesBehavior.swift index b4db84d5..e9ffce2c 100644 --- a/MVMCoreUI/Behaviors/SelectAllBoxesBehavior.swift +++ b/MVMCoreUI/Behaviors/SelectAllBoxesBehavior.swift @@ -8,10 +8,9 @@ /// Protocol to apply to any model of a UI Control with a binary on/off nature. /// -/// Example classes: Checkbox or Switch. +/// Example classes: Checkbox or Toggle. @objc public protocol SelectableMoleculeModel: AnyObject { @objc dynamic var selected: Bool { get set } - func select(as isSelected: Bool) } public class SelectAllBoxesBehaviorModel: PageBehaviorModelProtocol { @@ -148,7 +147,7 @@ public class SelectAllBoxesBehavior: PageCustomActionHandlerBehavior, PageMolecu // Iterate through selectable molecules. for selectableModel in selectableModels { if toSelect(model: selectableModel) || toDeselect(model: selectableModel) { - selectableModel.select(as: didSelectAllState) + selectableModel.selected = didSelectAllState } }