Skip to content

Code Quality: Fixed two way binding for filter header #17400

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
merged 1 commit into from
Aug 4, 2025
+14 −21
Merged

Code Quality: Fixed two way binding for filter header #17400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions src/Files.App/ViewModels/ShellViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,18 @@ public void UpdateEmptyTextType()
public string? FilesAndFoldersFilter
{
get => _filesAndFoldersFilter;
set => SetProperty(ref _filesAndFoldersFilter, value);
set
{
if (SetProperty(ref _filesAndFoldersFilter, value))
{
FilesAndFolderFilterUpdated();
}
}
}

private void FilesAndFolderFilterUpdated()
{
_ = ApplyFilesAndFoldersChangesAsync();
}


Expand Down Expand Up @@ -1867,7 +1878,6 @@ await Task.Run(async () =>
});

filesAndFolders.AddRange(fileList);
FilesAndFoldersFilter = null;

await OrderFilesAndFoldersAsync();
await ApplyFilesAndFoldersChangesAsync();
Expand All @@ -1876,6 +1886,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(() =>
{
GetDesktopIniFileData();
CheckForBackgroundImage();
FilesAndFoldersFilter = null;
},
Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);
});
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/Views/Shells/ModernShellPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
VerticalAlignment="Center"
PlaceholderText="{helpers:ResourceString Name=Filename}"
PreviewKeyDown="FilterTextBox_PreviewKeyDown"
TextChanged="FilterTextBox_TextChanged" />
Text="{x:Bind ShellViewModel.FilesAndFoldersFilter, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
</Grid>

Expand Down
18 changes: 0 additions & 18 deletions src/Files.App/Views/Shells/ModernShellPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ public ModernShellPage() : base(new CurrentInstanceViewModel())
ShellViewModel.PageTypeUpdated += FilesystemViewModel_PageTypeUpdated;
ShellViewModel.OnSelectionRequestedEvent += FilesystemViewModel_OnSelectionRequestedEvent;
ShellViewModel.GitDirectoryUpdated += FilesystemViewModel_GitDirectoryUpdated;
ShellViewModel.DirectoryInfoUpdated += ShellViewModel_DirectoryInfoUpdated;
ShellViewModel.FocusFilterHeader += ShellViewModel_FocusFilterHeader;

ToolbarViewModel.PathControlDisplayText = Strings.Home.GetLocalizedResource();
Expand All @@ -63,13 +62,6 @@ private async void ShellViewModel_FocusFilterHeader(object sender, EventArgs e)
FilterTextBox.Focus(FocusState.Programmatic);
}

private void ShellViewModel_DirectoryInfoUpdated(object sender, EventArgs e)
{
// Regular binding causes issues when refreshing the directory so we set the text manually
if (FilterTextBox?.IsLoaded ?? false)
FilterTextBox.Text = ShellViewModel.FilesAndFoldersFilter ?? string.Empty;
}

private void ModernShellPage_RefreshWidgetsRequested(object sender, EventArgs e)
{
if (ItemDisplayFrame?.Content is HomePage currentPage)
Expand Down Expand Up @@ -342,16 +334,6 @@ public override void NavigateToPath(string? navigationPath, Type? sourcePageType
ToolbarViewModel.PathControlDisplayText = ShellViewModel.WorkingDirectory;
}

private async void FilterTextBox_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
{
if (args.Reason is AutoSuggestionBoxTextChangeReason.UserInput)
{
ShellViewModel.FilesAndFoldersFilter = sender.Text;
await ShellViewModel.ApplyFilesAndFoldersChangesAsync();
}

}

private void FilterTextBox_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
{
if (e.Key is VirtualKey.Escape &&
Expand Down
Loading