Update focused cell after a cell has been deleted with keyboard short…

…cut (mac), closes #2345

src/ui/osx/TogglDesktop/TimeEntryListViewController.m

@@ -203,7 +203,7 @@ - (void)displayTimeEntryList:(DisplayCommand *)cmd
 			[viewitems addObject:it];
 		}
 	}
-
+	NSInteger i = [self.timeEntriesTableView selectedRow];
 	[self.timeEntriesTableView reloadData];
 	if (cmd.open)
 	{
@@ -235,6 +235,18 @@ - (void)displayTimeEntryList:(DisplayCommand *)cmd
 		}
 		[self.timeEntriesTableView scrollPoint:scrollOrigin];
 	}
+
+	// If row was focused before reload we restore that state
+	NSIndexSet *indexSet = [NSIndexSet indexSetWithIndex:i];
+
+	[self.timeEntriesTableView selectRowIndexes:indexSet byExtendingSelection:NO];
+	TimeEntryCell *cell = [self getSelectedEntryCell:i];
+	if (cell != nil)
+	{
+		[self clearLastSelectedEntry];
+		[cell setFocused];
+		[self.timeEntriesTableView scrollRowToVisible:self.lastSelectedRowIndex];
+	}
 }
 
 - (void)resetEditPopover:(NSNotification *)notification

src/ui/osx/TogglDesktop/test2/NSUnstripedTableView.m

@@ -98,6 +98,7 @@ - (void)deleteEntry
 		if (cell.confrimless_delete)
 		{
 			toggl_delete_time_entry(ctx, [cell.GUID UTF8String]);
+			[self setFirstRowAsSelected];
 			return;
 		}
 		NSString *msg = [NSString stringWithFormat:@"Delete time entry \"%@\"?", cell.descriptionTextField.stringValue];
@@ -116,6 +117,25 @@ - (void)deleteEntry
 		NSLog(@"Deleting time entry %@", cell.GUID);
 
 		toggl_delete_time_entry(ctx, [cell.GUID UTF8String]);
+		[self setFirstRowAsSelected];
+	}
+}
+
+- (void)setFirstRowAsSelected
+{
+	[self deselectAll:nil];
+	if (self.latestSelectedRow > 0)
+	{
+		self.latestSelectedRow -= 1;
+	}
+
+	NSIndexSet *indexSet = [NSIndexSet indexSetWithIndex:self.latestSelectedRow];
+	[self selectRowIndexes:indexSet byExtendingSelection:NO];
+
+	TimeEntryCell *cell = [self getSelectedEntryCell];
+	if (cell != nil)
+	{
+		[cell setFocused];
 	}
 }