A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Added IUIFileSelector
Etienne Baudouxca0132e35dfa
diff --git a/.vscode/settings.json b/.vscode/settings.jsonindex ea88f81e0..c2e228ab2 100644--- a/.vscode/settings.json+++ b/.vscode/settings.json@@ -17,5 +17,6 @@},"emmet.includeLanguages": {"aspnetcorerazor": "html"- }+ },+ "dotnet.defaultSolution": "src\\DevToys-MacOS.sln"}diff --git a/src/app/dev/DevToys.Api/Core/IFileStorage.cs b/src/app/dev/DevToys.Api/Core/IFileStorage.csindex 41b071d37..ce92b6e07 100644--- a/src/app/dev/DevToys.Api/Core/IFileStorage.cs+++ b/src/app/dev/DevToys.Api/Core/IFileStorage.cs@@ -22,9 +22,18 @@ public interface IFileStorage/// <summary>/// Prompt the user to select a file to open./// </summary>+ /// <remarks>The returned items contain a stream. It won't be disposed automatically. It is important to dispose the stream yourself, when not needed anymore</remarks>/// <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);+ ValueTask<PickedFile?> PickOpenFileAsync(string[] fileTypes);++ /// <summary>+ /// Prompt the user to select many files to open.+ /// </summary>+ /// <remarks>The returned items contain a stream. It won't be disposed automatically. It is important to dispose the stream yourself, when not needed anymore</remarks>+ /// <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<PickedFile[]> PickOpenFilesAsync(string[] fileTypes);/// <summary>/// Prompt the user to select a folder.diff --git a/src/app/dev/DevToys.Api/Core/PickedFile.cs b/src/app/dev/DevToys.Api/Core/PickedFile.csnew file mode 100644index 000000000..68e066bde--- /dev/null+++ b/src/app/dev/DevToys.Api/Core/PickedFile.cs@@ -0,0 +1,8 @@+namespace DevToys.Api;++public record PickedFile(string FileName, Stream Stream)+{+ public string FileName { get; init; } = FileName;++ public Stream Stream { get; init; } = Stream;+}diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIFileSelector.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIFileSelector.csnew file mode 100644index 000000000..916d1e313--- /dev/null+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIFileSelector.cs@@ -0,0 +1,146 @@+namespace DevToys.Api;++/// <summary>+/// A component that represents a drop zone and selector for files, folders, images coming from the clipboard.+/// </summary>+public interface IUIFileSelector : IUIElement+{+ /// <summary>+ /// Gets the list of absolute path to the file(s) the user selected.+ /// </summary>+ /// <remarks>The items contain a stream. It won't be disposed automatically. It is important to dispose the stream yourself, when not needed anymore</remarks>+ PickedFile[] SelectedFiles { get; }++ /// <summary>+ /// Gets whether the user is allowed to select more than one file.+ /// </summary>+ bool CanSelectManyFiles { get; }++ /// <summary>+ /// Gets the list of file extensions allowed to be selected. An empty list of file extensions indicates any kind of file.+ /// </summary>+ string[] AllowedFileExtensions { get; }++ /// <summary>+ /// Gets the action to run when the user selected file(s).+ /// </summary>+ /// <remarks>The items contain a stream. It won't be disposed automatically. It is important to dispose the stream yourself, when not needed anymore</remarks>+ Func<PickedFile[], ValueTask>? OnFilesSelectedAction { get; }++ /// <summary>+ /// Raised when <see cref="CanSelectManyFiles"/> is changed.+ /// </summary>+ event EventHandler? CanSelectManyFilesChanged;++ /// <summary>+ /// Raised when <see cref="AllowedFileExtensions"/> is changed.+ /// </summary>+ event EventHandler? AllowedFileExtensionsChanged;+}++[DebuggerDisplay($"Id = {{{nameof(Id)}}}, SelectedFiles = {{{nameof(SelectedFiles)}}}")]+internal sealed class UIFileSelector : UIElement, IUIFileSelector+{+ private PickedFile[] _selectedFiles = Array.Empty<PickedFile>();+ private bool _allowMultipleFileSelection;+ private string[] _allowedFileExtensions = Array.Empty<string>();++ internal UIFileSelector(string? id)+ : base(id)+ {+ }++ public PickedFile[] SelectedFiles+ {+ get => _selectedFiles;+ internal set+ {+ SetPropertyValue(ref _selectedFiles, value, null);+ OnFilesSelectedAction?.Invoke(_selectedFiles);+ }+ }++ public bool CanSelectManyFiles+ {+ get => _allowMultipleFileSelection;+ internal set => SetPropertyValue(ref _allowMultipleFileSelection, value, CanSelectManyFilesChanged);+ }++ public string[] AllowedFileExtensions+ {+ get => _allowedFileExtensions;+ internal set => SetPropertyValue(ref _allowedFileExtensions, value, AllowedFileExtensionsChanged);+ }++ public Func<PickedFile[], ValueTask>? OnFilesSelectedAction { get; internal set; }++ public event EventHandler? CanSelectManyFilesChanged;+ public event EventHandler? AllowedFileExtensionsChanged;+}++public static partial class GUI+{+ /// <summary>+ /// Create a component that represents a drop zone and selector for files, folders, images coming from the clipboard.+ /// </summary>+ public static IUIFileSelector FileSelector()+ {+ return FileSelector(null);+ }++ /// <summary>+ /// Create a component that represents a drop zone and selector for files, folders, images coming from the clipboard.+ /// </summary>+ /// <param name="id">An optional unique identifier for this UI element.</param>+ public static IUIFileSelector FileSelector(string? id)+ {+ return new UIFileSelector(id);+ }++ /// <summary>+ /// Sets selected files.+ /// </summary>+ /// <remarks>The items contain a stream. It won't be disposed automatically. It is important to dispose the stream yourself, when not needed anymore</remarks>+ public static IUIFileSelector WithFiles(this IUIFileSelector element, params PickedFile[] files)+ {+ ((UIFileSelector)element).SelectedFiles = files;+ return element;+ }++ /// <summary>+ /// Sets the action to run when the user selected file(s).+ /// </summary>+ /// <remarks>The items contain a stream. It won't be disposed automatically. It is important to dispose the stream yourself, when not needed anymore</remarks>+ public static IUIFileSelector OnFilesSelected(this IUIFileSelector element, Func<PickedFile[], ValueTask>? actionOnFilesSelected)+ {+ ((UIFileSelector)element).OnFilesSelectedAction = actionOnFilesSelected;+ return element;+ }++ /// <summary>+ /// Sets the list of file extensions allowed to be selected. An empty list of file extensions indicates any kind of file.+ /// </summary>+ public static IUIFileSelector LimitFileTypesTo(this IUIFileSelector element, params string[] fileExtensions)+ {+ ((UIFileSelector)element).AllowedFileExtensions = fileExtensions;+ return element;+ }++ /// <summary>+ /// Allows the user to select only one file at once.+ /// </summary>+ public static IUIFileSelector CanSelectOneFile(this IUIFileSelector element)+ {+ ((UIFileSelector)element).CanSelectManyFiles = false;+ return element;+ }++ /// <summary>+ /// Allows the user to select multiple files at once.+ /// </summary>+ public static IUIFileSelector CanSelectManyFiles(this IUIFileSelector element)+ {+ ((UIFileSelector)element).CanSelectManyFiles = true;+ return element;+ }+}diff --git a/src/app/dev/DevToys.Blazor/Assets/sass/devtoys.scss b/src/app/dev/DevToys.Blazor/Assets/sass/devtoys.scssindex b7474aa82..c87e087e5 100644--- a/src/app/dev/DevToys.Blazor/Assets/sass/devtoys.scss+++ b/src/app/dev/DevToys.Blazor/Assets/sass/devtoys.scss@@ -5,6 +5,13 @@*, *::before, *::after {box-sizing: border-box;+ -moz-box-sizing: border-box;+ -webkit-box-sizing: border-box;++ -webkit-user-select: none;+ user-select: none;+ -webkit-user-drag: none;+ user-drag: none;}html, body {diff --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 5508ba958..caa28560b 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@@ -138,6 +138,20 @@--stealth-button-border-disabled: var(--control-fill-color-transparent);--stealth-button-border-thickness: 1px solid;+ --hyperlink-button-background: var(--control-fill-color-transparent);+ --hyperlink-button-background-pointer-over: var(--control-fill-color-secondary);+ --hyperlink-button-background-pressed: var(--control-fill-color-tertiary);+ --hyperlink-button-background-disabled: var(--control-fill-color-transparent);+ --hyperlink-button-foreground: var(--accent-default);+ --hyperlink-button-foreground-pointer-over: var(--accent-tertiary);+ --hyperlink-button-foreground-pressed: var(--accent-disabled);+ --hyperlink-button-foreground-disabled: var(--accent-disabled);+ --hyperlink-button-border: var(--control-fill-color-transparent);+ --hyperlink-button-border-pointer-over: var(--control-border-color-default);+ --hyperlink-button-border-pressed: var(--control-stroke-color-default);+ --hyperlink-button-border-disabled: var(--control-fill-color-transparent);+ --hyperlink-button-border-thickness: 1px solid;+/* CheckBox */--check-box-check-corner-radius: var(--control-corner-radius);--check-box-foreground: var(--text-fill-color-primary);@@ -342,7 +356,9 @@/* 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);+ /* UIFileSelector */+ --ui-file-selector-background-color: transparent;+ --ui-file-selector-stroke-color: var(--text-fill-color-disabled);+ --ui-file-selector-dragging-background-color: var(--control-fill-color-tertiary);+ --ui-file-selector-dragging-stroke-color: var(--text-fill-color-tertiary);}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 1af1d54d1..2844bee65 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@@ -102,6 +102,32 @@ button {color: var(--stealth-button-foreground-disabled);}}++ &hyperlink {+ border: var(--hyperlink-button-border-thickness);+ border-color: var(--hyperlink-button-border);+ background-color: var(--hyperlink-button-background);+ color: var(--hyperlink-button-foreground);+ background-clip: padding-box;++ &:hover {+ border-color: var(--hyperlink-button-border-pointer-over);+ background-color: var(--hyperlink-button-background-pointer-over);+ color: var(--hyperlink-button-foreground-pointer-over);+ }++ &:active {+ border-color: var(--hyperlink-button-border-pressed);+ background-color: var(--hyperlink-button-background-pressed);+ color: var(--hyperlink-button-foreground-pressed);+ }++ &.disabled {+ border-color: var(--hyperlink-button-border-disabled);+ background-color: var(--hyperlink-button-background-disabled);+ color: var(--hyperlink-button-foreground-disabled);+ }+ }}&.disabled {diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/Button/ButtonAppearance.cs b/src/app/dev/DevToys.Blazor/Components/BasicInput/Button/ButtonAppearance.csindex 4b9484ff7..6c9e1ace4 100644--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/Button/ButtonAppearance.cs+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/Button/ButtonAppearance.cs@@ -5,6 +5,7 @@ public sealed class ButtonAppearanceinternal static readonly ButtonAppearance Neutral = new("neutral");internal static readonly ButtonAppearance Accent = new("accent");internal static readonly ButtonAppearance Stealth = new("stealth");+ internal static readonly ButtonAppearance Hyperlink = new("hyperlink");private ButtonAppearance(string className){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 6d45e1d5e..007fa30ef 100644--- a/src/app/dev/DevToys.Blazor/Components/Text/TextBlock/TextBlock.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/Text/TextBlock/TextBlock.razor.cs@@ -42,6 +42,7 @@ public class TextBlock : StyledComponentBase.AddClass("no-wrap", NoWrap).AddClass("trim", CanTrim).AddClass("hide", !IsVisible)+ .AddClass("horizontal-center", HorizontalAlignment == UIHorizontalAlignment.Center).AddClass(FinalCssClasses).Build();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 fca53a15e..09907778f 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@@ -97,4 +97,8 @@&.hide {display: none !important;}++ &.horizontal-center {+ text-align: center;+ }}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 4967f4895..35cd4f222 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@@ -196,7 +196,7 @@ public partial class TextBox : MefComponentBase, IFocusable_contextMenuItems.Add(PasteContextMenuItem);}- if (Text?.Length > 0)+ if (Text?.Length > 0 && Type != TextBoxTypes.Number){SelectAllContextMenuItem.OnClick = EventCallback.Factory.Create<DropDownListItem>(this, OnSelectAllAsync);_contextMenuItems.Add(SelectAllContextMenuItem);diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIElementPresenter.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UIElementPresenter.razorindex eba3c3d5a..b27b10147 100644--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UIElementPresenter.razor+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIElementPresenter.razor@@ -54,6 +54,10 @@<UIIconPresenter UIIcon="@icon" />break;+ case IUIFileSelector fileSelector:+ <UIFileSelectorPresenter UIFileSelector="@fileSelector"/>+ 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/UIFileSelectorPresenter.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razornew file mode 100644index 000000000..3d222bc7c--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor@@ -0,0 +1,74 @@+@namespace DevToys.Blazor.Components.UIElements+@using DevToys.Api;+@inherits MefComponentBase++<!-- TODO: Localize -->+<Container id="@ExtendedId"+ IsVisible="@UIFileSelector.IsVisible"+ IsEnabled="@UIFileSelector.IsEnabled"+ HorizontalAlignment="@UIFileSelector.HorizontalAlignment"+ VerticalAlignment="@UIFileSelector.VerticalAlignment"+ Class="ui-file-selector">++ <!-- Input form used for getting the dropped file when use drag and drop a file into the UI. -->+ <InputFile id="@InputFileId"+ style="display: none;"+ multiple="true"+ webkitdirectory="true"+ directory="true"+ OnChange="OnFileDropped" />++ <StackPanel Spacing="8"+ Orientation="UIOrientation.Vertical"+ MarginTop="24"+ MarginLeft="24"+ MarginBottom="24"+ MarginRight="24"+ HorizontalAlignment="UIHorizontalAlignment.Center"+ VerticalAlignment="UIVerticalAlignment.Center">++ <TextBlock HorizontalAlignment="UIHorizontalAlignment.Center"+ Text="@DragDropInstructions" />++ <TextBlock HorizontalAlignment="UIHorizontalAlignment.Center"+ NoWrap="true"+ Text="or" />++ <StackPanel HorizontalAlignment="UIHorizontalAlignment.Center"+ Spacing="6"+ Orientation="UIOrientation.Horizontal">+ <Button VerticalAlignment="UIVerticalAlignment.Center"+ Appearance="ButtonAppearance.Hyperlink"+ @onclick="@OnBrowseFilesButtonClickAsync">+ <TextBlock Text="Browse files" />+ </Button>++ @if (@UIFileSelector.CanSelectManyFiles)+ {+ <TextBlock Text="/"+ VerticalAlignment="UIVerticalAlignment.Center" />+ <Button VerticalAlignment="UIVerticalAlignment.Center"+ Appearance="ButtonAppearance.Hyperlink"+ @onclick="@OnBrowseFoldersButtonClickAsync">+ <TextBlock Text="Browse folders" />+ </Button>+ }++ <TextBlock Text="/"+ VerticalAlignment="UIVerticalAlignment.Center" />+ <Button VerticalAlignment="UIVerticalAlignment.Center"+ Appearance="ButtonAppearance.Hyperlink"+ @onclick="@OnPasteButtonClickAsync">+ <TextBlock Text="Paste" />+ </Button>+ </StackPanel>++ <TextBlock Text="@HasInvalidFilesSelectedIndication"+ IsVisible="@HasInvalidFilesSelected"+ Appearance="TextBlockAppearance.Caption"+ HorizontalAlignment="UIHorizontalAlignment.Center"+ Style="color: orange"/>++ </StackPanel>++</Container>\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.cs b/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.csnew file mode 100644index 000000000..cd383c134--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.cs@@ -0,0 +1,280 @@+using Microsoft.AspNetCore.Components.Forms;++namespace DevToys.Blazor.Components.UIElements;++public partial class UIFileSelectorPresenter : MefComponentBase+{+ protected override string? JavaScriptFile => "./_content/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.js";++ protected string ExtendedId => UIFileSelector.Id + "-" + Id;++ protected string InputFileId => UIFileSelector.Id + "-" + Id + "-InputFile";++ [Import]+ internal IClipboard Clipboard { get; set; } = default!;++ [Import]+ internal IFileStorage FileStorage { get; set; } = default!;++ [Parameter]+ public IUIFileSelector UIFileSelector { get; set; } = default!;++ internal string DragDropInstructions { get; private set; } = string.Empty;++ internal string HasInvalidFilesSelectedIndication { get; private set; } = string.Empty;++ internal bool HasInvalidFilesSelected { get; private set; }++ protected override void OnInitialized()+ {+ base.OnInitialized();++ UIFileSelector.AllowedFileExtensionsChanged += UIFileSelector_AllowedFileExtensionsChanged;+ UIFileSelector.CanSelectManyFilesChanged += UIFileSelector_CanSelectManyFilesChanged;++ UpdateInstructionStrings();+ }++ protected override async Task OnAfterRenderAsync(bool firstRender)+ {+ base.OnAfterRender(firstRender);+ if (firstRender)+ {+ using (await Semaphore.WaitAsync(CancellationToken.None))+ {+ await (await JSModule).InvokeVoidWithErrorHandlingAsync("registerDropZone", ExtendedId);+ }+ }+ }++ public override async ValueTask DisposeAsync()+ {+ UIFileSelector.AllowedFileExtensionsChanged -= UIFileSelector_AllowedFileExtensionsChanged;+ UIFileSelector.CanSelectManyFilesChanged -= UIFileSelector_CanSelectManyFilesChanged;+ await (await JSModule).InvokeVoidWithErrorHandlingAsync("dispose", ExtendedId);+ await base.DisposeAsync();+ }++ private void OnFileDropped(InputFileChangeEventArgs args)+ {+ IReadOnlyList<IBrowserFile> droppedFiles = args.GetMultipleFiles(maximumFileCount: int.MaxValue);++ if (droppedFiles.Count == 0)+ {+ return;+ }++ if (!UIFileSelector.CanSelectManyFiles)+ {+ if (droppedFiles.Count == 1 && !string.IsNullOrEmpty(droppedFiles[0].Name))+ {+ string[] fileTypes = GetTreatedFileExtensions();+ if (fileTypes.Any(fileType => string.Equals(("." + fileType), Path.GetExtension(droppedFiles[0].Name), StringComparison.OrdinalIgnoreCase)))+ {+ UIFileSelector.WithFiles(new PickedFile(droppedFiles[0].Name, droppedFiles[0].OpenReadStream(maxAllowedSize: long.MaxValue)));+ return;+ }+ }++ HasInvalidFilesSelected = true;+ return;+ }+ else+ {+ var pickedFiles = new List<PickedFile>();+ string[] fileTypes = GetTreatedFileExtensions();++ for (int i = 0; i < droppedFiles.Count; i++)+ {+ IBrowserFile droppedFile = droppedFiles[i];+ if (!string.IsNullOrEmpty(droppedFile.Name))+ {+ if (fileTypes.Any(fileType => string.Equals(("." + fileType), Path.GetExtension(droppedFile.Name), StringComparison.OrdinalIgnoreCase)))+ {+ pickedFiles.Add(new PickedFile(droppedFile.Name, droppedFile.OpenReadStream(maxAllowedSize: long.MaxValue)));+ }+ else+ {+ HasInvalidFilesSelected = true;+ }+ }+ else+ {+ HasInvalidFilesSelected = true;+ }+ }++ if (pickedFiles.Count > 0)+ {+ UIFileSelector.WithFiles(pickedFiles.ToArray());+ }+ else+ {+ HasInvalidFilesSelected = true;+ }+ }+ }++ private async Task OnBrowseFilesButtonClickAsync()+ {+ string[] fileTypes = GetTreatedFileExtensions();++ PickedFile[] pickedFiles;+ if (UIFileSelector.CanSelectManyFiles)+ {+ pickedFiles = await FileStorage.PickOpenFilesAsync(fileTypes);+ }+ else+ {+ PickedFile? pickedFile = await FileStorage.PickOpenFileAsync(fileTypes);+ if (pickedFile != null)+ {+ pickedFiles = new[] { pickedFile };+ }+ else+ {+ pickedFiles = Array.Empty<PickedFile>();+ }+ }++ if (pickedFiles.Length > 0)+ {+ UIFileSelector.WithFiles(pickedFiles);+ }+ }++ private async Task OnBrowseFoldersButtonClickAsync()+ {+ var files = new List<PickedFile>();+ string? selectedFolder = await FileStorage.PickFolderAsync();++ if (!string.IsNullOrWhiteSpace(selectedFolder))+ {+ if (UIFileSelector.AllowedFileExtensions is null || UIFileSelector.AllowedFileExtensions.Length == 0)+ {+ foreach (string filePath in Directory.GetFiles(selectedFolder, "*", SearchOption.AllDirectories))+ {+ var info = new FileInfo(filePath);+ files.Add(new(info.Name, info.OpenRead()));+ }+ }+ else+ {+ string[] fileTypes = GetTreatedFileExtensions();+ foreach (string fileType in fileTypes)+ {+ foreach (string filePath in Directory.GetFiles(selectedFolder, "*." + fileType, SearchOption.AllDirectories))+ {+ var info = new FileInfo(filePath);+ files.Add(new(info.Name, info.OpenRead()));+ }+ }+ }+ }++ if (files.Count > 0)+ {+ UIFileSelector.WithFiles(files.ToArray());+ }+ }++ private async Task OnPasteButtonClickAsync()+ {+ // TODO: Support image (format tbd) + file list.+ await Clipboard.GetClipboardDataAsync();+ }++ private string[] GetTreatedFileExtensions()+ {+ if (UIFileSelector.AllowedFileExtensions is null)+ {+ return Array.Empty<string>();+ }++ return UIFileSelector.AllowedFileExtensions.Select(fileType => fileType.Trim('*').Trim('.').ToLower()).ToArray();+ }++ // TODO: Localize+ private void UpdateInstructionStrings()+ {+ string[] allowedFileExtensions = GetTreatedFileExtensions();++ if (allowedFileExtensions is null+ || allowedFileExtensions.Length == 0+ || (allowedFileExtensions.Length == 1 && string.IsNullOrEmpty(allowedFileExtensions[0])))+ {+ if (UIFileSelector.CanSelectManyFiles)+ {+ DragDropInstructions = "Drag & drop any files here"; // FileSelectorDragDropAnyFiles+ }+ else+ {+ DragDropInstructions = "Drag & drop any file here"; // FileSelectorDragDropAnyFile+ }+ }+ else if (allowedFileExtensions.Length == 1)+ {+ string extensionsString+ = allowedFileExtensions[0]+ .Replace(".", string.Empty)+ .ToUpperInvariant();++ if (UIFileSelector.CanSelectManyFiles)+ {+ DragDropInstructions+ = string.Format(+ "Drag & drop any {0} files here", // FileSelectorDragDropAnySpecificFiles+ extensionsString);+ }+ else+ {+ DragDropInstructions+ = string.Format(+ "Drag & drop a {0} file here", // FileSelectorDragDropAnySpecificFile+ extensionsString);+ }++ HasInvalidFilesSelectedIndication+ = string.Format(+ "Only {0} file(s) can be used.", // FileSelectorInvalidSelectedFiles+ extensionsString);+ }+ else+ {+ string extensionsString+ = string.Join(", ", allowedFileExtensions.Order())+ .Replace(".", string.Empty)+ .ToUpperInvariant();++ if (UIFileSelector.CanSelectManyFiles)+ {+ DragDropInstructions+ = string.Format(+ "Drag & drop any {0} files here", // FileSelectorDragDropAnySpecificFiles+ extensionsString);+ }+ else+ {+ DragDropInstructions+ = string.Format(+ "Drag & drop a {0} file here", // FileSelectorDragDropAnySpecificFile+ extensionsString);+ }++ HasInvalidFilesSelectedIndication+ = string.Format(+ "Only {0} file(s) can be used.", // FileSelectorInvalidSelectedFiles+ extensionsString);+ }+ }++ private void UIFileSelector_CanSelectManyFilesChanged(object? sender, EventArgs e)+ {+ UpdateInstructionStrings();+ }++ private void UIFileSelector_AllowedFileExtensionsChanged(object? sender, EventArgs e)+ {+ UpdateInstructionStrings();+ }+}diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.js b/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.jsnew file mode 100644index 000000000..b8dd2ec54--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.js@@ -0,0 +1,67 @@+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);+ });+ element.addEventListener("dragleave", unhighlightIfNeeded, false);+ element.addEventListener("drop", unhighlight, false);+ // Handle dropped files+ element.addEventListener("drop", handleDrop, false);+}+export function dispose(id) {+ const element = document.getElementById(id);+ // Stop drop zone+ ["dragenter", "dragover", "dragleave", "drop"].forEach(eventName => {+ element.removeEventListener(eventName, preventDefaults, false);+ });+ ["dragenter", "dragover"].forEach(eventName => {+ element.removeEventListener(eventName, highlight, false);+ });+ element.removeEventListener("dragleave", unhighlightIfNeeded, false);+ element.removeEventListener("drop", unhighlight, false);+}+function preventDefaults(e) {+ e.preventDefault();+ e.stopPropagation();+}+function highlight(e) {+ if (e.dataTransfer.items.length > 0 && e.dataTransfer.items[0].kind === "file") {+ e.dataTransfer.dropEffect = "copy";+ e.currentTarget.classList.add("dragging");+ }+ else {+ e.dataTransfer.dropEffect = "none";+ }+}+function unhighlightIfNeeded(e) {+ // Get the location on screen of the element.+ const rect = e.currentTarget.getBoundingClientRect();+ // Check the mouseEvent coordinates are outside of the rectangle+ if (e.x > rect.left + rect.width || e.x < rect.left+ || e.y > rect.top + rect.height || e.y < rect.top) {+ unhighlight(e);+ }+}+function unhighlight(e) {+ e.currentTarget.classList.remove("dragging");+}+function handleDrop(e) {+ const dt = e.dataTransfer;+ const files = dt.files;+ const element = e.currentTarget;+ if (files.length > 0) {+ 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=UIFileSelectorPresenter.razor.js.map\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.scss b/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.scssnew file mode 100644index 000000000..9c602898a--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.scss@@ -0,0 +1,14 @@+.ui-file-selector {+ border: 2px dashed var(--ui-file-selector-stroke-color);+ border-radius: var(--overlay-corner-radius);+ background-color: var(--ui-file-selector-background-color);++ &.dragging {+ border-color: var(--ui-file-selector-dragging-stroke-color);+ background-color: var(--ui-file-selector-dragging-background-color);++ * {+ pointer-events: none !important;+ }+ }+}diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.ts b/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.tsnew file mode 100644index 000000000..328b42805--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.ts@@ -0,0 +1,78 @@+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);+ });+ element.addEventListener("dragleave", unhighlightIfNeeded, false);+ element.addEventListener("drop", unhighlight, false);++ // Handle dropped files+ element.addEventListener("drop", handleDrop, false);+}++export function dispose(id: string): void {+ const element = document.getElementById(id);++ // Stop drop zone+ ["dragenter", "dragover", "dragleave", "drop"].forEach(eventName => {+ element.removeEventListener(eventName, preventDefaults, false);+ });+ ["dragenter", "dragover"].forEach(eventName => {+ element.removeEventListener(eventName, highlight, false);+ });+ element.removeEventListener("dragleave", unhighlightIfNeeded, false);+ element.removeEventListener("drop", unhighlight, false);+}++function preventDefaults(e: DragEvent): void {+ e.preventDefault();+ e.stopPropagation();+}++function highlight(e: DragEvent) {+ if (e.dataTransfer.items.length > 0 && e.dataTransfer.items[0].kind === "file") {+ e.dataTransfer.dropEffect = "copy";+ (<HTMLElement>e.currentTarget).classList.add("dragging");+ } else {+ e.dataTransfer.dropEffect = "none";+ }+}++function unhighlightIfNeeded(e: DragEvent) {+ // Get the location on screen of the element.+ const rect = (<HTMLElement>e.currentTarget).getBoundingClientRect();++ // Check the mouseEvent coordinates are outside of the rectangle+ if (e.x > rect.left + rect.width || e.x < rect.left+ || e.y > rect.top + rect.height || e.y < rect.top) {+ unhighlight(e);+ }+}++function unhighlight(e: DragEvent) {+ (<HTMLElement>e.currentTarget).classList.remove("dragging");+}++function handleDrop(e: DragEvent) {+ const dt = e.dataTransfer;+ const files: FileList = dt.files;+ const element = (<HTMLElement>e.currentTarget);++ if (files.length > 0) {+ 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/UITextInputWrapper.razor.cs b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.csindex 19bb1ba49..9d79375a9 100644--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.cs@@ -138,6 +138,11 @@ public partial class UITextInputWrapper : MefComponentBaseprivate async Task OnFileDroppedAsync(InputFileChangeEventArgs args){+ if (string.IsNullOrEmpty(args.File.Name))+ {+ return;+ }+await InvokeAsync(() =>{IsLoadingFile = true;@@ -145,7 +150,7 @@ public partial class UITextInputWrapper : MefComponentBase});using var stream = new MemoryStream();- using Stream fileStream = args.File.OpenReadStream(maxAllowedSize: int.MaxValue);+ using Stream fileStream = args.File.OpenReadStream(maxAllowedSize: long.MaxValue);await fileStream.CopyToAsync(stream);stream.Seek(0, SeekOrigin.Begin);await LoadFileAsync(stream);@@ -176,18 +181,18 @@ public partial class UITextInputWrapper : MefComponentBaseprivate async Task OnLoadFileButtonClickAsync(){- Stream? fileStream = null;+ PickedFile? pickedFile = null;try{- fileStream = await FileStorage.PickOpenFileAsync(FileTypes);- if (fileStream is not null)+ pickedFile = await FileStorage.PickOpenFileAsync(FileTypes);+ if (pickedFile is not null){- await LoadFileAsync(fileStream);+ await LoadFileAsync(pickedFile.Stream);}}finally{- fileStream?.Dispose();+ pickedFile?.Stream.Dispose();}}diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.js b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.jsindex ea22b3a49..b34d2ae40 100644--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.js+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.js@@ -17,9 +17,8 @@ export function registerDropZone(id) {["dragenter", "dragover"].forEach(eventName => {element.addEventListener(eventName, highlight, false);});- ["dragleave", "drop"].forEach(eventName => {- element.addEventListener(eventName, unhighlight, false);- });+ element.addEventListener("dragleave", unhighlightIfNeeded, false);+ element.addEventListener("drop", unhighlight, false);// Handle dropped fileselement.addEventListener("drop", handleDrop, false);}@@ -34,9 +33,8 @@ export function dispose(id) {["dragenter", "dragover"].forEach(eventName => {element.removeEventListener(eventName, highlight, false);});- ["dragleave", "drop"].forEach(eventName => {- element.removeEventListener(eventName, unhighlight, false);- });+ element.removeEventListener("dragleave", unhighlightIfNeeded, false);+ element.removeEventListener("drop", unhighlight, false);}function preventDefaults(e) {e.preventDefault();@@ -45,19 +43,28 @@ function preventDefaults(e) {function highlight(e) {if (e.dataTransfer.items.length === 1 && e.dataTransfer.items[0].kind === "file") {e.dataTransfer.dropEffect = "copy";- e.target.classList.add("dragging");+ e.currentTarget.classList.add("dragging");}else {e.dataTransfer.dropEffect = "none";}}+function unhighlightIfNeeded(e) {+ // Get the location on screen of the element.+ const rect = e.currentTarget.getBoundingClientRect();+ // Check the mouseEvent coordinates are outside of the rectangle+ if (e.x > rect.left + rect.width || e.x < rect.left+ || e.y > rect.top + rect.height || e.y < rect.top) {+ unhighlight(e);+ }+}function unhighlight(e) {- e.target.classList.remove("dragging");+ e.currentTarget.classList.remove("dragging");}function handleDrop(e) {const dt = e.dataTransfer;const files = dt.files;- const element = e.target;+ const element = e.currentTarget;if (files.length === 1) {const inputFileElement = element.querySelector("input[type=file]");if (inputFileElement === null) {diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.scss b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.scssindex 16ccbbbd8..85def538f 100644--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.scss+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.scss@@ -21,10 +21,10 @@}&.dragging {- border-color: var(--ui-text-input-wrapper-dragging-stroke-color);- background-color: var(--ui-text-input-wrapper-dragging-background-color);+ border-color: var(--ui-file-selector-dragging-stroke-color);+ background-color: var(--ui-file-selector-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.tsindex 817463809..16ab9515b 100644--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.ts+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.ts@@ -21,9 +21,8 @@ export function registerDropZone(id: string): void {["dragenter", "dragover"].forEach(eventName => {element.addEventListener(eventName, highlight, false);});- ["dragleave", "drop"].forEach(eventName => {- element.addEventListener(eventName, unhighlight, false);- });+ element.addEventListener("dragleave", unhighlightIfNeeded, false);+ element.addEventListener("drop", unhighlight, false);// Handle dropped fileselement.addEventListener("drop", handleDrop, false);@@ -42,9 +41,8 @@ export function dispose(id: string): void {["dragenter", "dragover"].forEach(eventName => {element.removeEventListener(eventName, highlight, false);});- ["dragleave", "drop"].forEach(eventName => {- element.removeEventListener(eventName, unhighlight, false);- });+ element.removeEventListener("dragleave", unhighlightIfNeeded, false);+ element.removeEventListener("drop", unhighlight, false);}function preventDefaults(e: DragEvent): void {@@ -55,20 +53,31 @@ function preventDefaults(e: DragEvent): void {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");+ (<HTMLElement>e.currentTarget).classList.add("dragging");} else {e.dataTransfer.dropEffect = "none";}}+function unhighlightIfNeeded(e: DragEvent) {+ // Get the location on screen of the element.+ const rect = (<HTMLElement>e.currentTarget).getBoundingClientRect();++ // Check the mouseEvent coordinates are outside of the rectangle+ if (e.x > rect.left + rect.width || e.x < rect.left+ || e.y > rect.top + rect.height || e.y < rect.top) {+ unhighlight(e);+ }+}+function unhighlight(e: DragEvent) {- (<HTMLElement>e.target).classList.remove("dragging");+ (<HTMLElement>e.currentTarget).classList.remove("dragging");}function handleDrop(e: DragEvent) {const dt = e.dataTransfer;const files: FileList = dt.files;- const element = (<HTMLElement>e.target);+ const element = (<HTMLElement>e.currentTarget);if (files.length === 1) {const inputFileElement = element.querySelector("input[type=file]") as HTMLInputElement | null;diff --git a/src/app/dev/DevToys.Tools/Tools/Sample/SampleToolFactory.cs b/src/app/dev/DevToys.Tools/Tools/Sample/SampleToolFactory.csindex fa33f06c9..f2f9d2b61 100644--- a/src/app/dev/DevToys.Tools/Tools/Sample/SampleToolFactory.cs+++ b/src/app/dev/DevToys.Tools/Tools/Sample/SampleToolFactory.cs@@ -1,5 +1,4 @@-using DevToys.Api;-using Microsoft.Extensions.Logging;+using Microsoft.Extensions.Logging;using Newtonsoft.Json.Linq;namespace DevToys.Tools.Tools.Sample;diff --git a/src/app/dev/DevToys.Tools/Tools/Settings/SettingsGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Settings/SettingsGuiTool.csindex 2f51cc2f3..d25aa83bc 100644--- a/src/app/dev/DevToys.Tools/Tools/Settings/SettingsGuiTool.cs+++ b/src/app/dev/DevToys.Tools/Tools/Settings/SettingsGuiTool.cs@@ -90,6 +90,10 @@ internal sealed class SettingsGuiTool : IGuiToolButton().Text("Bottom Center button").OnClick(OnBottomCenterButtonClickAsync),Button().Text("Bottom Right button")),NumberInput(),+ FileSelector()+ .CanSelectManyFiles()+ .LimitFileTypesTo("*.bmp", "jpeg", "png", ".jpg")+ .OnFilesSelected(OnFilesSelected),SingleLineTextInput().Title("Read-write text input with copy").ReadOnly(),MultilineTextInput().Title("Monaco editor")@@ -115,6 +119,11 @@ internal sealed class SettingsGuiTool : IGuiToolreturn ValueTask.CompletedTask;}+ private ValueTask OnFilesSelected(PickedFile[] files)+ {+ return ValueTask.CompletedTask;+ }+private ValueTask OnDropDownListSelectionChangeAsync(IUIDropDownListItem? selection){return ValueTask.CompletedTask;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 0a235ee8a..1f6551187 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@@ -65,7 +65,13 @@ internal sealed class FileStorage : IFileStoragethrow new NotImplementedException();}- public ValueTask<Stream?> PickOpenFileAsync(string[] fileTypes)+ public ValueTask<PickedFile?> 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();+ }++ public ValueTask<PickedFile[]> PickOpenFilesAsync(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.MacOS/Core/FileStorage.cs b/src/app/dev/platforms/desktop/DevToys.MacOS/Core/FileStorage.csindex 6fac6a9b9..1d048f868 100644--- a/src/app/dev/platforms/desktop/DevToys.MacOS/Core/FileStorage.cs+++ b/src/app/dev/platforms/desktop/DevToys.MacOS/Core/FileStorage.cs@@ -62,7 +62,7 @@ internal sealed class FileStorage : IFileStoragestring? fileExtension = fileTypes.FirstOrDefault(fileType => fileType.Replace(".", string.Empty).Replace("*", string.Empty).Length > 0);if (!string.IsNullOrWhiteSpace(fileExtension)){- fileExtension = fileExtension.Trim('*').Trim('.');+ fileExtension = fileExtension.Trim('*').Trim('.').ToLower();}else{@@ -84,11 +84,11 @@ internal sealed class FileStorage : IFileStorage});}- public async ValueTask<Stream?> PickOpenFileAsync(string[] fileTypes)+ public async ValueTask<PickFileResult?> PickOpenFileAsync(string[] fileTypes){return await ThreadHelper.RunOnUIThreadAsync(async () =>{- fileTypes = fileTypes.Select(fileType => fileType.Trim('*').Trim('.')).ToArray();+ fileTypes = fileTypes.Select(fileType => fileType.Trim('*').Trim('.').ToLower()).ToArray();var otpions = new PickOptions(){@@ -102,13 +102,44 @@ internal sealed class FileStorage : IFileStorageFileResult? fileResult = await FilePicker.Default.PickAsync(otpions);if (fileResult is not null){- return await fileResult.OpenReadAsync();+ return new PickFileResult(fileResult.FileName, await fileResult.OpenReadAsync());}return null;});}+ public async ValueTask<PickFileResult[]> PickOpenFilesAsync(string[] fileTypes)+ {+ return await ThreadHelper.RunOnUIThreadAsync(async () =>+ {+ fileTypes = fileTypes.Select(fileType => fileType.Trim('*').Trim('.').ToLower()).ToArray();++ var otpions = new PickOptions()+ {+ FileTypes = new FilePickerFileType(new Dictionary<DevicePlatform, IEnumerable<string>>+ {+ { DevicePlatform.macOS, fileTypes },+ { DevicePlatform.MacCatalyst, fileTypes }+ })+ };++ IEnumerable<FileResult>? fileResults = await FilePicker.Default.PickMultipleAsync(otpions);+ if (fileResults is not null)+ {+ var result = new List<PickFileResult>();+ foreach (FileResult file in fileResults)+ {+ result.Add(new PickFileResult(file.FileName, await file.OpenReadAsync()));+ }++ return result.ToArray();+ }++ return Array.Empty<PickFileResult>();+ });+ }+public async ValueTask<string?> PickFolderAsync(){return await ThreadHelper.RunOnUIThreadAsync(async () =>diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/App.xaml.cs b/src/app/dev/platforms/desktop/DevToys.Windows/App.xaml.csindex 0975c759c..f6761a4b7 100644--- a/src/app/dev/platforms/desktop/DevToys.Windows/App.xaml.cs+++ b/src/app/dev/platforms/desktop/DevToys.Windows/App.xaml.cs@@ -1,4 +1,4 @@-using System.Windows;+using Application = System.Windows.Application;namespace DevToys.Windows;/// <summary>diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml.csindex cc7066d59..ce75ecdbc 100644--- a/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml.cs+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml.cs@@ -8,6 +8,12 @@ using System.Windows.Media;using System.Windows.Shell;using DevToys.Api;using DevToys.Windows.Native;+using Application = System.Windows.Application;+using Button = System.Windows.Controls.Button;+using Color = System.Windows.Media.Color;+using KeyEventArgs = System.Windows.Input.KeyEventArgs;+using Point = System.Windows.Point;+using Size = System.Windows.Size;namespace DevToys.Windows.Controls;@@ -204,7 +210,7 @@ public abstract partial class MicaWindowWithOverlay : Window}else if (msg == HwndSourceMessages.WM_NCLBUTTONDOWN){- HandleClickOnMaximizeAndRestoreButon(lParam, ref handled);+ HandleClickOnMaximizeAndRestoreButton(lParam, ref handled);}return (nint.Zero, handled);@@ -383,7 +389,7 @@ public abstract partial class MicaWindowWithOverlay : Windowreturn nint.Zero;}- private void HandleClickOnMaximizeAndRestoreButon(nint lParam, ref bool handled)+ private void HandleClickOnMaximizeAndRestoreButton(nint lParam, ref bool handled){int x = lParam.ToInt32() & 0xffff;int y = lParam.ToInt32() >> 16;diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Core/FileStorage.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Core/FileStorage.csindex de188189b..d38faa9d2 100644--- a/src/app/dev/platforms/desktop/DevToys.Windows/Core/FileStorage.cs+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Core/FileStorage.cs@@ -2,7 +2,8 @@using System.Text;using DevToys.Api;using DevToys.Windows.Helpers;-using Microsoft.Win32;+using OpenFileDialog = Microsoft.Win32.OpenFileDialog;+using SaveFileDialog = Microsoft.Win32.SaveFileDialog;namespace DevToys.Windows.Core;@@ -88,7 +89,7 @@ internal sealed class FileStorage : IFileStorage});}- public async ValueTask<Stream?> PickOpenFileAsync(string[] fileTypes)+ public async ValueTask<PickedFile?> PickOpenFileAsync(string[] fileTypes){return await ThreadHelper.RunOnUIThreadAsync(() =>{@@ -107,31 +108,88 @@ internal sealed class FileStorage : IFileStorageif (openFileDialog.ShowDialog() == true){- return openFileDialog.OpenFile();+ return new PickedFile(openFileDialog.FileName, openFileDialog.OpenFile());}return null;});}- public ValueTask<string?> PickFolderAsync()+ public async ValueTask<PickedFile[]> PickOpenFilesAsync(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();+ return await ThreadHelper.RunOnUIThreadAsync(() =>+ {+ var openFileDialog = new OpenFileDialog+ {+ CheckFileExists = true,+ CheckPathExists = true,+ Multiselect = true,+ ShowReadOnly = true+ };++ if (fileTypes is not null)+ {+ openFileDialog.Filter = GenerateFilter(fileTypes);+ }++ if (openFileDialog.ShowDialog() == true)+ {+ Stream[] streams = openFileDialog.OpenFiles();+ string[] fileNames = openFileDialog.FileNames;+ Guard.IsEqualTo(streams.Length, fileNames.Length);++ var result = new PickedFile[streams.Length];+ for (int i = 0; i < streams.Length; i++)+ {+ result[i] = new(fileNames[i], streams[i]);+ }++ return result;+ }++ return Array.Empty<PickedFile>();+ });+ }++ public async ValueTask<string?> PickFolderAsync()+ {+ return await ThreadHelper.RunOnUIThreadAsync(() =>+ {+ var openFolderDialog = new FolderBrowserDialog();++ if (openFolderDialog.ShowDialog() == DialogResult.OK)+ {+ return openFolderDialog.SelectedPath;+ }++ return null;+ });}private static string GenerateFilter(string[] fileTypes){var filters = new StringBuilder();- foreach (string fileType in fileTypes)+ var allFileTypesDescription = new List<string>();+ var allFileTypes = new List<string>();++ foreach (string fileType in fileTypes.Order()){- filters.Append($"{fileType}|{fileType}|");+ string lowercaseFileType = "*." + fileType.Trim('*').Trim('.').ToLower();+ string fileTypeDescription = fileType.Trim('*').Trim('.').ToUpper();+ filters.Append($"{fileTypeDescription}|{lowercaseFileType}|");+ allFileTypesDescription.Add(fileTypeDescription);+ allFileTypes.Add(lowercaseFileType);}if (filters.Length > 0){filters.Remove(filters.Length - 1, 1);++ // TODO: Localize.+ string allFiles = "All " + string.Join(", ", allFileTypesDescription);+ filters.Insert(0, $"{allFiles}|{string.Join(";", allFileTypes)}|");}+return filters.ToString();}}diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Core/Helpers/ThreadHelper.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Core/Helpers/ThreadHelper.csindex 23be01998..5d95910ba 100644--- a/src/app/dev/platforms/desktop/DevToys.Windows/Core/Helpers/ThreadHelper.cs+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Core/Helpers/ThreadHelper.cs@@ -1,6 +1,6 @@-using System.Windows;-using System.Windows.Threading;+using System.Windows.Threading;using DevToys.Api;+using Application = System.Windows.Application;namespace DevToys.Windows.Helpers;diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/DevToys.Windows.csproj b/src/app/dev/platforms/desktop/DevToys.Windows/DevToys.Windows.csprojindex 978e52625..50beafd4d 100644--- a/src/app/dev/platforms/desktop/DevToys.Windows/DevToys.Windows.csproj+++ b/src/app/dev/platforms/desktop/DevToys.Windows/DevToys.Windows.csproj@@ -5,6 +5,7 @@<TargetPlatformMinVersion>7.0</TargetPlatformMinVersion><OutputType>WinExe</OutputType><UseWPF>true</UseWPF>+ <UseWindowsForms>true</UseWindowsForms><ApplicationManifest>app.manifest</ApplicationManifest><AllowUnsafeBlocks>true</AllowUnsafeBlocks></PropertyGroup>diff --git a/src/app/tests/DevToys.UnitTests/Mocks/MockIFileStorage.cs b/src/app/tests/DevToys.UnitTests/Mocks/MockIFileStorage.csindex fc7a78edf..91c167ff0 100644--- a/src/app/tests/DevToys.UnitTests/Mocks/MockIFileStorage.cs+++ b/src/app/tests/DevToys.UnitTests/Mocks/MockIFileStorage.cs@@ -30,12 +30,17 @@ internal class MockIFileStorage : IFileStoragethrow new NotImplementedException();}- public ValueTask<Stream> PickOpenFileAsync(string[] fileTypes)+ public ValueTask<PickedFile> 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();}+ public ValueTask<PickedFile[]> PickOpenFilesAsync(string[] fileTypes)+ {+ throw new NotImplementedException();+ }+public ValueTask<string> PickFolderAsync(){throw new NotImplementedException();