A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Started to add Settings tool
Etienne Baudoux7030ca85dbc5
diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIButton.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIButton.csindex 2defb027d..ca269b381 100644--- a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIButton.cs+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIButton.cs@@ -10,6 +10,11 @@ public interface IUIButton : IUIElement/// </summary>bool IsAccent { get; }+ /// <summary>+ /// Gets whether the button appearance should be a hyperlink.+ /// </summary>+ bool IsHyperlink { get; }+/// <summary>/// Gets the text to display in the button./// </summary>@@ -35,6 +40,7 @@ public interface IUIButton : IUIElementinternal sealed class UIButton : UIElement, IUIButton{private bool _isAccent;+ private bool _isHyperlink;private string? _text;internal UIButton(string? id)@@ -45,7 +51,27 @@ internal sealed class UIButton : UIElement, IUIButtonpublic bool IsAccent{get => _isAccent;- internal set => SetPropertyValue(ref _isAccent, value, IsAccentChanged);+ internal set+ {+ if (_isAccent != value)+ {+ SetPropertyValue(ref _isAccent, value, IsAccentChanged);+ IsHyperlink = false;+ }+ }+ }++ public bool IsHyperlink+ {+ get => _isHyperlink;+ internal set+ {+ if (_isHyperlink != value)+ {+ SetPropertyValue(ref _isHyperlink, value, IsAccentChanged);+ IsAccent = false;+ }+ }}public string? Text@@ -59,6 +85,8 @@ internal sealed class UIButton : UIElement, IUIButtonpublic event EventHandler? TextChanged;public event EventHandler? IsAccentChanged;++ public event EventHandler? IsHyperlinkChanged;}public static partial class GUI@@ -117,6 +145,15 @@ public static partial class GUIreturn element;}+ /// <summary>+ /// Sets the button to appear as a hyperlink.+ /// </summary>+ public static IUIButton HyperlinkAppearance(this IUIButton element)+ {+ ((UIButton)element).IsHyperlink = true;+ return element;+ }+/// <summary>/// Sets the button to appear as neutral./// </summary>diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUISetting.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUISetting.csindex 58c075acd..1e5dd0f47 100644--- a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUISetting.cs+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUISetting.cs@@ -160,12 +160,9 @@ public static partial class GUI/// <param name="settingDefinition">The definition of the setting to associate to this <see cref="IUISetting"/>.</param>/// <param name="onOptionSelected">(optional) A method to invoke when the setting value changed.</param>/// <param name="dropDownListItems">(optional) A list of items to be displayed in the drop down list. <see cref="IUIDropDownListItem.Value"/> should be of type <typeparamref name="T"/>.</param>- public static IUISetting Handle<T>(this IUISetting element, ISettingsProvider settingsProvider, SettingDefinition<T> settingDefinition, Func<T, ValueTask>? onOptionSelected, params IUIDropDownListItem[] dropDownListItems) where T : struct, IConvertible+ public static IUISetting Handle<T>(this IUISetting element, ISettingsProvider settingsProvider, SettingDefinition<T> settingDefinition, Func<T, ValueTask>? onOptionSelected, params IUIDropDownListItem[] dropDownListItems){- if (!typeof(T).IsEnum)- {- ThrowHelper.ThrowArgumentException($"{nameof(T)} must be an enumerated type.");- }+ bool typeIsEnum = typeof(T).IsEnum;var settingElement = (UISetting)element;@@ -175,7 +172,23 @@ public static partial class GUIT currentSettingValue = settingsProvider.GetSetting(settingDefinition);- dropDownList.Select(dropDownList.Items?.FirstOrDefault(i => i.Value is T e && e.ToInt32(null) == currentSettingValue.ToInt32(null)));+ dropDownList.Select(+ dropDownList.Items?.FirstOrDefault((IUIDropDownListItem item) =>+ {+ if (item.Value is null)+ {+ if (currentSettingValue is null)+ {+ return true;+ }++ return false;+ }++ Guard.IsOfType<T>(item.Value);++ return item.Value.Equals(currentSettingValue);+ }));dropDownList.OnItemSelected((IUIDropDownListItem? item) =>{diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/UIToolView.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/UIToolView.csindex 1936e7677..f90e93b6a 100644--- a/src/app/dev/DevToys.Api/Tool/GUI/Components/UIToolView.cs+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/UIToolView.cs@@ -23,8 +23,6 @@ public class UIToolView : INotifyPropertyChanged/// </summary>public IUIElement RootElement { get; }- public event EventHandler? IsScrollableChanged;-public event PropertyChangedEventHandler? PropertyChanged;protected void SetPropertyValue<T>(diff --git a/src/app/dev/DevToys.Blazor/Assets/samples/json-sample.json b/src/app/dev/DevToys.Blazor/Assets/samples/json-sample.jsonnew file mode 100644index 000000000..6f0b909a5--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Assets/samples/json-sample.json@@ -0,0 +1,5 @@+{+ "name": "John",+ "age": 30,+ "car": null+}\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.Designer.cs b/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.Designer.csindex d31e2f7f5..374eb9723 100644--- a/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.Designer.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.Designer.cs@@ -69,6 +69,69 @@ namespace DevToys.Blazor.BuiltInTools.Settings {}}+ /// <summary>+ /// Looks up a localized string similar to Appearance.+ /// </summary>+ internal static string Appearance {+ get {+ return ResourceManager.GetString("Appearance", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to App theme.+ /// </summary>+ internal static string AppTheme {+ get {+ return ResourceManager.GetString("AppTheme", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Select which app theme to display.+ /// </summary>+ internal static string AppThemeDescription {+ get {+ return ResourceManager.GetString("AppThemeDescription", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Behaviors.+ /// </summary>+ internal static string Behaviors {+ get {+ return ResourceManager.GetString("Behaviors", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Compact spacing.+ /// </summary>+ internal static string CompactMode {+ get {+ return ResourceManager.GetString("CompactMode", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Decrease space between UI elements.+ /// </summary>+ internal static string CompactModeDescription {+ get {+ return ResourceManager.GetString("CompactModeDescription", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Dark.+ /// </summary>+ internal static string Dark {+ get {+ return ResourceManager.GetString("Dark", resourceCulture);+ }+ }+/// <summary>/// Looks up a localized string similar to Same as the system./// </summary>@@ -87,6 +150,51 @@ namespace DevToys.Blazor.BuiltInTools.Settings {}}+ /// <summary>+ /// Looks up a localized string similar to Font.+ /// </summary>+ internal static string Font {+ get {+ return ResourceManager.GetString("Font", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Help us translating DevToys!.+ /// </summary>+ internal static string HelpTranslating {+ get {+ return ResourceManager.GetString("HelpTranslating", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Language.+ /// </summary>+ internal static string Language {+ get {+ return ResourceManager.GetString("Language", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to The app needs to be restarted when selecting another language.+ /// </summary>+ internal static string LanguageDescription {+ get {+ return ResourceManager.GetString("LanguageDescription", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Light.+ /// </summary>+ internal static string Light {+ get {+ return ResourceManager.GetString("Light", resourceCulture);+ }+ }+/// <summary>/// Looks up a localized string similar to Settings./// </summary>@@ -95,5 +203,59 @@ namespace DevToys.Blazor.BuiltInTools.Settings {return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);}}++ /// <summary>+ /// Looks up a localized string similar to Smart detection.+ /// </summary>+ internal static string SmartDetection {+ get {+ return ResourceManager.GetString("SmartDetection", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Automatically detect the best tool based on the clipboard content.+ /// </summary>+ internal static string SmartDetectionDescription {+ get {+ return ResourceManager.GetString("SmartDetectionDescription", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Automatically paste the clipboard content when selecting a recommended tool.+ /// </summary>+ internal static string SmartDetectionPaste {+ get {+ return ResourceManager.GetString("SmartDetectionPaste", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Text editor.+ /// </summary>+ internal static string TextEditor {+ get {+ return ResourceManager.GetString("TextEditor", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Preview.+ /// </summary>+ internal static string TextEditorPreview {+ get {+ return ResourceManager.GetString("TextEditorPreview", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Use system settings.+ /// </summary>+ internal static string UseSystemSettings {+ get {+ return ResourceManager.GetString("UseSystemSettings", resourceCulture);+ }+ }}}diff --git a/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.resx b/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.resxindex 2178b290c..8b42af460 100644--- a/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.resx+++ b/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.resx@@ -120,13 +120,67 @@<data name="AccessibleName" xml:space="preserve"><value>Settings</value></data>+ <data name="Appearance" xml:space="preserve">+ <value>Appearance</value>+ </data>+ <data name="AppTheme" xml:space="preserve">+ <value>App theme</value>+ </data>+ <data name="AppThemeDescription" xml:space="preserve">+ <value>Select which app theme to display</value>+ </data>+ <data name="Behaviors" xml:space="preserve">+ <value>Behaviors</value>+ </data>+ <data name="CompactMode" xml:space="preserve">+ <value>Compact spacing</value>+ </data>+ <data name="CompactModeDescription" xml:space="preserve">+ <value>Decrease space between UI elements</value>+ </data>+ <data name="Dark" xml:space="preserve">+ <value>Dark</value>+ </data><data name="DefaultLanguage" xml:space="preserve"><value>Same as the system</value></data><data name="Description" xml:space="preserve"><value>Customize DevToys look & feel</value></data>+ <data name="Font" xml:space="preserve">+ <value>Font</value>+ </data>+ <data name="HelpTranslating" xml:space="preserve">+ <value>Help us translating DevToys!</value>+ </data>+ <data name="Language" xml:space="preserve">+ <value>Language</value>+ </data>+ <data name="LanguageDescription" xml:space="preserve">+ <value>The app needs to be restarted when selecting another language</value>+ </data>+ <data name="Light" xml:space="preserve">+ <value>Light</value>+ </data><data name="ShortDisplayTitle" xml:space="preserve"><value>Settings</value></data>+ <data name="SmartDetection" xml:space="preserve">+ <value>Smart detection</value>+ </data>+ <data name="SmartDetectionDescription" xml:space="preserve">+ <value>Automatically detect the best tool based on the clipboard content</value>+ </data>+ <data name="SmartDetectionPaste" xml:space="preserve">+ <value>Automatically paste the clipboard content when selecting a recommended tool</value>+ </data>+ <data name="TextEditor" xml:space="preserve">+ <value>Text editor</value>+ </data>+ <data name="TextEditorPreview" xml:space="preserve">+ <value>Preview</value>+ </data>+ <data name="UseSystemSettings" xml:space="preserve">+ <value>Use system settings</value>+ </data></root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/SettingsGuiTool.cs b/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/SettingsGuiTool.csindex e7df96d4c..7f2c939d9 100644--- a/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/SettingsGuiTool.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/SettingsGuiTool.cs@@ -1,4 +1,6 @@-using DevToys.Core.Settings;+using System.Reflection;+using DevToys.Blazor.Core.Languages;+using DevToys.Core.Settings;namespace DevToys.Blazor.BuiltInTools.Settings;@@ -18,58 +20,205 @@ namespace DevToys.Blazor.BuiltInTools.Settings;[NoCompactOverlaySupport]internal sealed class SettingsGuiTool : IGuiTool{-#pragma warning disable IDE0044 // Add readonly modifier- [Import]- private ISettingsProvider _settingsProvider = null!;-#pragma warning restore IDE0044 // Add readonly modifier-- /// <summary>- /// Dummy setting- /// </summary>- public static readonly SettingDefinition<bool> DummySetting- = new(name: nameof(DummySetting), defaultValue: true);-- /// <summary>- /// Dummy setting- /// </summary>- public static readonly SettingDefinition<AvailableApplicationTheme> DummySetting2- = new(name: nameof(DummySetting2), defaultValue: AvailableApplicationTheme.Default);+ private readonly ISettingsProvider _settingsProvider;+ private readonly IFontProvider _fontProvider;+ private readonly IUIDropDownListItem[] _availableLanguages;+ private readonly IUIDropDownListItem _currentLanguage;+ private readonly IUIDropDownListItem[] _availableFonts;+ private readonly IUISetting _smartDetectionAutomaticallyPasteSetting = Setting("smart-detection-automatically-paste-setting");+ private readonly string _previewJsonText;++ [ImportingConstructor]+ public SettingsGuiTool(ISettingsProvider settingsProvider, IFontProvider fontProvider)+ {+ _settingsProvider = settingsProvider;+ _fontProvider = fontProvider;++ // Load available languages and current language.+ (IUIDropDownListItem[] availableLanguagesItems, IUIDropDownListItem currentLanguageItem) = LoadLanguages();+ _currentLanguage = currentLanguageItem;+ _availableLanguages = availableLanguagesItems;++ // Load available fonts+ _availableFonts = LoadAvailableFonts();++ // Load sample JSON.+ _previewJsonText = LoadPreviewJsonText();+ }public UIToolView View=> new(Stack()- .Vertical()- .WithChildren(- SettingGroup()- .Icon("FluentSystemIcons", '\uF6A9')- .Title("Title")- .Description("Description")- .Handle(- _settingsProvider,- DummySetting2,- onOptionSelected: null,- Item("Use system settings", AvailableApplicationTheme.Default),- Item("Light", AvailableApplicationTheme.Light),- Item("Dark", AvailableApplicationTheme.Dark))- .WithSettings(- Setting()- .Title("Compact mode")- .Handle(_settingsProvider, PredefinedSettings.CompactMode),- Setting()- .Title("Line numbers")- .Handle(_settingsProvider, PredefinedSettings.TextEditorLineNumbers),- Setting()- .Title("Title")- .Description("Description")- .InteractiveElement(- Switch()),- Setting()- .Title("Title")- .Description("Description")- .InteractiveElement(- Switch()))));+ .Vertical()+ .LargeSpacing()+ .WithChildren(++ // Appearance settings+ Stack()+ .Vertical()+ .WithChildren(++ Label().Text(Settings.Appearance),+ Setting("language-setting")+ .Icon("FluentSystemIcons", '\uF4F2')+ .Title(Settings.Language)+ .Description(Settings.LanguageDescription)+ .InteractiveElement(++ Stack()+ .Horizontal()+ .WithChildren(++ Button("help-translate-devtoys")+ .HyperlinkAppearance()+ .Text(Settings.HelpTranslating)+ .OnClick(OnHelpTranslatingButtonClickAsync),++ SelectDropDownList("language-select-drop-down-list")+ .WithItems(_availableLanguages)+ .Select(_currentLanguage)+ .OnItemSelected(OnLanguageSelectedAsync))),++ Setting("app-theme-setting")+ .Icon("FluentSystemIcons", '\uF591')+ .Title(Settings.AppTheme)+ .Description(Settings.AppThemeDescription)+ .Handle(+ _settingsProvider,+ PredefinedSettings.Theme,+ onOptionSelected: null,+ Item(Settings.UseSystemSettings, AvailableApplicationTheme.Default),+ Item(Settings.Light, AvailableApplicationTheme.Light),+ Item(Settings.Dark, AvailableApplicationTheme.Dark)),++ Setting("compact-mode-setting")+ .Icon("FluentSystemIcons", '\uE0DC')+ .Title(Settings.CompactMode)+ .Description(Settings.CompactModeDescription)+ .Handle(+ _settingsProvider,+ PredefinedSettings.CompactMode)),++ // Behavior settings+ Stack()+ .Vertical()+ .WithChildren(++ Label().Text(Settings.Behaviors),+ SettingGroup("smart-detection-settings")+ .Icon("FluentSystemIcons", '\uF4D5')+ .Title(Settings.SmartDetection)+ .Description(Settings.SmartDetectionDescription)+ .Handle(_settingsProvider, PredefinedSettings.SmartDetection, OnSmartDetectionOptionChangedAsync)+ .WithSettings(++ _smartDetectionAutomaticallyPasteSetting+ .Title(Settings.SmartDetectionPaste)+ .Handle(_settingsProvider, PredefinedSettings.SmartDetectionPaste))),++ // Text Editor settings+ Stack()+ .Vertical()+ .WithChildren(++ Label().Text(Settings.TextEditor),+ Setting("text-editor-font-settings")+ .Icon("FluentSystemIcons", '\uF7E3')+ .Title(Settings.Font)+ .Handle(+ _settingsProvider,+ PredefinedSettings.TextEditorFont,+ onOptionSelected: null,+ dropDownListItems: _availableFonts),++ MultilineTextInput("text-editor-render-preview")+ .Title(Settings.TextEditorPreview)+ .AlignVertically(UIVerticalAlignment.Top)+ .ReadOnly()+ .Language("json")+ .Text(_previewJsonText))));public void OnDataReceived(string dataTypeName, object? parsedData){}++ private ValueTask OnHelpTranslatingButtonClickAsync()+ {+ Shell.OpenUrlInWebBrowser("https://crowdin.com/project/devtoys");+ return ValueTask.CompletedTask;+ }++ private ValueTask OnLanguageSelectedAsync(IUIDropDownListItem? selectedItem)+ {+ if (selectedItem is not null && selectedItem.Value is LanguageDefinition languageDefinition)+ {+ _settingsProvider.SetSetting(PredefinedSettings.Language, languageDefinition.InternalName);+ }+ return ValueTask.CompletedTask;+ }++ private ValueTask OnSmartDetectionOptionChangedAsync(bool enabled)+ {+ if (enabled)+ {+ _smartDetectionAutomaticallyPasteSetting.Enable();+ }+ else+ {+ _smartDetectionAutomaticallyPasteSetting.Disable();+ }++ return ValueTask.CompletedTask;+ }++ private IUIDropDownListItem[] LoadAvailableFonts()+ {+ string[] systemFontFamilies = _fontProvider.GetFontFamilies();+ var availableFonts = new IUIDropDownListItem[systemFontFamilies.Length];++ for (int i = 0; i < systemFontFamilies.Length; i++)+ {+ string fontName = systemFontFamilies[i];+ availableFonts[i]+ = Item(+ fontName,+ fontName);+ }++ return availableFonts;+ }++ private (IUIDropDownListItem[] availableLanguagesItems, IUIDropDownListItem currentLanguageItem) LoadLanguages()+ {+ string currentLanguage = _settingsProvider.GetSetting(PredefinedSettings.Language);+ var availableLanguagesItems = new IUIDropDownListItem[LanguageManager.Instance.AvailableLanguages.Count];+ IUIDropDownListItem currentLanguageItem = default!;++ for (int i = 0; i < LanguageManager.Instance.AvailableLanguages.Count; i++)+ {+ LanguageDefinition languageDefinition = LanguageManager.Instance.AvailableLanguages[i];+ availableLanguagesItems[i]+ = Item(+ languageDefinition.DisplayName,+ languageDefinition);++ if (languageDefinition.InternalName == currentLanguage)+ {+ currentLanguageItem = availableLanguagesItems[i];+ }+ }++ Guard.IsNotNull(currentLanguageItem);+ return (availableLanguagesItems, currentLanguageItem);+ }++ private static string LoadPreviewJsonText()+ {+ var assembly = Assembly.GetExecutingAssembly();+ string resourceName = "DevToys.Blazor.Assets.samples.json-sample.json";++ using Stream stream = assembly.GetManifestResourceStream(resourceName)!;+ using var reader = new StreamReader(stream);+ return reader.ReadToEnd();+ }}diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/ComboBox/ComboBox.razor b/src/app/dev/DevToys.Blazor/Components/BasicInput/ComboBox/ComboBox.razorindex 2daf03f39..f012956f7 100644--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/ComboBox/ComboBox.razor+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/ComboBox/ComboBox.razor@@ -52,7 +52,8 @@<FocusTrapper Style="display: contents;"OnEscapeKeyPressed="OnEscapeKeyPressed"@onfocusout="OnEscapeKeyPressed">- <ScrollViewer Orientation="UIOrientation.Vertical"+ <ScrollViewer @ref="_scrollViewer"+ Orientation="UIOrientation.Vertical"IsEnabled="@IsActuallyEnabled"Class="@FinalCssClasses"Style="@Style"@@ -96,17 +97,20 @@{RenderItem = (item) => __builder =>{- @if (!OverrideDefaultItemTemplate)+ bool isSelected = object.ReferenceEquals(item, SelectedItem);+ if (!OverrideDefaultItemTemplate){<ListBoxItem OnSelected="OnItemClick"- IsSelected="object.ReferenceEquals(item, SelectedItem)"- Item="item">+ IsSelected="isSelected"+ Item="item"+ id="@(isSelected ? SelectedItemId : string.Empty)">@ItemTemplate(item)</ListBoxItem>}else{- <div class="@((object.ReferenceEquals(item, SelectedItem) ? "selected" : string.Empty))"+ <div class="@((isSelected ? "selected" : string.Empty))"+ id="@(isSelected ? SelectedItemId : string.Empty)"@onclick="@(() => OnItemClick(item))">@ItemTemplate(item)</div>diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/ComboBox/ComboBox.razor.cs b/src/app/dev/DevToys.Blazor/Components/BasicInput/ComboBox/ComboBox.razor.csindex eae89c2a8..7a74a77f2 100644--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/ComboBox/ComboBox.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/ComboBox/ComboBox.razor.cs@@ -7,8 +7,11 @@ public partial class ComboBox<TElement> : SelectBase<TElement> where TElement :{private bool _isOpen;private ElementReference? _listBox;+ private ScrollViewer? _scrollViewer;private Button? _button;+ protected string SelectedItemId => Id + "-selectedItem";+public ComboBox(){RaiseSelectionEventOnKeyboardNavigation = false;@@ -54,6 +57,16 @@ public partial class ComboBox<TElement> : SelectBase<TElement> where TElement :ContextMenuService.CloseContextMenuRequested += ContextMenuService_CloseContextMenuRequested;_isOpen = true;StateHasChanged();++ Task.Delay(200)+ .ContinueWith(t =>+ {+ InvokeAsync(async () =>+ {+ Guard.IsNotNull(_scrollViewer);+ await _scrollViewer.ScrollToAsync(SelectedItemId);+ });+ });}}diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor b/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razorindex 276550766..783cb2105 100644--- a/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor@@ -47,7 +47,7 @@@if (Control is not null){- <div class="card-control">+ <div class="card-control @(IsChildOfExpander ? "child-of-expander" : string.Empty)"><StackPanel VerticalAlignment="UIVerticalAlignment.Center" HorizontalAlignment="UIHorizontalAlignment.Stretch">@Control</StackPanel>diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor.cs b/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor.csindex 95c74b70a..e33a5d0f0 100644--- a/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor.cs@@ -16,5 +16,10 @@ public partial class Card : StyledComponentBase[Parameter]public RenderFragment? Control { get; set; }++ [CascadingParameter]+ protected Expander? ParentExpander { get; set; }++ protected bool IsChildOfExpander => ParentExpander is not null;}diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor.scss b/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor.scssindex d3d46aaf6..379ca79ef 100644--- a/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor.scss+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor.scss@@ -37,6 +37,10 @@.card-control {display: inline-flex;gap: 16px;++ &.child-of-expander {+ margin-right: calc(32px + 4px);+ }}}diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor b/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razorindex e386e730d..4f4f88e6c 100644--- a/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor@@ -37,7 +37,9 @@</Card><div class="expander-content-anchor" aria-expanded="@IsExpanded.ToString().ToLower()"><div class="expander-content">- @(ChildContent)+ <CascadingValue Value="this" IsFixed="true">+ @(ChildContent)+ </CascadingValue></div></div></Container>diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor.scss b/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor.scssindex b46dbf2f9..8c5a90623 100644--- a/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor.scss+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor.scss@@ -76,3 +76,14 @@}}}++// Compact mode+div[data-compactmode] {+ .expander {+ .expander-content-anchor {+ .expander-content{+ min-height: 48px;+ }+ }+ }+}diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/Grid/Grid.razor.cs b/src/app/dev/DevToys.Blazor/Components/Layout/Grid/Grid.razor.csindex 7315bf45f..44868373d 100644--- a/src/app/dev/DevToys.Blazor/Components/Layout/Grid/Grid.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Grid/Grid.razor.cs@@ -10,8 +10,9 @@ public partial class Grid : StyledComponentBase.AddStyle("grid-template-columns", GetGridTemplate(Columns)).AddStyle("grid-template-rows", GetGridTemplate(Rows)).AddStyle("gap", $"{RowSpacing.ToPx()} {ColumnSpacing.ToPx()}")- .AddImportantStyle("height", "inherit")- .AddImportantStyle("width", "inherit")+ .AddImportantStyle("height", "inherit", VerticalAlignment == UIVerticalAlignment.Stretch)+ .AddImportantStyle("height", "fit-content", VerticalAlignment != UIVerticalAlignment.Stretch)+ .AddImportantStyle("width", "inherit", HorizontalAlignment == UIHorizontalAlignment.Stretch).AddStyle(Style).Build();diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razor b/src/app/dev/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razorindex 301798f69..134b8cee2 100644--- a/src/app/dev/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razor+++ b/src/app/dev/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razor@@ -1,5 +1,5 @@@namespace DevToys.Blazor.Components-@inherits StyledComponentBase+@inherits JSStyledComponentBase<CascadingValue Name="ParentIsEnabled" Value="@IsActuallyEnabled"><Container HorizontalAlignment="@HorizontalAlignment"@@ -16,7 +16,7 @@PaddingBottom="@PaddingBottom"IsEnabled="@IsActuallyEnabled"IsVisible="@IsVisible">- <div id=@Id+ <div id="@Id"class="scroll-viewer @(FinalCssClasses)"style="@(Style)"@ref=Elementdiff --git a/src/app/dev/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razor.cs b/src/app/dev/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razor.csindex 1aa047e11..0fd6a82c1 100644--- a/src/app/dev/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razor.cs@@ -1,7 +1,9 @@namespace DevToys.Blazor.Components;-public partial class ScrollViewer : StyledComponentBase+public partial class ScrollViewer : JSStyledComponentBase{+ protected override string? JavaScriptFile => "./_content/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razor.js";+/// <summary>/// Gets or set the orientation in which the content can be scrolled./// </summary>@@ -96,4 +98,14 @@ public partial class ScrollViewer : StyledComponentBasebase.OnParametersSet();}++ public async Task ScrollToAsync(string elementId)+ {+ Guard.IsNotNullOrWhiteSpace(elementId);++ using (await Semaphore.WaitAsync(CancellationToken.None))+ {+ await (await JSModule).InvokeVoidWithErrorHandlingAsync("scrollToElement", Element, elementId);+ }+ }}diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razor.js b/src/app/dev/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razor.jsnew file mode 100644index 000000000..e1bce1414--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razor.js@@ -0,0 +1,9 @@+export function scrollToElement(scrollViewer, elementToScrollToId) {+ const elementToScrollTo = document.getElementById(elementToScrollToId);+ if (elementToScrollTo != null) {+ const absoluteElementTop = elementToScrollTo.offsetTop - scrollViewer.offsetTop;+ const middle = absoluteElementTop - (scrollViewer.offsetHeight / 2);+ scrollViewer.scrollTop = middle;+ }+}+//# sourceMappingURL=ScrollViewer.razor.js.map\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razor.ts b/src/app/dev/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razor.tsnew file mode 100644index 000000000..33afb5f0f--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razor.ts@@ -0,0 +1,9 @@+export function scrollToElement(scrollViewer: HTMLElement, elementToScrollToId: string): void {+ const elementToScrollTo = document.getElementById(elementToScrollToId);++ if (elementToScrollTo != null) {+ const absoluteElementTop = elementToScrollTo.offsetTop - scrollViewer.offsetTop;+ const middle = absoluteElementTop - (scrollViewer.offsetHeight / 2);+ scrollViewer.scrollTop = middle;+ }+}\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor.cs b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor.csindex 6bf90f507..cbe2ea648 100644--- a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor.cs@@ -1,4 +1,5 @@using DevToys.Blazor.Components.Monaco.Editor;+using DevToys.Core.Settings;namespace DevToys.Blazor.Components;@@ -27,6 +28,9 @@ public partial class MonacoEditor : RicherMonacoEditorBase[Import]internal IThemeListener ThemeListener { get; set; } = default!;+ [Import]+ internal ISettingsProvider SettingsProvider { get; set; } = default!;+[Parameter]public string? Header { get; set; }@@ -40,6 +44,7 @@ public partial class MonacoEditor : RicherMonacoEditorBasebase.OnInitialized();ThemeListener.ThemeChanged += ThemeListener_ThemeChanged;+ SettingsProvider.SettingChanged += SettingsProvider_SettingChanged;_oldIsActuallyEnabled = IsActuallyEnabled;}@@ -71,6 +76,9 @@ public partial class MonacoEditor : RicherMonacoEditorBaseoptions.BracketPairColorization = new BracketPairColorizationOptions { Enabled = true };options.RenderLineHighlightOnlyWhenFocus = true;+ // Apply global user settings+ options.FontFamily = SettingsProvider.GetSetting(PredefinedSettings.TextEditorFont);+// Create the editorawait MonacoEditorHelper.CreateMonacoEditorInstanceAsync(JSRuntime, Id, options, null, Reference);}@@ -103,6 +111,10 @@ public partial class MonacoEditor : RicherMonacoEditorBase{ThemeListener.ThemeChanged -= ThemeListener_ThemeChanged;}+ if (SettingsProvider is not null)+ {+ SettingsProvider.SettingChanged -= SettingsProvider_SettingChanged;+ }return base.DisposeAsync();}@@ -118,6 +130,16 @@ public partial class MonacoEditor : RicherMonacoEditorBase}}+ private void SettingsProvider_SettingChanged(object? sender, SettingChangedEventArgs e)+ {+ var options = new EditorUpdateOptions()+ {+ FontFamily = SettingsProvider.GetSetting(PredefinedSettings.TextEditorFont)+ };++ UpdateOptionsAsync(options);+ }+private void ThemeListener_ThemeChanged(object? sender, EventArgs e){var options = new EditorUpdateOptions()diff --git a/src/app/dev/DevToys.Blazor/Components/Text/TextBlock/TextBlock.razor.cs b/src/app/dev/DevToys.Blazor/Components/Text/TextBlock/TextBlock.razor.csindex 28ab90d4e..848eaf900 100644--- a/src/app/dev/DevToys.Blazor/Components/Text/TextBlock/TextBlock.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/Text/TextBlock/TextBlock.razor.cs@@ -42,7 +42,7 @@ public class TextBlock : StyledComponentBase.AddClass("no-wrap", NoWrap).AddClass("trim", CanTrim).AddClass("hide", !IsVisible)- .AddClass("disabled", !IsEnabled) // Don't use IsActuallyEnabled+ .AddClass("disabled", !IsActuallyEnabled).AddClass("horizontal-center", HorizontalAlignment == UIHorizontalAlignment.Center).AddClass(FinalCssClasses).Build();diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIButtonPresenter.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UIButtonPresenter.razorindex 014e1b7d0..60039e78d 100644--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UIButtonPresenter.razor+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIButtonPresenter.razor@@ -7,7 +7,7 @@IsEnabled="@UIButton.IsEnabled"HorizontalAlignment="@UIButton.HorizontalAlignment"VerticalAlignment="@UIButton.VerticalAlignment"- Appearance="@((UIButton.IsAccent ? ButtonAppearance.Accent : ButtonAppearance.Neutral))"+ Appearance="@((UIButton.IsAccent ? ButtonAppearance.Accent : UIButton.IsHyperlink ? ButtonAppearance.Hyperlink : ButtonAppearance.Neutral))"@onclick=OnButtonClickAsync><TextBlock Text="@UIButton?.Text" NoWrap="true" /></Button>\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIMultiLineTextInputPresenter.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UIMultiLineTextInputPresenter.razorindex 170f957f2..6d1368809 100644--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UIMultiLineTextInputPresenter.razor+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIMultiLineTextInputPresenter.razor@@ -6,6 +6,8 @@UITextInput="@UIMultiLineTextInput"IsExtendableToFullScreen="@UIMultiLineTextInput.IsExtendableToFullScreen"><MonacoEditor @ref="_monacoEditor"+ VerticalAlignment="@UIMultiLineTextInput.VerticalAlignment"+ HorizontalAlignment="@UIMultiLineTextInput.HorizontalAlignment"IsVisible="@UIMultiLineTextInput.IsVisible"IsEnabled="@(UIMultiLineTextInput.IsEnabled && IsActuallyEnabled)"ConstructionOptions="@OnMonacoConstructionOptions"diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UISelectDropDownListPresenter.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UISelectDropDownListPresenter.razorindex de65fb1cc..be8c94f6a 100644--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UISelectDropDownListPresenter.razor+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UISelectDropDownListPresenter.razor@@ -10,6 +10,7 @@Header="@UISelectDropDownList.Title"@bind-SelectedIndex="@SelectedIndex"Items="@UISelectDropDownList.Items"+ Virtualize="false"Context="item"><ItemTemplate><TextBlock Text="@item.Text" NoWrap="true" />diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UISelectDropDownListPresenter.razor.cs b/src/app/dev/DevToys.Blazor/Components/UIElements/UISelectDropDownListPresenter.razor.csindex 565d9e1a0..1b70dc8ad 100644--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UISelectDropDownListPresenter.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UISelectDropDownListPresenter.razor.cs@@ -14,6 +14,7 @@ public partial class UISelectDropDownListPresenter : ComponentBase, IDisposable{base.OnInitialized();UISelectDropDownList.SelectedItemChanged += UISelectDropDownList_SelectedItemChanged;+ UISelectDropDownList_SelectedItemChanged(this, EventArgs.Empty);}protected override void OnParametersSet()diff --git a/src/app/dev/DevToys.Blazor/Core/Helpers/Shell.cs b/src/app/dev/DevToys.Blazor/Core/Helpers/Shell.csnew file mode 100644index 000000000..f52b9507c--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Core/Helpers/Shell.cs@@ -0,0 +1,37 @@+using System.Runtime.InteropServices;++namespace DevToys.Blazor.Core.Helpers;++internal static class Shell+{+ internal static void OpenUrlInWebBrowser(string url)+ {+ Guard.IsNotNullOrWhiteSpace(url);++ try+ {+ Process.Start(url);+ }+ catch+ {+ // hack because of this: https://github.com/dotnet/corefx/issues/10361+ if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))+ {+ url = url.Replace("&", "^&");+ Process.Start(new ProcessStartInfo(url) { UseShellExecute = true });+ }+ else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))+ {+ Process.Start("xdg-open", url);+ }+ else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))+ {+ Process.Start("open", url);+ }+ else+ {+ throw;+ }+ }+ }+}diff --git a/src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj b/src/app/dev/DevToys.Blazor/DevToys.Blazor.csprojindex f6169c904..bb5a5a460 100644--- a/src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj+++ b/src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj@@ -40,11 +40,16 @@<TypeScriptCompile Remove="wwwroot\lib\monaco-editor\**\*.*" /></ItemGroup>+ <ItemGroup>+ <Content Remove="Assets\samples\json-sample.json" />+ </ItemGroup>+<ItemGroup><EmbeddedResource Include="Assets\fonts\FluentSystemIcons-Regular.ttf"><ExcludeFromSingleFile>true</ExcludeFromSingleFile><CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory></EmbeddedResource>+ <EmbeddedResource Include="Assets\samples\json-sample.json" /><EmbeddedResource Update="BuiltInTools\Settings\Settings.resx"><LastGenOutput>Settings.Designer.cs</LastGenOutput><Generator>ResXFileCodeGenerator</Generator>diff --git a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolGroup.razor.cs b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolGroup.razor.csindex b081b430b..5a09fdd1e 100644--- a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolGroup.razor.cs+++ b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolGroup.razor.cs@@ -37,31 +37,6 @@ public partial class ToolGroup : MefComponentBaseprivate void OnSuggestToolIdeaClick(){- string url = "https://github.com/veler/DevToys/issues/new/choose";- try- {- Process.Start(url);- }- catch- {- // hack because of this: https://github.com/dotnet/corefx/issues/10361- if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))- {- url = url.Replace("&", "^&");- Process.Start(new ProcessStartInfo(url) { UseShellExecute = true });- }- else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))- {- Process.Start("xdg-open", url);- }- else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))- {- Process.Start("open", url);- }- else- {- throw;- }- }+ Shell.OpenUrlInWebBrowser("https://github.com/veler/DevToys/issues/new/choose");}}diff --git a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razorindex bb111af0c..05854b63d 100644--- a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor+++ b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor@@ -50,7 +50,7 @@<GridCell Row="1" ColumnSpan="2"><FullScreenContainer IsInFullScreenModeChanged="@OnIsInFullScreenModeChanged">- @if (ViewModel.ToolView.RootElement is not null)+ @if (ViewModel.ToolView is not null && ViewModel.ToolView.RootElement is not null){<UIElementPresenter UIElement="@ViewModel.ToolView.RootElement" />}diff --git a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor.cs b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor.csindex cc2644b21..bbc1d9c9d 100644--- a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor.cs+++ b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor.cs@@ -34,14 +34,20 @@ public partial class ToolPage : MefComponentBase, IDisposableif (GuiToolViewItem is not null){ViewModel.Load(GuiToolViewItem);- ViewModel.ToolView.PropertyChanged -= ToolView_PropertyChanged;- ViewModel.ToolView.PropertyChanged += ToolView_PropertyChanged;+ if (ViewModel.ToolView is not null)+ {+ ViewModel.ToolView.PropertyChanged -= ToolView_PropertyChanged;+ ViewModel.ToolView.PropertyChanged += ToolView_PropertyChanged;+ }}}public void Dispose(){- ViewModel.ToolView.PropertyChanged -= ToolView_PropertyChanged;+ if (ViewModel.ToolView is not null)+ {+ ViewModel.ToolView.PropertyChanged -= ToolView_PropertyChanged;+ }GC.SuppressFinalize(this);}diff --git a/src/app/dev/DevToys.Business/ViewModels/MainWindowViewModel.cs b/src/app/dev/DevToys.Business/ViewModels/MainWindowViewModel.csindex dea4674f9..7e3c2c763 100644--- a/src/app/dev/DevToys.Business/ViewModels/MainWindowViewModel.cs+++ b/src/app/dev/DevToys.Business/ViewModels/MainWindowViewModel.cs@@ -4,6 +4,7 @@ using CommunityToolkit.Mvvm.Input;using CommunityToolkit.Mvvm.Messaging;using DevToys.Api;using DevToys.Core.Models;+using DevToys.Core.Settings;using DevToys.Core.Tools;using DevToys.Core.Tools.ViewItems;using DevToys.Localization.Strings.MainWindow;@@ -203,7 +204,7 @@ internal sealed partial class MainWindowViewModel : ObservableRecipient/// </summary>internal async Task RunSmartDetectionAsync(bool isInCompactOverlayMode){- if (isInCompactOverlayMode || !_settingsProvider.GetSetting(DevToys.Core.Settings.PredefinedSettings.SmartDetection))+ if (isInCompactOverlayMode || !_settingsProvider.GetSetting(PredefinedSettings.SmartDetection)){return;}@@ -248,19 +249,23 @@ internal sealed partial class MainWindowViewModel : ObservableRecipient}}- // If one unique tool got found- // And that the current selected menu item is a group, or that the user didn't selected another menu item since the smart detection started- if (detectedTools.Count == 1 && (SelectedMenuItem == selectedMenuBeforeSmartDetection || SelectedMenuItem is GroupViewItem && firstToolViewItem is not null))+ // If user's setting allow us to jump to a tool automatically and paste the data automatically+ if (_settingsProvider.GetSetting(PredefinedSettings.SmartDetectionPaste)){- // Then let's navigate immediately to it and set the detected data as an input.- SelectedMenuItem = firstToolViewItem;- detectedTools[0].ToolInstance.PassSmartDetectedData(detectedTools[0].DataTypeName, detectedTools[0].ParsedData);- }- else if (detectedTools.Count > 1)- {- // Next time user navigates to a tool, if this one has been detected by Smart Detection,- // we will pass data to it.- _passSmartDetectedDataToNextSelectedToolIsAllowed = true;+ // If one unique tool got found+ // And that the current selected menu item is a group, or that the user didn't selected another menu item since the smart detection started+ if (detectedTools.Count == 1 && (SelectedMenuItem == selectedMenuBeforeSmartDetection || SelectedMenuItem is GroupViewItem && firstToolViewItem is not null))+ {+ // Then let's navigate immediately to it and set the detected data as an input.+ SelectedMenuItem = firstToolViewItem;+ detectedTools[0].ToolInstance.PassSmartDetectedData(detectedTools[0].DataTypeName, detectedTools[0].ParsedData);+ }+ else if (detectedTools.Count > 1)+ {+ // Next time user navigates to a tool, if this one has been detected by Smart Detection,+ // we will pass data to it.+ _passSmartDetectedDataToNextSelectedToolIsAllowed = true;+ }}_oldSmartDetectedTools = detectedTools;diff --git a/src/app/dev/DevToys.Core/Settings/PredefinedSettings.cs b/src/app/dev/DevToys.Core/Settings/PredefinedSettings.csindex 646706a4f..2eb9e05ed 100644--- a/src/app/dev/DevToys.Core/Settings/PredefinedSettings.cs+++ b/src/app/dev/DevToys.Core/Settings/PredefinedSettings.cs@@ -79,6 +79,15 @@ public static class PredefinedSettings= new(name: nameof(SmartDetection),defaultValue: true);++ /// <summary>+ /// Whether the application should automatically paste the content of the clipboard when selecting a tool that has been automatically recommended by Smart Detection.+ /// </summary>+ public static readonly SettingDefinition<bool> SmartDetectionPaste+ = new(+ name: nameof(SmartDetectionPaste),+ defaultValue: true);+/// <summary>/// Whether the compact mode is enabled or not./// </summary>diff --git a/src/app/dev/DevToys.Tools/SmartDetection/JsonDataTypeDetector.cs b/src/app/dev/DevToys.Tools/SmartDetection/JsonDataTypeDetector.csindex 07600066d..daacb2c9e 100644--- a/src/app/dev/DevToys.Tools/SmartDetection/JsonDataTypeDetector.cs+++ b/src/app/dev/DevToys.Tools/SmartDetection/JsonDataTypeDetector.cs@@ -25,10 +25,16 @@ internal sealed partial class JsonDataTypeDetector : IDataTypeDetector{try{- var jsonNode = JsonNode.Parse(dataString);- if (jsonNode is not null)+ var options = new JsonDocumentOptions{- return ValueTask.FromResult(new DataDetectionResult(Success: true, Data: new Tuple<JsonNode, string>(jsonNode, dataString)));+ CommentHandling = JsonCommentHandling.Skip,+ AllowTrailingCommas = true,+ MaxDepth = int.MaxValue+ };+ var jsonDocument = JsonDocument.Parse(dataString, options);+ if (jsonDocument is not null)+ {+ return ValueTask.FromResult(new DataDetectionResult(Success: true, Data: new Tuple<JsonDocument, string>(jsonDocument, dataString)));}}catch (JsonException)diff --git a/src/app/dev/DevToys.Tools/Tools/Sample/SampleToolFactory.cs b/src/app/dev/DevToys.Tools/Tools/Sample/SampleToolFactory.csindex 7e447e6ff..89b0f886b 100644--- a/src/app/dev/DevToys.Tools/Tools/Sample/SampleToolFactory.cs+++ b/src/app/dev/DevToys.Tools/Tools/Sample/SampleToolFactory.cs@@ -1,4 +1,5 @@-using System.Text.Json.Nodes;+using System.Text.Json;+using System.Text.Json.Nodes;using Microsoft.Extensions.Logging;namespace DevToys.Tools.Tools.Sample;@@ -113,7 +114,7 @@ internal sealed class SampleGuiTool : IGuiToolpublic void OnDataReceived(string dataTypeName, object? parsedData){- if (dataTypeName == PredefinedCommonDataTypeNames.Json && parsedData is Tuple<JsonNode, string> strongTypedParsedData)+ if (dataTypeName == PredefinedCommonDataTypeNames.Json && parsedData is Tuple<JsonDocument, string> strongTypedParsedData){//_editor.Text(strongTypedParsedData.Item2);//_editor.Highlight(new TextSpan(3, 6));diff --git a/src/app/dev/DevToys.Tools/Tools/Test/TestGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Test/TestGuiTool.csindex 2bc51094e..b3e226fdf 100644--- a/src/app/dev/DevToys.Tools/Tools/Test/TestGuiTool.cs+++ b/src/app/dev/DevToys.Tools/Tools/Test/TestGuiTool.cs@@ -1,4 +1,5 @@#if DEBUG+using System.Text.Json;using System.Text.Json.Nodes;namespace DevToys.Tools.Tools.Test;@@ -199,7 +200,7 @@ internal sealed class TestGuiTool : IGuiTool// Smart detection handler.public void OnDataReceived(string dataTypeName, object? parsedData){- if (dataTypeName == PredefinedCommonDataTypeNames.Json && parsedData is Tuple<JsonNode, string> strongTypedParsedData)+ if (dataTypeName == PredefinedCommonDataTypeNames.Json && parsedData is Tuple<JsonDocument, string> strongTypedParsedData){// Pass the JSON from Smart Detection into the Input text editor._inputJsonEditor.Text(strongTypedParsedData.Item2);diff --git a/src/app/tests/DevToys.UnitTests/Mocks/Tools/MockDataTypeDetector.cs b/src/app/tests/DevToys.UnitTests/Mocks/Tools/MockDataTypeDetector.csindex 8df04ac03..8954588ea 100644--- a/src/app/tests/DevToys.UnitTests/Mocks/Tools/MockDataTypeDetector.cs+++ b/src/app/tests/DevToys.UnitTests/Mocks/Tools/MockDataTypeDetector.cs@@ -1,5 +1,5 @@using System.ComponentModel.Composition;-using System.Text.Json.Nodes;+using System.Text.Json;using System.Threading;using System.Threading.Tasks;@@ -17,10 +17,16 @@ internal class MockJsonDataTypeDetector : IDataTypeDetector{try{- var jtoken = JsonNode.Parse(dataString);- if (jtoken is not null)+ var options = new JsonDocumentOptions{- return ValueTask.FromResult(new DataDetectionResult(Success: true, Data: new Tuple<JsonNode, string>(jtoken, dataString)));+ CommentHandling = JsonCommentHandling.Allow,+ AllowTrailingCommas = true,+ MaxDepth = int.MaxValue+ };+ var jsonDocument = JsonDocument.Parse(dataString, options);+ if (jsonDocument is not null)+ {+ return ValueTask.FromResult(new DataDetectionResult(Success: true, Data: new Tuple<JsonDocument, string>(jsonDocument, dataString)));}}catch