Merge branch 'unite2025/lsp-uitk' into unite2025/screen-reader-improvements

Author: Bianca Marina Stana

Assets/Scripts/Screen Reader/UITk/AccessibleProperties.cs

@@ -124,6 +124,10 @@ public bool allowsDirectInteraction
         public event Func<AccessibilityScrollDirection, bool> scrolled;
         public event Func<bool> dismissed;
 
+        public bool selectable => selected != null;
+        public bool scrollable => scrolled != null;
+        public bool dismissable => dismissed != null;
+
         internal void InvokeFocused(AccessibilityNode accessibilityNode, bool isFocused)
         {
             focused?.Invoke(isFocused);

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

@@ -222,7 +222,7 @@ public event Func<bool> selected
             {
                 m_Selected -= value;
 
-                if (m_Selected == null)
+                if (!m_Selectable)
                 {
                     DisconnectFromSelected();
                 }
@@ -245,7 +245,7 @@ public event Func<AccessibilityScrollDirection, bool> scrolled
             {
                 m_Scrolled -= value;
 
-                if (m_Scrolled == null)
+                if (!m_Scrollable)
                 {
                     DisconnectFromScrolled();
                 }
@@ -265,13 +265,61 @@ public event Func<bool> dismissed
             {
                 m_Dismissed -= value;
 
-                if (m_Dismissed == null)
+                if (!m_Dismissable)
                 {
                     DisconnectFromDismissed();
                 }
             }
         }
 
+        bool m_Selectable
+        {
+            get
+            {
+                var selectable = m_Selected != null;
+                var acc = m_OwnerElement?.GetAccessibleProperties();
+
+                if (acc != null)
+                {
+                    selectable |= acc.selectable;
+                }
+
+                return selectable;
+            }
+        }
+
+        bool m_Scrollable
+        {
+            get
+            {
+                var scrollable = m_Scrolled != null;
+                var acc = m_OwnerElement?.GetAccessibleProperties();
+
+                if (acc != null)
+                {
+                    scrollable |= acc.scrollable;
+                }
+
+                return scrollable;
+            }
+        }
+
+        bool m_Dismissable
+        {
+            get
+            {
+                var dismissable = m_Dismissed != null;
+                var acc = m_OwnerElement?.GetAccessibleProperties();
+
+                if (acc != null)
+                {
+                    dismissable |= acc.dismissable;
+                }
+
+                return dismissable;
+            }
+        }
+
         void ConnectToNode()
         {
             ConnectToFocusChanged();
@@ -323,7 +371,7 @@ void ConnectToSelected()
         {
             // Implementing the selected event tells the screen reader that the node is selectable, which may lead to
             // a specific behaviour. Therefore, we don't implement the node's selected event unless we actually need it.
-            if (node == null || m_Selected == null)
+            if (node == null || !m_Selectable)
             {
                 return;
             }
@@ -431,7 +479,7 @@ void InvokeDecremented()
         void ConnectToScrolled()
         {
 #if UNITY_6000_3_OR_NEWER
-            if (node == null || m_Scrolled == null)
+            if (node == null || !m_Scrollable)
             {
                 return;
             }
@@ -474,7 +522,7 @@ void ConnectToDismissed()
             // Implementing the dismissed event tells the screen reader that the node is dismissible, which may lead to
             // a specific behaviour. Therefore, we don't implement the node's dismissed event unless we actually need
             // it.
-            if (node == null || m_Dismissed == null)
+            if (node == null || !m_Dismissable)
             {
                 return;
             }

Assets/Scripts/UITk/Card.cs

@@ -4,7 +4,6 @@
 using UnityEngine.Accessibility;
 using UnityEngine.UIElements;
 using Unity.Samples.ScreenReader;
-using Button = UnityEngine.UIElements.Button;
 
 namespace Unity.Samples.LetterSpell
 {

Assets/Scripts/UITk/MainView.cs

@@ -599,7 +599,10 @@ void OnLetterCardsChanged()
                 card.text = letterCard.letter.ToString();
                 card.name = letterCard.letter.ToString();
                 card.GetOrCreateAccessibleProperties().label = card.text;
-                card.dropped += (oldIndex, newIndex) => { gameplay.ReorderLetter(oldIndex, newIndex); };
+                card.dropped += (oldIndex, newIndex) =>
+                {
+                    gameplay.ReorderLetter(oldIndex, newIndex);
+                };
             }
         }