Fixed a few more accessibility issues

Bianca Marina Stana · Bianca Marina Stana · commit 743d80f8f6d3 · 2025-11-11T22:13:44.000-05:00
diff --git a/Assets/Scripts/Screen Reader/UGUI/AccessibleSlider.cs b/Assets/Scripts/Screen Reader/UGUI/AccessibleSlider.cs
@@ -1,6 +1,7 @@
 using TMPro;
 using UnityEngine;
 using UnityEngine.Accessibility;
+using UnityEngine.EventSystems;
 using UnityEngine.UI;
 
 namespace Unity.Samples.ScreenReader
@@ -10,9 +11,10 @@ namespace Unity.Samples.ScreenReader
     /// </summary>
     [AddComponentMenu("Accessibility/Accessible Slider"), DisallowMultipleComponent]
     [ExecuteAlways]
-    public sealed class AccessibleSlider : AccessibleElement
+    public class AccessibleSlider : AccessibleElement
     {
-        Slider m_Slider;
+        protected Slider m_Slider;
+
         Text m_Text;
         TMP_Text m_TMPText;
 
@@ -49,6 +51,11 @@ protected override void BindToControl()
 
                 incremented += OnIncremented;
                 decremented += OnDecremented;
+
+                if (Application.platform == RuntimePlatform.WindowsPlayer)
+                {
+                    focused += OnSliderFocused;
+                }
             }
         }
 
@@ -60,10 +67,30 @@ protected override void UnbindFromControl()
 
                 incremented -= OnIncremented;
                 decremented -= OnDecremented;
+
+                if (Application.platform == RuntimePlatform.WindowsPlayer)
+                {
+                    focused -= OnSliderFocused;
+                }
+            }
+        }
+
+        void OnSliderFocused(bool isFocused)
+        {
+            if (isFocused)
+            {
+                if (m_Slider != null && m_Slider.IsActive() && m_Slider.IsInteractable())
+                {
+                    m_Slider.Select();
+                }
+            }
+            else if (!EventSystem.current.alreadySelecting)
+            {
+                EventSystem.current.SetSelectedGameObject(null);
             }
         }
 
-        void OnIncremented()
+        protected virtual void OnIncremented()
         {
             if (m_Slider.IsActive() && m_Slider.IsInteractable())
             {
@@ -73,7 +100,7 @@ void OnIncremented()
             }
         }
 
-        void OnDecremented()
+        protected virtual void OnDecremented()
         {
             if (m_Slider.IsActive() && m_Slider.IsInteractable())
             {
@@ -83,7 +110,7 @@ void OnDecremented()
             }
         }
 
