File tree Expand file tree Collapse file tree 1 file changed +14
-5
lines changed
Rg.Plugins.Popup/Platforms/Android/Impl Expand file tree Collapse file tree 1 file changed +14
-5
lines changed Original file line number Diff line number Diff line change @@ -116,17 +116,26 @@ static void HandleAccessibilityWorkaround(PopupPage page)
116
116
{
117
117
if ( page . AndroidTalkbackAccessibilityWorkaround )
118
118
{
119
- var navCount = XApplication . Current . MainPage . Navigation . NavigationStack . Count ;
120
- var modalCount = XApplication . Current . MainPage . Navigation . ModalStack . Count ;
121
- XApplication . Current . MainPage . GetOrCreateRenderer ( ) . View . ImportantForAccessibility = ImportantForAccessibility . Auto ;
119
+ var mainPage = XApplication . Current . MainPage ;
120
+
121
+ var navCount = mainPage . Navigation . NavigationStack . Count ;
122
+ var modalCount = mainPage . Navigation . ModalStack . Count ;
123
+
124
+ var mainPageRenderer = mainPage . GetOrCreateRenderer ( ) ;
125
+
126
+ // Workaround for https://github.com/rotorgames/Rg.Plugins.Popup/issues/721
127
+ if ( ! ( mainPage is MultiPage < Page > ) )
128
+ {
129
+ mainPageRenderer . View . ImportantForAccessibility = ImportantForAccessibility . Auto ;
130
+ }
122
131
123
132
if ( navCount > 0 )
124
133
{
125
- XApplication . Current . MainPage . Navigation . NavigationStack [ navCount - 1 ] . GetOrCreateRenderer ( ) . View . ImportantForAccessibility = ImportantForAccessibility . Auto ;
134
+ mainPage . Navigation . NavigationStack [ navCount - 1 ] . GetOrCreateRenderer ( ) . View . ImportantForAccessibility = ImportantForAccessibility . Auto ;
126
135
}
127
136
if ( modalCount > 0 )
128
137
{
129
- XApplication . Current . MainPage . Navigation . ModalStack [ modalCount - 1 ] . GetOrCreateRenderer ( ) . View . ImportantForAccessibility = ImportantForAccessibility . Auto ;
138
+ mainPage . Navigation . ModalStack [ modalCount - 1 ] . GetOrCreateRenderer ( ) . View . ImportantForAccessibility = ImportantForAccessibility . Auto ;
130
139
}
131
140
}
132
141
}
You can’t perform that action at this time.
0 commit comments