Fix accessibility on underlying popups

LuckyDucko · Sep 12, 2024 · cea156e · cea156e
1 parent ef3d3c3
commit cea156e
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/Mopups/Mopups.Maui/Platforms/Android/Impl/AndroidMopups.cs b/Mopups/Mopups.Maui/Platforms/Android/Impl/AndroidMopups.cs
@@ -96,28 +96,36 @@ void HandleAccessibility(bool showPopup, bool disableAccessibilityHandling, Popu
             }
 
             int navCount = mainPage.Navigation.NavigationStack.Count;
-            int modalCount = mainPage.Navigation.ModalStack.Count;
-
             if(navCount > 0)
             {
-                var androidView = mainPage.Navigation?.NavigationStack[navCount - 1]?.Handler?.PlatformView as Android.Views.View;
+                var androidView = mainPage.Navigation.NavigationStack[navCount - 1]?.Handler?.PlatformView as Android.Views.View;
 
                 if(androidView is not null && androidView.ImportantForAccessibility != ImportantForAccessibility.NoHideDescendants)
                 {
                     views.Add(androidView);
                 }
             }
 
+            int modalCount = mainPage.Navigation.ModalStack.Count;
             if(modalCount > 0)
             {
-                var androidView = mainPage.Navigation?.ModalStack[modalCount - 1]?.Handler?.PlatformView as Android.Views.View;
+                var androidView = mainPage.Navigation.ModalStack[modalCount - 1]?.Handler?.PlatformView as Android.Views.View;
                 if(androidView is not null && androidView.ImportantForAccessibility != ImportantForAccessibility.NoHideDescendants)
                 {
                     views.Add(androidView);
                 }
             }
 
-            var test = popup.GetType();
+            var popupCount = MopupService.Instance.PopupStack.Count;
+            if(popupCount > 1)
+            {
+                var androidView = MopupService.Instance.PopupStack[popupCount - 2]?.Handler?.PlatformView as Android.Views.View;
+                if(androidView is not null && androidView.ImportantForAccessibility != ImportantForAccessibility.NoHideDescendants)
+                {
+                    views.Add(androidView);
+                }
+            }
+
             accessibilityStates.Add(test, views);
         }
 
@@ -163,4 +171,4 @@ static Task<bool> PostAsync(Android.Views.View? nativeView)
 
         return tcs.Task;
     }
-}
+}