show correct tab and ensure keyboard shown on launch is supported

duckduckgo · Mar 20, 2024 · 1953f3d · 1953f3d
1 parent d9c9a43
commit 1953f3d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/DuckDuckGo/AppDelegate.swift b/DuckDuckGo/AppDelegate.swift
@@ -600,7 +600,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     private func showKeyboardOnLaunch() {
         guard KeyboardSettings().onAppLaunch && showKeyboardIfSettingOn && shouldShowKeyboardOnLaunch() else { return }
-        self.mainViewController?.enterSearch()
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+            self.mainViewController?.enterSearch()
+        }
         showKeyboardIfSettingOn = false
     }
 

diff --git a/DuckDuckGo/MainViewController.swift b/DuckDuckGo/MainViewController.swift
@@ -304,8 +304,8 @@ class MainViewController: UIViewController {
 
         startOnboardingFlowIfNotSeenBefore()
         tabsBarController?.refresh(tabsModel: tabManager.model)
-        swipeTabsCoordinator?.refresh(tabsModel: tabManager.model)
-        
+        swipeTabsCoordinator?.refresh(tabsModel: tabManager.model, scrollToSelected: true)
+
         _ = AppWidthObserver.shared.willResize(toWidth: view.frame.width)
         applyWidth()
 
@@ -1284,7 +1284,7 @@ class MainViewController: UIViewController {
         }
         attachHomeScreen()
         tabsBarController?.refresh(tabsModel: tabManager.model)
-        swipeTabsCoordinator?.refresh(tabsModel: tabManager.model)
+        swipeTabsCoordinator?.refresh(tabsModel: tabManager.model, scrollToSelected: true)
         homeController?.openedAsNewTab(allowingKeyboard: allowingKeyboard)
     }
 

diff --git a/DuckDuckGo/SwipeTabsCoordinator.swift b/DuckDuckGo/SwipeTabsCoordinator.swift
@@ -101,8 +101,6 @@ class SwipeTabsCoordinator: NSObject {
     }
 
     private func scrollToCurrent() {
-        guard isEnabled else { return }
-
         let targetOffset = collectionView.frame.width * CGFloat(tabsModel.currentIndex)
 
         guard targetOffset != collectionView.contentOffset.x else {