Merge branch 'unite2025/lsp-uitk' of https://github.com/Unity-Technologies/a11y-public-sample into unite2025/lsp-uitk

Author: alexandredzi

Assets/Scripts/Screen Reader/UITk/Handlers/BasePopupFieldHandler.cs

@@ -30,6 +30,10 @@ public override string GetHint()
             return LocalizationSettings.StringDatabase.GetLocalizedString("Game Text", "DROPDOWN_CLOSED_HINT");
         }
 
+#if UNITY_6000_3_OR_NEWER
+        public override AccessibilityRole GetRole() => AccessibilityRole.Dropdown;
+#endif // UNITY_6000_3_OR_NEWER
+
         protected override void BindToElement(VisualElement element)
         {
             base.BindToElement(element);

Assets/Scripts/Screen Reader/UITk/Handlers/ButtonHandler.cs

@@ -29,10 +29,10 @@ public override string GetLabel()
             return (ownerElement as Button)?.text;
         }
 
+        public override AccessibilityRole GetRole() => AccessibilityRole.Button;
+
         protected override void BindToElement(VisualElement ve)
         {
         }
-
-        public override AccessibilityRole GetRole() => AccessibilityRole.Button;
     }
 }

Assets/Scripts/Screen Reader/UITk/Handlers/DropdownFieldHandler.cs

@@ -30,6 +30,10 @@ public override string GetHint()
             return LocalizationSettings.StringDatabase.GetLocalizedString("Game Text", "DROPDOWN_CLOSED_HINT");
         }
 
+#if UNITY_6000_3_OR_NEWER
+        public override AccessibilityRole GetRole() => AccessibilityRole.Dropdown;
+#endif // UNITY_6000_3_OR_NEWER
+
         protected override void BindToElement(VisualElement element)
         {
             base.BindToElement(element);

Assets/Scripts/Screen Reader/UITk/Handlers/LabelHandler.cs

@@ -7,11 +7,11 @@ namespace Unity.Samples.ScreenReader
     [Preserve]
     class LabelHandler : VisualElementAccessibilityHandler
     {
-        public override AccessibilityRole GetRole() => AccessibilityRole.StaticText;
-
         public override string GetLabel()
         {
             return (ownerElement as Label)?.text;
         }
+
+        public override AccessibilityRole GetRole() => AccessibilityRole.StaticText;
     }
 }

Assets/Scripts/Screen Reader/UITk/Handlers/ScrollViewHandler.cs

@@ -8,11 +8,10 @@ namespace Unity.Samples.ScreenReader
     [Preserve]
     public class ScrollViewHandler : VisualElementAccessibilityHandler
     {
-        public override AccessibilityRole GetRole()
-        {
-            return AccessibilityRole.ScrollView;
-        }
-        
+#if UNITY_6000_3_OR_NEWER
+        public override AccessibilityRole GetRole() => AccessibilityRole.ScrollView;
+#endif // UNITY_6000_3_OR_NEWER
+
         protected override void BindToElement(VisualElement ve)
         {
             var scrollView = ve as ScrollView;

Assets/Scripts/Screen Reader/UITk/Handlers/TabViewHandler.cs

@@ -1,3 +1,4 @@
+using UnityEngine.Accessibility;
 using UnityEngine.UIElements;
 
 namespace Unity.Samples.ScreenReader
@@ -25,6 +26,10 @@ public override string GetLabel()
         {
             return m_Tab.label;
         }
+
+#if UNITY_6000_3_OR_NEWER
+        public override AccessibilityRole GetRole() => AccessibilityRole.TabButton;
+#endif // UNITY_6000_3_OR_NEWER
     }
 
     class TabHandlerCreator : VisualElementAccessibilityHandlerFactory.ICreator