From de184d376e34822924f1aced1a71c516a744cda0 Mon Sep 17 00:00:00 2001 From: brave-builds Date: Thu, 27 Feb 2025 16:50:07 +0000 Subject: [PATCH] Uplift of #27708 (squashed) to release --- .../Browser/BrowserViewController/BVC+TabManagerDelegate.swift | 1 + .../BrowserViewController/BVC+WKNavigationDelegate.swift | 3 +++ 2 files changed, 4 insertions(+) diff --git a/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+TabManagerDelegate.swift b/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+TabManagerDelegate.swift index 0b17cc8d56d3..5c7c16642e1a 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+TabManagerDelegate.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+TabManagerDelegate.swift @@ -59,6 +59,7 @@ extension BrowserViewController: TabManagerDelegate { topToolbar.hideProgressBar() } + previous?.shownPromptAlert?.dismiss(animated: false) readerModeCache = ReaderModeScriptHandler.cache(for: tab) ReaderModeHandler.readerModeCache = readerModeCache diff --git a/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+WKNavigationDelegate.swift b/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+WKNavigationDelegate.swift index de41756c8fee..8deec9d0c612 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+WKNavigationDelegate.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+WKNavigationDelegate.swift @@ -1422,6 +1422,9 @@ extension BrowserViewController: WKUIDelegate { _ = observation // Silence write but not read warning observation = nil guard let self = self, let tab = self.tabManager[webView] else { return } + + // When a child tab is being selected, dismiss any popups on the parent tab + tab.parent?.shownPromptAlert?.dismiss(animated: false) self.tabManager.selectTab(tab) } )