Fix brave/brave-ios#7851: Tab selection for TabsBar interface is done…

… after active website is loaded (brave/brave-ios#8032)
brave · Sep 6, 2023 · 034d193 · 034d193
1 parent 71756cd
commit 034d193
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/Sources/Brave/Frontend/Browser/BrowserViewController.swift b/Sources/Brave/Frontend/Browser/BrowserViewController.swift
@@ -1069,6 +1069,8 @@ public class BrowserViewController: UIViewController {
     }
     searchController?.additionalSafeAreaInsets = additionalInsets
     favoritesController?.additionalSafeAreaInsets = additionalInsets
+
+    tabsBar.reloadDataAndRestoreSelectedTab(isAnimated: false)
   }
 
   override public var canBecomeFirstResponder: Bool {

diff --git a/...e/Frontend/Browser/BrowserViewController/BrowserViewController+WKNavigationDelegate.swift b/...e/Frontend/Browser/BrowserViewController/BrowserViewController+WKNavigationDelegate.swift
@@ -686,8 +686,6 @@ extension BrowserViewController: WKNavigationDelegate {
         // Set rewards inter site url as new page load url.
         rewardsXHRLoadURL = webView.url
       }
-
-      tabsBar.reloadDataAndRestoreSelectedTab()
 
       if tab.walletEthProvider != nil {
         tab.emitEthereumEvent(.connect)

diff --git a/Sources/Brave/Frontend/Browser/Tabs/TabBar/TabsBarViewController.swift b/Sources/Brave/Frontend/Browser/Tabs/TabBar/TabsBarViewController.swift
@@ -240,17 +240,23 @@ class TabsBarViewController: UIViewController {
     }
   }
 
-  func reloadDataAndRestoreSelectedTab() {
+  func reloadDataAndRestoreSelectedTab(isAnimated: Bool? = nil) {
     collectionView.reloadData()
 
     guard let tabManager = tabManager, let selectedTabIndex = selectedTabIndexPath else {
       return
     }
+
+    var scrollTabsBarAnimated = !tabManager.isRestoring
+
+    if let isAnimated = isAnimated {
+      scrollTabsBarAnimated = isAnimated
+    }
 
     if selectedTabIndex.row < tabList.count() {
       collectionView.selectItem(
         at: selectedTabIndex,
-        animated: (!tabManager.isRestoring),
+        animated: scrollTabsBarAnimated,
         scrollPosition: .centeredHorizontally)
     }
   }