Root: update accessibilityElements and post .screenChanged

1 files changed, 9 insertions, 2 deletions

diff --git a/ios/MullvadVPN/RootContainerViewController.swift b/ios/MullvadVPN/RootContainerViewController.swift
index 7aaadddc56..0364b411c8 100644
--- a/ios/MullvadVPN/RootContainerViewController.swift
+++ b/ios/MullvadVPN/RootContainerViewController.swift
@@ -107,8 +107,6 @@ class RootContainerViewController: UIViewController {
         addTransitionView()
         addHeaderBarView()
         updateHeaderBarBackground()
-
-        accessibilityElements = [headerBarView, transitionContainer]
     }
 
     override func viewDidLayoutSubviews() {
@@ -361,6 +359,7 @@ class RootContainerViewController: UIViewController {
             }
 
             self.updateInterfaceOrientation(attemptRotateToDeviceOrientation: true)
+            self.updateAccessibilityElementsAndNotifyScreenChange()
 
             completion?()
         }
@@ -552,6 +551,14 @@ class RootContainerViewController: UIViewController {
         }
     }
 
+    private func updateAccessibilityElementsAndNotifyScreenChange() {
+        // Update accessibility elements to define the correct navigation order: header bar, content view.
+        view.accessibilityElements = [headerBarView, topViewController?.view].compactMap { $0 }
+
+        // Tell accessibility that the significant part of screen was changed.
+        UIAccessibility.post(notification: .screenChanged, argument: nil)
+    }
+
 }
 
 class RootContainerPushSegue: UIStoryboardSegue {