handle new tab / home screen transition

duckduckgo · Jan 31, 2024 · cc424da · cc424da
1 parent 804e6dc
commit cc424da
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/DuckDuckGo/SwipeTabsCoordinator.swift b/DuckDuckGo/SwipeTabsCoordinator.swift
@@ -174,19 +174,17 @@ extension SwipeTabsCoordinator: UICollectionViewDelegate {
         let modifier = (offset > 0 ? -1 : 1)
         let nextIndex = tabsModel.currentIndex + modifier
         print("***", #function, "nextIndex", nextIndex)
-        guard tabsModel.tabs.indices.contains(nextIndex) else {
-            print("***", #function, "invalid index", nextIndex)
-            return
-        }
 
         let targetFrame = CGRect(origin: .zero, size: coordinator.contentContainer.frame.size)
 
-        let tab = tabsModel.get(tabAt: nextIndex)
-        if let image = tabPreviewsSource.preview(for: tab) {
+        let tab = tabsModel.safeGetTabAt(nextIndex)
+        if let tab, let image = tabPreviewsSource.preview(for: tab) {
             print("***", #function, "image preview")
             createPreviewFromImage(image)
-        } else if tab.link == nil {
-            print("***", #function, "home screen preview")
+        } else if tab?.link == nil {
+            // either the tab or link is nil - either way transition to the home screen
+            // TODO handle favorites
+            print("***", #function, "new tab home screen preview")
             createPreviewFromLogoContainerWithSize(targetFrame.size)
         } else {
             print("***", #function, "no preview found")
@@ -389,3 +387,12 @@ class OmniBarCell: UICollectionViewCell {
     }
 
 }
+
+extension TabsModel {
+
+    func safeGetTabAt(_ index: Int) -> Tab? {
+        guard tabs.indices.contains(index) else { return nil }
+        return tabs[index]
+    }
+
+}