A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
[DevToys 2.0] Added UISingleLineTextInputPresenter, UIMultiLineTextInputPresenter and UIDiffTextInputPresenter (#870)
Etienne BAUDOUXfe9713c8d3f5
diff --git a/src/app/dev/DevToys.Api/Core/IFileStorage.cs b/src/app/dev/DevToys.Api/Core/IFileStorage.csindex 2064b9bcf..89d6d1739 100644--- a/src/app/dev/DevToys.Api/Core/IFileStorage.cs+++ b/src/app/dev/DevToys.Api/Core/IFileStorage.cs@@ -16,8 +16,15 @@ public interface IFileStorage/// Prompt the user to select a location to save a file, and decide of the file name./// </summary>/// <param name="fileTypes">The list of file types the user can choose. For example, ".txt". Use "*" for any file type.</param>- /// <returns>If succeeded, returns the file path selected by the user, otherwise, returns null.</returns>- ValueTask<string?> PickSaveFileAsync(string[] fileTypes);+ /// <returns>If succeeded, returns a write-only stream corresponding to the file the user selected, otherwise, returns null.</returns>+ ValueTask<Stream?> PickSaveFileAsync(string[] fileTypes);++ /// <summary>+ /// Prompt the user to select a file to open.+ /// </summary>+ /// <param name="fileTypes">The list of file types the user can choose. For example, ".txt". Use "*" for any file type.</param>+ /// <returns>If succeeded, returns a read-only stream corresponding to the file the user selected, otherwise, returns null.</returns>+ ValueTask<Stream?> PickOpenFileAsync(string[] fileTypes);/// <summary>/// Determines whether the file indicated by the given <paramref name="relativeOrAbsoluteFilePath"/> exists.diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIDiffTextInput.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIDiffTextInput.csindex 3bb847c7e..d5642a561 100644--- a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIDiffTextInput.cs+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIDiffTextInput.cs@@ -2,14 +2,21 @@/// <summary>/// A component that can be used to display side by side or inlined texts and highlight differences between them.-/// This component is powered by Monaco Editor./// </summary>public interface IUIDiffTextInput : IUISingleLineTextInput{/// <summary>- /// Gets the text displayed to the right of the diff view.+ /// Gets the original text displayed to the left of the diff view./// </summary>- string RightText { get; }+ /// <remarks>+ /// This is the same value than <see cref="IUISingleLineTextInput.Text"/>.+ /// </remarks>+ string OriginalText { get; }++ /// <summary>+ /// Gets the modified text displayed to the right of the diff view.+ /// </summary>+ string ModifiedText { get; }/// <summary>/// Gets whether the text diff control should show differences side by side or inlined.@@ -17,12 +24,107 @@ public interface IUIDiffTextInput : IUISingleLineTextInputbool InlineMode { get; }/// <summary>- /// Raised when <see cref="RightText"/> is changed.+ /// Raised when <see cref="ModifiedText"/> is changed./// </summary>- event EventHandler? RightTextChanged;+ event EventHandler? ModifiedTextChanged;/// <summary>/// Raised when <see cref="InlineMode"/> is changed./// </summary>event EventHandler? InlineModeChanged;}++[DebuggerDisplay($"Id = {{{nameof(Id)}}}, Text = {{{nameof(Text)}}}")]+internal class UIDiffTextInput : UISingleLineTextInput, IUIDiffTextInput+{+ private bool _inline;+ private string? _modifiedText;++ internal UIDiffTextInput(string? id)+ : base(id)+ {+ }++ public string OriginalText+ {+ get => Text;+ set => Text = value;+ }++ public string ModifiedText+ {+ get => _modifiedText ?? string.Empty;+ internal set => SetPropertyValue(ref _modifiedText, value, ModifiedTextChanged);+ }++ public bool InlineMode+ {+ get => _inline;+ internal set => SetPropertyValue(ref _inline, value, InlineModeChanged);+ }++ public event EventHandler? ModifiedTextChanged;+ public event EventHandler? InlineModeChanged;+}++public static partial class GUI+{+ /// <summary>+ /// A component that can be used to display side by side or inlined texts and highlight differences between them.+ /// </summary>+ public static IUIDiffTextInput DiffTextInput()+ {+ return DiffTextInput(null);+ }++ /// <summary>+ /// A component that can be used to display side by side or inlined texts and highlight differences between them.+ /// </summary>+ /// <param name="id">An optional unique identifier for this UI element.</param>+ public static IUIDiffTextInput DiffTextInput(string? id)+ {+ return new UIDiffTextInput(id);+ }++ /// <summary>+ /// Sets the unformatted original text of the control to compare with the modified one.+ /// </summary>+ public static T OriginalText<T>(this T element, string text) where T : IUIDiffTextInput+ {+ if (element is UIDiffTextInput strongElement)+ {+ strongElement.OriginalText = text;+ }+ return element;+ }++ /// <summary>+ /// Sets the unformatted modified text of the control to compare with the original one.+ /// </summary>+ public static T ModifiedText<T>(this T element, string text) where T : IUIDiffTextInput+ {+ if (element is UIDiffTextInput strongElement)+ {+ strongElement.ModifiedText = text;+ }+ return element;+ }++ /// <summary>+ /// Sets the <see cref="IUIDiffTextInput.InlineMode"/> to true.+ /// </summary>+ public static IUIDiffTextInput InlineView(this IUIDiffTextInput element)+ {+ ((UIDiffTextInput)element).InlineMode = true;+ return element;+ }++ /// <summary>+ /// Sets the <see cref="IUIDiffTextInput.InlineMode"/> to false.+ /// </summary>+ public static IUIDiffTextInput SplitView(this IUIDiffTextInput element)+ {+ ((UIDiffTextInput)element).InlineMode = false;+ return element;+ }+}diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIMultilineLineTextInput.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIMultiLineTextInput.cssimilarity index 83%rename from src/app/dev/DevToys.Api/Tool/GUI/Components/IUIMultilineLineTextInput.csrename to src/app/dev/DevToys.Api/Tool/GUI/Components/IUIMultiLineTextInput.csindex 6764de64b..53fa1ba01 100644--- a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIMultilineLineTextInput.cs+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIMultiLineTextInput.cs@@ -3,10 +3,7 @@/// <summary>/// A component that can be used to display or edit unformatted text on multiple lines./// </summary>-/// <remarks>-/// This component is powered by Monaco Editor.-/// </remarks>-public interface IUIMultilineLineTextInput : IUISingleLineTextInput+public interface IUIMultiLineTextInput : IUISingleLineTextInput{/// <summary>/// Gets the list of spans to highlight in the text document.@@ -30,7 +27,7 @@ public interface IUIMultilineLineTextInput : IUISingleLineTextInput}[DebuggerDisplay($"Id = {{{nameof(Id)}}}, Text = {{{nameof(Text)}}}")]-internal class UIMultilineTextInput : UISingleLineTextInput, IUIMultilineLineTextInput+internal class UIMultilineTextInput : UISingleLineTextInput, IUIMultiLineTextInput{private IReadOnlyList<TextSpan>? _highlightedSpans;private string? _syntaxColorizationLanguageName;@@ -64,7 +61,7 @@ public static partial class GUI/// <remarks>/// This component is powered by Monaco Editor./// </remarks>- public static IUIMultilineLineTextInput MultilineTextInput()+ public static IUIMultiLineTextInput MultilineTextInput(){return MultilineTextInput(null);}@@ -76,7 +73,7 @@ public static partial class GUI/// This component is powered by Monaco Editor./// </remarks>/// <param name="id">An optional unique identifier for this UI element.</param>- public static IUIMultilineLineTextInput MultilineTextInput(string? id)+ public static IUIMultiLineTextInput MultilineTextInput(string? id){return new UIMultilineTextInput(id);}@@ -89,7 +86,7 @@ public static partial class GUI/// </remarks>/// <param name="id">An optional unique identifier for this UI element.</param>/// <param name="programmingLanguageName">the programming language name to use to colorize the text in the control.</param>- public static IUIMultilineLineTextInput MultilineTextInput(string? id, string programmingLanguageName)+ public static IUIMultiLineTextInput MultilineTextInput(string? id, string programmingLanguageName){return new UIMultilineTextInput(id).Language(programmingLanguageName);}@@ -97,7 +94,7 @@ public static partial class GUI/// <summary>/// Sets the list of spans to highlight in the text document./// </summary>- public static IUIMultilineLineTextInput Highlight(this IUIMultilineLineTextInput element, params TextSpan[] spans)+ public static IUIMultiLineTextInput Highlight(this IUIMultiLineTextInput element, params TextSpan[] spans){((UIMultilineTextInput)element).HighlightedSpans = spans;return element;@@ -106,7 +103,7 @@ public static partial class GUI/// <summary>/// Sets the programming language name to use to colorize the text in the control./// </summary>- public static IUIMultilineLineTextInput Language(this IUIMultilineLineTextInput element, string programmingLanguageName)+ public static IUIMultiLineTextInput Language(this IUIMultiLineTextInput element, string programmingLanguageName){((UIMultilineTextInput)element).SyntaxColorizationLanguageName = programmingLanguageName;return element;diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIWrap.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIWrap.csnew file mode 100644index 000000000..bf7374258--- /dev/null+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIWrap.cs@@ -0,0 +1,112 @@+namespace DevToys.Api;++/// <summary>+/// A component that stacks child elements horizontally and stack them into multiple lines if there's not enough space to keep everything on a single line.+/// </summary>+public interface IUIWrap : IUIElement+{+ /// <summary>+ /// Gets a value that indicates the space between stacked elements.+ /// Default is <see cref="UISpacing.Small"/>.+ /// </summary>+ UISpacing Spacing { get; }++ /// <summary>+ /// Gets the list of child elements.+ /// </summary>+ IUIElement[]? Children { get; }++ /// <summary>+ /// Raised when <see cref="Spacing"/> is changed.+ /// </summary>+ public event EventHandler? SpacingChanged;++ /// <summary>+ /// Raised when <see cref="Children"/> is changed.+ /// </summary>+ public event EventHandler? ChildrenChanged;+}++[DebuggerDisplay($"Id = {{{nameof(Id)}}}")]+internal sealed class UIWrap : UIElement, IUIWrap+{+ private UISpacing _spacing = UISpacing.Small;+ private IUIElement[]? _children;++ internal UIWrap(string? id)+ : base(id)+ {+ }++ public UISpacing Spacing+ {+ get => _spacing;+ internal set => SetPropertyValue(ref _spacing, value, SpacingChanged);+ }++ public IUIElement[]? Children+ {+ get => _children;+ internal set => SetPropertyValue(ref _children, value, ChildrenChanged);+ }++ public event EventHandler? SpacingChanged;++ public event EventHandler? ChildrenChanged;+}++public static partial class GUI+{+ /// <summary>+ /// Create a component that stacks child elements horizontally and stack them into multiple lines if there's not enough space to keep everything on a single line.+ /// </summary>+ public static IUIWrap Wrap()+ {+ return Wrap(null);+ }++ /// <summary>+ /// Create a component that stacks child elements horizontally and stack them into multiple lines if there's not enough space to keep everything on a single line.+ /// </summary>+ /// <param name="id">An optional unique identifier for this UI element.</param>+ public static IUIWrap Wrap(string? id)+ {+ return new UIWrap(id);+ }++ /// <summary>+ /// Set the children to be displayed in the stack.+ /// </summary>+ public static IUIWrap WithChildren(this IUIWrap element, params IUIElement[] children)+ {+ ((UIWrap)element).Children = children;+ return element;+ }++ /// <summary>+ /// Set a small spacing between children.+ /// </summary>+ public static IUIWrap SmallSpacing(this IUIWrap element)+ {+ ((UIWrap)element).Spacing = UISpacing.Small;+ return element;+ }++ /// <summary>+ /// Set a medium spacing between children.+ /// </summary>+ public static IUIWrap MediumSpacing(this IUIWrap element)+ {+ ((UIWrap)element).Spacing = UISpacing.Medium;+ return element;+ }++ /// <summary>+ /// Set a large spacing between children.+ /// </summary>+ public static IUIWrap LargeSpacing(this IUIWrap element)+ {+ ((UIWrap)element).Spacing = UISpacing.Large;+ return element;+ }+}diff --git a/src/app/dev/DevToys.Blazor/Assets/sass/theme/_default.scss b/src/app/dev/DevToys.Blazor/Assets/sass/theme/_default.scssindex f00c0c3ab..a35dc222e 100644--- a/src/app/dev/DevToys.Blazor/Assets/sass/theme/_default.scss+++ b/src/app/dev/DevToys.Blazor/Assets/sass/theme/_default.scss@@ -34,6 +34,9 @@ html, body {--focus-stroke:0 0 0 1px var(--focus-stroke-inner),0 0 0 3px var(--focus-stroke-outer);++ /* Monaco Editor diff view vertical splitter width */+ --vscode-sash-size: 16px;}/* Themes */@@ -54,6 +57,11 @@ div[data-theme='macos-light-theme'] {}div {+ color: currentColor;+}++*, .main-layout {+ /* Default foreground */color: var(--text-fill-color-primary);}@@ -63,6 +71,6 @@ div {.theme-transition *:after {transition-property: color, background-color;transition-timing-function: ease-out;- transition-duration: 200ms;+ transition-duration: 0ms;transition-delay: 0 !important;}\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/Assets/sass/theme/windows/dark.scss b/src/app/dev/DevToys.Blazor/Assets/sass/theme/windows/dark.scssindex e11ed8d9b..5508ba958 100644--- a/src/app/dev/DevToys.Blazor/Assets/sass/theme/windows/dark.scss+++ b/src/app/dev/DevToys.Blazor/Assets/sass/theme/windows/dark.scss@@ -61,6 +61,7 @@--control-stroke-on-accent-secondary: hsla(0, 0%, 0%, 14%);--control-strong-stroke-default: rgba(255, 255, 255, 0.544);--control-strong-stroke-disabled: rgba(255, 255, 255, 0.157);+ --divider-stroke-color-default: rgba(255, 255, 255, 0.082);/* Subtle Fill */--subtle-fill-transparent: transparent;@@ -340,4 +341,8 @@/* UISettingGroup */--ui-setting-group-presenter-inner-ui-setting-background-color: transparent;++ /* UITextInputWrapper */+ --ui-text-input-wrapper-dragging-background-color: var(--control-fill-color-tertiary);+ --ui-text-input-wrapper-dragging-stroke-color: var(--text-fill-color-tertiary);}diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/Button/Button.razor b/src/app/dev/DevToys.Blazor/Components/BasicInput/Button/Button.razorindex 1501a592b..a7de92e40 100644--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/Button/Button.razor+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/Button/Button.razor@@ -22,6 +22,7 @@class="@(FinalCssClasses)"style="@(Style)"tabindex="0"+ title="@ToolTip"@ref=Element@attributes="AdditionalAttributes"@onclick:stopPropagation="@IsActuallyEnabled">diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/Button/Button.razor.cs b/src/app/dev/DevToys.Blazor/Components/BasicInput/Button/Button.razor.csindex 3f0c46948..608f241dc 100644--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/Button/Button.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/Button/Button.razor.cs@@ -1,10 +1,13 @@namespace DevToys.Blazor.Components;-public partial class Button : JSStyledComponentBase+public partial class Button : JSStyledComponentBase, IFocusable{[Parameter]public ButtonAppearance Appearance { get; set; } = ButtonAppearance.Neutral;+ [Parameter]+ public string? ToolTip { get; set; }+/// <summary>/// Gets or sets the content to be rendered inside the component./// </summary>@@ -33,7 +36,7 @@ public partial class Button : JSStyledComponentBasebase.OnParametersSet();}- internal ValueTask<bool> FocusAsync()+ public ValueTask<bool> FocusAsync(){return JSRuntime.InvokeVoidWithErrorHandlingAsync("devtoys.DOM.setFocus", Element);}diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/Button/Button.razor.scss b/src/app/dev/DevToys.Blazor/Components/BasicInput/Button/Button.razor.scssindex b15befc2c..1af1d54d1 100644--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/Button/Button.razor.scss+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/Button/Button.razor.scss@@ -18,6 +18,7 @@ button {transition: 83ms ease background;width: inherit;height: inherit;+ min-width: fit-content;&:focus-visible {box-shadow: var(--focus-stroke);diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/CheckBox/CheckBox.razor.cs b/src/app/dev/DevToys.Blazor/Components/BasicInput/CheckBox/CheckBox.razor.csindex 1fd4904c4..bcf6e6242 100644--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/CheckBox/CheckBox.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/CheckBox/CheckBox.razor.cs@@ -1,6 +1,6 @@namespace DevToys.Blazor.Components;-public partial class CheckBox : JSStyledComponentBase+public partial class CheckBox : JSStyledComponentBase, IFocusable{/// <summary>/// Gets or sets the text to display in the check box.@@ -20,7 +20,7 @@ public partial class CheckBox : JSStyledComponentBase[Parameter]public EventCallback<bool> IsCheckedChanged { get; set; }- internal ValueTask<bool> FocusAsync()+ public ValueTask<bool> FocusAsync(){return JSRuntime.InvokeVoidWithErrorHandlingAsync("devtoys.DOM.setFocus", Element);}diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownList/DropDownList.razor b/src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownButton/DropDownButton.razorsimilarity index 89%rename from src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownList/DropDownList.razorrename to src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownButton/DropDownButton.razorindex e206ca3d4..69d592a96 100644--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownList/DropDownList.razor+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownButton/DropDownButton.razor@@ -1,5 +1,6 @@@namespace DevToys.Blazor.Components@inherits StyledComponentBase+@typeparam TItem<CascadingValue Name="ParentIsEnabled" Value="@IsActuallyEnabled"><CascadingValue Value="this" IsFixed="true">@@ -21,26 +22,30 @@class="drop-down-list-with-header @(FinalCssClasses)"style="@(Style)"@attributes="AdditionalAttributes">-+@if (!string.IsNullOrWhiteSpace(Header)){<TextBlock Appearance="TextBlockAppearance.Body" Class="drop-down-list-header" Text="@Header" />}-+<Button Class="@($"drop-down-list-button {FinalCssClasses}")"HorizontalAlignment="@HorizontalAlignment"Width="@Width"Appearance="ButtonAppearance.Neutral"IsEnabled="@IsActuallyEnabled"+ ToolTip="@ToolTip"@onclick="@ToggleDropDown">@ChildContent- <div class="arrow-down-icon">- <FontIcon Glyph="@('\uf2a6')" Height="12" Width="12" />- </div>-+ @if (DisplayArrow)+ {+ <div class="arrow-down-icon">+ <FontIcon Glyph="@('\uf2a6')" Height="12" Width="12" />+ </div>+ }+<Popover Open="_isOpen"- AnchorOrigin="Origin.BottomCenter"- TransformOrigin="Origin.TopCenter"+ AnchorOrigin="@AnchorOrigin"+ TransformOrigin="@TransformOrigin"RelativeWidth="false"Class="drop-down-list-drop-down"@ontouchend:stopPropagation>@@ -76,7 +81,7 @@</CascadingValue></Popover></Button>-+</div></Container></CascadingValue>diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownList/DropDownList.razor.cs b/src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownButton/DropDownButton.razor.cssimilarity index 67%rename from src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownList/DropDownList.razor.csrename to src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownButton/DropDownButton.razor.csindex 66ee7eb96..ebda24e23 100644--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownList/DropDownList.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownButton/DropDownButton.razor.cs@@ -3,10 +3,10 @@ using Microsoft.AspNetCore.Components.Web;namespace DevToys.Blazor.Components;-public partial class DropDownList : StyledComponentBase+public partial class DropDownButton<TItem> : StyledComponentBase where TItem : DropDownListItem{private bool _isOpen;- private ListBox<DropDownListItem>? _listBox;+ private ListBox<TItem>? _listBox;[Inject]internal ContextMenuService ContextMenuService { get; set; } = default!;@@ -20,11 +20,31 @@ public partial class DropDownList : StyledComponentBase[Parameter]public string? Header { get; set; }+ [Parameter]+ public string? ToolTip { get; set; }++ [Parameter]+ public bool DisplayArrow { get; set; } = true;++ /// <summary>+ /// Set the anchor point on the element of the popover.+ /// The anchor point will determinate where the popover will be placed.+ /// </summary>+ [Parameter]+ public Origin AnchorOrigin { get; set; } = Origin.BottomCenter;++ /// <summary>+ /// Sets the intersection point if the anchor element. At this point the popover will lay above the popover.+ /// This property in conjunction with <see cref="AnchorOrigin"/> determinate where the popover will be placed.+ /// </summary>+ [Parameter]+ public Origin TransformOrigin { get; set; } = Origin.TopCenter;+/// <summary>/// Gets or sets the menu items to display in the drop down list./// </summary>[Parameter]- public ICollection<DropDownListItem>? Items { get; set; }+ public ICollection<TItem>? Items { get; set; }protected override async Task OnAfterRenderAsync(bool firstRender){@@ -84,7 +104,7 @@ public partial class DropDownList : StyledComponentBaseif (_listBox is not null && _listBox.SelectedItem is not null && _listBox.SelectedItem.IsEnabled){CloseDropDown(null);- _listBox.SelectedItem.OnClick.InvokeAsync().Forget();+ _listBox.SelectedItem.OnClick.InvokeAsync(_listBox.SelectedItem).Forget();}}}diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownList/DropDownList.razor.scss b/src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownButton/DropDownButton.razor.scsssimilarity index 100%rename from src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownList/DropDownList.razor.scssrename to src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownButton/DropDownButton.razor.scssdiff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownList/DropDownListItem.cs b/src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownButton/DropDownListItem.cssimilarity index 80%rename from src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownList/DropDownListItem.csrename to src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownButton/DropDownListItem.csindex 1c1ba8006..04c244007 100644--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownList/DropDownListItem.cs+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownButton/DropDownListItem.cs@@ -10,5 +10,5 @@ public class DropDownListIteminternal bool IsEnabled { get; set; } = true;- internal EventCallback OnClick { get; set; }+ internal EventCallback<DropDownListItem> OnClick { get; set; }}diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/RadioButton/RadioButton.razor.cs b/src/app/dev/DevToys.Blazor/Components/BasicInput/RadioButton/RadioButton.razor.csindex 560235795..4205fcf8b 100644--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/RadioButton/RadioButton.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/RadioButton/RadioButton.razor.cs@@ -1,6 +1,6 @@namespace DevToys.Blazor.Components;-public partial class RadioButton : JSStyledComponentBase+public partial class RadioButton : JSStyledComponentBase, IFocusable{/// <summary>/// Gets or sets the text to display in the radio button.@@ -26,7 +26,7 @@ public partial class RadioButton : JSStyledComponentBase[Parameter]public EventCallback<bool> IsCheckedChanged { get; set; }- internal ValueTask<bool> FocusAsync()+ public ValueTask<bool> FocusAsync(){return JSRuntime.InvokeVoidWithErrorHandlingAsync("devtoys.DOM.setFocus", Element);}diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/ToggleSwitch/ToggleSwitch.razor.cs b/src/app/dev/DevToys.Blazor/Components/BasicInput/ToggleSwitch/ToggleSwitch.razor.csindex b5ea5d022..7d09c21c5 100644--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/ToggleSwitch/ToggleSwitch.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/ToggleSwitch/ToggleSwitch.razor.cs@@ -1,6 +1,6 @@namespace DevToys.Blazor.Components;-public partial class ToggleSwitch : JSStyledComponentBase+public partial class ToggleSwitch : JSStyledComponentBase, IFocusable{/// <summary>/// Gets or sets the text to display in the toggle switch.@@ -20,7 +20,7 @@ public partial class ToggleSwitch : JSStyledComponentBase[Parameter]public EventCallback<bool> OnCheckedChanged { get; set; }- internal ValueTask<bool> FocusAsync()+ public ValueTask<bool> FocusAsync(){return JSRuntime.InvokeVoidWithErrorHandlingAsync("devtoys.DOM.setFocus", Element);}diff --git a/src/app/dev/DevToys.Blazor/Components/Collections/GridView/GridView.razor.cs b/src/app/dev/DevToys.Blazor/Components/Collections/GridView/GridView.razor.csindex 210fd0d32..e23584c46 100644--- a/src/app/dev/DevToys.Blazor/Components/Collections/GridView/GridView.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/Collections/GridView/GridView.razor.cs@@ -51,11 +51,6 @@ public partial class GridView<TKey, TElement> : JSStyledComponentBase}}- public override async ValueTask DisposeAsync()- {- await base.DisposeAsync();- }-internal Task OnItemClickAsync(TElement item){return OnItemClick.InvokeAsync(item);diff --git a/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBox.razor.cs b/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBox.razor.csindex 426077215..ff15fe761 100644--- a/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBox.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBox.razor.cs@@ -1,6 +1,6 @@namespace DevToys.Blazor.Components;-public partial class ListBox<TElement> : SelectBase<TElement> where TElement : class+public partial class ListBox<TElement> : SelectBase<TElement>, IFocusable where TElement : class{[Parameter]public string Role { get; set; } = "listbox";@@ -8,7 +8,7 @@ public partial class ListBox<TElement> : SelectBase<TElement> where TElement : c[Parameter]public bool UseNativeScrollBar { get; set; }- internal ValueTask<bool> FocusAsync()+ public ValueTask<bool> FocusAsync(){return JSRuntime.InvokeVoidWithErrorHandlingAsync("devtoys.DOM.setFocus", Element);}diff --git a/src/app/dev/DevToys.Blazor/Components/Feedback/InfoBar/InfoBar.razor b/src/app/dev/DevToys.Blazor/Components/Feedback/InfoBar/InfoBar.razorindex d1581fd5f..69319b50e 100644--- a/src/app/dev/DevToys.Blazor/Components/Feedback/InfoBar/InfoBar.razor+++ b/src/app/dev/DevToys.Blazor/Components/Feedback/InfoBar/InfoBar.razor@@ -78,7 +78,7 @@<div class="info-bar-button action"><Button Appearance="@(IsActionButtonAccent ? ButtonAppearance.Accent : ButtonAppearance.Neutral)"@onclick="@OnActionButtonClicked">- <TextBlock Text="@ActionButtonText" />+ <TextBlock Text="@ActionButtonText" NoWrap="true"/></Button></div>}diff --git a/src/app/dev/DevToys.Blazor/Components/IFocusable.cs b/src/app/dev/DevToys.Blazor/Components/IFocusable.csnew file mode 100644index 000000000..5ffec933e--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/IFocusable.cs@@ -0,0 +1,6 @@+namespace DevToys.Blazor.Components;++internal interface IFocusable+{+ ValueTask<bool> FocusAsync();+}diff --git a/src/app/dev/DevToys.Blazor/Components/JSStyledComponentBase.cs b/src/app/dev/DevToys.Blazor/Components/JSStyledComponentBase.csindex de6bf59b4..48eefb880 100644--- a/src/app/dev/DevToys.Blazor/Components/JSStyledComponentBase.cs+++ b/src/app/dev/DevToys.Blazor/Components/JSStyledComponentBase.cs@@ -35,7 +35,7 @@ public abstract class JSStyledComponentBase : StyledComponentBase, IAsyncDisposa/// Gets the reference for the current component./// </summary>/// <value>The reference.</value>- protected DotNetObjectReference<JSStyledComponentBase> Reference+ internal DotNetObjectReference<JSStyledComponentBase> Reference{get{diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor b/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razorindex 01db3cbe2..1bf704e36 100644--- a/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor@@ -28,7 +28,7 @@Height="20"/><div class="card-context"><div class="card-title">- <TextBlock Appearance="TextBlockAppearance.Body" Text="@Title" />+ <TextBlock Appearance="TextBlockAppearance.Body" Text="@Title" NoWrap="true" CanTrim="true" /></div>@if (!string.IsNullOrWhiteSpace(Description)){diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/Container/Container.razor.cs b/src/app/dev/DevToys.Blazor/Components/Layout/Container/Container.razor.csindex ede8159f7..214f9fda8 100644--- a/src/app/dev/DevToys.Blazor/Components/Layout/Container/Container.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Container/Container.razor.cs@@ -91,6 +91,7 @@ public partial class Container : StyledComponentBaseinnerStyleBuilder.AddImportantStyle("padding-right", PaddingRight.ToPx(), PaddingRight.HasValue);innerStyleBuilder.AddImportantStyle("padding-top", PaddingTop.ToPx(), PaddingTop.HasValue);innerStyleBuilder.AddImportantStyle("padding-bottom", PaddingBottom.ToPx(), PaddingBottom.HasValue);+ innerStyleBuilder.AddImportantStyle("position", "relative");FinalStyles = styleBuilder.ToString();FinalInnerStyles = innerStyleBuilder.ToString();diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/FocusTrapper/FocusTrapper.razor.cs b/src/app/dev/DevToys.Blazor/Components/Layout/FocusTrapper/FocusTrapper.razor.csindex 1dbcb24a3..271007dba 100644--- a/src/app/dev/DevToys.Blazor/Components/Layout/FocusTrapper/FocusTrapper.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/Layout/FocusTrapper/FocusTrapper.razor.cs@@ -2,7 +2,7 @@namespace DevToys.Blazor.Components;-public partial class FocusTrapper : JSStyledComponentBase+public partial class FocusTrapper : JSStyledComponentBase, IFocusable{protected override string JavaScriptFile => "./_content/DevToys.Blazor/Components/Layout/FocusTrapper/FocusTrapper.razor.js";@@ -15,7 +15,7 @@ public partial class FocusTrapper : JSStyledComponentBase[Parameter]public RenderFragment? ChildContent { get; set; }- internal ValueTask<bool> FocusAsync()+ public ValueTask<bool> FocusAsync(){return JSRuntime.InvokeVoidWithErrorHandlingAsync("devtoys.DOM.setFocus", Element);}diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/StackPanel/StackPanel.razor.scss b/src/app/dev/DevToys.Blazor/Components/Layout/StackPanel/StackPanel.razor.scssindex ff30fa933..b7c5265ae 100644--- a/src/app/dev/DevToys.Blazor/Components/Layout/StackPanel/StackPanel.razor.scss+++ b/src/app/dev/DevToys.Blazor/Components/Layout/StackPanel/StackPanel.razor.scss@@ -14,4 +14,6 @@align-items: center;justify-content: normal;width: 100%;+ max-height: inherit !important;+ height: 100% !important;}\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/Components/Menu/ContextMenu/ContextMenu.razor.cs b/src/app/dev/DevToys.Blazor/Components/Menu/ContextMenu/ContextMenu.razor.csindex d8be2df31..cb2acf78a 100644--- a/src/app/dev/DevToys.Blazor/Components/Menu/ContextMenu/ContextMenu.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/Menu/ContextMenu/ContextMenu.razor.cs@@ -119,7 +119,7 @@ public partial class ContextMenu : StyledComponentBaseif (_listBox is not null && _listBox.SelectedItem is not null && _listBox.SelectedItem.IsEnabled){CloseMenuAsync(null).Forget();- _listBox.SelectedItem.OnClick.InvokeAsync().Forget();+ _listBox.SelectedItem.OnClick.InvokeAsync(_listBox.SelectedItem).Forget();}}}diff --git a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.js b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.jsindex 8e3aebd93..f672d2bc2 100644--- a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.js+++ b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.js@@ -4,7 +4,7 @@ export function registerResizeHandler(id, navId, dotNetObjRef) {// On nav bar resizeconst resizeObserver = new ResizeObserver((navBars) => {adjustSidebarBodyHeight(navTag);- dotNetObjRef.invokeMethodAsync("OnComponentResize", navBars[0].contentRect.width);+ dotNetObjRef.invokeMethodAsync("OnComponentResize", Math.trunc(navBars[0].contentRect.width));});resizeObserver.observe(navBar);}diff --git a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.scss b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.scssindex 512645b6e..2f04cdace 100644--- a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.scss+++ b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.scss@@ -13,8 +13,7 @@ $sidebar-top-bar-height: 48px;grid-template-rows: $sidebar-top-bar-height calc(100vh - $sidebar-top-bar-height);gap: 0px 0px;grid-template-areas:- "header header"- "sidebar content";+ "header header" "sidebar content";&.hidden {background: var(--navigation-view-content-background);@@ -47,9 +46,7 @@ $sidebar-top-bar-height: 48px;grid-template-rows: auto 1fr auto;gap: 0px 0px;grid-template-areas:- "sidebar-header"- "sidebar-body"- "sidebar-footer";+ "sidebar-header" "sidebar-body" "sidebar-footer";&.transition {@include transition( left 0.2s ease-in-out, width 0.2s ease-in-out, max-width 0.2s ease-in-out, box-shadow 0.2s ease-in-out );@@ -110,6 +107,7 @@ $sidebar-top-bar-height: 48px;border: var(--navigation-view-content-grid-border-thickness);border-color: var(--navigation-view-content-grid-border);border-top-left-radius: var(--overlay-corner-radius);+ position: relative;}&.expanded-overlay {diff --git a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.ts b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.tsindex d19d050fe..b8fdf6cd9 100644--- a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.ts+++ b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.ts@@ -5,7 +5,7 @@ export function registerResizeHandler(id: string, navId: string, dotNetObjRef: D// On nav bar resizeconst resizeObserver = new ResizeObserver((navBars) => {adjustSidebarBodyHeight(navTag);- dotNetObjRef.invokeMethodAsync("OnComponentResize", navBars[0].contentRect.width);+ dotNetObjRef.invokeMethodAsync("OnComponentResize", Math.trunc(navBars[0].contentRect.width));});resizeObserver.observe(navBar);diff --git a/src/app/dev/DevToys.Blazor/Components/StyledComponentBase.cs b/src/app/dev/DevToys.Blazor/Components/StyledComponentBase.csindex e4060e863..0114c1c1d 100644--- a/src/app/dev/DevToys.Blazor/Components/StyledComponentBase.cs+++ b/src/app/dev/DevToys.Blazor/Components/StyledComponentBase.cs@@ -5,8 +5,8 @@ public abstract class StyledComponentBase : ComponentBaseprivate static readonly Random random = new();private readonly Lazy<ObservableHashSet<string>> _css;- private bool _isEnabled = true;- private bool _parentIsEnabled = true;++ protected readonly HashSet<StyledComponentBase> _childrenComponents = new();/// <summary>/// Gets a reference to the HTML element rendered by the component.@@ -16,7 +16,7 @@ public abstract class StyledComponentBase : ComponentBase/// <summary>/// Gets the value of the <c>id</c> attribute in the DOM of this component./// </summary>- public string Id { get; } = NewId();+ public string Id { get; protected set; } = NewId();/// <summary>/// Gets or sets additional custom attributes that will be rendered by the component.@@ -142,6 +142,9 @@ public abstract class StyledComponentBase : ComponentBase[Parameter]public int? PaddingBottom { get; set; }+ [Parameter]+ public StyledComponentBase? ParentComponent { get; set; }+/// <summary>/// Gets a list of CSS class to apply to the component./// </summary>@@ -204,6 +207,22 @@ public abstract class StyledComponentBase : ComponentBasebase.OnParametersSet();}+ protected override void OnInitialized()+ {+ base.OnInitialized();++ if (ParentComponent is not null)+ {+ ParentComponent.RegisterChildComponent(this);+ }+ }++ protected void RegisterChildComponent(StyledComponentBase component)+ {+ Guard.IsNotNull(component);+ _childrenComponents.Add(component);+ }+/// <summary>/// Returns a new small Id./// HTML id must start with a letter.diff --git a/src/app/dev/DevToys.Blazor/Components/Text/AutoSuggestBox/AutoSuggestBox.razor.cs b/src/app/dev/DevToys.Blazor/Components/Text/AutoSuggestBox/AutoSuggestBox.razor.csindex 2ee3bfafc..c6f6ec043 100644--- a/src/app/dev/DevToys.Blazor/Components/Text/AutoSuggestBox/AutoSuggestBox.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/Text/AutoSuggestBox/AutoSuggestBox.razor.cs@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Components.Web;namespace DevToys.Blazor.Components;-public partial class AutoSuggestBox<TElement> : StyledComponentBase, IDisposable where TElement : class+public partial class AutoSuggestBox<TElement> : StyledComponentBase, IFocusable, IDisposable where TElement : class{private TextBox? _textBox = default!;private ListBox<TElement>? _resultListBox = default!;@@ -32,7 +32,7 @@ public partial class AutoSuggestBox<TElement> : StyledComponentBase, IDisposablepublic string? Query => _textBox?.Text;- internal ValueTask<bool> FocusAsync()+ public ValueTask<bool> FocusAsync(){Guard.IsNotNull(_textBox);return _textBox.FocusAsync();diff --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 21e97060f..7b2c08d7c 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,6 +1,4 @@-using System.Text.Json;-using System.Text.Json.Serialization;-using DevToys.Blazor.Components.Monaco.Editor;+using DevToys.Blazor.Components.Monaco.Editor;namespace DevToys.Blazor.Components;@@ -8,6 +6,21 @@ public partial class MonacoEditor : RicherMonacoEditorBase{private readonly object _lock = new object();private bool _isLoaded;+ private bool _oldIsActuallyEnabled;+ private bool _oldReadOnlyState;++ public MonacoEditor()+ {+ }++ public MonacoEditor(IJSRuntime? jsRuntime = null, string? id = null)+ : base(jsRuntime)+ {+ if (!string.IsNullOrEmpty(id))+ {+ Id = id;+ }+ }[Import]internal IThemeListener ThemeListener { get; set; } = default!;@@ -25,6 +38,7 @@ public partial class MonacoEditor : RicherMonacoEditorBasebase.OnInitialized();ThemeListener.ThemeChanged += ThemeListener_ThemeChanged;+ _oldIsActuallyEnabled = IsActuallyEnabled;}protected override async Task OnAfterRenderAsync(bool firstRender)@@ -43,22 +57,40 @@ public partial class MonacoEditor : RicherMonacoEditorBaseoptions.MouseWheelZoom = false;options.OverviewRulerBorder = false;options.ScrollBeyondLastLine = false;- options.FontLigatures = true;+ options.FontLigatures = false;options.SnippetSuggestions = "none";options.CodeLens = false;- options.QuickSuggestions = new QuickSuggestionsOptions { Comments = false, Other = false, Strings = false } ;+ options.QuickSuggestions = new QuickSuggestionsOptions { Comments = false, Other = false, Strings = false };options.WordBasedSuggestions = false;options.Minimap = new EditorMinimapOptions { Enabled = false };options.Hover = new EditorHoverOptions { Enabled = false };options.MatchBrackets = "always";options.BracketPairColorization = new BracketPairColorizationOptions { Enabled = true };-- options.Language = "json";+ options.RenderLineHighlightOnlyWhenFocus = true;// Create the editorawait MonacoEditorHelper.CreateMonacoEditorInstanceAsync(JSRuntime, Id, options, null, Reference);}+ if (IsActuallyEnabled != _oldIsActuallyEnabled)+ {+ _oldIsActuallyEnabled = IsActuallyEnabled;++ var options = new EditorUpdateOptions();+ if (IsActuallyEnabled)+ {+ options.ReadOnly = _oldReadOnlyState;+ }+ else+ {+ EditorOptions currentOptions = await this.GetRawOptionsAsync();+ _oldReadOnlyState = currentOptions.ReadOnly.GetValueOrDefault(false);+ options.ReadOnly = true;+ }++ await UpdateOptionsAsync(options);+ }+await base.OnAfterRenderAsync(firstRender);}@@ -72,18 +104,6 @@ public partial class MonacoEditor : RicherMonacoEditorBasereturn base.DisposeAsync();}- internal ValueTask<bool> UpdateOptionsAsync(EditorUpdateOptions newOptions)- {- // Convert the options object into a JsonElement to get rid of the properties with null values- string optionsJson = JsonSerializer.Serialize(newOptions, new JsonSerializerOptions- {- DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,- PropertyNamingPolicy = JsonNamingPolicy.CamelCase- });- JsonElement optionsDict = JsonSerializer.Deserialize<JsonElement>(optionsJson);- return JSRuntime.InvokeVoidWithErrorHandlingAsync("devtoys.MonacoEditor.updateOptions", Id, optionsDict);- }-protected override void OnEditorLoaded(){base.OnEditorLoaded();diff --git a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor.scss b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor.scssindex 68adead2a..93f5b6600 100644--- a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor.scss+++ b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor.scss@@ -19,12 +19,15 @@}&-instance {- min-height: 100px;+ min-height: 200px;+ height: inherit;+ display: grid;}&-with-header {display: block;position: relative;+ height: 100%;.monaco-editor-standalone-header {margin-bottom: 4px;@@ -32,6 +35,7 @@}&-container {+ height: inherit;cursor: text;position: relative;border-radius: var(--control-corner-radius);diff --git a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorBase.cs b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorBase.csindex 6a4aaf608..c0b9d3cd6 100644--- a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorBase.cs+++ b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorBase.cs@@ -4,7 +4,7 @@ using DevToys.Blazor.Components.Monaco.Editor;namespace DevToys.Blazor.Components;-public abstract class MonacoEditorBase : MefComponentBase+public abstract class MonacoEditorBase : MefComponentBase, IFocusable{private static readonly object themeDefinedLock = new();private static bool isThemeDefined;@@ -84,7 +84,7 @@ public abstract class MonacoEditorBase : MefComponentBaseawait base.OnAfterRenderAsync(firstRender);}- protected virtual async Task SetEventListenersAsync()+ internal virtual async Task SetEventListenersAsync(){if (OnDidDispose.HasDelegate){@@ -100,11 +100,13 @@ public abstract class MonacoEditorBase : MefComponentBase{switch (eventName){- case nameof(OnDidDispose): await OnDidDispose.InvokeAsync(this); break;+ case nameof(OnDidDispose):+ await OnDidDispose.InvokeAsync(this);+ break;}}- protected ValueTask<bool> SetEventListenerAsync(string eventName)+ internal ValueTask<bool> SetEventListenerAsync(string eventName)=> JSRuntime.InvokeVoidWithErrorHandlingAsync("devtoys.MonacoEditor.setEventListener", Id, eventName);public override async ValueTask DisposeAsync()@@ -139,7 +141,7 @@ public abstract class MonacoEditorBase : MefComponentBase/// <summary>/// Brings browser focus to the editor text/// </summary>- internal ValueTask<bool> FocusAsync()+ public ValueTask<bool> FocusAsync()=> JSRuntime.InvokeVoidWithErrorHandlingAsync("devtoys.MonacoEditor.focus", Id);/// <summary>diff --git a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorDiff.razor b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorDiff.razornew file mode 100644index 000000000..fb1e30ec1--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorDiff.razor@@ -0,0 +1,42 @@+@namespace DevToys.Blazor.Components+@inherits RicherMonacoEditorDiffBase++<CascadingValue Name="ParentIsEnabled" Value="@IsActuallyEnabled">+ <Container HorizontalAlignment="@HorizontalAlignment"+ VerticalAlignment="@VerticalAlignment"+ Width="@Width"+ Height="@Height"+ MarginLeft="@MarginLeft"+ MarginRight="@MarginRight"+ MarginTop="@MarginTop"+ MarginBottom="@MarginBottom"+ PaddingLeft="@PaddingLeft"+ PaddingRight="@PaddingRight"+ PaddingTop="@PaddingTop"+ PaddingBottom="@PaddingBottom"+ IsEnabled="@IsActuallyEnabled"+ IsVisible="@IsVisible">+ <div id="@(Id)-monaco-container"+ class="monaco-editor-standalone-with-header @(FinalCssClasses)"+ style="@(Style)"+ @attributes="AdditionalAttributes">++ @if (!string.IsNullOrWhiteSpace(Header))+ {+ <TextBlock Appearance="TextBlockAppearance.Body" Class="monaco-editor-standalone-header" Text="@Header" />+ }++ <div class="monaco-editor-standalone-container @(IsActuallyEnabled ? string.Empty : "disabled")"+ @ref=Element>++ <ProgressRing id="@($"{Id}-loading")"+ IsIndeterminate="@ShowLoading"+ IsVisible="@ShowLoading" />++ <div id="@Id" class="monaco-editor-standalone-instance"></div>++ <div class="monaco-editor-standalone-underline" />+ </div>+ </div>+ </Container>+</CascadingValue>\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorDiff.razor.cs b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorDiff.razor.csnew file mode 100644index 000000000..3eb16a9f8--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorDiff.razor.cs@@ -0,0 +1,157 @@+using DevToys.Blazor.Components.Monaco.Editor;++namespace DevToys.Blazor.Components;++public partial class MonacoEditorDiff : RicherMonacoEditorDiffBase+{+ private readonly object _lock = new object();+ private bool _isLoaded;+ private bool _oldIsActuallyEnabled;+ private bool _oldReadOnlyState;++ [Import]+ internal IThemeListener ThemeListener { get; set; } = default!;++ [Parameter]+ public string? Header { get; set; }++ [Parameter]+ public Func<MonacoEditorDiff, StandaloneDiffEditorConstructionOptions>? ConstructionOptions { get; set; }++ private bool ShowLoading { get; set; }++ protected override void OnInitialized()+ {+ base.OnInitialized();++ ThemeListener.ThemeChanged += ThemeListener_ThemeChanged;+ _oldIsActuallyEnabled = IsActuallyEnabled;+ }++ protected override async Task OnAfterRenderAsync(bool firstRender)+ {+ if (firstRender)+ {+ Guard.IsNull(OriginalEditor);+ Guard.IsNull(ModifiedEditor);++ InvokeAsync(DisplayLoadingIfSlowLoadingAsync).Forget();++ // Get desired options+ StandaloneDiffEditorConstructionOptions options = ConstructionOptions?.Invoke(this) ?? new();++ // Overwrite some important options.+ options.Theme = GetTheme();+ options.AutomaticLayout = true;+ options.GlyphMargin = false;+ options.MouseWheelZoom = false;+ options.OverviewRulerBorder = false;+ options.ScrollBeyondLastLine = false;+ options.FontLigatures = false;+ options.SnippetSuggestions = "none";+ options.CodeLens = false;+ options.QuickSuggestions = new QuickSuggestionsOptions { Comments = false, Other = false, Strings = false };+ options.Minimap = new EditorMinimapOptions { Enabled = false };+ options.Hover = new EditorHoverOptions { Enabled = false };+ options.MatchBrackets = "always";+ options.BracketPairColorization = new BracketPairColorizationOptions { Enabled = true };+ options.RenderLineHighlightOnlyWhenFocus = true;++ options.OriginalEditable = false;+ options.DiffCodeLens = false;+ options.RenderOverviewRuler = true;++ // Create the bridges for the inner editors+ _originalEditor = MonacoEditorHelper.CreateVirtualEditor(JSRuntime, Id + "_original");+ _modifiedEditor = MonacoEditorHelper.CreateVirtualEditor(JSRuntime, Id + "_modified");++ Guard.IsNotNull(OriginalEditor);+ Guard.IsNotNull(ModifiedEditor);++ // Create the editor+ await MonacoEditorHelper.CreateMonacoEditorDiffInstanceAsync(+ JSRuntime,+ Id,+ options,+ null,+ Reference,+ OriginalEditor.Reference,+ ModifiedEditor.Reference);+ }++ await base.OnAfterRenderAsync(firstRender);++ if (IsActuallyEnabled != _oldIsActuallyEnabled)+ {+ _oldIsActuallyEnabled = IsActuallyEnabled;++ var options = new DiffEditorOptions();+ if (IsActuallyEnabled)+ {+ options.ReadOnly = _oldReadOnlyState;+ }+ else+ {+ Guard.IsNotNull(ModifiedEditor);+ EditorOptions currentOptions = await this.ModifiedEditor.GetRawOptionsAsync();+ _oldReadOnlyState = currentOptions.ReadOnly.GetValueOrDefault(false);+ options.ReadOnly = true;+ }++ await UpdateOptionsAsync(options);+ }+ }++ public override ValueTask DisposeAsync()+ {+ if (ThemeListener is not null)+ {+ ThemeListener.ThemeChanged -= ThemeListener_ThemeChanged;+ }++ return base.DisposeAsync();+ }++ protected override void OnEditorLoaded()+ {+ base.OnEditorLoaded();+ lock (_lock)+ {+ _isLoaded = true;+ ShowLoading = false;+ StateHasChanged();+ }+ }++ private void ThemeListener_ThemeChanged(object? sender, EventArgs e)+ {+ MonacoEditorHelper.SetThemeAsync(JSRuntime, GetTheme());+ }++ private string GetTheme()+ {+ Guard.IsNotNull(ThemeListener);+ return ThemeListener.ActualAppTheme == ApplicationTheme.Dark ? BuiltinTheme.VsDark : BuiltinTheme.Vs;+ }++ private async Task DisplayLoadingIfSlowLoadingAsync()+ {+ // Let's not show the progress ring during the first 100ms. We know customers tends to perceive anything+ // faster than 100ms as "instant", so no need to bother the user with a very shortly displayed progress ring+ // if we succeed to load within 100ms.+ // https://psychology.stackexchange.com/questions/1664/what-is-the-threshold-where-actions-are-perceived-as-instant++ const int delay = 100;++ await Task.Delay(delay);++ lock (_lock)+ {+ if (!_isLoaded)+ {+ ShowLoading = true;+ StateHasChanged();+ }+ }+ }+}diff --git a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorDiff.razor.scss b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorDiff.razor.scssnew file mode 100644index 000000000..302dd10de--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorDiff.razor.scss@@ -0,0 +1,3 @@+.monaco-sash {+ background-color: var(--subtle-fill-secondary);+}diff --git a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorHelper.cs b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorHelper.csindex 1cc15306f..a9c845e6c 100644--- a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorHelper.cs+++ b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorHelper.cs@@ -47,43 +47,42 @@ internal static class MonacoEditorHelperreturn dotnetObjectRef.Value as MonacoEditor;}-/// <summary>/// Create a new diff editor under `domElement`./// `domElement` should be empty (not contain other dom nodes)./// The editor will read the size of `domElement`./// </summary>- //internal static async ValueTask<DiffMonacoEditor?> CreateDiffEditorAsync(- // IJSRuntime runtime,- // string domElementId,- // StandaloneDiffEditorConstructionOptions options,- // EditorOverrideServices overrideServices,- // DotNetObjectReference<JSStyledComponentBase> dotnetObjectRef,- // DotNetObjectReference<JSStyledComponentBase> dotnetObjectRefOriginal,- // DotNetObjectReference<JSStyledComponentBase> dotnetObjectRefModified)- //{- // options ??= new StandaloneDiffEditorConstructionOptions();-- // // Convert the options object into a JsonElement to get rid of the properties with null values- // string optionsJson = JsonSerializer.Serialize(options, new JsonSerializerOptions- // {- // DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,- // PropertyNamingPolicy = JsonNamingPolicy.CamelCase- // });- // JsonElement optionsDict = JsonSerializer.Deserialize<JsonElement>(optionsJson);-- // // Create the editor- // await runtime.InvokeVoidAsync(- // "devtoys.MonacoEditor.createDiffEditor",- // domElementId,- // optionsDict,- // overrideServices,- // dotnetObjectRef,- // dotnetObjectRefOriginal,- // dotnetObjectRefModified);-- // return dotnetObjectRef.Value as DiffMonacoEditor;- //}+ internal static async ValueTask<MonacoEditorDiff?> CreateMonacoEditorDiffInstanceAsync(+ IJSRuntime runtime,+ string domElementId,+ StandaloneDiffEditorConstructionOptions options,+ EditorOverrideServices? overrideServices,+ DotNetObjectReference<JSStyledComponentBase> dotnetObjectRef,+ DotNetObjectReference<JSStyledComponentBase> dotnetObjectRefOriginal,+ DotNetObjectReference<JSStyledComponentBase> dotnetObjectRefModified)+ {+ options ??= new StandaloneDiffEditorConstructionOptions();++ // Convert the options object into a JsonElement to get rid of the properties with null values+ string optionsJson = JsonSerializer.Serialize(options, new JsonSerializerOptions+ {+ DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,+ PropertyNamingPolicy = JsonNamingPolicy.CamelCase+ });+ JsonElement optionsDict = JsonSerializer.Deserialize<JsonElement>(optionsJson);++ // Create the editor+ await runtime.InvokeVoidAsync(+ "devtoys.MonacoEditor.createDiffEditor",+ domElementId,+ optionsDict,+ overrideServices,+ dotnetObjectRef,+ dotnetObjectRefOriginal,+ dotnetObjectRefModified);++ return dotnetObjectRef.Value as MonacoEditorDiff;+ }/// <summary>/// Create a new editor model.@@ -145,4 +144,13 @@ internal static class MonacoEditorHelper/// </summary>internal static ValueTask<bool> RemeasureFontsAsync(IJSRuntime runtime)=> runtime.InvokeVoidWithErrorHandlingAsync("devtoys.MonacoEditor.remeasureFonts");++ internal static MonacoEditor CreateVirtualEditor(IJSRuntime jsRuntime, string id, string? cssClass = null)+ {+ var virtual_editor = new MonacoEditor(jsRuntime, id)+ {+ Class = cssClass ?? string.Empty+ };+ return virtual_editor;+ }}diff --git a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/RicherMonacoEditorBase.cs b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/RicherMonacoEditorBase.csindex 4cbc1e615..dd97751af 100644--- a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/RicherMonacoEditorBase.cs+++ b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/RicherMonacoEditorBase.cs@@ -5,11 +5,19 @@ using DevToys.Blazor.Components.Monaco.Editor;namespace DevToys.Blazor.Components;-public abstract class RicherMonacoEditorBase : MonacoEditorBase+public class RicherMonacoEditorBase : MonacoEditorBase{private readonly List<string> _deltaDecorationIds = new();private CursorStateComputer? _executeEditsLambda;+ public RicherMonacoEditorBase(IJSRuntime? jsRuntime = null)+ {+ if (jsRuntime is not null)+ {+ JSRuntime = jsRuntime;+ }+ }+/// <summary>/// An event emitted when the content of the current model has changed./// </summary>@@ -166,7 +174,7 @@ public abstract class RicherMonacoEditorBase : MonacoEditorBase[Parameter]public EventCallback<ScrollEvent> OnDidScrollChange { get; set; }- protected override async Task SetEventListenersAsync()+ internal override async Task SetEventListenersAsync(){if (OnDidCompositionEnd.HasDelegate){@@ -693,4 +701,22 @@ public abstract class RicherMonacoEditorBase : MonacoEditorBase/// </summary>internal ValueTask<ScrolledVisiblePosition> GetScrolledVisiblePositionAsync(Position position)=> JSRuntime.InvokeAsync<ScrolledVisiblePosition>("devtoys.MonacoEditor.getScrolledVisiblePosition", Id, position);++ /// <summary>+ /// Change the language for a model.+ /// </summary>+ internal async ValueTask<bool> SetLanguageAsync(string languageId)+ => await MonacoEditorHelper.SetModelLanguageAsync(JSRuntime, await GetModelAsync(), languageId);++ internal ValueTask<bool> UpdateOptionsAsync(EditorUpdateOptions newOptions)+ {+ // Convert the options object into a JsonElement to get rid of the properties with null values+ string optionsJson = JsonSerializer.Serialize(newOptions, new JsonSerializerOptions+ {+ DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,+ PropertyNamingPolicy = JsonNamingPolicy.CamelCase+ });+ JsonElement optionsDict = JsonSerializer.Deserialize<JsonElement>(optionsJson);+ return JSRuntime.InvokeVoidWithErrorHandlingAsync("devtoys.MonacoEditor.updateOptions", Id, optionsDict);+ }}diff --git a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/RicherMonacoEditorDiffBase.cs b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/RicherMonacoEditorDiffBase.csnew file mode 100644index 000000000..661fc5c4e--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/RicherMonacoEditorDiffBase.cs@@ -0,0 +1,349 @@+using System.Text.Json;+using System.Text.Json.Serialization;+using DevToys.Blazor.Components.Monaco;+using DevToys.Blazor.Components.Monaco.Editor;++namespace DevToys.Blazor.Components;++public abstract class RicherMonacoEditorDiffBase : MonacoEditorBase+{+ protected RicherMonacoEditorBase? _originalEditor;+ protected RicherMonacoEditorBase? _modifiedEditor;++ /// <summary>+ /// Get the `original` editor.+ /// </summary>+ public RicherMonacoEditorBase? OriginalEditor => _originalEditor;++ /// <summary>+ /// Get the `modified` editor.+ /// </summary>+ public RicherMonacoEditorBase? ModifiedEditor => _modifiedEditor;++ /// <summary>+ /// An event emitted when the diff information computed by this diff editor has been updated.+ /// @event+ /// </summary>+ [Parameter]+ public EventCallback<RicherMonacoEditorDiffBase> OnDidUpdateDiff { get; set; }++ [Parameter]+ public EventCallback OnDidDisposeOriginal { get; set; }++ [Parameter]+ public EventCallback OnDidInitOriginal { get; set; }++ [Parameter]+ public EventCallback<ModelContentChangedEvent> OnDidChangeModelContentOriginal { get; set; }++ [Parameter]+ public EventCallback<ModelLanguageChangedEvent> OnDidChangeModelLanguageOriginal { get; set; }++ [Parameter]+ public EventCallback<ModelLanguageConfigurationChangedEvent> OnDidChangeModelLanguageConfigurationOriginal { get; set; }++ [Parameter]+ public EventCallback<ModelOptionsChangedEvent> OnDidChangeModelOptionsOriginal { get; set; }++ [Parameter]+ public EventCallback<ConfigurationChangedEvent> OnDidChangeConfigurationOriginal { get; set; }++ [Parameter]+ public EventCallback<CursorPositionChangedEvent> OnDidChangeCursorPositionOriginal { get; set; }++ [Parameter]+ public EventCallback<CursorSelectionChangedEvent> OnDidChangeCursorSelectionOriginal { get; set; }++ [Parameter]+ public EventCallback<ModelChangedEvent> OnDidChangeModelOriginal { get; set; }++ [Parameter]+ public EventCallback<ModelDecorationsChangedEvent> OnDidChangeModelDecorationsOriginal { get; set; }++ [Parameter]+ public EventCallback OnDidFocusEditorTextOriginal { get; set; }++ [Parameter]+ public EventCallback OnDidBlurEditorTextOriginal { get; set; }++ [Parameter]+ public EventCallback OnDidFocusEditorWidgetOriginal { get; set; }++ [Parameter]+ public EventCallback OnDidBlurEditorWidgetOriginal { get; set; }++ [Parameter]+ public EventCallback OnDidCompositionStartOriginal { get; set; }++ [Parameter]+ public EventCallback OnDidCompositionEndOriginal { get; set; }++ [Parameter]+ public EventCallback<PasteEvent> OnDidPasteOriginal { get; set; }++ [Parameter]+ public EventCallback<EditorMouseEvent> OnMouseUpOriginal { get; set; }++ [Parameter]+ public EventCallback<EditorMouseEvent> OnMouseDownOriginal { get; set; }++ [Parameter]+ public EventCallback<EditorMouseEvent> OnContextMenuOriginal { get; set; }++ [Parameter]+ public EventCallback<EditorMouseEvent> OnMouseMoveOriginal { get; set; }++ [Parameter]+ public EventCallback<PartialEditorMouseEvent> OnMouseLeaveOriginal { get; set; }++ [Parameter]+ public EventCallback<KeyboardEvent> OnKeyUpOriginal { get; set; }++ [Parameter]+ public EventCallback<KeyboardEvent> OnKeyDownOriginal { get; set; }++ [Parameter]+ public EventCallback<EditorLayoutInfo> OnDidLayoutChangeOriginal { get; set; }++ [Parameter]+ public EventCallback<ContentSizeChangedEvent> OnDidContentSizeChangeOriginal { get; set; }++ [Parameter]+ public EventCallback<ScrollEvent> OnDidScrollChangeOriginal { get; set; }++ [Parameter]+ public EventCallback OnDidDisposeModified { get; set; }++ [Parameter]+ public EventCallback OnDidInitModified { get; set; }++ [Parameter]+ public EventCallback<ModelContentChangedEvent> OnDidChangeModelContentModified { get; set; }++ [Parameter]+ public EventCallback<ModelLanguageChangedEvent> OnDidChangeModelLanguageModified { get; set; }++ [Parameter]+ public EventCallback<ModelLanguageConfigurationChangedEvent> OnDidChangeModelLanguageConfigurationModified { get; set; }++ [Parameter]+ public EventCallback<ModelOptionsChangedEvent> OnDidChangeModelOptionsModified { get; set; }++ [Parameter]+ public EventCallback<ConfigurationChangedEvent> OnDidChangeConfigurationModified { get; set; }++ [Parameter]+ public EventCallback<CursorPositionChangedEvent> OnDidChangeCursorPositionModified { get; set; }++ [Parameter]+ public EventCallback<CursorSelectionChangedEvent> OnDidChangeCursorSelectionModified { get; set; }++ [Parameter]+ public EventCallback<ModelChangedEvent> OnDidChangeModelModified { get; set; }++ [Parameter]+ public EventCallback<ModelDecorationsChangedEvent> OnDidChangeModelDecorationsModified { get; set; }++ [Parameter]+ public EventCallback OnDidFocusEditorTextModified { get; set; }++ [Parameter]+ public EventCallback OnDidBlurEditorTextModified { get; set; }++ [Parameter]+ public EventCallback OnDidFocusEditorWidgetModified { get; set; }++ [Parameter]+ public EventCallback OnDidBlurEditorWidgetModified { get; set; }++ [Parameter]+ public EventCallback OnDidCompositionStartModified { get; set; }++ [Parameter]+ public EventCallback OnDidCompositionEndModified { get; set; }++ [Parameter]+ public EventCallback<PasteEvent> OnDidPasteModified { get; set; }++ [Parameter]+ public EventCallback<EditorMouseEvent> OnMouseUpModified { get; set; }++ [Parameter]+ public EventCallback<EditorMouseEvent> OnMouseDownModified { get; set; }++ [Parameter]+ public EventCallback<EditorMouseEvent> OnContextMenuModified { get; set; }++ [Parameter]+ public EventCallback<EditorMouseEvent> OnMouseMoveModified { get; set; }++ [Parameter]+ public EventCallback<PartialEditorMouseEvent> OnMouseLeaveModified { get; set; }++ [Parameter]+ public EventCallback<KeyboardEvent> OnKeyUpModified { get; set; }++ [Parameter]+ public EventCallback<KeyboardEvent> OnKeyDownModified { get; set; }++ [Parameter]+ public EventCallback<EditorLayoutInfo> OnDidLayoutChangeModified { get; set; }++ [Parameter]+ public EventCallback<ContentSizeChangedEvent> OnDidContentSizeChangeModified { get; set; }++ [Parameter]+ public EventCallback<ScrollEvent> OnDidScrollChangeModified { get; set; }++ protected override async Task OnAfterRenderAsync(bool firstRender)+ {+ if (firstRender)+ {+#pragma warning disable BL0005++ Guard.IsNotNull(OriginalEditor);+ OriginalEditor.OnDidDispose = OnDidDisposeOriginal;+ OriginalEditor.OnDidInit = OnDidInitOriginal;+ OriginalEditor.OnDidChangeModelContent = OnDidChangeModelContentOriginal;+ OriginalEditor.OnDidChangeModelLanguage = OnDidChangeModelLanguageOriginal;+ OriginalEditor.OnDidChangeModelLanguageConfiguration = OnDidChangeModelLanguageConfigurationOriginal;+ OriginalEditor.OnDidChangeModelOptions = OnDidChangeModelOptionsOriginal;+ OriginalEditor.OnDidChangeConfiguration = OnDidChangeConfigurationOriginal;+ OriginalEditor.OnDidChangeCursorPosition = OnDidChangeCursorPositionOriginal;+ OriginalEditor.OnDidChangeCursorSelection = OnDidChangeCursorSelectionOriginal;+ OriginalEditor.OnDidChangeModel = OnDidChangeModelOriginal;+ OriginalEditor.OnDidChangeModelDecorations = OnDidChangeModelDecorationsOriginal;+ OriginalEditor.OnDidFocusEditorText = OnDidFocusEditorTextOriginal;+ OriginalEditor.OnDidBlurEditorText = OnDidBlurEditorTextOriginal;+ OriginalEditor.OnDidFocusEditorWidget = OnDidFocusEditorWidgetOriginal;+ OriginalEditor.OnDidBlurEditorWidget = OnDidBlurEditorWidgetOriginal;+ OriginalEditor.OnDidCompositionStart = OnDidCompositionStartOriginal;+ OriginalEditor.OnDidCompositionEnd = OnDidCompositionEndOriginal;+ //readonly onDidAttemptReadOnlyEdit: IEvent<void>;+ OriginalEditor.OnDidPaste = OnDidPasteOriginal;+ OriginalEditor.OnMouseUp = OnMouseUpOriginal;+ OriginalEditor.OnMouseDown = OnMouseDownOriginal;+ OriginalEditor.OnContextMenu = OnContextMenuOriginal;+ OriginalEditor.OnMouseMove = OnMouseMoveOriginal;+ OriginalEditor.OnMouseLeave = OnMouseLeaveOriginal;+ OriginalEditor.OnKeyUp = OnKeyUpOriginal;+ OriginalEditor.OnKeyDown = OnKeyDownOriginal;+ OriginalEditor.OnDidLayoutChange = OnDidLayoutChangeOriginal;+ OriginalEditor.OnDidContentSizeChange = OnDidContentSizeChangeOriginal;+ OriginalEditor.OnDidScrollChange = OnDidScrollChangeOriginal;+ //readonly onDidChangeHiddenAreas: IEvent<void>;+ await OriginalEditor.SetEventListenersAsync();+ await OriginalEditor.OnDidInit.InvokeAsync(OriginalEditor);++ Guard.IsNotNull(ModifiedEditor);+ ModifiedEditor.OnDidCompositionEnd = OnDidCompositionEndModified;+ ModifiedEditor.OnDidDispose = OnDidDisposeModified;+ ModifiedEditor.OnDidInit = OnDidInitModified;+ ModifiedEditor.OnDidChangeModelContent = OnDidChangeModelContentModified;+ ModifiedEditor.OnDidChangeModelLanguage = OnDidChangeModelLanguageModified;+ ModifiedEditor.OnDidChangeModelLanguageConfiguration = OnDidChangeModelLanguageConfigurationModified;+ ModifiedEditor.OnDidChangeModelOptions = OnDidChangeModelOptionsModified;+ ModifiedEditor.OnDidChangeConfiguration = OnDidChangeConfigurationModified;+ ModifiedEditor.OnDidChangeCursorPosition = OnDidChangeCursorPositionModified;+ ModifiedEditor.OnDidChangeCursorSelection = OnDidChangeCursorSelectionModified;+ ModifiedEditor.OnDidChangeModel = OnDidChangeModelModified;+ ModifiedEditor.OnDidChangeModelDecorations = OnDidChangeModelDecorationsModified;+ ModifiedEditor.OnDidFocusEditorText = OnDidFocusEditorTextModified;+ ModifiedEditor.OnDidBlurEditorText = OnDidBlurEditorTextModified;+ ModifiedEditor.OnDidFocusEditorWidget = OnDidFocusEditorWidgetModified;+ ModifiedEditor.OnDidBlurEditorWidget = OnDidBlurEditorWidgetModified;+ ModifiedEditor.OnDidCompositionStart = OnDidCompositionStartModified;+ ModifiedEditor.OnDidCompositionEnd = OnDidCompositionEndModified;+ //readonly onDidAttemptReadOnlyEdit: IEvent<void>;+ ModifiedEditor.OnDidPaste = OnDidPasteModified;+ ModifiedEditor.OnMouseUp = OnMouseUpModified;+ ModifiedEditor.OnMouseDown = OnMouseDownModified;+ ModifiedEditor.OnContextMenu = OnContextMenuModified;+ ModifiedEditor.OnMouseMove = OnMouseMoveModified;+ ModifiedEditor.OnMouseLeave = OnMouseLeaveModified;+ ModifiedEditor.OnKeyUp = OnKeyUpModified;+ ModifiedEditor.OnKeyDown = OnKeyDownModified;+ ModifiedEditor.OnDidLayoutChange = OnDidLayoutChangeModified;+ ModifiedEditor.OnDidContentSizeChange = OnDidContentSizeChangeModified;+ ModifiedEditor.OnDidScrollChange = OnDidScrollChangeModified;+ //readonly onDidChangeHiddenAreas: IEvent<void>;+ await ModifiedEditor.SetEventListenersAsync();+ await ModifiedEditor.OnDidInit.InvokeAsync(ModifiedEditor);+#pragma warning restore BL0005+ }+ await base.OnAfterRenderAsync(firstRender);+ }++ public override async ValueTask DisposeAsync()+ {+ if (OriginalEditor is not null)+ {+ await OriginalEditor.DisposeAsync();+ }++ if (ModifiedEditor is not null)+ {+ await ModifiedEditor.DisposeAsync();+ }++ await base.DisposeAsync();+ }++ internal override async Task SetEventListenersAsync()+ {+ if (OnDidUpdateDiff.HasDelegate)+ {+ await SetEventListenerAsync("OnDidUpdateDiff");+ }++ await base.SetEventListenersAsync();+ }++ [JSInvokable]+ public override async Task EventCallbackAsync(string eventName, string eventJson)+ {+ switch (eventName)+ {+ case "OnDidUpdateDiff": await OnDidUpdateDiff.InvokeAsync(this); break;+ }+ await base.EventCallbackAsync(eventName, eventJson);+ }++ /// <summary>+ /// @see {@link ICodeEditor.getContainerDomNode}+ /// </summary>+ public ValueTask<string> GetContainerDomNodeIdAsync()+ => JSRuntime.InvokeAsync<string>("devtoys.MonacoEditor.getContainerDomNodeId", Id);++ /// <summary>+ /// Type the getModel() of IEditor.+ /// </summary>+ public ValueTask<DiffEditorModel> GetModelAsync()+ => JSRuntime.InvokeAsync<DiffEditorModel>("devtoys.MonacoEditor.getInstanceDiffModel", Id);++ /// <summary>+ /// Sets the current model attached to this editor.+ /// If the previous model was created by the editor via the value key in the options+ /// literal object, it will be destroyed. Otherwise, if the previous model was set+ /// via setModel, or the model key in the options literal object, the previous model+ /// will not be destroyed.+ /// It is safe to call setModel(null) to simply detach the current model from the editor.+ /// </summary>+ public ValueTask<bool> SetModelAsync(DiffEditorModel model)+ => JSRuntime.InvokeVoidWithErrorHandlingAsync("devtoys.MonacoEditor.setInstanceDiffModel", Id, model);++ /// <summary>+ /// Update the editor's options after the editor has been created.+ /// </summary>+ public ValueTask<bool> UpdateOptionsAsync(DiffEditorOptions newOptions)+ {+ // Convert the options object into a JsonElement to get rid of the properties with null values+ string optionsJson = JsonSerializer.Serialize(newOptions, new JsonSerializerOptions+ {+ DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,+ PropertyNamingPolicy = JsonNamingPolicy.CamelCase+ });+ JsonElement optionsDict = JsonSerializer.Deserialize<JsonElement>(optionsJson);+ return JSRuntime.InvokeVoidWithErrorHandlingAsync("devtoys.MonacoEditor.updateOptions", Id, optionsDict);+ }+}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 d4938a91e..6d45e1d5e 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@@ -16,6 +16,12 @@ public class TextBlock : StyledComponentBase[Parameter]public bool NoWrap { get; set; }+ /// <summary>+ /// Indicates whether the text can be trimmed if there's not enough space to display it fully.+ /// </summary>+ [Parameter]+ public bool CanTrim { get; set; }+/// <summary>/// Gets or sets the text to display./// </summary>@@ -30,19 +36,37 @@ public class TextBlock : StyledComponentBaseprotected override void BuildRenderTree(RenderTreeBuilder builder){+ string classBuilder+ = new CssBuilder("text-block")+ .AddClass($"type-{Appearance.Class}")+ .AddClass("no-wrap", NoWrap)+ .AddClass("trim", CanTrim)+ .AddClass("hide", !IsVisible)+ .AddClass(FinalCssClasses)+ .Build();+builder.OpenElement(0, Appearance.Tag);builder.AddAttribute(1, "id", Id);- builder.AddAttribute(2, "class", $"text-block type-{Appearance.Class} {(NoWrap ? "no-wrap" : string.Empty)} {FinalCssClasses}");+ builder.AddAttribute(2, "class", classBuilder.ToString());builder.AddAttribute(3, "style", Style);+ int sequence = 4;+ if (AdditionalAttributes is not null)+ {+ foreach (KeyValuePair<string, object> attribute in AdditionalAttributes)+ {+ builder.AddAttribute(sequence, attribute.Key, attribute.Value);+ sequence++;+ }+ }+if (HighlightedSpans is null || HighlightedSpans.Length == 0){- builder.AddContent(4, Text);+ builder.AddContent(sequence, Text);}else if (!string.IsNullOrEmpty(Text!)){// Create a set of `text <mark> highlighted span </mark> text`- int sequence = 4;int lastPlainTextStartPosition = 0;foreach (TextSpan highlightedSpan in HighlightedSpans.OrderBy(span => span.StartPosition))diff --git a/src/app/dev/DevToys.Blazor/Components/Text/TextBlock/TextBlock.razor.scss b/src/app/dev/DevToys.Blazor/Components/Text/TextBlock/TextBlock.razor.scssindex b4e4ec3bc..fca53a15e 100644--- a/src/app/dev/DevToys.Blazor/Components/Text/TextBlock/TextBlock.razor.scss+++ b/src/app/dev/DevToys.Blazor/Components/Text/TextBlock/TextBlock.razor.scss@@ -21,7 +21,7 @@&display {font: {family: var(--font-family-display);- weight: 300;+ weight: 400;}}@@ -87,4 +87,14 @@&.no-wrap {white-space: nowrap;}++ &.trim {+ overflow: hidden !important;+ text-overflow: ellipsis;+ width: 100%;+ }++ &.hide {+ display: none !important;+ }}diff --git a/src/app/dev/DevToys.Blazor/Components/Text/TextBox/TextBox.razor.cs b/src/app/dev/DevToys.Blazor/Components/Text/TextBox/TextBox.razor.csindex ce48a64ee..a9d7a7a52 100644--- a/src/app/dev/DevToys.Blazor/Components/Text/TextBox/TextBox.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/Text/TextBox/TextBox.razor.cs@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Components.Forms;namespace DevToys.Blazor.Components;-public partial class TextBox : MefComponentBase+public partial class TextBox : MefComponentBase, IFocusable{private static readonly ContextMenuItem CutContextMenuItem= new()@@ -83,7 +83,7 @@ public partial class TextBox : MefComponentBase[Parameter]public EventCallback<string?> TextChanged { get; set; }- internal ValueTask<bool> FocusAsync()+ public ValueTask<bool> FocusAsync(){Guard.IsNotNull(_input);Guard.IsNotNull(_input.Element);@@ -182,31 +182,31 @@ public partial class TextBox : MefComponentBase{if (!IsReadOnly){- CutContextMenuItem.OnClick = EventCallback.Factory.Create(this, OnCutAsync);+ CutContextMenuItem.OnClick = EventCallback.Factory.Create<DropDownListItem>(this, OnCutAsync);_contextMenuItems.Add(CutContextMenuItem);}- CopyContextMenuItem.OnClick = EventCallback.Factory.Create(this, OnCopyAsync);+ CopyContextMenuItem.OnClick = EventCallback.Factory.Create<DropDownListItem>(this, OnCopyAsync);_contextMenuItems.Add(CopyContextMenuItem);}if (!IsReadOnly){- PasteContextMenuItem.OnClick = EventCallback.Factory.Create(this, OnPasteAsync);+ PasteContextMenuItem.OnClick = EventCallback.Factory.Create<DropDownListItem>(this, OnPasteAsync);_contextMenuItems.Add(PasteContextMenuItem);}if (Text?.Length > 0){- SelectAllContextMenuItem.OnClick = EventCallback.Factory.Create(this, OnSelectAllAsync);+ SelectAllContextMenuItem.OnClick = EventCallback.Factory.Create<DropDownListItem>(this, OnSelectAllAsync);_contextMenuItems.Add(SelectAllContextMenuItem);}}}- private async Task OnCutAsync()+ private async Task OnCutAsync(DropDownListItem dropDownListItem){- await OnCopyAsync();+ await OnCopyAsync(dropDownListItem);if (!string.IsNullOrEmpty(Text)){@@ -219,7 +219,7 @@ public partial class TextBox : MefComponentBase}}- private async Task OnCopyAsync()+ private async Task OnCopyAsync(DropDownListItem _){if (!string.IsNullOrEmpty(Text)){@@ -232,7 +232,7 @@ public partial class TextBox : MefComponentBase}}- private async Task OnPasteAsync()+ private async Task OnPasteAsync(DropDownListItem _){object? clipboardData = await Clipboard.GetClipboardDataAsync();if (clipboardData is string)@@ -244,7 +244,7 @@ public partial class TextBox : MefComponentBase}}- private async Task OnSelectAllAsync()+ private async Task OnSelectAllAsync(DropDownListItem _){using (await Semaphore.WaitAsync(CancellationToken.None)){diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIButtonPresenter.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UIButtonPresenter.razorindex 83713af41..014e1b7d0 100644--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UIButtonPresenter.razor+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIButtonPresenter.razor@@ -9,5 +9,5 @@VerticalAlignment="@UIButton.VerticalAlignment"Appearance="@((UIButton.IsAccent ? ButtonAppearance.Accent : ButtonAppearance.Neutral))"@onclick=OnButtonClickAsync>- <TextBlock Text="@UIButton?.Text" />+ <TextBlock Text="@UIButton?.Text" NoWrap="true" /></Button>\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIDiffTextInputPresenter.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UIDiffTextInputPresenter.razornew file mode 100644index 000000000..ea8774e24--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIDiffTextInputPresenter.razor@@ -0,0 +1,12 @@+@namespace DevToys.Blazor.Components.UIElements+@using DevToys.Api;+@inherits JSStyledComponentBase++<MonacoEditorDiff @ref="_monacoEditor"+ IsVisible="@UIDiffTextInput.IsVisible"+ IsEnabled="@UIDiffTextInput.IsEnabled"+ HorizontalAlignment="@UIDiffTextInput.HorizontalAlignment"+ VerticalAlignment="@UIDiffTextInput.VerticalAlignment"+ Header="@UIDiffTextInput.Title"+ ConstructionOptions="@OnMonacoConstructionOptions"+ OnDidInit="@OnMonacoEditorInitializedAsync" />\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIDiffTextInputPresenter.razor.cs b/src/app/dev/DevToys.Blazor/Components/UIElements/UIDiffTextInputPresenter.razor.csnew file mode 100644index 000000000..6fc693616--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIDiffTextInputPresenter.razor.cs@@ -0,0 +1,92 @@+using DevToys.Blazor.Components.Monaco;+using DevToys.Blazor.Components.Monaco.Editor;++namespace DevToys.Blazor.Components.UIElements;++public partial class UIDiffTextInputPresenter : JSStyledComponentBase, IDisposable+{+ private MonacoEditorDiff _monacoEditor = default!;+ private UITextInputWrapper _textInputWrapper = default!;++ [Parameter]+ public IUIDiffTextInput UIDiffTextInput { get; set; } = default!;++ protected override void OnInitialized()+ {+ base.OnInitialized();+ UIDiffTextInput.TextChanged += UIMultiLineTextInput_TextChanged;+ UIDiffTextInput.ModifiedTextChanged += UIDiffTextInput_RightTextChanged;+ UIDiffTextInput.IsReadOnlyChanged += UIMultiLineTextInput_IsReadOnlyChanged;+ UIDiffTextInput.InlineModeChanged += UIDiffTextInput_InlineModeChanged;+ }++ public void Dispose()+ {+ UIDiffTextInput.TextChanged -= UIMultiLineTextInput_TextChanged;+ UIDiffTextInput.ModifiedTextChanged -= UIDiffTextInput_RightTextChanged;+ UIDiffTextInput.IsReadOnlyChanged -= UIMultiLineTextInput_IsReadOnlyChanged;+ UIDiffTextInput.InlineModeChanged -= UIDiffTextInput_InlineModeChanged;+ GC.SuppressFinalize(this);+ }++ private async Task OnMonacoEditorInitializedAsync()+ {+ // Get or create the original model+ TextModel original_model = await MonacoEditorHelper.GetModelAsync(JSRuntime, "sample-diff-editor-originalModel");+ if (original_model == null)+ {+ original_model = await MonacoEditorHelper.CreateModelAsync(JSRuntime, UIDiffTextInput.Text, "javascript", "sample-diff-editor-originalModel");+ }++ // Get or create the modified model+ TextModel modified_model = await MonacoEditorHelper.GetModelAsync(JSRuntime, "sample-diff-editor-modifiedModel");+ if (modified_model == null)+ {+ modified_model = await MonacoEditorHelper.CreateModelAsync(JSRuntime, UIDiffTextInput.ModifiedText, "javascript", "sample-diff-editor-modifiedModel");+ }++ // Set the editor model+ await _monacoEditor.SetModelAsync(new DiffEditorModel+ {+ Original = original_model,+ Modified = modified_model+ });+ }++ private async void UIMultiLineTextInput_TextChanged(object? sender, EventArgs e)+ {+ Guard.IsNotNull(_monacoEditor.OriginalEditor);+ await _monacoEditor.OriginalEditor.SetValueAsync(UIDiffTextInput.Text);+ }++ private async void UIDiffTextInput_RightTextChanged(object? sender, EventArgs e)+ {+ Guard.IsNotNull(_monacoEditor.ModifiedEditor);+ await _monacoEditor.ModifiedEditor.SetValueAsync(UIDiffTextInput.ModifiedText);+ }++ private async void UIMultiLineTextInput_IsReadOnlyChanged(object? sender, EventArgs e)+ {+ await _monacoEditor.UpdateOptionsAsync(new DiffEditorOptions+ {+ ReadOnly = UIDiffTextInput.IsReadOnly+ });+ }++ private async void UIDiffTextInput_InlineModeChanged(object? sender, EventArgs e)+ {+ await _monacoEditor.UpdateOptionsAsync(new DiffEditorOptions+ {+ EnableSplitViewResizing = !UIDiffTextInput.InlineMode+ });+ }++ private StandaloneDiffEditorConstructionOptions OnMonacoConstructionOptions(MonacoEditorDiff monacoEditor)+ {+ return new StandaloneDiffEditorConstructionOptions+ {+ ReadOnly = UIDiffTextInput.IsReadOnly,+ EnableSplitViewResizing = !UIDiffTextInput.InlineMode+ };+ }+}diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIElementPresenter.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UIElementPresenter.razorindex 21800d772..e6ae67ea0 100644--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UIElementPresenter.razor+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIElementPresenter.razor@@ -10,6 +10,10 @@<UIStackPresenter UIStack="@stack" />break;+ case IUIWrap wrap:+ <UIWrapPresenter UIWrap="@wrap" />+ break;+case IUIButton button:<UIButtonPresenter UIButton="@button" />break;@@ -30,6 +34,22 @@<UISelectDropDownListPresenter UISelectDropDownList="@selectDropDownList" />break;+ case IUIDiffTextInput diffTextInput:+ <UIDiffTextInputPresenter UIDiffTextInput="@diffTextInput" />+ break;++ case IUIMultiLineTextInput multiLineTextInput:+ <UIMultiLineTextInputPresenter UIMultiLineTextInput="@multiLineTextInput" />+ break;++ case IUISingleLineTextInput singleLineTextInput:+ <UISingleLineTextInputPresenter UISingleLineTextInput="@singleLineTextInput" />+ break;++ case IUIIcon icon:+ <UIIconPresenter UIIcon="@icon" />+ break;+default:throw new NotSupportedException($"Gui Tool component of type '{UIElement.GetType().FullName}' isn't supported.");}diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIIconPresenter.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UIIconPresenter.razornew file mode 100644index 000000000..60db715c4--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIIconPresenter.razor@@ -0,0 +1,13 @@+@namespace DevToys.Blazor.Components.UIElements+@using DevToys.Api;+@inherits ComponentBase++<FontIcon id="@UIIcon.Id"+ IsVisible="@UIIcon.IsVisible"+ IsEnabled="@UIIcon.IsEnabled"+ HorizontalAlignment="@UIIcon.HorizontalAlignment"+ VerticalAlignment="@UIIcon.VerticalAlignment"+ Glyph="@UIIcon.Glyph"+ FontFamily="@UIIcon.FontName"+ Height="@UIIcon.Size"+ Width="@UIIcon.Size"/>\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIIconPresenter.razor.cs b/src/app/dev/DevToys.Blazor/Components/UIElements/UIIconPresenter.razor.csnew file mode 100644index 000000000..2cbcd5cdd--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIIconPresenter.razor.cs@@ -0,0 +1,7 @@+namespace DevToys.Blazor.Components.UIElements;++public partial class UIIconPresenter : ComponentBase+{+ [Parameter]+ public IUIIcon UIIcon { get; set; } = default!;+}diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIMultiLineTextInputPresenter.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UIMultiLineTextInputPresenter.razornew file mode 100644index 000000000..702eba090--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIMultiLineTextInputPresenter.razor@@ -0,0 +1,12 @@+@namespace DevToys.Blazor.Components.UIElements+@using DevToys.Api;+@inherits StyledComponentBase++<UITextInputWrapper @ref="_textInputWrapper" UITextInput="@UIMultiLineTextInput">+ <MonacoEditor @ref="_monacoEditor"+ IsVisible="@UIMultiLineTextInput.IsVisible"+ IsEnabled="@UIMultiLineTextInput.IsEnabled"+ ConstructionOptions="@OnMonacoConstructionOptions"+ OnDidChangeModelContent="OnTextChangedAsync"+ ParentComponent="_textInputWrapper" />+</UITextInputWrapper>\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIMultiLineTextInputPresenter.razor.cs b/src/app/dev/DevToys.Blazor/Components/UIElements/UIMultiLineTextInputPresenter.razor.csnew file mode 100644index 000000000..cfc581a7b--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIMultiLineTextInputPresenter.razor.cs@@ -0,0 +1,62 @@+using DevToys.Blazor.Components.Monaco.Editor;++namespace DevToys.Blazor.Components.UIElements;++public partial class UIMultiLineTextInputPresenter : StyledComponentBase, IDisposable+{+ private MonacoEditor _monacoEditor = default!;+ private UITextInputWrapper _textInputWrapper = default!;++ [Parameter]+ public IUIMultiLineTextInput UIMultiLineTextInput { get; set; } = default!;++ protected override void OnInitialized()+ {+ base.OnInitialized();+ UIMultiLineTextInput.SyntaxColorizationLanguageNameChanged += UIMultiLineTextInput_SyntaxColorizationLanguageNameChanged;+ UIMultiLineTextInput.TextChanged += UIMultiLineTextInput_TextChanged;+ UIMultiLineTextInput.IsReadOnlyChanged += UIMultiLineTextInput_IsReadOnlyChanged;+ }++ public void Dispose()+ {+ UIMultiLineTextInput.SyntaxColorizationLanguageNameChanged -= UIMultiLineTextInput_SyntaxColorizationLanguageNameChanged;+ UIMultiLineTextInput.TextChanged -= UIMultiLineTextInput_TextChanged;+ UIMultiLineTextInput.IsReadOnlyChanged -= UIMultiLineTextInput_IsReadOnlyChanged;+ GC.SuppressFinalize(this);+ }++ private async void UIMultiLineTextInput_TextChanged(object? sender, EventArgs e)+ {+ await _monacoEditor.SetValueAsync(UIMultiLineTextInput.Text);+ }++ private async void UIMultiLineTextInput_SyntaxColorizationLanguageNameChanged(object? sender, EventArgs e)+ {+ await _monacoEditor.SetLanguageAsync(UIMultiLineTextInput.SyntaxColorizationLanguageName);+ }++ private async void UIMultiLineTextInput_IsReadOnlyChanged(object? sender, EventArgs e)+ {+ await _monacoEditor.UpdateOptionsAsync(new EditorUpdateOptions+ {+ ReadOnly = UIMultiLineTextInput.IsReadOnly+ });+ }++ private async Task OnTextChangedAsync(ModelContentChangedEvent ev)+ {+ UIMultiLineTextInput.Text(await _monacoEditor.GetValueAsync(preserveBOM: null, lineEnding: null));+ }++ private StandaloneEditorConstructionOptions OnMonacoConstructionOptions(MonacoEditor monacoEditor)+ {+ // TODO: if language is plain text, then should we hide line numbers and few other things?+ return new StandaloneEditorConstructionOptions+ {+ ReadOnly = UIMultiLineTextInput.IsReadOnly,+ Language = UIMultiLineTextInput.SyntaxColorizationLanguageName,+ Value = UIMultiLineTextInput.Text+ };+ }+}diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UISelectDropDownListPresenter.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UISelectDropDownListPresenter.razorindex f92002a90..de65fb1cc 100644--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UISelectDropDownListPresenter.razor+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UISelectDropDownListPresenter.razor@@ -12,6 +12,6 @@Items="@UISelectDropDownList.Items"Context="item"><ItemTemplate>- <TextBlock Text="@item.Text"/>+ <TextBlock Text="@item.Text" NoWrap="true" /></ItemTemplate></ComboBox>\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UISettingGroupPresenter.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UISettingGroupPresenter.razorindex 8276e15ef..737634733 100644--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UISettingGroupPresenter.razor+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UISettingGroupPresenter.razor@@ -21,7 +21,7 @@<ChildContent><StackPanel Orientation="UIOrientation.Vertical"HorizontalAlignment="UIHorizontalAlignment.Stretch"- Style="@(UISettingGroup.ChildrenAreAllSettings ? "row-gap: 0px !important" : string.Empty)">+ Spacing="@(UISettingGroup.ChildrenAreAllSettings ? 0 : 4)">@if (UISettingGroup.Children is not null){for (int i = 0; i < UISettingGroup.Children.Length; i++)diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UISingleLineTextInputPresenter.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UISingleLineTextInputPresenter.razornew file mode 100644index 000000000..c0c372692--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UISingleLineTextInputPresenter.razor@@ -0,0 +1,12 @@+@namespace DevToys.Blazor.Components.UIElements+@using DevToys.Api;+@inherits StyledComponentBase++<UITextInputWrapper @ref="_textInputWrapper" UITextInput="@UISingleLineTextInput">+ <TextBox IsVisible="@UISingleLineTextInput.IsVisible"+ IsEnabled="@UISingleLineTextInput.IsEnabled"+ Text="@UISingleLineTextInput.Text"+ IsReadOnly="@UISingleLineTextInput.IsReadOnly"+ TextChanged="@OnTextChanged"+ ParentComponent="_textInputWrapper" />+</UITextInputWrapper>\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UISingleLineTextInputPresenter.razor.cs b/src/app/dev/DevToys.Blazor/Components/UIElements/UISingleLineTextInputPresenter.razor.csnew file mode 100644index 000000000..a20541cf6--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UISingleLineTextInputPresenter.razor.cs@@ -0,0 +1,14 @@+namespace DevToys.Blazor.Components.UIElements;++public partial class UISingleLineTextInputPresenter : StyledComponentBase+{+ private UITextInputWrapper _textInputWrapper = default!;++ [Parameter]+ public IUISingleLineTextInput UISingleLineTextInput { get; set; } = default!;++ private void OnTextChanged(string newText)+ {+ UISingleLineTextInput.Text(newText);+ }+}diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razornew file mode 100644index 000000000..9cb1fde74--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor@@ -0,0 +1,123 @@+@namespace DevToys.Blazor.Components.UIElements+@using DevToys.Api;+@inherits MefComponentBase++<!-- TODO: Localize -->+<Grid id="@ExtendedId"+ Class="ui-text-input-wrapper"+ IsVisible="@UITextInput.IsVisible"+ IsEnabled="@UITextInput.IsEnabled"+ HorizontalAlignment="@UITextInput.HorizontalAlignment"+ VerticalAlignment="@UITextInput.VerticalAlignment"+ RowSpacing="6"+ Rows="@(new List<GridLength>+ {+ GridLength.Auto,+ new GridLength(1, GridUnitType.Fraction)+ })"+ ColumnSpacing="6"+ Columns="@(new List<GridLength>+ {+ new GridLength(1, GridUnitType.Fraction),+ GridLength.Auto+ })">+ <GridCell Row="0" Column="0">+ <Grid RowSpacing="0"+ Rows="@(new List<GridLength>+ {+ new GridLength(1, GridUnitType.Fraction),+ new GridLength(20, GridUnitType.Pixel)+ })">+ <GridCell Row="1">+ <TextBlock id="@(ExtendedId + "-title")"+ Text="@UITextInput.Title"+ NoWrap="true"+ CanTrim="true" />+ </GridCell>+ </Grid>+ </GridCell>+ <GridCell Row="0"+ Column="1">+ <StackPanel IsEnabled="@(!IsLoadingFile)" Wrap="false">+ @if (!_hideNonEssentialToolBar)+ {+ @if (!UITextInput.IsReadOnly)+ {+ <Button @onclick="@OnPasteButtonClickAsync">+ <StackPanel>+ <FontIcon Glyph="@('\uF2D5')" />+ <TextBlock Text="Paste"+ IsVisible="@(!_isToolBarShrink)" />+ </StackPanel>+ </Button>+ <Button ToolTip="Load a file"+ @onclick="@OnLoadFileButtonClickAsync">+ <FontIcon Glyph="@('\uF378')" />+ </Button>+ <Button ToolTip="Clear"+ @onclick="@OnClearButtonClickAsync">+ <FontIcon Glyph="@('\uF369')" />+ </Button>+ }++ @if (!UITextInput.IsReadOnly && UITextInput.CanCopyWhenEditable)+ {+ <div class="ui-text-input-wrapper-separator"></div>+ }++ @if (UITextInput.IsReadOnly || UITextInput.CanCopyWhenEditable)+ {+ <Button ToolTip="Save as..."+ @onclick="@OnSaveAsButtonClickAsync">+ <FontIcon Glyph="@('\uF67F')" />+ </Button>+ <Button @onclick="@OnCopyButtonClick">+ <StackPanel>+ <FontIcon Glyph="@('\uF32B')" />+ <TextBlock Text="Copy"+ IsVisible="@(!_isToolBarShrink)" />+ </StackPanel>+ </Button>+ }+ }+ else+ {+ <DropDownButton ToolTip="More..."+ Items="@CollapsedDropDownListItems"+ AnchorOrigin="Origin.BottomRight"+ TransformOrigin="Origin.TopRight"+ DisplayArrow="false">+ <FontIcon Glyph="@('\uE824')" Height="22" Width="22" />+ </DropDownButton>+ }+ <div class="ui-text-input-wrapper-separator"></div>+ <DropDownButton ToolTip="Transfer to another tool"+ Items="@SmartDetectionDropDownItems"+ AnchorOrigin="Origin.BottomRight"+ TransformOrigin="Origin.TopRight">+ <img src="@(ToolsDetectedBySmartDetection ? "_content/DevToys.Blazor/img/idea.svg" : "_content/DevToys.Blazor/img/idea-disabled.svg")"+ height="22"+ width="22"+ style="flex-basis: auto; align-self:center;" />+ </DropDownButton>+ </StackPanel>+ </GridCell>+ <GridCell Row="1" Column="0" ColumnSpan="2">+ <Container IsEnabled="@(!IsLoadingFile)">+ @ChildContent++ <!-- Progress bar to indicate when a file is being loaded -->+ <div class="ui-text-input-wrapper-centered-progress-bar">+ <ProgressBar IsIndeterminate="true"+ IsVisible="@IsLoadingFile"+ MarginLeft="24"+ MarginRight="24"+ HorizontalAlignment="UIHorizontalAlignment.Stretch"+ VerticalAlignment="UIVerticalAlignment.Top" />+ </div>++ <!-- Input form used for getting the dropped file when use drag and drop a file into the UI. -->+ <InputFile style="display: none;" OnChange="OnFileDroppedAsync" />+ </Container>+ </GridCell>+</Grid>\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.cs b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.csnew file mode 100644index 000000000..a9daaa067--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.cs@@ -0,0 +1,445 @@+using CommunityToolkit.Mvvm.Messaging;+using DevToys.Core.Models;+using DevToys.Core.Tools;+using Microsoft.AspNetCore.Components.Forms;+using Microsoft.Extensions.Logging;+using Uno.Extensions;++namespace DevToys.Blazor.Components.UIElements;++public partial class UITextInputWrapper : MefComponentBase+{+ private const int MinimumWidthBeforeShrinkingToolBar = 650;+ private const int MinimumWidthBeforeHidingNonEssentialToolBar = 500;++ private static readonly string[] FileTypes = new[]+ {+ "*.*",+ "*.txt",+ "*.js",+ "*.ts",+ "*.cs",+ "*.java",+ "*.xml",+ "*.xsd",+ "*.json",+ "*.md",+ "*.sql",+ "*.html",+ "*.cshtml",+ "*.razor",+ "*.css"+ };++ private readonly ILogger _logger;+ private readonly DisposableSemaphore _disposableSemaphore = new();++ private Grid _rootGrid = default!;+ private CancellationTokenSource? _cancellationTokenSource;+ private bool _isToolBarShrink;+ private bool _hideNonEssentialToolBar;++ protected override string? JavaScriptFile => "./_content/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.js";++ [Import]+ internal SmartDetectionService SmartDetectionService { get; set; } = default!;++ [Import]+ internal IClipboard Clipboard { get; set; } = default!;++ [Import]+ internal IFileStorage FileStorage { get; set; } = default!;++ [Import]+ internal ISettingsProvider SettingsProvider { get; set; } = default!;++ [Parameter]+ public IUISingleLineTextInput UITextInput { get; set; } = default!;++ [Parameter]+ public RenderFragment? ChildContent { get; set; }++ protected bool IsLoadingFile { get; set; }++ protected bool ToolsDetectedBySmartDetection { get; set; }++ protected List<SmartDetectionDropDownListItem> SmartDetectionDropDownItems { get; } = new();++ protected List<DropDownListItem> CollapsedDropDownListItems { get; } = new();++ protected string ExtendedId => UITextInput.Id + "-" + Id;++ public UITextInputWrapper()+ {+ _logger = this.Log();+ }++ protected override void OnInitialized()+ {+ base.OnInitialized();+ UITextInput.TextChanged += UITextInput_TextChanged;+ }++ protected override async Task OnAfterRenderAsync(bool firstRender)+ {+ base.OnAfterRender(firstRender);+ if (firstRender)+ {+ TriggerSmartDetection();++ using (await Semaphore.WaitAsync(CancellationToken.None))+ {+ await (await JSModule).InvokeVoidWithErrorHandlingAsync("registerResizeHandler", ExtendedId, Reference);+ if (!UITextInput.IsReadOnly)+ {+ await (await JSModule).InvokeVoidWithErrorHandlingAsync("registerDropZone", ExtendedId);+ }+ }+ }+ }++ public override async ValueTask DisposeAsync()+ {+ await (await JSModule).InvokeVoidWithErrorHandlingAsync("dispose", ExtendedId);+ await base.DisposeAsync();+ }++ [JSInvokable]+ public void OnComponentResize(int textInputWrapperWidth)+ {+ bool stateChanged+ = (textInputWrapperWidth < MinimumWidthBeforeShrinkingToolBar && !_isToolBarShrink)+ || (textInputWrapperWidth >= MinimumWidthBeforeShrinkingToolBar && _isToolBarShrink);++ if (stateChanged)+ {+ _isToolBarShrink = !_isToolBarShrink;+ StateHasChanged();+ }++ bool oldNonEssentialToolBarState = _hideNonEssentialToolBar;+ _hideNonEssentialToolBar = _isToolBarShrink && textInputWrapperWidth < MinimumWidthBeforeHidingNonEssentialToolBar;+ if (_hideNonEssentialToolBar != oldNonEssentialToolBarState)+ {+ if (_hideNonEssentialToolBar)+ {+ BuildCollapsedMenu();+ }++ StateHasChanged();+ }+ }++ private async Task OnFileDroppedAsync(InputFileChangeEventArgs args)+ {+ await InvokeAsync(() =>+ {+ IsLoadingFile = true;+ StateHasChanged();+ });++ using var stream = new MemoryStream();+ using Stream fileStream = args.File.OpenReadStream(maxAllowedSize: int.MaxValue);+ await fileStream.CopyToAsync(stream);+ stream.Seek(0, SeekOrigin.Begin);+ await LoadFileAsync(stream);+ }++ private void UITextInput_TextChanged(object? sender, EventArgs e)+ {+ TriggerSmartDetection();+ }++ private async Task OnPasteButtonClickAsync()+ {+ object? clipboardContent = await Clipboard.GetClipboardDataAsync();+ if (clipboardContent is string clipboardString)+ {+ if (SettingsProvider.GetSetting(PredefinedSettings.TextEditorPasteClearsText))+ {+ UITextInput.Text(clipboardString);+ }+ else+ {+ UITextInput.Text(UITextInput.Text + clipboardString);+ }+ }++ await FocusOnTextEditorAsync();+ }++ private async Task OnLoadFileButtonClickAsync()+ {+ Stream? fileStream = null;+ try+ {+ fileStream = await FileStorage.PickOpenFileAsync(FileTypes);+ if (fileStream is not null)+ {+ await LoadFileAsync(fileStream);+ }+ }+ finally+ {+ fileStream?.Dispose();+ }+ }++ private async Task OnClearButtonClickAsync()+ {+ UITextInput.Text(string.Empty);+ await FocusOnTextEditorAsync();+ }++ private async Task OnSaveAsButtonClickAsync()+ {+ string text = UITextInput.Text;++ Stream? fileStream = null;+ try+ {+ fileStream = await FileStorage.PickSaveFileAsync(new[] { "*.*" });+ if (fileStream is not null)+ {+ await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(CancellationToken.None);++ bool failed = false;++ try+ {+ using var writer = new StreamWriter(fileStream);+ writer.Write(text);+ }+ catch (Exception ex)+ {+ LogErrorSavingFile(ex);+ failed = true;+ }+ finally+ {+ if (failed)+ {+ await InvokeAsync(() =>+ {+ // TODO: Display ContentDialog++ //var dialog = new ContentDialog+ //{+ // // XamlRoot must be set in the case of a ContentDialog running in a Desktop app+ // XamlRoot = this.XamlRoot,+ // Title = ToolPage.UnableSaveFile,+ // Content = string.Format(ToolPage.UnableSaveFileDescription, file.Name),+ // CloseButtonText = ToolPage.Ok,+ // DefaultButton = ContentDialogButton.Close+ //};+ //await dialog.ShowAsync();+ });+ }+ }+ }+ }+ finally+ {+ fileStream?.Dispose();+ }+ }++ private void OnCopyButtonClick()+ {+ Clipboard.SetClipboardTextAsync(UITextInput.Text).ForgetSafely();+ }++ private async Task LoadFileAsync(Stream fileStream)+ {+ await InvokeAsync(() =>+ {+ IsLoadingFile = true;+ StateHasChanged();+ });++ try+ {+ await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(CancellationToken.None);++ LogOpeningFile(fileStream.Length);++ // TODO: Detect encoding.+ using var reader = new StreamReader(fileStream);+ string? text = await reader.ReadToEndAsync();++ await InvokeAsync(async () =>+ {+ UITextInput.Text(text);++ IsLoadingFile = false;++ StateHasChanged();++ await FocusOnTextEditorAsync();+ });+ }+ catch (Exception ex)+ {+ LogErrorOpeningFile(ex);++ await InvokeAsync(async () =>+ {+ IsLoadingFile = false;+ // TODO: Display ContentDialog++ //var dialog = new ContentDialog+ //{+ // // XamlRoot must be set in the case of a ContentDialog running in a Desktop app+ // XamlRoot = this.XamlRoot,+ // Title = ToolPage.UnableOpenFile,+ // Content = string.Format(ToolPage.UnableOpenFileDescription, fileStream.Name),+ // CloseButtonText = ToolPage.Ok,+ // DefaultButton = ContentDialogButton.Close+ //};+ //await dialog.ShowAsync();+ });+ }+ }++ private async Task FocusOnTextEditorAsync()+ {+ Guard.IsEqualTo(_childrenComponents.Count, 1);+ var focusableChild = _childrenComponents.First() as IFocusable;+ if (focusableChild is not null)+ {+ await focusableChild.FocusAsync();+ }+ }++ private void TriggerSmartDetection()+ {+ CancellationTokenSource? cancellationSourceToken = _cancellationTokenSource;+ cancellationSourceToken?.Cancel();+ cancellationSourceToken?.Dispose();+ Interlocked.Exchange(ref _cancellationTokenSource, new(TimeSpan.FromSeconds(5)));+ SmartDetectToolsAsync(UITextInput.Text, _cancellationTokenSource.Token).ForgetSafely();+ }++ private async Task SmartDetectToolsAsync(string text, CancellationToken cancellationToken)+ {+ await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);++ IReadOnlyList<SmartDetectedTool> detectedTools;+ using (await _disposableSemaphore.WaitAsync(cancellationToken))+ {+ // Detect tools to recommend.+ detectedTools+ = await SmartDetectionService.DetectAsync(text, strict: false, cancellationToken)+ .ConfigureAwait(true);++ await InvokeAsync(() =>+ {+ if (!cancellationToken.IsCancellationRequested)+ {+ SmartDetectionDropDownItems.Clear();++ if (detectedTools.Count > 0)+ {+ ToolsDetectedBySmartDetection = true;++ for (int i = 0; i < detectedTools.Count; i++)+ {+ SmartDetectedTool detectedTool = detectedTools[i];+ EventCallback<DropDownListItem> onClickEventCallback = EventCallback.Factory.Create<DropDownListItem>(this, SmartDetectionMenuItem_Click);+ var menuItem = new SmartDetectionDropDownListItem+ {+ IconGlyph = detectedTool.ToolInstance.IconGlyph,+ IconFontFamily = detectedTool.ToolInstance.IconFontName,+ Text = detectedTool.ToolInstance.LongOrShortDisplayTitle,+ SmartDetectedTool = detectedTool,+ OnClick = onClickEventCallback+ };++ SmartDetectionDropDownItems.Add(menuItem);+ }+ }+ else+ {+ ToolsDetectedBySmartDetection = false;++ var noToolDetectedMenuItem = new SmartDetectionDropDownListItem+ {+ Text = "No tool to suggest",+ IsEnabled = false+ };++ SmartDetectionDropDownItems.Add(noToolDetectedMenuItem);+ }++ StateHasChanged();+ }+ });+ }+ }++ private void SmartDetectionMenuItem_Click(DropDownListItem menuItem)+ {+ if (menuItem is SmartDetectionDropDownListItem smartDetectionDropDownListItem)+ {+ WeakReferenceMessenger.Default.Send(new ChangeSelectedMenuItemMessage(smartDetectionDropDownListItem.SmartDetectedTool));+ }+ }++ private void BuildCollapsedMenu()+ {+ // TODO: Localize+ CollapsedDropDownListItems.Clear();++ if (!UITextInput.IsReadOnly)+ {+ CollapsedDropDownListItems.Add(new DropDownListItem+ {+ IconGlyph = '\uF2D5',+ Text = "Paste",+ OnClick = EventCallback.Factory.Create<DropDownListItem>(this, OnPasteButtonClickAsync)+ });+ CollapsedDropDownListItems.Add(new DropDownListItem+ {+ IconGlyph = '\uF378',+ Text = "Load a file",+ OnClick = EventCallback.Factory.Create<DropDownListItem>(this, OnLoadFileButtonClickAsync)+ });+ CollapsedDropDownListItems.Add(new DropDownListItem+ {+ IconGlyph = '\uF369',+ Text = "Clear",+ OnClick = EventCallback.Factory.Create<DropDownListItem>(this, OnClearButtonClickAsync)+ });+ }++ if (UITextInput.IsReadOnly || UITextInput.CanCopyWhenEditable)+ {+ CollapsedDropDownListItems.Add(new DropDownListItem+ {+ IconGlyph = '\uF67F',+ Text = "Save as...",+ OnClick = EventCallback.Factory.Create<DropDownListItem>(this, OnSaveAsButtonClickAsync)+ });+ CollapsedDropDownListItems.Add(new DropDownListItem+ {+ IconGlyph = '\uF32B',+ Text = "Copy",+ OnClick = EventCallback.Factory.Create<DropDownListItem>(this, OnCopyButtonClick)+ });+ }+ }++ [LoggerMessage(1, LogLevel.Information, "Loading a file into a text input control. The file size is {fileSize} byte(s).")]+ partial void LogOpeningFile(long fileSize);++ [LoggerMessage(2, LogLevel.Warning, "Unable to open a file in a text input control.")]+ partial void LogErrorOpeningFile(Exception ex);++ [LoggerMessage(3, LogLevel.Warning, "Unable to save a file from a text input control.")]+ partial void LogErrorSavingFile(Exception ex);++ public class SmartDetectionDropDownListItem : DropDownListItem+ {+ internal SmartDetectedTool SmartDetectedTool { get; set; } = default!;+ }+}diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.js b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.jsnew file mode 100644index 000000000..ea22b3a49--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.js@@ -0,0 +1,71 @@+export function registerResizeHandler(id, dotNetObjRef) {+ const element = document.getElementById(id);+ // Setup resize observer.+ const resizeObserver = new ResizeObserver((elements) => {+ dotNetObjRef.invokeMethodAsync("OnComponentResize", Math.trunc(elements[0].contentRect.width));+ });+ resizeObserver.observe(element);+ element.resizeObserver = resizeObserver;+}+export function registerDropZone(id) {+ const element = document.getElementById(id);+ // Prevent default drag behaviors+ ["dragenter", "dragover", "dragleave", "drop"].forEach(eventName => {+ element.addEventListener(eventName, preventDefaults, false);+ });+ // Highlight drop area when item is dragged over it+ ["dragenter", "dragover"].forEach(eventName => {+ element.addEventListener(eventName, highlight, false);+ });+ ["dragleave", "drop"].forEach(eventName => {+ element.addEventListener(eventName, unhighlight, false);+ });+ // Handle dropped files+ element.addEventListener("drop", handleDrop, false);+}+export function dispose(id) {+ const element = document.getElementById(id);+ // Stop resize observer.+ element.resizeObserver.disconnect();+ // Stop drop zone+ ["dragenter", "dragover", "dragleave", "drop"].forEach(eventName => {+ element.removeEventListener(eventName, preventDefaults, false);+ });+ ["dragenter", "dragover"].forEach(eventName => {+ element.removeEventListener(eventName, highlight, false);+ });+ ["dragleave", "drop"].forEach(eventName => {+ element.removeEventListener(eventName, unhighlight, false);+ });+}+function preventDefaults(e) {+ e.preventDefault();+ e.stopPropagation();+}+function highlight(e) {+ if (e.dataTransfer.items.length === 1 && e.dataTransfer.items[0].kind === "file") {+ e.dataTransfer.dropEffect = "copy";+ e.target.classList.add("dragging");+ }+ else {+ e.dataTransfer.dropEffect = "none";+ }+}+function unhighlight(e) {+ e.target.classList.remove("dragging");+}+function handleDrop(e) {+ const dt = e.dataTransfer;+ const files = dt.files;+ const element = e.target;+ if (files.length === 1) {+ const inputFileElement = element.querySelector("input[type=file]");+ if (inputFileElement === null) {+ throw new Error("");+ }+ inputFileElement.files = files;+ const event = new Event("change", { bubbles: true });+ inputFileElement.dispatchEvent(event);+ }+}+//# sourceMappingURL=UITextInputWrapper.razor.js.map\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.scss b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.scssnew file mode 100644index 000000000..16ccbbbd8--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.scss@@ -0,0 +1,31 @@+.ui-text-input-wrapper {+ border: 2px dashed transparent;+ border-radius: var(--overlay-corner-radius);++ .ui-text-input-wrapper-separator {+ border-left: 1px solid var(--divider-stroke-color-default);+ width: 1px;+ height: 100%;+ margin-left: 2px;+ margin-right: 2px;+ }++ .ui-text-input-wrapper-centered-progress-bar {+ position: absolute;+ top: 50%;+ left: 0;+ transform: translate(0%, -50%);+ bottom: 50%;+ right: 0;+ height: fit-content;+ }++ &.dragging {+ border-color: var(--ui-text-input-wrapper-dragging-stroke-color);+ background-color: var(--ui-text-input-wrapper-dragging-background-color);++ > * {+ pointer-events: none !important;+ }+ }+}diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.ts b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.tsnew file mode 100644index 000000000..817463809--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.ts@@ -0,0 +1,83 @@+export function registerResizeHandler(id: string, dotNetObjRef: DotNet.DotNetObject): void {+ const element = document.getElementById(id);++ // Setup resize observer.+ const resizeObserver = new ResizeObserver((elements) => {+ dotNetObjRef.invokeMethodAsync("OnComponentResize", Math.trunc(elements[0].contentRect.width));+ });+ resizeObserver.observe(element);+ (<any>element).resizeObserver = resizeObserver;+}++export function registerDropZone(id: string): void {+ const element = document.getElementById(id);++ // Prevent default drag behaviors+ ["dragenter", "dragover", "dragleave", "drop"].forEach(eventName => {+ element.addEventListener(eventName, preventDefaults, false);+ });++ // Highlight drop area when item is dragged over it+ ["dragenter", "dragover"].forEach(eventName => {+ element.addEventListener(eventName, highlight, false);+ });+ ["dragleave", "drop"].forEach(eventName => {+ element.addEventListener(eventName, unhighlight, false);+ });++ // Handle dropped files+ element.addEventListener("drop", handleDrop, false);+}++export function dispose(id: string): void {+ const element = document.getElementById(id);++ // Stop resize observer.+ (<ResizeObserver>(<any>element).resizeObserver).disconnect();++ // Stop drop zone+ ["dragenter", "dragover", "dragleave", "drop"].forEach(eventName => {+ element.removeEventListener(eventName, preventDefaults, false);+ });+ ["dragenter", "dragover"].forEach(eventName => {+ element.removeEventListener(eventName, highlight, false);+ });+ ["dragleave", "drop"].forEach(eventName => {+ element.removeEventListener(eventName, unhighlight, false);+ });+}++function preventDefaults(e: DragEvent): void {+ e.preventDefault();+ e.stopPropagation();+}++function highlight(e: DragEvent) {+ if (e.dataTransfer.items.length === 1 && e.dataTransfer.items[0].kind === "file") {+ e.dataTransfer.dropEffect = "copy";+ (<HTMLElement>e.target).classList.add("dragging");+ } else {+ e.dataTransfer.dropEffect = "none";+ }+}++function unhighlight(e: DragEvent) {+ (<HTMLElement>e.target).classList.remove("dragging");+}++function handleDrop(e: DragEvent) {+ const dt = e.dataTransfer;+ const files: FileList = dt.files;+ const element = (<HTMLElement>e.target);++ if (files.length === 1) {+ const inputFileElement = element.querySelector("input[type=file]") as HTMLInputElement | null;+ if (inputFileElement === null) {+ throw new Error("");+ }++ inputFileElement.files = files;+ const event = new Event("change", { bubbles: true });+ inputFileElement.dispatchEvent(event);+ }+}\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIWrapPresenter.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UIWrapPresenter.razornew file mode 100644index 000000000..7b4091f32--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIWrapPresenter.razor@@ -0,0 +1,20 @@+@namespace DevToys.Blazor.Components.UIElements+@using DevToys.Api;+@inherits ComponentBase++<StackPanel id="@UIWrap.Id"+ IsVisible="@UIWrap.IsVisible"+ IsEnabled="@UIWrap.IsEnabled"+ HorizontalAlignment="@UIWrap.HorizontalAlignment"+ VerticalAlignment="@UIWrap.VerticalAlignment"+ Orientation="UIOrientation.Horizontal"+ Wrap="true"+ Spacing="@(UIWrap.Spacing == UISpacing.Small ? 4 : (UIWrap.Spacing == UISpacing.Medium ? 8 : 12))">+ @if (UIWrap.Children is not null)+ {+ for (int i = 0; i < UIWrap.Children.Length; i++)+ {+ <UIElementPresenter UIElement="@UIWrap.Children[i]" />+ }+ }+</StackPanel>\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIWrapPresenter.razor.cs b/src/app/dev/DevToys.Blazor/Components/UIElements/UIWrapPresenter.razor.csnew file mode 100644index 000000000..1c4cc01bb--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIWrapPresenter.razor.cs@@ -0,0 +1,7 @@+namespace DevToys.Blazor.Components.UIElements;++public partial class UIWrapPresenter : ComponentBase+{+ [Parameter]+ public IUIWrap UIWrap { get; set; } = default!;+}diff --git a/src/app/dev/DevToys.Blazor/Pages/Index.razor.cs b/src/app/dev/DevToys.Blazor/Pages/Index.razor.csindex e8ddbaca5..7d9bf5820 100644--- a/src/app/dev/DevToys.Blazor/Pages/Index.razor.cs+++ b/src/app/dev/DevToys.Blazor/Pages/Index.razor.cs@@ -62,7 +62,11 @@ public partial class Index : MefComponentBaseprivate void WindowService_WindowActivated(object? sender, EventArgs e){// Start Smart Detection- ViewModel.RunSmartDetectionAsync(WindowService.IsOverlayMode).Forget();+ ViewModel.RunSmartDetectionAsync(WindowService.IsOverlayMode)+ .ContinueWith(async _ =>+ {+ await InvokeAsync(StateHasChanged);+ });}private void OnBackButtonClicked()diff --git a/src/app/dev/DevToys.Blazor/Pages/SubPages/TestPage.razor b/src/app/dev/DevToys.Blazor/Pages/SubPages/TestPage.razorindex 222465b92..c6b2ba6f8 100644--- a/src/app/dev/DevToys.Blazor/Pages/SubPages/TestPage.razor+++ b/src/app/dev/DevToys.Blazor/Pages/SubPages/TestPage.razor@@ -1,7 +1,7 @@<h3>TestPage</h3><CascadingValue Value="this" IsFixed="true">- <ScrollViewer>+ @*<ScrollViewer><StackPanel Class="entrance-theme-transition"Orientation="UIOrientation.Vertical"PaddingLeft="16"@@ -59,7 +59,7 @@</LeftOrTopCellContent><RightOrBottomCellContent><StackPanel Orientation="UIOrientation.Vertical">- <DropDownList Header="Drop down list header"+ <DropDownButton Header="Drop down list header"Items="@(new List<DropDownListItem>{new DropDownListItem { Text = "Item 1", IconGlyph = '\uE670' },@@ -79,8 +79,8 @@new DropDownListItem { Text = "Item 15 - longer text" }})"><TextBlock Appearance="TextBlockAppearance.Body" Text="Click me!" />- </DropDownList>- @*<ComboBox Items="@(new List<string>+ </DropDownButton>+ <ComboBox Items="@(new List<string>{"Item 1", "Item 2", "Item 3", "Item 4", "Item 5", "Item 6", "Item 7", "Item 8", "Item 9", "Item 10","Item 11", "Item 12", "Item 13", "Item 14", "Item 15", "Item 16 - longer text"@@ -92,7 +92,7 @@<ItemTemplate>@item</ItemTemplate>- </ComboBox>*@+ </ComboBox><ListBox Items="@(new List<string>{"Item 1", "Item 2", "Item 3", "Item 4", "Item 5", "Item 6", "Item 7", "Item 8", "Item 9", "Item 10",@@ -133,5 +133,5 @@</Control></Card></StackPanel>- </ScrollViewer>+ </ScrollViewer>*@</CascadingValue>\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razorindex d3f2e09a1..590875608 100644--- a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor+++ b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor@@ -4,37 +4,36 @@<CascadingValue Value="this" IsFixed="true"><ScrollViewer Class="entrance-theme-transition tool-page">- <Grid RowSpacing="12"- Rows="@(new List<GridLength>+ @RenderTool+ </ScrollViewer>+</CascadingValue>++@code {+ private RenderFragment RenderTool { get; set; } = default!;++ protected override Task OnInitializedAsync()+ {+ RenderTool = (__builder) =>+ {+ <Grid RowSpacing="12"+ Rows="@(new List<GridLength>{GridLength.Auto,new GridLength(1, GridUnitType.Fraction)})">- <GridCell Row="0">- <TextBlock Appearance="@TextBlockAppearance.Title"- Style="font-size: 24px !important"- Text="@ViewModel.HeaderText" />- </GridCell>+ <GridCell Row="0">+ <TextBlock Appearance="@TextBlockAppearance.Title"+ Style="font-size: 24px !important"+ Text="@ViewModel.HeaderText" />+ </GridCell>- <GridCell Row="1">- <UIElementPresenter UIElement="@ViewModel.ToolView" />- </GridCell>- </Grid>- @*<StackPanel Orientation="Orientation.Vertical">- <TextBlock Appearance="@TextBlockAppearance.Title" Style="font-size: 24px !important" Text="@ViewModel.HeaderText" />- <Card Title="Compact mode" Description="Description of the option" IconGlyph="@('\uEA19')">- <Control>- <ToggleSwitch IsOn="@IsCompactModeEnabled" OnCheckedChanged="OnCompactModeChanged" Text="@((IsCompactModeEnabled ? "On" : "Off"))" />- </Control>- </Card>- <Button HorizontalAlignment="HorizontalAlignment.Left"><TextBlock Text="Sample button" /></Button>- <Button HorizontalAlignment="HorizontalAlignment.Left"><TextBlock Text="Sample button" /></Button>- <Button HorizontalAlignment="HorizontalAlignment.Left"><TextBlock Text="Sample button" /></Button>- <Button HorizontalAlignment="HorizontalAlignment.Left"><TextBlock Text="Sample button" /></Button>- <Button HorizontalAlignment="HorizontalAlignment.Left"><TextBlock Text="Sample button" /></Button>- <Button HorizontalAlignment="HorizontalAlignment.Left"><TextBlock Text="Sample button" /></Button>- <Button HorizontalAlignment="HorizontalAlignment.Left"><TextBlock Text="Sample button" /></Button>- </StackPanel>*@- </ScrollViewer>-</CascadingValue>\ No newline at end of file+ <GridCell Row="1">+ <UIElementPresenter UIElement="@ViewModel.ToolView" />+ </GridCell>+ </Grid>+ };++ return base.OnInitializedAsync();+ }+}\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/wwwroot/img/idea-disabled.svg b/src/app/dev/DevToys.Blazor/wwwroot/img/idea-disabled.svgindex 2d63a957e..8a3261152 100644--- a/src/app/dev/DevToys.Blazor/wwwroot/img/idea-disabled.svg+++ b/src/app/dev/DevToys.Blazor/wwwroot/img/idea-disabled.svg@@ -3,7 +3,7 @@viewBox="0 0 48 48"version="1.1"id="svg36"- sodipodi:docname="Idea-disabled.svg"+ sodipodi:docname="idea-disabled.svg"inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"diff --git a/src/app/dev/DevToys.Blazor/wwwroot/js/devtoys.js b/src/app/dev/DevToys.Blazor/wwwroot/js/devtoys.jsindex 5f282702b..01908e23f 100644--- a/src/app/dev/DevToys.Blazor/wwwroot/js/devtoys.js+++ b/src/app/dev/DevToys.Blazor/wwwroot/js/devtoys.js@@ -1 +1,10 @@-\ No newline at end of file+window.addEventListener("dragover", function (e) {+ e.preventDefault();++ // Prevent drop anything on the window (except where we will allow it).+ e.dataTransfer.dropEffect = "none";+}, false);++window.addEventListener("drop", function (e) {+ e.preventDefault();+}, false);\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Sample/SampleToolFactory.cs b/src/app/dev/DevToys.Tools/Tools/Sample/SampleToolFactory.csindex 15f8b0c82..7aa187a90 100644--- a/src/app/dev/DevToys.Tools/Tools/Sample/SampleToolFactory.cs+++ b/src/app/dev/DevToys.Tools/Tools/Sample/SampleToolFactory.cs@@ -128,7 +128,7 @@ internal sealed class SampleGuiTool : IGuiTool[TargetPlatform(Platform.WASM)]internal sealed class SampleGuiTool2 : IGuiTool{- private readonly IUIMultilineLineTextInput _editor = MultilineTextInput().CanCopyWhenEditable();+ private readonly IUIMultiLineTextInput _editor = MultilineTextInput().CanCopyWhenEditable();public IUIElement View=> _editor;diff --git a/src/app/dev/DevToys.Tools/Tools/Settings/SettingsGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Settings/SettingsGuiTool.csindex 7f9012f07..298451f30 100644--- a/src/app/dev/DevToys.Tools/Tools/Settings/SettingsGuiTool.cs+++ b/src/app/dev/DevToys.Tools/Tools/Settings/SettingsGuiTool.cs@@ -77,20 +77,20 @@ internal sealed class SettingsGuiTool : IGuiTool.Description("Description").InteractiveElement(Switch())),- Stack()- .Horizontal()+ Wrap().WithChildren(_topLeftButton,Button().Text("Top Center button"),Button().Text("Top Right button")),- Stack()- .Horizontal()+ Wrap().Disable().WithChildren(Button().Text("Bottom Left button"),Button().Text("Bottom Center button").OnClick(OnBottomCenterButtonClickAsync),- Button().Text("Bottom Right button"))//,- /*SingleLineTextInput().CanCopyWhenEditable()*/);+ Button().Text("Bottom Right button")),+ SingleLineTextInput().Title("Read-write text input with copy").ReadOnly(),+ MultilineTextInput().Title("Monaco editor").Text("{\"hello\": \"there\"}").Language("json"),+ DiffTextInput().Title("Difference").OriginalText("hello").ModifiedText("hello world"));public void OnDataReceived(string dataTypeName, object? parsedData){diff --git a/src/app/dev/platforms/desktop/DevToys.CLI/Core/FileStorage/FileStorage.cs b/src/app/dev/platforms/desktop/DevToys.CLI/Core/FileStorage/FileStorage.csindex 4cedef844..54da1dd4c 100644--- a/src/app/dev/platforms/desktop/DevToys.CLI/Core/FileStorage/FileStorage.cs+++ b/src/app/dev/platforms/desktop/DevToys.CLI/Core/FileStorage/FileStorage.cs@@ -59,7 +59,13 @@ internal sealed class FileStorage : IFileStoragereturn File.OpenWrite(relativeOrAbsoluteFilePath);}- public ValueTask<string?> PickSaveFileAsync(string[] fileTypes)+ public ValueTask<Stream?> PickSaveFileAsync(string[] fileTypes)+ {+ // TODO: prompt the user to type in the console a relative or absolute file path that has one of the file types indicated.+ throw new NotImplementedException();+ }++ public ValueTask<Stream?> PickOpenFileAsync(string[] fileTypes){// TODO: prompt the user to type in the console a relative or absolute file path that has one of the file types indicated.throw new NotImplementedException();diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Core/FileStorage.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Core/FileStorage.csindex 5110ccb87..80747394f 100644--- a/src/app/dev/platforms/desktop/DevToys.Windows/Core/FileStorage.cs+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Core/FileStorage.cs@@ -1,5 +1,7 @@using System.IO;+using System.Text;using DevToys.Api;+using Microsoft.Win32;namespace DevToys.Windows.Core;@@ -54,9 +56,69 @@ internal sealed class FileStorage : IFileStoragereturn File.OpenWrite(relativeOrAbsoluteFilePath);}- public ValueTask<string?> PickSaveFileAsync(string[] fileTypes)+ public ValueTask<Stream?> PickSaveFileAsync(string[] fileTypes){- // TODO: prompt the user to type in the console a relative or absolute file path that has one of the file types indicated.- throw new NotImplementedException();+ var saveFileDialog = new SaveFileDialog+ {+ OverwritePrompt = true+ };++ if (fileTypes is not null)+ {+ saveFileDialog.Filter = GenerateFilter(fileTypes);+ }++ if (saveFileDialog.ShowDialog() == true)+ {+ if (File.Exists(saveFileDialog.FileName))+ {+ // Clear the file.+ using FileStream fileStream = File.Open(saveFileDialog.FileName, FileMode.Open);+ fileStream.SetLength(0);+ fileStream.Close();+ }++ return new ValueTask<Stream?>(saveFileDialog.OpenFile());+ }++ return new ValueTask<Stream?>(Task.FromResult<Stream?>(null));+ }++ public ValueTask<Stream?> PickOpenFileAsync(string[] fileTypes)+ {+ var openFileDialog = new OpenFileDialog+ {+ CheckFileExists = true,+ CheckPathExists = true,+ Multiselect = false,+ ShowReadOnly = true+ };++ if (fileTypes is not null)+ {+ openFileDialog.Filter = GenerateFilter(fileTypes);+ }++ if (openFileDialog.ShowDialog() == true)+ {+ return new ValueTask<Stream?>(openFileDialog.OpenFile());+ }++ return new ValueTask<Stream?>(Task.FromResult<Stream?>(null));+ }++ private static string GenerateFilter(string[] fileTypes)+ {+ var filters = new StringBuilder();+ foreach (string fileType in fileTypes)+ {+ filters.Append($"{fileType}|{fileType}|");+ }++ if (filters.Length > 0)+ {+ filters.Remove(filters.Length - 1, 1);+ }+ return filters.ToString();}}diff --git a/src/app/tests/DevToys.UnitTests/Mocks/MockIFileStorage.cs b/src/app/tests/DevToys.UnitTests/Mocks/MockIFileStorage.csindex c1899ed66..5f61bb1d0 100644--- a/src/app/tests/DevToys.UnitTests/Mocks/MockIFileStorage.cs+++ b/src/app/tests/DevToys.UnitTests/Mocks/MockIFileStorage.cs@@ -24,8 +24,15 @@ internal class MockIFileStorage : IFileStoragethrow new NotImplementedException();}- public ValueTask<string> PickSaveFileAsync(string[] fileTypes)+ public ValueTask<Stream?> PickSaveFileAsync(string[] fileTypes){+ // TODO: prompt the user to type in the console a relative or absolute file path that has one of the file types indicated.+ throw new NotImplementedException();+ }++ public ValueTask<Stream?> PickOpenFileAsync(string[] fileTypes)+ {+ // TODO: prompt the user to type in the console a relative or absolute file path that has one of the file types indicated.throw new NotImplementedException();}}diff --git a/src/spellcheckerexclusion.dic b/src/spellcheckerexclusion.dicindex f4cc125d0..1e4f04b1a 100644--- a/src/spellcheckerexclusion.dic+++ b/src/spellcheckerexclusion.dic@@ -7,3 +7,4 @@ FiradwmapihwndDoesnt+monaco\ No newline at end of file