adde re-selection of groups when exiting search.

cathyjf · Nov 14, 2022 · 59f4fd0 · 59f4fd0
1 parent 289a27c
commit 59f4fd0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/MacPass/MPDocument+Search.m b/MacPass/MPDocument+Search.m
@@ -50,7 +50,6 @@ - (void)enterSearchWithContext:(MPEntrySearchContext *)context {
   [NSNotificationCenter.defaultCenter postNotificationName:MPDocumentDidEnterSearchNotification object:self];
   [self updateSearch:self];
   /* clear selection */
-  self.selectedGroups = nil;
   self.selectedEntries = nil;
 }
 

diff --git a/MacPass/MPOutlineViewController.m b/MacPass/MPOutlineViewController.m
@@ -46,6 +46,7 @@
 
 @interface MPOutlineViewController () {
   BOOL _bindingEstablished;
+  NSIndexSet *_storedSelectionIndexSet;
   MPOutlineContextMenuDelegate *_menuDelegate;
 
 }
@@ -100,7 +101,6 @@ - (void)viewDidLoad {
                                              name:MPDidActivateViewNotification
                                            object:self.outlineView];
 
-
   NSView *clipView = self.outlineView.enclosingScrollView.contentView;
   [NSNotificationCenter.defaultCenter addObserver:self
                                          selector:@selector(_outlineDidScroll:)
@@ -226,6 +226,8 @@ - (void)setDatabaseNameWrapper:(NSString *)databaseNameWrapper {
 - (void)registerNotificationsForDocument:(MPDocument *)document {
   [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(_didAddGroup:) name:MPDocumentDidAddGroupNotification object:document];
   [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(_didRevertDocument:) name:MPDocumentDidRevertNotification object:document];
+  [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(_didEnterSearch:) name:MPDocumentDidEnterSearchNotification object:document];
+  [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(_didExitSearch:) name:MPDocumentDidExitSearchNotification object:document];
 }
 
 - (void)clearSelection {
@@ -273,6 +275,16 @@ - (void)_didRevertDocument:(NSNotification *)notification {
   [self clearSelection];
 }
 
+- (void)_didEnterSearch:(NSNotification *)notification {
+  // store seelection
+  _storedSelectionIndexSet = self.outlineView.selectedRowIndexes;
+  [self clearSelection];
+}
+
+- (void)_didExitSearch:(NSNotification *)notification {
+  [self.outlineView selectRowIndexes:_storedSelectionIndexSet byExtendingSelection:NO];
+}
+
 - (id)itemUnderMouse {
   NSPoint mouseLocation = [self.outlineView.window mouseLocationOutsideOfEventStream];
   NSPoint localPoint = [self.outlineView convertPoint:mouseLocation fromView:self.outlineView.window.contentView];