Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 22 additions & 6 deletions src/settings-ui/Settings.UI/Services/NavigationService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

using System;

using ManagedCommon;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media.Animation;
Expand Down Expand Up @@ -57,13 +58,21 @@ public static bool Navigate(Type pageType, object parameter = null, NavigationTr
// Don't open the same page multiple times
if (Frame.Content?.GetType() != pageType || (parameter != null && !parameter.Equals(lastParamUsed)))
{
var navigationResult = Frame.Navigate(pageType, parameter, infoOverride);
if (navigationResult)
try
{
lastParamUsed = parameter;
}
var navigationResult = Frame.Navigate(pageType, parameter, infoOverride);
if (navigationResult)
{
lastParamUsed = parameter;
}

return navigationResult;
return navigationResult;
}
catch (Exception ex)
{
Logger.LogError($"Navigation to {pageType?.Name} failed with exception", ex);
return false;
}
}
else
{
Expand Down Expand Up @@ -101,7 +110,14 @@ internal static void EnsurePageIsSelected(Type pageType)
{
if (Frame.Content == null)
{
Frame.Navigate(pageType);
try
{
Frame.Navigate(pageType);
}
catch (Exception ex)
{
Logger.LogError($"EnsurePageIsSelected failed for {pageType?.Name}", ex);
}
}
}
}
Expand Down
41 changes: 24 additions & 17 deletions src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -599,27 +599,34 @@ private List<SuggestionItem> BuildSuggestionItems(string query, List<SettingEntr

private async void SearchBox_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
{
// If a suggestion is selected, navigate directly
if (args.ChosenSuggestion is SuggestionItem chosen)
try
{
NavigateFromSuggestion(chosen);
return;
}
// If a suggestion is selected, navigate directly
if (args.ChosenSuggestion is SuggestionItem chosen)
{
NavigateFromSuggestion(chosen);
return;
}

var queryText = (args.QueryText ?? _lastQueryText)?.Trim();
if (string.IsNullOrWhiteSpace(queryText))
{
NavigationService.Navigate<DashboardPage>();
return;
}
var queryText = (args.QueryText ?? _lastQueryText)?.Trim();
if (string.IsNullOrWhiteSpace(queryText))
{
NavigationService.Navigate<DashboardPage>();
return;
}

// Prefer cached results (from live search); if empty, perform a fresh search
var matched = _lastSearchResults?.Count > 0 && string.Equals(_lastQueryText, queryText, StringComparison.Ordinal)
? _lastSearchResults
: await Task.Run(() => SearchIndexService.Search(queryText));
// Prefer cached results (from live search); if empty, perform a fresh search
var matched = _lastSearchResults?.Count > 0 && string.Equals(_lastQueryText, queryText, StringComparison.Ordinal)
? _lastSearchResults
: await Task.Run(() => SearchIndexService.Search(queryText));

var searchParams = new SearchResultsNavigationParams(queryText, matched);
NavigationService.Navigate<SearchResultsPage>(searchParams);
var searchParams = new SearchResultsNavigationParams(queryText, matched);
NavigationService.Navigate<SearchResultsPage>(searchParams);
}
catch (Exception ex)
{
Logger.LogError("Search query submission failed", ex);
}
}

public void Dispose()
Expand Down
4 changes: 3 additions & 1 deletion src/settings-ui/Settings.UI/ViewModels/ShellViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using System.Threading.Tasks;
using System.Windows.Input;

using ManagedCommon;
using Microsoft.PowerToys.Settings.UI.Helpers;
using Microsoft.PowerToys.Settings.UI.Library;
using Microsoft.PowerToys.Settings.UI.Library.Helpers;
Expand Down Expand Up @@ -135,7 +136,8 @@ private void OnBackRequested(NavigationView sender, NavigationViewBackRequestedE

private void Frame_NavigationFailed(object sender, NavigationFailedEventArgs e)
{
throw e.Exception;
e.Handled = true;
Logger.LogError($"Failed to load page '{e.SourcePageType?.FullName}'", e.Exception);
}

private void Frame_Navigated(object sender, NavigationEventArgs e)
Expand Down
Loading