From 2f3759ae903edabebd9c6485b530b249d0d2fb37 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Fri, 27 Oct 2023 13:15:08 -0500
Subject: [PATCH] ONEAPP-4828 - Accessibility - Toggle (State)

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 VDS/Components/Toggle/Toggle.swift   | 12 ++++--------
 VDS/SupportingFiles/ReleaseNotes.txt |  1 +
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/VDS/Components/Toggle/Toggle.swift b/VDS/Components/Toggle/Toggle.swift
index d4ac06a0..47db0732 100644
--- a/VDS/Components/Toggle/Toggle.swift
+++ b/VDS/Components/Toggle/Toggle.swift
@@ -60,7 +60,6 @@ open class Toggle: Control, Changeable, FormFieldable {
     //--------------------------------------------------
     private let toggleContainerSize = CGSize(width: 52, height: 44)
     private let spacingBetween = VDSLayout.Spacing.space3X.value
-    private let labelMaxWidth = 40.0
     
     /// TextStyle used to render the label.
     private var textStyle: TextStyle {
@@ -187,9 +186,7 @@ open class Toggle: Control, Changeable, FormFieldable {
         accessibilityTraits = .button
         addSubview(label)
         addSubview(toggleView)
-        
-        label.widthLessThanEqualTo(labelMaxWidth)
-        
+                
         // Set up initial constraints for label and switch
         toggleView.centerYAnchor.constraint(equalTo: centerYAnchor).isActive = true
 
@@ -247,14 +244,13 @@ open class Toggle: Control, Changeable, FormFieldable {
     /// Used to update any Accessibility properties.
     open override func updateAccessibility() {
         super.updateAccessibility()
-        
         if showText {
-            setAccessibilityLabel(for: [label])
+            accessibilityValue = isSelected ? onText : offText
         } else {
-            accessibilityLabel = "Toggle"
+            accessibilityValue = isSelected ? "On" : "Off"
         }
     }
-    
+
     /// This will change the state of the Selector and execute the actionBlock if provided.
     open func toggle() {
         isOn.toggle()
diff --git a/VDS/SupportingFiles/ReleaseNotes.txt b/VDS/SupportingFiles/ReleaseNotes.txt
index d042255b..6fc26df1 100644
--- a/VDS/SupportingFiles/ReleaseNotes.txt
+++ b/VDS/SupportingFiles/ReleaseNotes.txt
@@ -1,6 +1,7 @@
 1.0.47
 =======
 - ONEAPP-4684 - Acessibility - Tooltip (Header)
+- ONEAPP-4828 - Accessibility - Toggle (State)
 
 1.0.46
 =======