Skip to content

A Swiss Army knife for developers.

added expander support (#867)

Benjamin TITEUXd0907f0a2ebd
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 211edf555..99f2055bd 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,8 +85,13 @@
var(--control-stroke-on-accent-secondary);
/* Card */
+ --card-border: var(--control-border-color-default);
+ --card-border-secondary: var(--card-background-color-secondary);
+ --card-border-thickness: 1px solid;
+ --card-foreground: var(--text-fill-color-primary);
--card-stroke-color-default: rgba(0, 0, 0, 0.06);
--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);
/* Button */
diff --git a/src/app/dev/DevToys.Blazor/Components/Feedback/FontIcon/FontIcon.razor.scss b/src/app/dev/DevToys.Blazor/Components/Feedback/FontIcon/FontIcon.razor.scss
index 15c5ec36c..c3dab4b6a 100644
--- a/src/app/dev/DevToys.Blazor/Components/Feedback/FontIcon/FontIcon.razor.scss
+++ b/src/app/dev/DevToys.Blazor/Components/Feedback/FontIcon/FontIcon.razor.scss
@@ -6,13 +6,13 @@
/* Center the icon in its parent */
margin: 0;
- position: relative;
- top: 50%;
- left: 50%;
- -ms-transform: translate(-50%, -50%);
- transform: translate(-50%, -50%);
+ // position: relative;
+ // top: 50%;
+ // left: 50%;
+ // -ms-transform: translate(-50%, -50%);
+ // transform: translate(-50%, -50%);
&::before {
content: attr(data-glyph)
}
-}
+}
\ No newline at end of file
diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor b/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor
new file mode 100644
index 000000000..e62618598
--- /dev/null
+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor
@@ -0,0 +1,45 @@
+@namespace DevToys.Blazor.Components
+@inherits StyledComponentBase
+
+<CascadingValue Value="this" IsFixed="true">
+ <Container HorizontalAlignment="@HorizontalAlignment"
+ VerticalAlignment="@VerticalAlignment"
+ Width="@Width"
+ Height="@Height"
+ 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="icon">
+ @Icon
+ </div>
+ }
+ <div class="context">
+ <div class="title">
+ @Title
+ </div>
+ @if (Description is not null)
+ {
+ <div class="description">
+ @Description
+ </div>
+ }
+ </div>
+ </div>
+ }
+
+ @if (Control is not null)
+ {
+ <div class="control">
+ @Control
+ </div>
+ }
+ </div>
+ </Container>
+</CascadingValue>
\ No newline at end of file
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
new file mode 100644
index 000000000..db0c5a655
--- /dev/null
+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor.cs
@@ -0,0 +1,17 @@
+namespace DevToys.Blazor.Components;
+
+public partial class Card : StyledComponentBase
+{
+ [Parameter]
+ public RenderFragment? Icon { get; set; }
+
+ [Parameter]
+ public RenderFragment? Title { get; set; }
+
+ [Parameter]
+ public RenderFragment? 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
new file mode 100644
index 000000000..738c3b064
--- /dev/null
+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Card/Card.razor.scss
@@ -0,0 +1,40 @@
+@use "../../../Assets/sass/devtoys" as *;
+
+.card {
+ @include flex($direction: row, $align: center, $justify: between);
+ @include typography-body;
+ color: var(--card-foreground);
+ border: var(--card-border-thickness);
+ border-color: var(--card-border);
+ 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;
+ padding-inline: 11px;
+ // End of todo
+
+ .header {
+ @include flex($direction: row, $align: center, $justify: between, $gap: 1rem);
+
+ .icon {
+ font-size: 16px;
+ height: 16px;
+ line-height: 16px;
+ }
+
+ .context {
+ @include flex($direction: column, $align: left, $gap: .5rem);
+ }
+ }
+
+ .control {
+ .icon {
+ font-size: 16px;
+ height: 16px;
+ line-height: 16px;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor b/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor
new file mode 100644
index 000000000..ec5055fa7
--- /dev/null
+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor
@@ -0,0 +1,30 @@
+@namespace DevToys.Blazor.Components
+@inherits StyledComponentBase
+
+<CascadingValue Value="this" IsFixed="true">
+ <Container HorizontalAlignment="@HorizontalAlignment"
+ VerticalAlignment="@VerticalAlignment"
+ Width="@Width"
+ Height="@Height"
+ IsVisible="@IsVisible"
+ Class="expander">
+ <Card data-expanded="@IsExpanded.ToString().ToLower()"
+ Class="expander-card"
+ Icon=@Icon
+ Title=@Title
+ Description=@Description>
+ <Control>
+ <Button Class="button"
+ Appearance="@ButtonAppearance.Stealth"
+ @onclick="OnClickAsync"
+ aria-label="Toggle Expander"
+ aria-expanded="@IsExpanded.ToString()">
+ <FontIcon Glyph="@('\uf2a6')" />
+ </Button>
+ </Control>
+ </Card>
+ <div class="expander-content" aria-expanded="@IsExpanded.ToString().ToLower()">
+ @(ChildContent)
+ </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
new file mode 100644
index 000000000..39a3cdc60
--- /dev/null
+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor.cs
@@ -0,0 +1,27 @@
+namespace DevToys.Blazor.Components;
+
+public partial class Expander : StyledComponentBase
+{
+ public bool IsExpanded { get; set; } = false;
+
+ [Parameter]
+ public RenderFragment? Icon { get; set; }
+
+ [Parameter]
+ public RenderFragment? Title { get; set; }
+
+ [Parameter]
+ public RenderFragment? Description { get; set; }
+
+ /// <summary>
+ /// Gets or sets the content to be rendered inside the component.
+ /// </summary>
+ [Parameter]
+ public RenderFragment? ChildContent { get; set; }
+
+ private Task OnClickAsync()
+ {
+ return Task.Run(() => IsExpanded = !IsExpanded);
+ }
+}
+
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
new file mode 100644
index 000000000..87bb247e2
--- /dev/null
+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Expander/Expander.razor.scss
@@ -0,0 +1,54 @@
+@use "../../../Assets/sass/devtoys" as *;
+
+.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);
+
+ &[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);
+ }
+ }
+ }
+
+ .control {
+ .font-icon {
+ @include transition(transform .2s ease-in-out);
+ }
+ }
+ }
+ }
+
+ .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);
+ }
+
+ &[aria-expanded='true'] {
+ transform: scaleY(1);
+ }
+ }
+}
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 c3a69c956..f793f1727 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
@@ -11,15 +11,13 @@ nav {
display: grid;
grid-template-columns: auto 1fr auto;
grid-template-rows: 1fr;
- gap: 0px 0px;
+ gap: 0px 16px;
grid-template-areas: ". . .";
padding-right: 0px;
.sidebar-item-icon {
height: 16px;
width: 16px;
- padding-top: 4px;
- margin-right: 16px;
}
.sidebar-expand-group-button {
diff --git a/src/app/dev/DevToys.Blazor/Pages/Index.razor b/src/app/dev/DevToys.Blazor/Pages/Index.razor
index 48d50e9f3..12794b3c0 100644
--- a/src/app/dev/DevToys.Blazor/Pages/Index.razor
+++ b/src/app/dev/DevToys.Blazor/Pages/Index.razor
@@ -200,6 +200,44 @@
<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>
+ <ChildContent>
+ <TextBlock Appearance="@TextBlockAppearance.BodyStrong" Text="Expander Content" />
+ </ChildContent>
+ </Expander>
</StackPanel>
</ScrollViewer>
</div>
diff --git a/src/app/dev/DevToys.Blazor/gulpfile.js b/src/app/dev/DevToys.Blazor/gulpfile.js
index a48ed26a0..cd596e07e 100644
--- a/src/app/dev/DevToys.Blazor/gulpfile.js
+++ b/src/app/dev/DevToys.Blazor/gulpfile.js
@@ -1,4 +1,4 @@
-/// <binding BeforeBuild='devtoysJavaScript, devtoysSass' Clean='devtoysCleanup' ProjectOpened='watchDevtoysSass, watchDevtoysJavaScript' />
+/// <binding BeforeBuild='devtoysJavaScript, devtoysSass' ProjectOpened='watchDevtoysSass, watchDevtoysJavaScript' />
/* eslint-disable @typescript-eslint/no-var-requires */
/* eslint-disable no-undef */
const gulp = require("gulp"); // or import * as gulp = require('gulp'