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

Author: Bianca Marina Stana

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

@@ -586,8 +586,8 @@ void UpdateAccessibilityHierarchyRecursively(VisualElement element,
                 shouldBeIgnored |= accElement.isIgnored;
                 modal = accElement.isModal;
 
-                // If the branch is visible but the AccessibleElement does not have a node yet then create it.
-                if (!shouldBeIgnored)
+                // If the branch is visible but the AccessibleElement does not have a node yet, then create it.
+                if (!shouldBeIgnored && !modal)
                 {
                     if (!IsNodeValid(accElement.node))
                     {

Assets/Scripts/UITk/Controls/Popup.cs

@@ -75,14 +75,8 @@ public PopupContent()
 
         PopupOverlay m_Overlay;
 
-        ClosePolicy m_ClosePolicy = ClosePolicy.CloseOnPressOutside | ClosePolicy.CloseOnEscape;
-
         [UxmlAttribute, CreateProperty]
-        public ClosePolicy closePolicy
-        {
-            get => m_ClosePolicy;
-            set => m_ClosePolicy = value;
-        }
+        public ClosePolicy closePolicy { get; set; } = ClosePolicy.CloseOnPressOutside | ClosePolicy.CloseOnEscape;
 
         public Popup()
         {

Assets/Scripts/UITk/MainView.cs

@@ -740,7 +740,7 @@ void MoveCard(bool shouldMoveLeft, int count = 1)
             // two cards.
             m_MainView.schedule.Execute(() =>
                 AssistiveSupport.notificationDispatcher.SendLayoutChanged(node)
-                ).ExecuteLater(50);
+                ).ExecuteLater(100);
 
             if (moved)
             {
@@ -751,7 +751,7 @@ void MoveCard(bool shouldMoveLeft, int count = 1)
                 // processed first so that the announcement is not interrupted by the focus change.
                 m_MainView.schedule.Execute(() =>
                     AssistiveSupport.notificationDispatcher.SendAnnouncement(message)
-                ).ExecuteLater(100);
+                ).ExecuteLater(200);
             }
 
             /*var accElement = draggable.transform.GetComponent<AccessibleElement>();
@@ -817,6 +817,8 @@ void ShowGameView(Gameplay.DifficultyLevel level)
         void ShowExitGamePopup()
         {
             m_ExitGamePopup.Show();
+
+            AccessibilityManager.GetService<UITkAccessibilityService>()?.RebuildHierarchy();
         }
 
         void CloseExitGamePopup()