A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Fixed vertical alignment issue + FileSelector bug again
Etienne Baudoux45ab3548608e
diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIFileSelector.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIFileSelector.csindex 41ddfa73c..c5f0d65b8 100644--- a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIFileSelector.cs+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIFileSelector.cs@@ -64,8 +64,11 @@ internal sealed class UIFileSelector : UIElement, IUIFileSelector{for (int i = 0; i < value.Length; i++){- string fileExtension = Path.GetExtension(value[i].FileName).Trim('.');- if (AllowedFileExtensions.All(ext => !string.Equals(ext, fileExtension, StringComparison.CurrentCultureIgnoreCase)))+ string fileExtension = Path.GetExtension(value[i].FileName);+ string fileExtensionTrimmed = fileExtension.Trim('.');+ if (AllowedFileExtensions+ .All(ext => !string.Equals(ext, fileExtension, StringComparison.CurrentCultureIgnoreCase)+ && !string.Equals(ext, fileExtensionTrimmed, StringComparison.CurrentCultureIgnoreCase))){ThrowHelper.ThrowInvalidOperationException($"File extension '{fileExtension}' is not allowed.");}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 20749b90c..6fe00b9ee 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@@ -62,13 +62,13 @@ public partial class Container : StyledComponentBasebreak;}+ styleBuilder.AddImportantStyle("min-height", "min-content", !Height.HasValue);+ styleBuilder.AddImportantStyle("max-height", "100%", !Height.HasValue);switch (VerticalAlignment){case UIVerticalAlignment.Stretch:styleBuilder.AddImportantStyle("align-items", "stretch");styleBuilder.AddImportantStyle("height", "100%", !Height.HasValue);- styleBuilder.AddImportantStyle("max-height", "100%", !Height.HasValue);- styleBuilder.AddImportantStyle("min-height", "min-content", !Height.HasValue);innerStyleBuilder.AddImportantStyle("max-height", "inherit", !Height.HasValue);innerStyleBuilder.AddImportantStyle("height", "100%", !Height.HasValue);innerStyleBuilder.AddImportantStyle("min-height", "min-content", !Height.HasValue);@@ -83,6 +83,7 @@ public partial class Container : StyledComponentBasebreak;case UIVerticalAlignment.Center:+ styleBuilder.AddImportantStyle("height", "100%", !Height.HasValue);styleBuilder.AddImportantStyle("align-items", "center");break;}diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.cs b/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.csindex 6b5c5ea66..d6d84c0cc 100644--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.cs@@ -307,8 +307,12 @@ public partial class UIFileSelectorPresenter : MefComponentBasestring fileName = fileNameGetter(file);if (!string.IsNullOrEmpty(fileName)){- var fileExtension = Path.GetExtension(fileName).Trim('.');- if (fileTypes.Length == 0 || fileTypes.Any(fileType => string.Equals(fileType, fileExtension, StringComparison.OrdinalIgnoreCase)))+ string fileExtension = Path.GetExtension(fileName);+ string fileExtensionTrimmed = fileExtension.Trim('.');+ if (fileTypes.Length == 0+ || fileTypes.Any(fileType+ => string.Equals(fileType, fileExtension, StringComparison.OrdinalIgnoreCase)+ || string.Equals(fileType, fileExtensionTrimmed, StringComparison.OrdinalIgnoreCase))){pickedFiles.Add(pickedFileCreator(file));}@@ -336,8 +340,12 @@ public partial class UIFileSelectorPresenter : MefComponentBase{if (files.Length == 1 && !string.IsNullOrEmpty(fileNameGetter(files[0]))){- string fileExtension = Path.GetExtension(fileNameGetter(files[0])).Trim('.');- if (fileTypes.Length == 0 || fileTypes.Any(fileType => string.Equals(fileType, fileExtension, StringComparison.OrdinalIgnoreCase)))+ string fileExtension = Path.GetExtension(fileNameGetter(files[0]));+ string fileExtensionTrimmed = fileExtension.Trim('.');+ if (fileTypes.Length == 0+ || fileTypes.Any(fileType+ => string.Equals(fileType, fileExtension, StringComparison.OrdinalIgnoreCase)+ || string.Equals(fileType, fileExtensionTrimmed, StringComparison.OrdinalIgnoreCase))){UIFileSelector.WithFiles(pickedFileCreator(files[0]));return;