Fix #736: When selecting a tab, deselect other ones. (#4432)

brave · Nov 2, 2021 · af10b16 · af10b16
1 parent 4451fa2
commit af10b16
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/Client/Frontend/Browser/TabManager.swift b/Client/Frontend/Browser/TabManager.swift
@@ -269,6 +269,10 @@ class TabManager: NSObject {
             log.error("Expected tab (\(String(describing: tab?.url))) is not selected. Selected index: \(selectedIndex)")
             return
         }
+
+        if let tabId = tab?.id {
+            TabMO.selectTabAndDeselectOthers(selectedTabId: tabId)
+        }
 
         UIImpactFeedbackGenerator(style: .light).bzzt()
         selectedTab?.createWebview()

diff --git a/Data/models/TabMO.swift b/Data/models/TabMO.swift
@@ -135,6 +135,20 @@ public final class TabMO: NSManagedObject, CRUD {
         }
 
     }
+
+    public class func selectTabAndDeselectOthers(selectedTabId: String) {
+        DataController.perform { context in
+            guard let tabToUpdate = getInternal(fromId: selectedTabId, context: context) else { return }
+
+            let predicate = NSPredicate(format: "isSelected == true")
+            all(where: predicate, context: context)?
+                .forEach {
+                    $0.isSelected = false
+                }
+
+            tabToUpdate.isSelected = true
+        }
+    }
 
     // Deletes the Tab History by removing items except the last one from historysnapshot and setting current index
     public class func removeHistory(with tabID: String) {