Skip to content

A Swiss Army knife for developers.

Fixed a UI bug preventing click through containers + Bug in UIFileSelector and UIImageViewer

Etienne Baudouxff60a7b72d20
diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIFileSelector.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIFileSelector.cs
index c5f0d65b8..05bfb5bd7 100644
--- a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIFileSelector.cs
+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIFileSelector.cs
@@ -60,7 +60,7 @@ internal sealed class UIFileSelector : UIElement, IUIFileSelector
ThrowHelper.ThrowInvalidOperationException("Cannot select more than one file.");
}
- if (value.Length > 0)
+ if (value.Length > 0 && AllowedFileExtensions.Length > 0)
{
for (int i = 0; i < value.Length; i++)
{
diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIImageViewer.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIImageViewer.cs
index ed37ffd5d..8e5cf9622 100644
--- a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIImageViewer.cs
+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIImageViewer.cs
@@ -29,17 +29,27 @@ internal sealed class UIImageViewer : UITitledElement, IUIImageViewer, IDisposab
{
}
+ internal bool DisposeAutomatically { get; set; }
+
public OneOf<FileInfo, Image, SandboxedFileReader>? ImageSource
{
get => _imageSource;
- internal set => SetPropertyValue(ref _imageSource, value, ImageSourceChanged);
+ internal set
+ {
+ if (DisposeAutomatically && ImageSource.HasValue && ImageSource.Value.Value is IDisposable disposable)
+ {
+ disposable.Dispose();
+ }
+
+ SetPropertyValue(ref _imageSource, value, ImageSourceChanged);
+ }
}
public event EventHandler? ImageSourceChanged;
public void Dispose()
{
- if (ImageSource.HasValue && ImageSource.Value.Value is IDisposable disposable)
+ if (ImageSource.HasValue && ImageSource.Value.Value is IDisposable disposable && DisposeAutomatically)
{
disposable.Dispose();
}
@@ -80,19 +90,27 @@ public static partial class GUI
/// <summary>
/// Sets the <see cref="IUIImageViewer.ImageSource"/> from a <see cref="SandboxedFileReader"/>.
/// </summary>
- public static IUIImageViewer WithPickedFile(this IUIImageViewer element, SandboxedFileReader pickedFile)
+ /// <param name="pickedFile">The file to display.</param>
+ /// <param name="disposeAutomatically">Indicates whether <paramref name="pickedFile"/> should be disposed when not displayed in the UI anymore.</param>
+ public static IUIImageViewer WithPickedFile(this IUIImageViewer element, SandboxedFileReader pickedFile, bool disposeAutomatically)
{
ValidateFileExtension(pickedFile.FileName);
- ((UIImageViewer)element).ImageSource = pickedFile;
+ var imageViewer = (UIImageViewer)element;
+ imageViewer.ImageSource = pickedFile;
+ imageViewer.DisposeAutomatically = disposeAutomatically;
return element;
}
/// <summary>
/// Sets the <see cref="IUIImageViewer.ImageSource"/> from an <see cref="Image"/>.
/// </summary>
- public static IUIImageViewer WithImage(this IUIImageViewer element, Image image)
+ /// <param name="image">The image to display</param>
+ /// <param name="disposeAutomatically">Indicates whether <paramref name="image"/> should be disposed when not displayed in the UI anymore.</param>
+ public static IUIImageViewer WithImage(this IUIImageViewer element, Image image, bool disposeAutomatically)
{
- ((UIImageViewer)element).ImageSource = image;
+ var imageViewer = (UIImageViewer)element;
+ imageViewer.ImageSource = image;
+ imageViewer.DisposeAutomatically = disposeAutomatically;
return 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.scss
index 2844bee65..615a87c99 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
@@ -19,6 +19,7 @@ button {
width: inherit;
height: inherit;
min-width: fit-content;
+ pointer-events: auto;
&:focus-visible {
box-shadow: var(--focus-stroke);
diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/CheckBox/CheckBox.razor.scss b/src/app/dev/DevToys.Blazor/Components/BasicInput/CheckBox/CheckBox.razor.scss
index 0cea5d061..29df80279 100644
--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/CheckBox/CheckBox.razor.scss
+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/CheckBox/CheckBox.razor.scss
@@ -14,6 +14,7 @@
appearance: none;
inline-size: 20px;
block-size: 20px;
+ pointer-events: auto;
&:focus-visible {
box-shadow: var(--focus-stroke);
@@ -30,7 +31,7 @@
background-color: var(--check-box-check-background-fill-unchecked-pressed);
color: var(--check-box-check-glyph-foreground-unchecked-pressed);
- +.checkbox-glyph {
+ + .checkbox-glyph {
color: var(--text-on-accent-secondary);
}
}
@@ -65,12 +66,12 @@
background-color: var(--check-box-check-background-fill-checked-disabled);
color: var(--check-box-check-glyph-foreground-checked-disabled);
- +.checkbox-glyph {
+ + .checkbox-glyph {
color: var(--text-on-accent-disabled);
}
}
- +.checkbox-glyph .path-checkmark {
+ + .checkbox-glyph .path-checkmark {
transition: 250ms cubic-bezier(0.55, 0, 0, 1) stroke-dashoffset;
stroke-dashoffset: 0;
}
@@ -79,12 +80,11 @@
&-container {
@include flex($align: center);
@include typography-body;
-
color: var(--check-box-foreground) !important;
user-select: none;
min-block-size: 32px;
- >span {
+ > span {
padding-inline-start: 8px;
}
diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/ComboBox/ComboBox.razor.scss b/src/app/dev/DevToys.Blazor/Components/BasicInput/ComboBox/ComboBox.razor.scss
index 985be939c..9cedad00b 100644
--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/ComboBox/ComboBox.razor.scss
+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/ComboBox/ComboBox.razor.scss
@@ -2,6 +2,7 @@
.combo-box {
@include typography-body;
+ pointer-events: auto;
&-with-header {
display: flex;
diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownButton/DropDownButton.razor.scss b/src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownButton/DropDownButton.razor.scss
index 1f92646da..43a7879ea 100644
--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownButton/DropDownButton.razor.scss
+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownButton/DropDownButton.razor.scss
@@ -2,6 +2,7 @@
.drop-down-list {
@include typography-body;
+ pointer-events: auto;
&-with-header {
display: flex;
diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/RadioButton/RadioButton.razor.scss b/src/app/dev/DevToys.Blazor/Components/BasicInput/RadioButton/RadioButton.razor.scss
index 65abe0a5f..481e2e019 100644
--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/RadioButton/RadioButton.razor.scss
+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/RadioButton/RadioButton.razor.scss
@@ -15,6 +15,7 @@
appearance: none;
inline-size: 20px;
block-size: 20px;
+ pointer-events: auto;
&::before {
content: "";
@@ -119,6 +120,7 @@
&:hover {
background-color: var(--radio-button-background-pointer-over);
+
> span {
color: var(--radio-button-foreground-pointer-over) !important;
}
@@ -126,6 +128,7 @@
&:active {
background-color: var(--radio-button-background-pressed);
+
> span {
color: var(--radio-button-foreground-pressed) !important;
}
@@ -133,6 +136,7 @@
&.disabled {
background-color: var(--radio-button-background-disabled);
+
> span {
color: var(--radio-button-foreground-disabled) !important;
}
diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/ToggleSwitch/ToggleSwitch.razor.scss b/src/app/dev/DevToys.Blazor/Components/BasicInput/ToggleSwitch/ToggleSwitch.razor.scss
index 4ec536158..be9f4e7e3 100644
--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/ToggleSwitch/ToggleSwitch.razor.scss
+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/ToggleSwitch/ToggleSwitch.razor.scss
@@ -15,6 +15,7 @@ $control-fast-out-slow-in-easing: cubic-bezier(0, 0, 0, 1);
appearance: none;
inline-size: var(--toggle-switch-width);
block-size: var(--toggle-switch-height);
+ pointer-events: auto;
&::before {
content: "";
diff --git a/src/app/dev/DevToys.Blazor/Components/Collections/DataGrid/DataGrid.razor.scss b/src/app/dev/DevToys.Blazor/Components/Collections/DataGrid/DataGrid.razor.scss
index 4b28e92cd..2d6932c9d 100644
--- a/src/app/dev/DevToys.Blazor/Components/Collections/DataGrid/DataGrid.razor.scss
+++ b/src/app/dev/DevToys.Blazor/Components/Collections/DataGrid/DataGrid.razor.scss
@@ -5,6 +5,7 @@
flex: 1;
border-collapse: collapse;
border-spacing: 0px;
+ pointer-events: auto;
&-container {
position: relative;
diff --git a/src/app/dev/DevToys.Blazor/Components/Collections/GridView/GridView.razor.scss b/src/app/dev/DevToys.Blazor/Components/Collections/GridView/GridView.razor.scss
index 16b8b2fb0..33fb829cd 100644
--- a/src/app/dev/DevToys.Blazor/Components/Collections/GridView/GridView.razor.scss
+++ b/src/app/dev/DevToys.Blazor/Components/Collections/GridView/GridView.razor.scss
@@ -3,6 +3,7 @@
width: 100%;
height: 100%;
flex: 1;
+ pointer-events: auto;
.header {
margin-bottom: 24px;
diff --git a/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBox.razor.scss b/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBox.razor.scss
index bd4d8ab45..d215335cc 100644
--- a/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBox.razor.scss
+++ b/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBox.razor.scss
@@ -1,4 +1,5 @@
.list-box {
margin: 0px;
padding: 0px;
+ pointer-events: auto;
}
diff --git a/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBoxItem.razor.scss b/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBoxItem.razor.scss
index 6426c6b1b..3835b2a99 100644
--- a/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBoxItem.razor.scss
+++ b/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBoxItem.razor.scss
@@ -17,6 +17,7 @@
-webkit-user-select: none;
min-block-size: 34px;
text-decoration: none;
+ pointer-events: auto;
&::before {
content: "";
@@ -47,6 +48,7 @@
&.selected {
background-color: var(--list-box-item-background-selected);
color: var(--list-box-item-foreground-selected) !important;
+
* {
color: var(--list-box-item-foreground-selected) !important;
}
diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor.scss b/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor.scss
index 379ca79ef..52a0bc530 100644
--- a/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor.scss
+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor.scss
@@ -12,6 +12,7 @@
min-height: 72px;
padding-block: 16px;
padding-inline: 11px;
+ pointer-events: auto;
.card-header {
display: grid;
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.cs
index 6fe00b9ee..551dd1a23 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
@@ -88,6 +88,7 @@ public partial class Container : StyledComponentBase
break;
}
+ innerStyleBuilder.AddStyle("pointer-events", "none");
innerStyleBuilder.AddImportantStyle("width", Width.ToPx(), Width.HasValue);
innerStyleBuilder.AddImportantStyle("height", Height.ToPx(), Height.HasValue);
innerStyleBuilder.AddImportantStyle("padding-left", PaddingLeft.ToPx(), PaddingLeft.HasValue);
diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor.scss b/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor.scss
index d7fb4ce80..b4b7a1012 100644
--- a/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor.scss
+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor.scss
@@ -1,6 +1,8 @@
@use "../../../Assets/sass/devtoys" as *;
.expander {
+ pointer-events: auto;
+
.card {
&:focus-visible {
box-shadow: var(--focus-stroke);
diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razor.scss b/src/app/dev/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razor.scss
index 35c37b375..e0fc354a8 100644
--- a/src/app/dev/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razor.scss
+++ b/src/app/dev/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razor.scss
@@ -3,6 +3,7 @@
overflow-x: overlay;
height: 100%;
width: 100%;
+ pointer-events: auto;
&.vertical {
overflow-y: overlay;
diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/SplitGrid/SplitGrid.razor.scss b/src/app/dev/DevToys.Blazor/Components/Layout/SplitGrid/SplitGrid.razor.scss
index f6e046d57..c6c0feedf 100644
--- a/src/app/dev/DevToys.Blazor/Components/Layout/SplitGrid/SplitGrid.razor.scss
+++ b/src/app/dev/DevToys.Blazor/Components/Layout/SplitGrid/SplitGrid.razor.scss
@@ -1,5 +1,6 @@
.split-grid {
height: inherit;
+ pointer-events: auto;
&-gripper {
display: flex;
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.scss
index 6b2972479..88a59cbca 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
@@ -7,6 +7,7 @@ $sidebar-expanded-overlay-zindex: 10000;
$sidebar-top-bar-height: 48px;
.nav-bar-root {
+ pointer-events: auto;
height: 100%;
display: grid;
grid-template-columns: auto 1fr;
diff --git a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBarItem.razor.scss b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBarItem.razor.scss
index bf07a7cf2..33e8ab822 100644
--- a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBarItem.razor.scss
+++ b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBarItem.razor.scss
@@ -1,4 +1,6 @@
nav {
+ pointer-events: auto;
+
.sidebar-item-separator {
margin: 4px 0px;
padding: 0;
diff --git a/src/app/dev/DevToys.Blazor/Components/Text/AutoSuggestBox/AutoSuggestBox.razor.scss b/src/app/dev/DevToys.Blazor/Components/Text/AutoSuggestBox/AutoSuggestBox.razor.scss
index 9433dc05f..ad1b22f7e 100644
--- a/src/app/dev/DevToys.Blazor/Components/Text/AutoSuggestBox/AutoSuggestBox.razor.scss
+++ b/src/app/dev/DevToys.Blazor/Components/Text/AutoSuggestBox/AutoSuggestBox.razor.scss
@@ -1,4 +1,5 @@
.auto-suggest-box-drop-down {
+ pointer-events: auto;
-webkit-border-radius: var(--overlay-corner-radius) !important;
-webkit-border-top-left-radius: 0px !important;
-webkit-border-top-right-radius: 0px !important;
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.scss
index 80a5ffedc..e7781f9ef 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
@@ -13,6 +13,7 @@
border-radius: var(--control-corner-radius);
color: var(--text-box-foreground);
background-color: transparent;
+ pointer-events: auto;
&.disabled {
color: var(--text-fill-color-disabled);
@@ -44,6 +45,7 @@
display: block;
position: relative;
height: 100%;
+ pointer-events: auto;
.monaco-editor-standalone-header {
margin-bottom: 4px;
diff --git a/src/app/dev/DevToys.Blazor/Components/Text/TextBox/TextBox.razor.scss b/src/app/dev/DevToys.Blazor/Components/Text/TextBox/TextBox.razor.scss
index 42a642c1a..33d2c315b 100644
--- a/src/app/dev/DevToys.Blazor/Components/Text/TextBox/TextBox.razor.scss
+++ b/src/app/dev/DevToys.Blazor/Components/Text/TextBox/TextBox.razor.scss
@@ -14,6 +14,7 @@
border-radius: var(--control-corner-radius);
color: var(--text-box-foreground);
background-color: transparent;
+ pointer-events: auto;
&::placeholder {
@include typography-body;
diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.scss b/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.scss
index 1f0f4d512..0633d9e58 100644
--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.scss
+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIFileSelectorPresenter.razor.scss
@@ -2,6 +2,7 @@
border: 2px dashed var(--ui-file-selector-stroke-color);
border-radius: var(--overlay-corner-radius);
background-color: var(--ui-file-selector-background-color);
+ pointer-events: auto;
&-content {
padding: 24px;
diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIImageViewerPresenter.razor.cs b/src/app/dev/DevToys.Blazor/Components/UIElements/UIImageViewerPresenter.razor.cs
index 22afb8566..26ce32b9d 100644
--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UIImageViewerPresenter.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIImageViewerPresenter.razor.cs
@@ -1,5 +1,6 @@
// TODO: Add logs.
using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Formats.Png;
namespace DevToys.Blazor.Components.UIElements;
@@ -170,8 +171,9 @@ public partial class UIImageViewerPresenter : MefComponentBase
{
await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);
- Guard.IsNotNull(UIImageViewer.ImageSource);
- await UIImageViewer.ImageSource.Value.Match(
+ if (UIImageViewer.ImageSource.HasValue)
+ {
+ await UIImageViewer.ImageSource.Value.Match(
async (FileInfo imageFileInfo) =>
{
using FileStream fileStream = imageFileInfo.OpenRead();
@@ -225,6 +227,11 @@ public partial class UIImageViewerPresenter : MefComponentBase
ImageName = imagePickedFile.FileName;
IsImageDisplayed = true;
});
+ }
+ else
+ {
+ IsImageDisplayed = false;
+ }
}
}
catch (OperationCanceledException)
@@ -249,6 +256,6 @@ public partial class UIImageViewerPresenter : MefComponentBase
{
Guard.IsNotNull(image);
- return image.ToBase64String(image.Metadata.DecodedImageFormat!);
+ return image.ToBase64String(image.Metadata.DecodedImageFormat ?? PngFormat.Instance);
}
}
diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Image/Base64ImageEncoderDecoderGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Image/Base64ImageEncoderDecoderGuiTool.cs
index d622692fa..a84ba6834 100644
--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Image/Base64ImageEncoderDecoderGuiTool.cs
+++ b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Image/Base64ImageEncoderDecoderGuiTool.cs
@@ -138,7 +138,7 @@ internal sealed partial class Base64ImageEncoderDecoderGuiTool : IGuiTool, IDisp
_selectedFile?.Dispose();
_selectedFile = files[0];
- _imageViewer.WithPickedFile(_selectedFile);
+ _imageViewer.WithPickedFile(_selectedFile, false);
StartConvert(_selectedFile);
return ValueTask.CompletedTask;