From de67fd7fb69e88f91aee74502599ce55554fc905 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Wed, 21 Aug 2024 16:07:10 -0500 Subject: [PATCH] refactored Signed-off-by: Matt Bruce --- MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxModel.swift | 2 +- MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxesModel.swift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxModel.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxModel.swift index 8b9282a9..90f12a09 100644 --- a/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxModel.swift @@ -8,7 +8,7 @@ import MVMCore import VDS -@objcMembers public class RadioBoxModel: FormFieldModel { +public class RadioBoxModel: FormFieldModel { //-------------------------------------------------- // MARK: - Properties //-------------------------------------------------- diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxesModel.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxesModel.swift index 9301a932..9ed15051 100644 --- a/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxesModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxesModel.swift @@ -73,7 +73,7 @@ import VDS extension Array where Element == RadioBoxModel { internal func convertToVDSRadioBoxModel(surface: Surface) -> [RadioBoxGroup.RadioBoxItemModel] { - compactMap({ item in + compactMap({ item in var radioBox = RadioBoxGroup.RadioBoxItemModel() radioBox.text = item.text radioBox.subText = item.subText @@ -81,7 +81,7 @@ extension Array where Element == RadioBoxModel { radioBox.surface = surface radioBox.selected = item.selected radioBox.strikethrough = item.strikethrough - radioBox.disabled = !(item.enabled && !item.readOnly) + radioBox.disabled = !item.isEnabled return radioBox }) }