Merge pull request #5542 from NicolasPerrenoud/fix_table_scroll_reset

Fix table scroll reset

Author: andydotxyz

widget/table.go

@@ -266,7 +266,7 @@ func (t *Table) Select(id TableCellID) {
 	}
 
 	rows, cols := t.Length()
-	if id.Row >= rows || id.Col >= cols {
+	if id.Row < 0 || id.Row >= rows || id.Col < 0 || id.Col >= cols {
 		return
 	}
 
@@ -277,6 +277,7 @@ func (t *Table) Select(id TableCellID) {
 		f(*t.selectedCell)
 	}
 	t.selectedCell = &id
+	t.currentFocus = id
 
 	t.ScrollTo(id)
 
@@ -589,11 +590,11 @@ func (t *Table) Tapped(e *fyne.PointEvent) {
 	}
 
 	col := t.columnAt(e.Position)
-	if col == noCellMatch {
+	if col == noCellMatch || col < 0 {
 		return // out of col range
 	}
 	row := t.rowAt(e.Position)
-	if row == noCellMatch {
+	if row == noCellMatch || row < 0 {
 		return // out of row range
 	}
 	t.Select(TableCellID{row, col})
@@ -604,7 +605,6 @@ func (t *Table) Tapped(e *fyne.PointEvent) {
 		if canvas != nil {
 			canvas.Focus(t)
 		}
-		t.currentFocus = TableCellID{row, col}
 		t.RefreshItem(t.currentFocus)
 	}
 }

widget/table_internal_test.go

@@ -143,6 +143,10 @@ func TestTable_Focus(t *testing.T) {
 
 	canvas.Focused().TypedKey(&fyne.KeyEvent{Name: fyne.KeySpace})
 	assert.Equal(t, &TableCellID{0, 0}, table.selectedCell)
+
+	table.Select(TableCellID{Row: 1, Col: 1})
+	assert.Equal(t, &TableCellID{1, 1}, table.selectedCell)
+	assert.Equal(t, TableCellID{1, 1}, table.currentFocus)
 }
 
 func TestTable_Headers(t *testing.T) {
@@ -729,6 +733,18 @@ func TestTable_Select(t *testing.T) {
 	assert.Equal(t, 3, selectedCol)
 	assert.Equal(t, 4, selectedRow)
 	test.AssertRendersToMarkup(t, "table/selected_scrolled.xml", w.Canvas())
+
+	table.Select(TableCellID{1, -1})
+	assert.Equal(t, 3, table.selectedCell.Col)
+	assert.Equal(t, 4, table.selectedCell.Row)
+	assert.Equal(t, 3, selectedCol)
+	assert.Equal(t, 4, selectedRow)
+
+	table.Select(TableCellID{-1, -1})
+	assert.Equal(t, 3, table.selectedCell.Col)
+	assert.Equal(t, 4, table.selectedCell.Row)
+	assert.Equal(t, 3, selectedCol)
+	assert.Equal(t, 4, selectedRow)
 }
 
 func TestTable_SetColumnWidth(t *testing.T) {