-        void UpdateValue(float newValue)
+        protected virtual void UpdateValue(float newValue)
         {
             value = $"{newValue:P0}";
             SetNodeProperties();
diff --git a/Assets/Scripts/Screen Reader/UGUI/AccessibleSliderWithSteps.cs b/Assets/Scripts/Screen Reader/UGUI/AccessibleSliderWithSteps.cs
@@ -1,7 +1,4 @@
-using TMPro;
 using UnityEngine;
-using UnityEngine.Accessibility;
-using UnityEngine.UI;
 
 namespace Unity.Samples.ScreenReader
 {
@@ -10,76 +7,25 @@ namespace Unity.Samples.ScreenReader
     /// </summary>
     [AddComponentMenu("Accessibility/Accessible Slider With Steps"), DisallowMultipleComponent]
     [ExecuteAlways]
-    public sealed class AccessibleSliderWithSteps : AccessibleElement
+    public sealed class AccessibleSliderWithSteps : AccessibleSlider
     {
-        Slider m_Slider;
-        Text m_Text;
-        TMP_Text m_TMPText;
-
-        void Start()
-        {
-#if UNITY_2023_3_OR_NEWER
-            role = AccessibilityRole.Slider;
-#endif // UNITY_2023_3_OR_NEWER
-
-            m_Slider = GetComponentInChildren<Slider>();
-            m_Text = GetComponentInChildren<Text>();
-            m_TMPText = GetComponentInChildren<TMP_Text>();
-
-            if (m_Text != null)
-            {
-                label ??= m_Text.text;
-            }
-            else if (m_TMPText != null)
-            {
-                label ??= m_TMPText.text;
-            }
-
-            if (m_Slider != null)
-            {
-                UpdateValue(m_Slider.value);
-            }
-        }
-
-        protected override void BindToControl()
-        {
-            if (m_Slider != null)
-            {
-                m_Slider.onValueChanged.AddListener(UpdateValue);
-
-                incremented += OnIncremented;
-                decremented += OnDecremented;
-            }
-        }
-
-        protected override void UnbindFromControl()
-        {
-            if (m_Slider != null)
-            {
-                m_Slider.onValueChanged.RemoveListener(UpdateValue);
-
-                incremented -= OnIncremented;
-                decremented -= OnDecremented;
-            }
-        }
-
-        void OnIncremented()
+        protected override void OnIncremented()
         {
             if (m_Slider.IsActive() && m_Slider.IsInteractable() && m_Slider.value < 2)
             {
                 m_Slider.value++;
             }
         }
 
-        void OnDecremented()
+        protected override void OnDecremented()
         {
             if (m_Slider.IsActive() && m_Slider.IsInteractable() && m_Slider.value > 0)
             {
                 m_Slider.value--;
             }
         }
 
-        void UpdateValue(float newValue)
+        protected override void UpdateValue(float newValue)
         {
             value = newValue switch
             {
diff --git a/Assets/Scripts/Screen Reader/UITk/Handlers/ButtonHandler.cs b/Assets/Scripts/Screen Reader/UITk/Handlers/ButtonHandler.cs
@@ -21,7 +21,7 @@ public ButtonHandler()
 
         public override string GetLabel()
         {
-            return (ownerElement as Button)?.text;
+            return ownerElement is Button button ? button.text : base.GetLabel();
         }
 
         public override AccessibilityRole GetRole() => AccessibilityRole.Button;
diff --git a/Assets/Scripts/Screen Reader/UITk/Handlers/LabelHandler.cs b/Assets/Scripts/Screen Reader/UITk/Handlers/LabelHandler.cs
@@ -9,7 +9,7 @@ class LabelHandler : VisualElementAccessibilityHandler
     {
         public override string GetLabel()
         {
-            return (ownerElement as Label)?.text;
+            return ownerElement is Label lbl ? lbl.text : base.GetLabel();
         }
 
         public override AccessibilityRole GetRole() => AccessibilityRole.StaticText;
diff --git a/Assets/Scripts/Screen Reader/UITk/Handlers/ScrollViewHandler.cs b/Assets/Scripts/Screen Reader/UITk/Handlers/ScrollViewHandler.cs
@@ -10,6 +10,10 @@ public class ScrollViewHandler : VisualElementAccessibilityHandler
     {
 #if UNITY_6000_3_OR_NEWER
         public override AccessibilityRole GetRole() => AccessibilityRole.ScrollView;
+#else // UNITY_6000_3_OR_NEWER
+        public override bool IsActive() =>
+            Application.platform != RuntimePlatform.Android &&
+            Application.platform != RuntimePlatform.IPhonePlayer;
 #endif // UNITY_6000_3_OR_NEWER
 
         protected override void BindToElement(VisualElement ve)
diff --git a/Assets/Scripts/Screen Reader/UITk/Handlers/SliderHandler.cs b/Assets/Scripts/Screen Reader/UITk/Handlers/SliderHandler.cs
@@ -1,3 +1,4 @@
+using UnityEngine;
 using UnityEngine.Accessibility;
 using UnityEngine.Scripting;
 using UnityEngine.UIElements;
@@ -9,6 +10,23 @@ class BaseSliderHandler<TValue> : BaseFieldHandler<TValue>
     {
         public BaseSliderHandler()
         {
+            if (Application.platform == RuntimePlatform.WindowsPlayer)
+            {
+                focused += focused =>
+                {
+                    var slider = ownerElement as Slider;
+
+                    if (focused)
+                    {
+                        slider?.Focus();
+                    }
+                    else
+                    {
+                        slider?.Blur();
+                    }
+                };
+            }
+
             incremented += () => Step(true);
             decremented += () => Step(false);
         }
@@ -30,9 +48,14 @@ public void Step(bool incr)
             slider.value += step;
         }
 
+        public override string GetLabel()
+        {
+            return ownerElement is Slider slider ? slider.label : base.GetLabel();
+        }
+
         public override string GetValue()
         {
-            return ownerElement is Slider field ? $"{field.value:P0}" : "";
+            return ownerElement is Slider slider ? $"{slider.value:P0}" : base.GetValue();
         }
 
 #if UNITY_2023_3_OR_NEWER
diff --git a/Assets/Scripts/Screen Reader/UITk/Handlers/TextFieldHandler.cs b/Assets/Scripts/Screen Reader/UITk/Handlers/TextFieldHandler.cs
@@ -10,31 +10,35 @@ class TextFieldFieldHandler : BaseFieldHandler<string>
     {
         public TextFieldFieldHandler()
         {
-            focused += focused =>
+            if (Application.platform == RuntimePlatform.OSXPlayer ||
+                Application.platform == RuntimePlatform.WindowsPlayer)
             {
-                var textField = ownerElement as TextField;
-
-                if (focused)
-                {
-                    textField?.Focus();
-                }
-                else
+                focused += focused =>
                 {
-                    textField?.Blur();
-                }
-            };
+                    var textField = ownerElement as TextField;
+
+                    if (focused)
+                    {
+                        textField?.Focus();
+                    }
+                    else
+                    {
+                        textField?.Blur();
+                    }
+                };
+            }
         }
 
-        public override string GetValue()
+        public override string GetLabel()
         {
-            var textField = ownerElement as TextField;
-
-            if (string.IsNullOrEmpty(textField?.value))
-            {
-                return ownerElement is TextField tf ? tf.textEdition.placeholder : null;
-            }
+            return ownerElement is TextField textField ? textField.label : base.GetLabel();
+        }
 
-            return base.GetValue();
+        public override string GetValue()
+        {
+            return ownerElement is TextField textField ?
+                string.IsNullOrEmpty(textField.value) ? textField.textEdition.placeholder : textField.value :
+                base.GetValue();
         }
 
 #if UNITY_6000_3_OR_NEWER
diff --git a/Assets/Scripts/Screen Reader/UITk/Handlers/ToggleHandler.cs b/Assets/Scripts/Screen Reader/UITk/Handlers/ToggleHandler.cs
@@ -19,6 +19,11 @@ public ToggleHandler()
             };
         }
 
+        public override string GetLabel()
+        {
+            return ownerElement is Toggle toggle ? toggle.label : base.GetLabel();
+        }
+
         public override string GetValue() => "";
 
 #if UNITY_2023_3_OR_NEWER
diff --git a/Assets/Scripts/Screen Reader/UITk/Handlers/VisualElementAccessibilityHandler.cs b/Assets/Scripts/Screen Reader/UITk/Handlers/VisualElementAccessibilityHandler.cs
@@ -71,22 +71,26 @@ public bool isActive
         {
             get
             {
-                if (m_OwnerElement != null)
+                if (m_OwnerElement == null)
                 {
-                    // If the node is disabled or hidden, then it is set as inactive regardless of
-                    // AccessibilityProperties.isActive.
-                    if (IsElementVisible(m_OwnerElement))
-                    {
-                        var acc = m_OwnerElement.GetAccessibleProperties();
-
-                        return acc is not { m_IsActive: { defined: true } } || acc.active;
-                    }
+                    return false;
                 }
 
-                return false;
+                // If the node is disabled or hidden, then it is set as inactive regardless of
+                // AccessibilityProperties.isActive.
+                if (!IsElementVisible(m_OwnerElement))
+                {
+                    return false;
+                }
+
+                var acc = m_OwnerElement.GetAccessibleProperties();
+
+                return (acc is not { m_IsActive: { defined: true } } || acc.active) && IsActive();
             }
         }
 
+        public virtual bool IsActive() => true;
+
         public bool isIgnored
         {
             get

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using TMPro;`
`2`	`2`	`using UnityEngine;`
`3`	`3`	`using UnityEngine.Accessibility;`
	`4`	`+using UnityEngine.EventSystems;`
`4`	`5`	`using UnityEngine.UI;`
`5`	`6`
`6`	`7`	`namespace Unity.Samples.ScreenReader`
`@@ -10,9 +11,10 @@ namespace Unity.Samples.ScreenReader`
`10`	`11`	`/// </summary>`
`11`	`12`	`[AddComponentMenu("Accessibility/Accessible Slider"), DisallowMultipleComponent]`
`12`	`13`	`[ExecuteAlways]`
`13`		`- public sealed class AccessibleSlider : AccessibleElement`
	`14`	`+ public class AccessibleSlider : AccessibleElement`
`14`	`15`	`{`
`15`		`- Slider m_Slider;`
	`16`	`+ protected Slider m_Slider;`
	`17`	`+`
`16`	`18`	`Text m_Text;`
`17`	`19`	`TMP_Text m_TMPText;`
`18`	`20`
`@@ -49,6 +51,11 @@ protected override void BindToControl()`
`49`	`51`
`50`	`52`	`incremented += OnIncremented;`
`51`	`53`	`decremented += OnDecremented;`
	`54`	`+`
	`55`	`+ if (Application.platform == RuntimePlatform.WindowsPlayer)`
	`56`	`+ {`
	`57`	`+ focused += OnSliderFocused;`
	`58`	`+ }`
`52`	`59`	`}`
`53`	`60`	`}`
`54`	`61`
`@@ -60,10 +67,30 @@ protected override void UnbindFromControl()`
`60`	`67`
`61`	`68`	`incremented -= OnIncremented;`
`62`	`69`	`decremented -= OnDecremented;`
	`70`	`+`
	`71`	`+ if (Application.platform == RuntimePlatform.WindowsPlayer)`
	`72`	`+ {`
	`73`	`+ focused -= OnSliderFocused;`
	`74`	`+ }`
	`75`	`+ }`
	`76`	`+ }`
	`77`	`+`
	`78`	`+ void OnSliderFocused(bool isFocused)`
	`79`	`+ {`
	`80`	`+ if (isFocused)`
	`81`	`+ {`
	`82`	`+ if (m_Slider != null && m_Slider.IsActive() && m_Slider.IsInteractable())`
	`83`	`+ {`
	`84`	`+ m_Slider.Select();`
	`85`	`+ }`
	`86`	`+ }`
	`87`	`+ else if (!EventSystem.current.alreadySelecting)`
	`88`	`+ {`
	`89`	`+ EventSystem.current.SetSelectedGameObject(null);`
`63`	`90`	`}`
`64`	`91`	`}`
`65`	`92`
`66`		`- void OnIncremented()`
	`93`	`+ protected virtual void OnIncremented()`
`67`	`94`	`{`
`68`	`95`	`if (m_Slider.IsActive() && m_Slider.IsInteractable())`
`69`	`96`	`{`
`@@ -73,7 +100,7 @@ void OnIncremented()`
`73`	`100`	`}`
`74`	`101`	`}`
`75`	`102`
`76`		`- void OnDecremented()`
	`103`	`+ protected virtual void OnDecremented()`
`77`	`104`	`{`
`78`	`105`	`if (m_Slider.IsActive() && m_Slider.IsInteractable())`
`79`	`106`	`{`
`@@ -83,7 +110,7 @@ void OnDecremented()`
`83`	`110`	`}`
`84`	`111`	`}`
`85`	`112`
`86`		`- void UpdateValue(float newValue)`
	`113`	`+ protected virtual void UpdateValue(float newValue)`
`87`	`114`	`{`
`88`	`115`	`value = $"{newValue:P0}";`
`89`	`116`	`SetNodeProperties();`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public ButtonHandler()`
`21`	`21`
`22`	`22`	`public override string GetLabel()`
`23`	`23`	`{`
`24`		`- return (ownerElement as Button)?.text;`
	`24`	`+ return ownerElement is Button button ? button.text : base.GetLabel();`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public override AccessibilityRole GetRole() => AccessibilityRole.Button;`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class LabelHandler : VisualElementAccessibilityHandler`
`9`	`9`	`{`
`10`	`10`	`public override string GetLabel()`
`11`	`11`	`{`
`12`		`- return (ownerElement as Label)?.text;`
	`12`	`+ return ownerElement is Label lbl ? lbl.text : base.GetLabel();`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`public override AccessibilityRole GetRole() => AccessibilityRole.StaticText;`
Original file line number	Diff line number	Diff line change
`@@ -71,22 +71,26 @@ public bool isActive`
`71`	`71`	`{`
`72`	`72`	`get`
`73`	`73`	`{`
`74`		`- if (m_OwnerElement != null)`
	`74`	`+ if (m_OwnerElement == null)`
`75`	`75`	`{`
`76`		`- // If the node is disabled or hidden, then it is set as inactive regardless of`
`77`		`- // AccessibilityProperties.isActive.`
`78`		`- if (IsElementVisible(m_OwnerElement))`
`79`		`- {`
`80`		`- var acc = m_OwnerElement.GetAccessibleProperties();`
`81`		`-`
`82`		`- return acc is not { m_IsActive: { defined: true } } \|\| acc.active;`
`83`		`- }`
	`76`	`+ return false;`
`84`	`77`	`}`
`85`	`78`
`86`		`- return false;`
	`79`	`+ // If the node is disabled or hidden, then it is set as inactive regardless of`
	`80`	`+ // AccessibilityProperties.isActive.`
	`81`	`+ if (!IsElementVisible(m_OwnerElement))`
	`82`	`+ {`
	`83`	`+ return false;`
	`84`	`+ }`
	`85`	`+`
	`86`	`+ var acc = m_OwnerElement.GetAccessibleProperties();`
	`87`	`+`
	`88`	`+ return (acc is not { m_IsActive: { defined: true } } \|\| acc.active) && IsActive();`
`87`	`89`	`}`
`88`	`90`	`}`
`89`	`91`
	`92`	`+ public virtual bool IsActive() => true;`
	`93`	`+`
`90`	`94`	`public bool isIgnored`
`91`	`95`	`{`
`92`	`96`	`get`