From ff1071890780d3b320e2bdbc8c725517ff80af1a Mon Sep 17 00:00:00 2001
From: feldspar <feldspar@yandex-team.com>
Date: Wed, 9 Apr 2025 15:09:51 +0300
Subject: [PATCH] Fixed non-modal tooltip presentation
 commit_hash:7682330dfda19b0061badf0901c65a60bf88cc19

---
 .../LayoutKit/Tooltips/TooltipManager.swift   | 50 ++++++++++---------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/client/ios/LayoutKit/LayoutKit/Tooltips/TooltipManager.swift b/client/ios/LayoutKit/LayoutKit/Tooltips/TooltipManager.swift
index cdd05cb95..40b7d2a72 100644
--- a/client/ios/LayoutKit/LayoutKit/Tooltips/TooltipManager.swift
+++ b/client/ios/LayoutKit/LayoutKit/Tooltips/TooltipManager.swift
@@ -122,29 +122,27 @@ public class DefaultTooltipManager: TooltipManager {
 
       let mainWindow = tooltipWindowManager.mainWindow
       // Passing the statusBarStyle control to `rootViewController` of the main window
-      let vc = ProxyViewController(
-        viewController: mainWindow.rootViewController ?? UIViewController(),
-        viewDidAppear: { UIAccessibility.post(notification: .screenChanged, argument: view) }
-      )
-      vc.view = view
-      proxyVC = vc
 
       if tooltip.params.mode == .modal {
+        let vc = ProxyViewController(
+          viewController: mainWindow.rootViewController ?? UIViewController()
+        )
+        vc.view = view
+        proxyVC = vc
+
         // Window won't rotate if `rootViewController` is not set
         modalWindow.rootViewController = vc
         tooltipWindowManager.showModalWindow()
-        view.frame = modalWindow.bounds
       } else {
-        guard let rootViewController = mainWindow.rootViewController else {
-          return assertionFailure("Failed to read root view controller of key window")
-        }
-        rootViewController.addChild(vc)
-        rootViewController.view.addSubview(view)
-        view.frame = rootViewController.view.bounds
+        mainWindow.addSubview(view)
       }
 
+      view.frame = modalWindow.bounds
+
       view.animateAppear()
 
+      UIAccessibility.postDelayed(notification: .screenChanged, argument: view)
+
       showingTooltips[info.id] = view
       let duration = tooltip.params.duration
       if !duration.isZero {
@@ -244,14 +242,9 @@ extension TooltipAnchorView {
 
 private final class ProxyViewController: UIViewController {
   private let viewController: UIViewController
-  private let viewDidAppear: Action
 
-  init(
-    viewController: UIViewController,
-    viewDidAppear: @escaping Action
-  ) {
+  init(viewController: UIViewController) {
     self.viewController = viewController
-    self.viewDidAppear = viewDidAppear
     super.init(nibName: nil, bundle: nil)
   }
 
@@ -263,11 +256,6 @@ private final class ProxyViewController: UIViewController {
   override var preferredStatusBarStyle: UIStatusBarStyle {
     viewController.preferredStatusBarStyle
   }
-
-  override func viewDidAppear(_ animated: Bool) {
-    super.viewDidAppear(animated)
-    viewDidAppear()
-  }
 }
 
 final class TooltipWindowManager {
@@ -305,3 +293,17 @@ extension TooltipManager {
   public func mapView(_: BlockView, to _: BlockViewID) {}
   public func reset() {}
 }
+
+extension UIAccessibility {
+  fileprivate static func postDelayed(
+    notification: UIAccessibility.Notification,
+    argument: Any?
+  ) {
+    after(0.2) {
+      UIAccessibility.post(
+        notification: notification,
+        argument: argument
+      )
+    }
+  }
+}