Skip to content

A Swiss Army knife for developers.

Fixed Expander and Card.

Etienne Baudoux84330beb26ba
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.scss
index ca156255e..7c2d3ada3 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
@@ -85,11 +85,11 @@
var(--control-stroke-on-accent-secondary);
/* Card */
- --card-border: var(--control-border-color-default);
- --card-border-secondary: var(--card-background-color-secondary);
+ --card-stroke-color-default: rgba(0, 0, 0, 0.1);
+ --card-border: var(--card-stroke-color-default);
--card-border-thickness: 1px solid;
--card-foreground: var(--text-fill-color-primary);
- --card-stroke-color-default: rgba(0, 0, 0, 0.1);
+ --card-foreground-description: var(--text-fill-color-secondary);
--card-background-color: rgba(255, 255, 255, 0.05);
--card-background-color-secondary: rgba(255, 255, 255, 0.03);
--card-hover-background-color: rgba(255, 255, 255, 0.06);
diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/Button/Button.razor b/src/app/dev/DevToys.Blazor/Components/BasicInput/Button/Button.razor
index d4e9f3bba..e572ccea0 100644
--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/Button/Button.razor
+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/Button/Button.razor
@@ -7,6 +7,14 @@
VerticalAlignment="@VerticalAlignment"
Width="@Width"
Height="@Height"
+ MarginLeft="@MarginLeft"
+ MarginRight="@MarginRight"
+ MarginTop="@MarginTop"
+ MarginBottom="@MarginBottom"
+ PaddingLeft="@PaddingLeft"
+ PaddingRight="@PaddingRight"
+ PaddingTop="@PaddingTop"
+ PaddingBottom="@PaddingBottom"
IsVisible="@IsVisible">
<button id=@Id
role="button"
diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/CheckBox/CheckBox.razor b/src/app/dev/DevToys.Blazor/Components/BasicInput/CheckBox/CheckBox.razor
index 9eeb2c19b..23d3cedb0 100644
--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/CheckBox/CheckBox.razor
+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/CheckBox/CheckBox.razor
@@ -7,12 +7,21 @@
VerticalAlignment="@VerticalAlignment"
Width="@Width"
Height="@Height"
+ MarginLeft="@MarginLeft"
+ MarginRight="@MarginRight"
+ MarginTop="@MarginTop"
+ MarginBottom="@MarginBottom"
+ PaddingLeft="@PaddingLeft"
+ PaddingRight="@PaddingRight"
+ PaddingTop="@PaddingTop"
+ PaddingBottom="@PaddingBottom"
IsVisible="@IsVisible">
<label
id=@Id
role="button"
class="checkbox-container @(IsEnabled ? string.Empty : "disabled")"
style="@(Style)"
+ @onclick:stopPropagation="@IsEnabled"
@ref=Element>
<span class="checkbox-inner">
<input
diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/ComboBox/ComboBox.razor b/src/app/dev/DevToys.Blazor/Components/BasicInput/ComboBox/ComboBox.razor
index 645b215d0..3004bc824 100644
--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/ComboBox/ComboBox.razor
+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/ComboBox/ComboBox.razor
@@ -7,6 +7,14 @@
VerticalAlignment="@VerticalAlignment"
Width="@Width"
Height="@Height"
+ MarginLeft="@MarginLeft"
+ MarginRight="@MarginRight"
+ MarginTop="@MarginTop"
+ MarginBottom="@MarginBottom"
+ PaddingLeft="@PaddingLeft"
+ PaddingRight="@PaddingRight"
+ PaddingTop="@PaddingTop"
+ PaddingBottom="@PaddingBottom"
IsVisible="@IsVisible">
<div id=@Id
class="combo-box-with-header @(FinalCssClasses)"
diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownList/DropDownList.razor b/src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownList/DropDownList.razor
index 1ce9d4f91..bee08cbe2 100644
--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownList/DropDownList.razor
+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/DropDownList/DropDownList.razor
@@ -6,6 +6,14 @@
VerticalAlignment="@VerticalAlignment"
Width="@Width"
Height="@Height"
+ MarginLeft="@MarginLeft"
+ MarginRight="@MarginRight"
+ MarginTop="@MarginTop"
+ MarginBottom="@MarginBottom"
+ PaddingLeft="@PaddingLeft"
+ PaddingRight="@PaddingRight"
+ PaddingTop="@PaddingTop"
+ PaddingBottom="@PaddingBottom"
IsVisible="@IsVisible">
<div id=@Id
class="drop-down-list-with-header @(FinalCssClasses)"
diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/RadioButton/RadioButton.razor b/src/app/dev/DevToys.Blazor/Components/BasicInput/RadioButton/RadioButton.razor
index 6c79009e2..b18f98b4a 100644
--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/RadioButton/RadioButton.razor
+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/RadioButton/RadioButton.razor
@@ -7,10 +7,19 @@
VerticalAlignment="@VerticalAlignment"
Width="@Width"
Height="@Height"
+ MarginLeft="@MarginLeft"
+ MarginRight="@MarginRight"
+ MarginTop="@MarginTop"
+ MarginBottom="@MarginBottom"
+ PaddingLeft="@PaddingLeft"
+ PaddingRight="@PaddingRight"
+ PaddingTop="@PaddingTop"
+ PaddingBottom="@PaddingBottom"
IsVisible="@IsVisible">
<label id=@Id
class="radio-button-container @(IsEnabled ? string.Empty : "disabled")"
style="@(Style)"
+ @onclick:stopPropagation="@IsEnabled"
@ref=Element>
<input type="radio"
tabindex="0"
diff --git a/src/app/dev/DevToys.Blazor/Components/BasicInput/ToggleSwitch/ToggleSwitch.razor b/src/app/dev/DevToys.Blazor/Components/BasicInput/ToggleSwitch/ToggleSwitch.razor
index 386ee3f3f..f2e2fc8d6 100644
--- a/src/app/dev/DevToys.Blazor/Components/BasicInput/ToggleSwitch/ToggleSwitch.razor
+++ b/src/app/dev/DevToys.Blazor/Components/BasicInput/ToggleSwitch/ToggleSwitch.razor
@@ -7,13 +7,23 @@
VerticalAlignment="@VerticalAlignment"
Width="@Width"
Height="@Height"
+ MarginLeft="@MarginLeft"
+ MarginRight="@MarginRight"
+ MarginTop="@MarginTop"
+ MarginBottom="@MarginBottom"
+ PaddingLeft="@PaddingLeft"
+ PaddingRight="@PaddingRight"
+ PaddingTop="@PaddingTop"
+ PaddingBottom="@PaddingBottom"
IsVisible="@IsVisible">
<label
id=@Id
role="button"
class="toggle-switch-container @(IsEnabled ? string.Empty : "disabled")"
style="@(Style)"
+ @onclick:stopPropagation="@IsEnabled"
@ref=Element>
+ <TextBlock Text="@Text" NoWrap="true" />
<input
type="checkbox"
tabindex="0"
@@ -23,7 +33,6 @@
@onclick:preventDefault="@(!IsEnabled)"
@onchange="OnChange"
@attributes="AdditionalAttributes" />
- <TextBlock Text="@Text" />
</label>
</Container>
</CascadingValue>
\ No newline at end of file
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 a3f5d6589..c4eb4ff9f 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
@@ -121,7 +121,7 @@ $control-fast-out-slow-in-easing: cubic-bezier(0, 0, 0, 1);
min-block-size: 32px;
> span {
- padding-inline-start: 8px;
+ padding-inline-end: 8px;
}
}
}
diff --git a/src/app/dev/DevToys.Blazor/Components/Collections/GridView/GridView.razor b/src/app/dev/DevToys.Blazor/Components/Collections/GridView/GridView.razor
index 4f4498f6f..d6489674a 100644
--- a/src/app/dev/DevToys.Blazor/Components/Collections/GridView/GridView.razor
+++ b/src/app/dev/DevToys.Blazor/Components/Collections/GridView/GridView.razor
@@ -8,6 +8,14 @@
VerticalAlignment="@VerticalAlignment"
Width="@Width"
Height="@Height"
+ MarginLeft="@MarginLeft"
+ MarginRight="@MarginRight"
+ MarginTop="@MarginTop"
+ MarginBottom="@MarginBottom"
+ PaddingLeft="@PaddingLeft"
+ PaddingRight="@PaddingRight"
+ PaddingTop="@PaddingTop"
+ PaddingBottom="@PaddingBottom"
IsVisible="@IsVisible">
<ScrollViewer @ref=_scrollViewer
Orientation="Orientation.Vertical"
diff --git a/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBox.razor b/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBox.razor
index b4369f415..a9a8d44b4 100644
--- a/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBox.razor
+++ b/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBox.razor
@@ -7,6 +7,14 @@
VerticalAlignment="@VerticalAlignment"
Width="@Width"
Height="@Height"
+ MarginLeft="@MarginLeft"
+ MarginRight="@MarginRight"
+ MarginTop="@MarginTop"
+ MarginBottom="@MarginBottom"
+ PaddingLeft="@PaddingLeft"
+ PaddingRight="@PaddingRight"
+ PaddingTop="@PaddingTop"
+ PaddingBottom="@PaddingBottom"
IsVisible="@IsVisible">
<ScrollViewer Orientation="Orientation.Vertical"
IsEnabled="@IsEnabled"
diff --git a/src/app/dev/DevToys.Blazor/Components/Feedback/FontIcon/FontIcon.razor b/src/app/dev/DevToys.Blazor/Components/Feedback/FontIcon/FontIcon.razor
index 70e73c7b1..49cd61e9c 100644
--- a/src/app/dev/DevToys.Blazor/Components/Feedback/FontIcon/FontIcon.razor
+++ b/src/app/dev/DevToys.Blazor/Components/Feedback/FontIcon/FontIcon.razor
@@ -6,6 +6,14 @@
VerticalAlignment="@VerticalAlignment"
Width="null"
Height="null"
+ MarginLeft="@MarginLeft"
+ MarginRight="@MarginRight"
+ MarginTop="@MarginTop"
+ MarginBottom="@MarginBottom"
+ PaddingLeft="@PaddingLeft"
+ PaddingRight="@PaddingRight"
+ PaddingTop="@PaddingTop"
+ PaddingBottom="@PaddingBottom"
IsVisible="@IsVisible">
<i id=@Id
class="font-icon @(FinalCssClasses)"
diff --git a/src/app/dev/DevToys.Blazor/Components/Feedback/InfoBar/InfoBar.razor b/src/app/dev/DevToys.Blazor/Components/Feedback/InfoBar/InfoBar.razor
index a6e751a8b..17f5c6f57 100644
--- a/src/app/dev/DevToys.Blazor/Components/Feedback/InfoBar/InfoBar.razor
+++ b/src/app/dev/DevToys.Blazor/Components/Feedback/InfoBar/InfoBar.razor
@@ -6,6 +6,14 @@
VerticalAlignment="@VerticalAlignment"
Width="@Width"
Height="@Height"
+ MarginLeft="@MarginLeft"
+ MarginRight="@MarginRight"
+ MarginTop="@MarginTop"
+ MarginBottom="@MarginBottom"
+ PaddingLeft="@PaddingLeft"
+ PaddingRight="@PaddingRight"
+ PaddingTop="@PaddingTop"
+ PaddingBottom="@PaddingBottom"
IsVisible="@IsVisible">
@if (IsOpen)
{
diff --git a/src/app/dev/DevToys.Blazor/Components/Feedback/ProgressBar/ProgressBar.razor b/src/app/dev/DevToys.Blazor/Components/Feedback/ProgressBar/ProgressBar.razor
index 1b404d657..c96654aaa 100644
--- a/src/app/dev/DevToys.Blazor/Components/Feedback/ProgressBar/ProgressBar.razor
+++ b/src/app/dev/DevToys.Blazor/Components/Feedback/ProgressBar/ProgressBar.razor
@@ -6,6 +6,14 @@
VerticalAlignment="@VerticalAlignment"
Width="@Width"
Height="@Height"
+ MarginLeft="@MarginLeft"
+ MarginRight="@MarginRight"
+ MarginTop="@MarginTop"
+ MarginBottom="@MarginBottom"
+ PaddingLeft="@PaddingLeft"
+ PaddingRight="@PaddingRight"
+ PaddingTop="@PaddingTop"
+ PaddingBottom="@PaddingBottom"
IsVisible="@IsVisible">
<svg @ref="Element"
tabindex="-1"
diff --git a/src/app/dev/DevToys.Blazor/Components/Feedback/ProgressRing/ProgressRing.razor b/src/app/dev/DevToys.Blazor/Components/Feedback/ProgressRing/ProgressRing.razor
index b45e18d4f..f7fdd44f9 100644
--- a/src/app/dev/DevToys.Blazor/Components/Feedback/ProgressRing/ProgressRing.razor
+++ b/src/app/dev/DevToys.Blazor/Components/Feedback/ProgressRing/ProgressRing.razor
@@ -6,6 +6,14 @@
VerticalAlignment="@VerticalAlignment"
Width="@Width"
Height="@Height"
+ MarginLeft="@MarginLeft"
+ MarginRight="@MarginRight"
+ MarginTop="@MarginTop"
+ MarginBottom="@MarginBottom"
+ PaddingLeft="@PaddingLeft"
+ PaddingRight="@PaddingRight"
+ PaddingTop="@PaddingTop"
+ PaddingBottom="@PaddingBottom"
IsVisible="@IsVisible">
<svg @ref="Element"
tabindex="-1"
diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor b/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor
index e62618598..4c686c37b 100644
--- a/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor
+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor
@@ -6,37 +6,39 @@
VerticalAlignment="@VerticalAlignment"
Width="@Width"
Height="@Height"
+ MarginLeft="@MarginLeft"
+ MarginRight="@MarginRight"
+ MarginTop="@MarginTop"
+ MarginBottom="@MarginBottom"
+ PaddingLeft="@PaddingLeft"
+ PaddingRight="@PaddingRight"
+ PaddingTop="@PaddingTop"
+ PaddingBottom="@PaddingBottom"
IsVisible="@IsVisible">
<div class="card @(FinalCssClasses)"
style="@(Style)"
@ref=Element
@attributes="AdditionalAttributes">
- @if (Icon is not null || Title is not null)
- {
- <div class="header">
- @if (Icon is not null)
+ <div class="card-header">
+ <FontIcon class="card-icon"
+ Glyph="@IconGlyph"
+ FontFamily="@IconFontFamily"/>
+ <div class="card-context">
+ <div class="card-title">
+ <TextBlock Appearance="TextBlockAppearance.Body" Text="@Title" />
+ </div>
+ @if (!string.IsNullOrWhiteSpace(Description))
{
- <div class="icon">
- @Icon
+ <div class="card-description">
+ <TextBlock Appearance="TextBlockAppearance.Caption" Text="@Description" />
</div>
}
- <div class="context">
- <div class="title">
- @Title
- </div>
- @if (Description is not null)
- {
- <div class="description">
- @Description
- </div>
- }
- </div>
</div>
- }
+ </div>
@if (Control is not null)
{
- <div class="control">
+ <div class="card-control">
@Control
</div>
}
diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor.cs b/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor.cs
index db0c5a655..95c74b70a 100644
--- a/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor.cs
@@ -3,13 +3,16 @@
public partial class Card : StyledComponentBase
{
[Parameter]
- public RenderFragment? Icon { get; set; }
+ public char IconGlyph { get; set; }
[Parameter]
- public RenderFragment? Title { get; set; }
+ public string IconFontFamily { get; set; } = "FluentSystemIcons";
[Parameter]
- public RenderFragment? Description { get; set; }
+ public string? Title { get; set; }
+
+ [Parameter]
+ public string? Description { get; set; }
[Parameter]
public RenderFragment? Control { get; set; }
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 012b6b63f..3701da498 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
@@ -1,7 +1,7 @@
@use "../../../Assets/sass/devtoys" as *;
.card {
- @include flex($direction: row, $align: center, $justify: between);
+ @include flex($direction: row, $align: center, $justify: between, $gap: 12px);
@include typography-body;
color: var(--card-foreground);
border: var(--card-border-thickness);
@@ -9,18 +9,33 @@
border-radius: var(--control-corner-radius);
background-clip: padding-box;
background-color: var(--card-background-color);
- // todo: Use dynamic values based on selected mode (compact, normal)
- margin: 1rem;
- min-height: 4rem;
- padding-block: 4px 6px;
+ min-height: 72px;
+ padding-block: 16px;
padding-inline: 11px;
- // End of todo
- .header {
- @include flex($direction: row, $align: center, $justify: between, $gap: 1rem);
+ .card-header {
+ display: grid;
+ grid-template-columns: 20px 1fr;
+ gap: 20px;
+ grid-template-areas: "icon context";
+ margin-left: 4px;
- .context {
- @include flex($direction: column, $align: left, $gap: .5rem);
+ .card-icon {
+ grid-area: icon;
}
+
+ .card-context {
+ grid-area: context;
+ @include flex($direction: column, $align: left);
+
+ .card-description {
+ color: var(--card-foreground-description);
+ }
+ }
+ }
+
+ .card-control {
+ display: inline-flex;
+ gap: 16px;
}
-}
\ No newline at end of file
+}
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 02fa5fae6..3601efb71 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
@@ -37,6 +37,11 @@ public partial class Container : StyledComponentBase
styleBuilder.AddImportantStyle("flex-direction", "row");
styleBuilder.AddImportantStyle("flex-wrap", "nowrap");
+ styleBuilder.AddStyle("margin-left", MarginLeft.ToPx(), MarginLeft.HasValue);
+ styleBuilder.AddStyle("margin-right", MarginRight.ToPx(), MarginRight.HasValue);
+ styleBuilder.AddStyle("margin-top", MarginTop.ToPx(), MarginTop.HasValue);
+ styleBuilder.AddStyle("margin-bottom", MarginBottom.ToPx(), MarginBottom.HasValue);
+
switch (HorizontalAlignment)
{
case HorizontalAlignment.Stretch:
@@ -80,6 +85,10 @@ public partial class Container : StyledComponentBase
innerStyleBuilder.AddImportantStyle("width", Width.ToPx(), Width.HasValue);
innerStyleBuilder.AddImportantStyle("height", Height.ToPx(), Height.HasValue);
+ innerStyleBuilder.AddImportantStyle("padding-left", PaddingLeft.ToPx(), PaddingLeft.HasValue);
+ innerStyleBuilder.AddImportantStyle("padding-right", PaddingRight.ToPx(), PaddingRight.HasValue);
+ innerStyleBuilder.AddImportantStyle("padding-top", PaddingTop.ToPx(), PaddingTop.HasValue);
+ innerStyleBuilder.AddImportantStyle("padding-bottom", PaddingBottom.ToPx(), PaddingBottom.HasValue);
FinalStyles = styleBuilder.ToString();
FinalInnerStyles = innerStyleBuilder.ToString();
diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor b/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor
index 6a5bbc90a..41b1e8cfa 100644
--- a/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor
+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor
@@ -6,26 +6,38 @@
VerticalAlignment="@VerticalAlignment"
Width="@Width"
Height="@Height"
+ MarginLeft="@MarginLeft"
+ MarginRight="@MarginRight"
+ MarginTop="@MarginTop"
+ MarginBottom="@MarginBottom"
+ PaddingLeft="@PaddingLeft"
+ PaddingRight="@PaddingRight"
+ PaddingTop="@PaddingTop"
+ PaddingBottom="@PaddingBottom"
IsVisible="@IsVisible"
Class="expander">
<Card data-expanded="@IsExpanded.ToString().ToLower()"
+ aria-label="Toggle Expander"
+ aria-expanded="@IsExpanded.ToString()"
+ tabindex="0"
Class="expander-card"
- Icon=@Icon
+ IconGlyph=@IconGlyph
+ IconFontFamily=@IconFontFamily
Title=@Title
- Description=@Description>
+ Description=@Description
+ @onclick="@OnClick"
+ @onkeydown="@OnKeyDown">
<Control>
- <Button Appearance="@ButtonAppearance.Stealth"
- @onclick="OnClickAsync"
- Height="32"
- Width="32"
- aria-label="Toggle Expander"
- aria-expanded="@IsExpanded.ToString()">
+ @Control
+ <div class="expander-expand-button">
<FontIcon Glyph="@('\uf2a6')" Height="12" Width="12" />
- </Button>
+ </div>
</Control>
</Card>
- <div class="expander-content" aria-expanded="@IsExpanded.ToString().ToLower()">
- @(ChildContent)
+ <div class="expander-content-anchor" aria-expanded="@IsExpanded.ToString().ToLower()">
+ <div class="expander-content">
+ @(ChildContent)
+ </div>
</div>
</Container>
</CascadingValue>
\ No newline at end of file
diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor.cs b/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor.cs
index 39a3cdc60..c6a800cca 100644
--- a/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor.cs
@@ -1,17 +1,26 @@
-namespace DevToys.Blazor.Components;
+using DevToys.Core;
+using Microsoft.AspNetCore.Components.Web;
+
+namespace DevToys.Blazor.Components;
public partial class Expander : StyledComponentBase
{
public bool IsExpanded { get; set; } = false;
[Parameter]
- public RenderFragment? Icon { get; set; }
+ public char IconGlyph { get; set; }
+
+ [Parameter]
+ public string IconFontFamily { get; set; } = "FluentSystemIcons";
+
+ [Parameter]
+ public string? Title { get; set; }
[Parameter]
- public RenderFragment? Title { get; set; }
+ public string? Description { get; set; }
[Parameter]
- public RenderFragment? Description { get; set; }
+ public RenderFragment? Control { get; set; }
/// <summary>
/// Gets or sets the content to be rendered inside the component.
@@ -19,9 +28,18 @@ public partial class Expander : StyledComponentBase
[Parameter]
public RenderFragment? ChildContent { get; set; }
- private Task OnClickAsync()
+ private void OnClick()
+ {
+ IsExpanded = !IsExpanded;
+ }
+
+ protected void OnKeyDown(KeyboardEventArgs ev)
{
- return Task.Run(() => IsExpanded = !IsExpanded);
+ if (string.Equals(ev.Code, "Enter", StringComparison.OrdinalIgnoreCase)
+ || string.Equals(ev.Code, "Space", StringComparison.OrdinalIgnoreCase))
+ {
+ OnClick();
+ }
}
}
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 87bb247e2..3baec54f3 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
@@ -2,53 +2,77 @@
.expander {
.card {
- &.expander-card {
- margin-bottom: 2px;
- @include transition(border-bottom-left-radius .2s ease-in-out, border-bottom-right-radius .2s ease-in-out);
+ &:focus-visible {
+ box-shadow: var(--focus-stroke);
+ }
- &[data-expanded='true'] {
- border-bottom-left-radius: 0;
- border-bottom-right-radius: 0;
+ &[data-expanded='true'] {
+ border-bottom-left-radius: 0;
+ border-bottom-right-radius: 0;
- .control {
- .font-icon {
- transform: rotate(180deg);
- @include transition(transform .2s ease-in-out);
- }
+ .expander-expand-button {
+ .font-icon {
+ transform: rotate(180deg);
+ @include transition(transform .2s ease-in-out);
}
}
+ }
+
+ &.expander-card {
+ @include transition(border-bottom-left-radius .2s ease-in-out, border-bottom-right-radius .2s ease-in-out);
+
+ .expander-expand-button {
+ display: grid;
+ height: 32px;
+ width: 32px;
+ border-radius: var(--control-corner-radius);
- .control {
.font-icon {
@include transition(transform .2s ease-in-out);
}
}
+
+ &:hover {
+ .expander-expand-button {
+ border-color: var(--stealth-button-border-pointer-over);
+ background-color: var(--stealth-button-background-pointer-over);
+ color: var(--stealth-button-foreground-pointer-over);
+ }
+ }
}
}
- .expander-content {
- @include flex($direction: row, $align: center, $justify: between);
- @include typography-body;
- // todo: Use dynamic values based on selected mode (compact, normal)
- margin: 1rem;
- min-height: 4rem;
- padding-block: 4px 6px;
- padding-inline: 11px;
-
- margin-top: 0;
- border-top-left-radius: 0;
- border-top-right-radius: 0;
- transform-origin: top;
- border-color: var(--card-border-secondary);
- background-color: var(--card-background-color-secondary);
- @include transition(transform .2s ease-in-out);
-
- &[aria-expanded='false'] {
- transform: scaleY(0);
+ .expander-content-anchor {
+ max-height: 0;
+ position: relative;
+ overflow: hidden;
+ @include transition(0ms linear 250ms max-height);
+
+ .expander-content {
+ @include flex($direction: row, $align: center, $justify: between);
+ @include typography-body;
+ min-height: 72px;
+ margin-top: 0;
+ border-radius: var(--control-corner-radius);
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+ border: var(--card-border-thickness);
+ border-top-width: 0px;
+ border-color: var(--card-border);
+ background-clip: padding-box;
+ background-color: var(--card-background-color-secondary);
+ @include transition(transform 250ms cubic-bezier(1, 1, 0, 1));
+ transform: translateY(-100%);
}
&[aria-expanded='true'] {
- transform: scaleY(1);
+ max-block-size: 6.02e23vmax;
+ transition: none;
+
+ .expander-content {
+ transform: none;
+ @include transition(250ms cubic-bezier(0, 0, 0, 1) transform);
+ }
}
}
}
diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/Grid/Grid.razor b/src/app/dev/DevToys.Blazor/Components/Layout/Grid/Grid.razor
index 08c518b2f..b771d988c 100644
--- a/src/app/dev/DevToys.Blazor/Components/Layout/Grid/Grid.razor
+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Grid/Grid.razor
@@ -5,6 +5,14 @@
VerticalAlignment="@VerticalAlignment"
Width="@Width"
Height="@Height"
+ MarginLeft="@MarginLeft"
+ MarginRight="@MarginRight"
+ MarginTop="@MarginTop"
+ MarginBottom="@MarginBottom"
+ PaddingLeft="@PaddingLeft"
+ PaddingRight="@PaddingRight"
+ PaddingTop="@PaddingTop"
+ PaddingBottom="@PaddingBottom"
IsVisible="@IsVisible">
<div id="@Id" @ref="@Element" class="@FinalCssClasses" style="@StyleValue" @attributes="AdditionalAttributes">
@ChildContent
diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razor b/src/app/dev/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razor
index 902027698..3c5fea398 100644
--- a/src/app/dev/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razor
+++ b/src/app/dev/DevToys.Blazor/Components/Layout/ScrollViewer/ScrollViewer.razor
@@ -6,6 +6,14 @@
VerticalAlignment="@VerticalAlignment"
Width="@Width"
Height="@Height"
+ MarginLeft="@MarginLeft"
+ MarginRight="@MarginRight"
+ MarginTop="@MarginTop"
+ MarginBottom="@MarginBottom"
+ PaddingLeft="@PaddingLeft"
+ PaddingRight="@PaddingRight"
+ PaddingTop="@PaddingTop"
+ PaddingBottom="@PaddingBottom"
IsVisible="@IsVisible">
<div id=@Id
class="scroll-viewer @(FinalCssClasses)"
diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/SplitGrid/SplitGrid.razor b/src/app/dev/DevToys.Blazor/Components/Layout/SplitGrid/SplitGrid.razor
index ba6f34c80..1ddb3f8c8 100644
--- a/src/app/dev/DevToys.Blazor/Components/Layout/SplitGrid/SplitGrid.razor
+++ b/src/app/dev/DevToys.Blazor/Components/Layout/SplitGrid/SplitGrid.razor
@@ -5,6 +5,14 @@
VerticalAlignment="@VerticalAlignment"
Width="@Width"
Height="@Height"
+ MarginLeft="@MarginLeft"
+ MarginRight="@MarginRight"
+ MarginTop="@MarginTop"
+ MarginBottom="@MarginBottom"
+ PaddingLeft="@PaddingLeft"
+ PaddingRight="@PaddingRight"
+ PaddingTop="@PaddingTop"
+ PaddingBottom="@PaddingBottom"
IsVisible="@IsVisible">
<div id="@Id"
@ref="@Element"
diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/StackPanel/StackPanel.razor b/src/app/dev/DevToys.Blazor/Components/Layout/StackPanel/StackPanel.razor
index 76546fbcb..e9dc7c868 100644
--- a/src/app/dev/DevToys.Blazor/Components/Layout/StackPanel/StackPanel.razor
+++ b/src/app/dev/DevToys.Blazor/Components/Layout/StackPanel/StackPanel.razor
@@ -6,6 +6,14 @@
VerticalAlignment="@VerticalAlignment"
Width="@Width"
Height="@Height"
+ MarginLeft="@MarginLeft"
+ MarginRight="@MarginRight"
+ MarginTop="@MarginTop"
+ MarginBottom="@MarginBottom"
+ PaddingLeft="@PaddingLeft"
+ PaddingRight="@PaddingRight"
+ PaddingTop="@PaddingTop"
+ PaddingBottom="@PaddingBottom"
IsVisible="@IsVisible">
<div id="@Id" @ref="@Element" class="@ClassValue" style="@StyleValue" @attributes="AdditionalAttributes">
@ChildContent
diff --git a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor
index 4e17f48ba..26cd5c9ed 100644
--- a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor
+++ b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor
@@ -14,11 +14,11 @@
@attributes="AdditionalAttributes">
<!-- Header -->
- <div class="header">
+ <div class="nav-bar-header">
<StackPanel Orientation="Orientation.Horizontal"
HorizontalAlignment="HorizontalAlignment.Left">
<Button Appearance="ButtonAppearance.Stealth"
- Class="button-icon"
+ Class="nav-bar-button-icon"
Style="margin: 5px 0px 0px 5px;"
IsEnabled="@CanGoBack"
title="Back"
@@ -29,7 +29,7 @@
@if (_sidebarState.IsHidden)
{
<Button Appearance="ButtonAppearance.Stealth"
- Class="button-icon"
+ Class="nav-bar-button-icon"
title="Toggle Navigation"
aria-label="Toggle Navigation"
aria-controls="@NavId"
@@ -51,7 +51,7 @@
@if (!_sidebarState.IsHidden)
{
<Button Appearance="ButtonAppearance.Stealth"
- Class="button-icon"
+ Class="nav-bar-button-icon"
Style="margin: 0px 4px 0px 5px;"
title="Toggle Navigation"
aria-label="Toggle Navigation"
@@ -68,7 +68,7 @@
// TODO: Localize
<Button Appearance="ButtonAppearance.Stealth"
- Class="button-icon"
+ Class="nav-bar-button-icon"
Style="@searchButtonStyle"
title="Click to search"
aria-label="Search"
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 76f8ad07e..870c9377e 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
@@ -27,14 +27,14 @@ $sidebar-top-bar-height: 48px;
}
}
- .button-icon {
+ .nav-bar-button-icon {
height: 36px;
width: 40px;
font-size: 16px;
line-height: 16px;
}
- .header {
+ .nav-bar-header {
grid-area: header;
z-index: calc($sidebar-expanded-overlay-zindex + 1);
}
diff --git a/src/app/dev/DevToys.Blazor/Components/StyledComponentBase.cs b/src/app/dev/DevToys.Blazor/Components/StyledComponentBase.cs
index 67a9a7512..d243c3432 100644
--- a/src/app/dev/DevToys.Blazor/Components/StyledComponentBase.cs
+++ b/src/app/dev/DevToys.Blazor/Components/StyledComponentBase.cs
@@ -75,6 +75,62 @@ public abstract class StyledComponentBase : ComponentBase
[Parameter]
public bool IsVisible { get; set; } = true;
+ /// <summary>
+ /// Gets or sets the outer-space to set on the left of the component.
+ /// If null, the component will use the default margin.
+ /// </summary>
+ [Parameter]
+ public int? MarginLeft { get; set; }
+
+ /// <summary>
+ /// Gets or sets the outer-space to set on the right of the component.
+ /// If null, the component will use the default margin.
+ /// </summary>
+ [Parameter]
+ public int? MarginRight { get; set; }
+
+ /// <summary>
+ /// Gets or sets the outer-space to set on the top of the component.
+ /// If null, the component will use the default margin.
+ /// </summary>
+ [Parameter]
+ public int? MarginTop { get; set; }
+
+ /// <summary>
+ /// Gets or sets the outer-space to set on the bottom of the component.
+ /// If null, the component will use the default margin.
+ /// </summary>
+ [Parameter]
+ public int? MarginBottom { get; set; }
+
+ /// <summary>
+ /// Gets or sets the inner-space to set on the left of the component.
+ /// If null, the component will use the default margin.
+ /// </summary>
+ [Parameter]
+ public int? PaddingLeft { get; set; }
+
+ /// <summary>
+ /// Gets or sets the inner-space to set on the right of the component.
+ /// If null, the component will use the default margin.
+ /// </summary>
+ [Parameter]
+ public int? PaddingRight { get; set; }
+
+ /// <summary>
+ /// Gets or sets the inner-space to set on the top of the component.
+ /// If null, the component will use the default margin.
+ /// </summary>
+ [Parameter]
+ public int? PaddingTop { get; set; }
+
+ /// <summary>
+ /// Gets or sets the inner-space to set on the bottom of the component.
+ /// If null, the component will use the default margin.
+ /// </summary>
+ [Parameter]
+ public int? PaddingBottom { get; set; }
+
/// <summary>
/// Gets a list of CSS class to apply to the component.
/// </summary>
diff --git a/src/app/dev/DevToys.Blazor/Components/Text/AutoSuggestBox/AutoSuggestBox.razor b/src/app/dev/DevToys.Blazor/Components/Text/AutoSuggestBox/AutoSuggestBox.razor
index a7fe66cdb..314e019aa 100644
--- a/src/app/dev/DevToys.Blazor/Components/Text/AutoSuggestBox/AutoSuggestBox.razor
+++ b/src/app/dev/DevToys.Blazor/Components/Text/AutoSuggestBox/AutoSuggestBox.razor
@@ -7,6 +7,14 @@
VerticalAlignment="@VerticalAlignment"
Width="@Width"
Height="@Height"
+ MarginLeft="@MarginLeft"
+ MarginRight="@MarginRight"
+ MarginTop="@MarginTop"
+ MarginBottom="@MarginBottom"
+ PaddingLeft="@PaddingLeft"
+ PaddingRight="@PaddingRight"
+ PaddingTop="@PaddingTop"
+ PaddingBottom="@PaddingBottom"
IsVisible="@IsVisible">
<div id="@Id" style="@Style">
<TextBox @ref="_textBox"
diff --git a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor
index 3ab723c7b..8747080c7 100644
--- a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor
+++ b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor
@@ -6,6 +6,14 @@
VerticalAlignment="@VerticalAlignment"
Width="@Width"
Height="@Height"
+ MarginLeft="@MarginLeft"
+ MarginRight="@MarginRight"
+ MarginTop="@MarginTop"
+ MarginBottom="@MarginBottom"
+ PaddingLeft="@PaddingLeft"
+ PaddingRight="@PaddingRight"
+ PaddingTop="@PaddingTop"
+ PaddingBottom="@PaddingBottom"
IsVisible="@IsVisible">
<div id="@(Id)-monaco-container"
class="monaco-editor-standalone-with-header @(FinalCssClasses)"
diff --git a/src/app/dev/DevToys.Blazor/Components/Text/TextBox/TextBox.razor b/src/app/dev/DevToys.Blazor/Components/Text/TextBox/TextBox.razor
index 949a15d05..5b95cbe03 100644
--- a/src/app/dev/DevToys.Blazor/Components/Text/TextBox/TextBox.razor
+++ b/src/app/dev/DevToys.Blazor/Components/Text/TextBox/TextBox.razor
@@ -6,6 +6,14 @@
VerticalAlignment="@VerticalAlignment"
Width="@Width"
Height="@Height"
+ MarginLeft="@MarginLeft"
+ MarginRight="@MarginRight"
+ MarginTop="@MarginTop"
+ MarginBottom="@MarginBottom"
+ PaddingLeft="@PaddingLeft"
+ PaddingRight="@PaddingRight"
+ PaddingTop="@PaddingTop"
+ PaddingBottom="@PaddingBottom"
IsVisible="@IsVisible">
<div id=@Id
class="text-box-with-header @(FinalCssClasses)"
diff --git a/src/app/dev/DevToys.Blazor/Pages/Index.razor b/src/app/dev/DevToys.Blazor/Pages/Index.razor
index 12794b3c0..191012dd8 100644
--- a/src/app/dev/DevToys.Blazor/Pages/Index.razor
+++ b/src/app/dev/DevToys.Blazor/Pages/Index.razor
@@ -90,7 +90,11 @@
<!-- TODO: Place here a component that takes in argument the guiToolViewItem -->
<div class="entranceThemeTransition" style="display: contents">
<ScrollViewer>
- <StackPanel Orientation="Orientation.Vertical">
+ <StackPanel Orientation="Orientation.Vertical"
+ PaddingLeft="16"
+ PaddingBottom="16"
+ PaddingRight="16"
+ PaddingTop="16">
<Grid ColumnSpacing="12"
RowSpacing="12"
Columns="@(new List<GridLength>
@@ -200,44 +204,21 @@
<InfoBar IsOpen="true" Title="Title" Message="Message" Severity="InfoBarSeverity.Warning" />
<InfoBar IsOpen="true" Title="Title" Message="Message" Severity="InfoBarSeverity.Error" />
<InfoBar IsOpen="true" ActionButtonText="Action" Title="Title" Message="Sanctus gubergren dolore molestie rebum minim molestie et aliquyam lorem ea. Nulla feugiat dolor elitr kasd vero vero lorem imperdiet stet dolor mazim accusam. Sanctus elit ex possim sit rebum stet dolores. Ipsum eos duis sed accusam et takimata kasd sea diam." />
- <Card>
- <Title>
- <TextBlock Appearance="@TextBlockAppearance.BodyStrong" Text="Card Title" />
- </Title>
- </Card>
- <Card>
- <Title>
- <TextBlock Appearance="@TextBlockAppearance.BodyStrong" Text="Card Title" />
- </Title>
- <Description>
- <TextBlock Appearance="@TextBlockAppearance.Caption" Text="Card Description" />
- </Description>
- </Card>
- <Card>
- <Icon>
- <FontIcon Glyph="@('\uEE7A')" />
- </Icon>
- <Title>
- <TextBlock Appearance="@TextBlockAppearance.BodyStrong" Text="Card Title" />
- </Title>
- <Description>
- <TextBlock Appearance="@TextBlockAppearance.Caption" Text="Card Description" />
- </Description>
- </Card>
- <Expander>
- <Icon>
- <FontIcon Glyph="@('\uEE7A')" />
- </Icon>
- <Title>
- <TextBlock Appearance="@TextBlockAppearance.BodyStrong" Text="Expander Card Title" />
- </Title>
- <Description>
- <TextBlock Appearance="@TextBlockAppearance.Caption" Text="Card Description" />
- </Description>
+ <Card Title="Card Title"/>
+ <Card Title="Card Title" Description="Card Description" />
+ <Expander IconGlyph="@('\uEE7A')" Title="Card Title" Description="Card Description">
+ <Control>
+ <ToggleSwitch IsOn="false" Text="An option" />
+ </Control>
<ChildContent>
- <TextBlock Appearance="@TextBlockAppearance.BodyStrong" Text="Expander Content" />
+ <TextBlock Appearance="@TextBlockAppearance.Display" Text="This text is scaled." />
</ChildContent>
</Expander>
+ <Card IconGlyph="@('\uEE7A')" Title="Card Title" Description="Lorem kasd dolore vero vulputate rebum sit et vel amet consetetur. Est et velit no consetetur diam et. Eos magna duo amet eu ea clita. Volutpat nulla diam exerci erat labore.">
+ <Control>
+ <ToggleSwitch IsOn="false" Text="An option" />
+ </Control>
+ </Card>
</StackPanel>
</ScrollViewer>
</div>