Skip to content

Fixes #5099 - Preserve filename on FileDialog table navigation #5408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tig merged 3 commits into from
May 25, 2026
Merged

Fixes #5099 - Preserve filename on FileDialog table navigation #5408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b5500b
Initial plan
Copilot May 25, 2026
0900583
Fix FileDialog preserve filename on table enter
Copilot May 25, 2026
b7f9561
Fix test: set AllowedTypes before EndInit runs
tig May 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Terminal.Gui/Views/FileDialogs/FileDialog.TableView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ private bool TableView_KeyDown (Key keyEvent)
// BUGBUG: See https://github.com/gui-cs/Terminal.Gui/issues/5087#issuecomment-4328093883
private void TableViewOnValueChanged (object? sender, ValueChangedEventArgs<TableSelection?> e)
{
if (!_tableView.HasFocus || _tableView.Value is null || _tableView.Table?.Rows == 0)
if (_pushingState || !_tableView.HasFocus || _tableView.Value is null || _tableView.Table?.Rows == 0)
{
return;
}
Expand Down
46 changes: 46 additions & 0 deletions Tests/IntegrationTests/FluentTests/FileDialogTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,4 +409,50 @@ public void SaveFileDialog_TableView_UpDown_PreserveFilenameOnDirectoryChanges_T

c.Stop ();
}

[Theory]
[MemberData (nameof (GetAllDriverNames))]
public void SaveFileDialog_TableView_EnterOnDirectory_PreserveFilenameOnDirectoryChanges_True (string d)
{
// Copilot
SaveDialog? sd = null;
MockFileSystem? fs = null;

using AppTestHelper c = With.A (() =>
{
IRunnable r = NewSaveDialog (out sd, out fs);
sd.Style.PreserveFilenameOnDirectoryChanges = true;
sd.AllowedTypes = [new AllowedType ("C# File", ".cs")];

return r;
}, 100, 20, d)
.Then (_ =>
{
sd!.Path = fs!.Path.Combine (GetFileSystemRoot (fs), "hello.cs");
})
.ScreenShot ("Save dialog with filename", _out)
.Focus<TableView> (_ => true)
.KeyDown (Key.CursorDown)
.ScreenShot ("After selecting logs directory", _out)
.KeyDown (Key.Enter)
.ScreenShot ("After entering logs directory", _out)
.Then (_ =>
{
Assert.True (sd!.IsRunning);
Assert.True (sd.Canceled);
Assert.Contains ("logs", sd.Path);
Assert.EndsWith ("hello.cs", sd.Path);
})
.KeyDown (Key.Enter)
.ScreenShot ("After entering parent directory row", _out)
.Then (_ =>
{
Assert.True (sd!.IsRunning);
Assert.True (sd.Canceled);
Assert.DoesNotContain ("logs", sd.Path);
Assert.EndsWith ("hello.cs", sd.Path);
});

c.Stop ();
}
}
Loading