From a3dfa2efeda9f63927aa4185ce7c11284db88379 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 1 Aug 2023 13:57:59 -0500 Subject: [PATCH] updated for item count in groups Signed-off-by: Matt Bruce --- VDS/Components/Checkbox/CheckboxGroup.swift | 3 ++- VDS/Components/RadioButton/RadioButtonGroup.swift | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/VDS/Components/Checkbox/CheckboxGroup.swift b/VDS/Components/Checkbox/CheckboxGroup.swift index 0c499e42..03635d4d 100644 --- a/VDS/Components/Checkbox/CheckboxGroup.swift +++ b/VDS/Components/Checkbox/CheckboxGroup.swift @@ -38,13 +38,14 @@ open class CheckboxGroup: SelectorGroupHandlerBase { public var selectorModels: [CheckboxModel]? { didSet { if let selectorModels { - selectorViews = selectorModels.map { model in + selectorViews = selectorModels.enumerated().map { index, model in return CheckboxItem().with { $0.disabled = model.disabled $0.surface = model.surface $0.inputId = model.inputId $0.value = model.value $0.accessibilityLabel = model.accessibileText + $0.accessibilityValue = "item \(index+1) of \(selectorModels.count)" $0.labelText = model.labelText $0.labelTextAttributes = model.labelTextAttributes $0.childText = model.childText diff --git a/VDS/Components/RadioButton/RadioButtonGroup.swift b/VDS/Components/RadioButton/RadioButtonGroup.swift index 9d8f67eb..1ffa55bb 100644 --- a/VDS/Components/RadioButton/RadioButtonGroup.swift +++ b/VDS/Components/RadioButton/RadioButtonGroup.swift @@ -33,13 +33,14 @@ open class RadioButtonGroup: SelectorGroupSelectedHandlerBase { public var selectorModels: [RadioButtonModel]? { didSet { if let selectorModels { - selectorViews = selectorModels.map { model in + selectorViews = selectorModels.enumerated().map { index, model in return RadioButtonItem().with { $0.disabled = model.disabled $0.surface = model.surface $0.inputId = model.inputId $0.value = model.value $0.accessibilityLabel = model.accessibileText + $0.accessibilityValue = "item \(index+1) of \(selectorModels.count)" $0.labelText = model.labelText $0.labelTextAttributes = model.labelTextAttributes $0.childText = model.childText