Skip to content

Commit b5d2512

Browse files
mckaragozmckaragoz
authored
Fix Input Sizing (#511)
1 parent 7a191f3 commit b5d2512

File tree

5 files changed

+59
-17
lines changed

5 files changed

+59
-17
lines changed

‎CodeBeam.MudBlazor.Extensions.Docs/Pages/VisualTest.razor‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
@page "/visualtest"
2+
3+
<MudStack>
4+
<MudStack Row="true">
5+
<MudSelect T="string" />
6+
<MudSelectExtended T="string" />
7+
</MudStack>
8+
<MudStack Row="true">
9+
<MudSelect T="string" Variant="Variant.Outlined" />
10+
<MudSelectExtended T="string" Variant="Variant.Outlined" />
11+
</MudStack>
12+
<MudStack Row="true">
13+
<MudSelect T="string" Variant="Variant.Filled" />
14+
<MudSelectExtended T="string" Variant="Variant.Filled" />
15+
</MudStack>
16+
17+
<MudStack Row="true">
18+
<MudTextField T="string" />
19+
<MudTextFieldExtended T="string" />
20+
</MudStack>
21+
<MudStack Row="true">
22+
<MudTextField T="string" Variant="Variant.Outlined" />
23+
<MudTextFieldExtended T="string" Variant="Variant.Outlined" />
24+
</MudStack>
25+
<MudStack Row="true">
26+
<MudTextField T="string" Variant="Variant.Filled" />
27+
<MudTextFieldExtended T="string" Variant="Variant.Filled" />
28+
</MudStack>
29+
</MudStack>
30+

‎CodeBeam.MudBlazor.Extensions/Base/MudBaseInputExtended.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ protected MudBaseInputExtended() : base(new DefaultConverter<T>()) { }
5959
/// </summary>
6060
[Parameter] public EventCallback OnChange { get; set; }
6161

62+
/// <summary>
63+
/// Set the text-align on the component.
64+
/// </summary>
65+
[Parameter]
66+
[Category(CategoryTypes.Text.Appearance)]
67+
public Typo Typo { get; set; } = Typo.subtitle1;
68+
6269
/// <summary>
6370
/// If true, the input will take up the full width of its container.
6471
/// </summary>

‎CodeBeam.MudBlazor.Extensions/Components/InputExtended/MudInputCssHelperExtended.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public static string GetClassname<T>(MudBaseInputExtended<T> baseInput, Func<boo
2828
.AddClass("mud-disabled", baseInput.Disabled)
2929
.AddClass("mud-input-error", baseInput.HasErrors)
3030
.AddClass("mud-ltr", baseInput.GetInputType() == InputType.Email || baseInput.GetInputType() == InputType.Telephone)
31-
//.AddClass($"mud-typography-{baseInput.Typo.ToDescriptionString()}")
31+
.AddClass($"mud-typography-{baseInput.Typo.ToDescriptionString()}")
3232
.AddClass(baseInput.Class)
3333
.Build();
3434

‎CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.razor‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
@if (Strict && !IsValueInList)
2828
{
2929
//Show nothing
30-
<MudText Typo="Typo.body1" Class="mud-text-secondary">@Placeholder</MudText>
30+
<MudText Typo="@Typo" Class="mud-text-secondary">@Placeholder</MudText>
3131
}
3232
@if (ValuePresenter == ValuePresenter.Text)
3333
{
3434
if (string.IsNullOrEmpty(Text))
3535
{
36-
<MudText Typo="Typo.body1" Class="mud-text-secondary">@Placeholder</MudText>
36+
<MudText Typo="@Typo" Class="mud-text-secondary">@Placeholder</MudText>
3737
}
3838

3939
<MudRender>@GetSelectTextPresenter()</MudRender>
@@ -42,7 +42,7 @@
4242
{
4343
if (SelectedValues == null || !SelectedValues.Any())
4444
{
45-
<MudText Typo="Typo.body1" Class="mud-text-secondary">@Placeholder</MudText>
45+
<MudText Typo="@Typo" Class="mud-text-secondary">@Placeholder</MudText>
4646
}
4747
<MudChipSet T="T" Class="d-flex flex-wrap mud-width-full" Style="row-gap: 4px" AllClosable="ChipCloseable" OnClose="ChipClosed">
4848
@if (ItemCollection != null)
@@ -65,7 +65,7 @@
6565
{
6666
if (SelectedListItem == null)
6767
{
68-
<MudText Typo="Typo.body1" Class="mud-text-secondary">@Placeholder</MudText>
68+
<MudText Typo="@Typo" Class="mud-text-secondary">@Placeholder</MudText>
6969

7070
}
7171
else if (ItemTemplate != null)
@@ -76,7 +76,7 @@
7676
}
7777
else if (!string.IsNullOrEmpty(Placeholder))
7878
{
79-
<MudText Typo="Typo.body1" Class="mud-text-secondary">@Placeholder</MudText>
79+
<MudText Typo="@Typo" Class="mud-text-secondary">@Placeholder</MudText>
8080
}
8181
}
8282
else if (SelectedListItem.ChildContent != null)
@@ -87,7 +87,7 @@
8787
{
8888
@if (string.IsNullOrEmpty(Text))
8989
{
90-
<MudText Typo="Typo.body1" Class="mud-text-secondary">@Placeholder</MudText>
90+
<MudText Typo="@Typo" Class="mud-text-secondary">@Placeholder</MudText>
9191
}
9292

9393
<MudRender>@GetSelectTextPresenter()</MudRender>
@@ -108,16 +108,20 @@
108108
@StaticContent(this)
109109
}
110110

111-
<CascadingValue Value="@this" IsFixed="true">
112-
<MudListExtended @ref="@_list" T="T" @bind-SelectedValue="@Value" Style="@($"overflow-y:auto; max-height: {MaxHeight}px")" @bind-SelectedValues="@SelectedValues" @bind-SelectedItem="@SelectedListItem" @bind-SelectedItems="@SelectedListItems"
113-
Clickable="true" Color="@Color" Dense="@Dense" ItemCollection="@ItemCollection" Virtualize="@Virtualize" Padding="@EnablePopoverPadding" EnableSelectedItemStyle="@EnableSelectedItemStyle"
114-
MultiSelection="@MultiSelection" MultiSelectionComponent="@MultiSelectionComponent" MultiSelectionAlign="@MultiSelectionAlign" SelectAll="@SelectAll" SelectAllPosition="@SelectAllPosition" SelectAllText="@SelectAllText"
115-
CheckedIcon="@CheckedIcon" UncheckedIcon="@UncheckedIcon" IndeterminateIcon="@IndeterminateIcon" SelectValueOnTab="@SelectValueOnTab" Comparer="@Comparer"
116-
ItemTemplate="@ItemTemplate" ItemSelectedTemplate="@ItemSelectedTemplate" ItemDisabledTemplate="@ItemDisabledTemplate" SearchBox="@SearchBox" SearchBoxAutoFocus="@SearchBoxAutoFocus" SearchFunc="@SearchFunc" SearchBoxPlaceholder="@SearchBoxPlaceholder"
117-
SearchBoxClearable="@SearchBoxClearable" SearchBoxVariant="@SearchBoxVariant" SearchBoxAdornment="SearchBoxAdornment" ToStringFunc="@ToStringFunc" OnSearchStringChange="@OnSearchStringChange">
118-
@ChildContent
119-
</MudListExtended>
120-
</CascadingValue>
111+
@if (ItemCollection != null || ChildContent != null)
112+
{
113+
<CascadingValue Value="@this" IsFixed="true">
114+
<MudListExtended @ref="@_list" T="T" @bind-SelectedValue="@Value" Style="@($"overflow-y:auto; max-height: {MaxHeight}px")" @bind-SelectedValues="@SelectedValues" @bind-SelectedItem="@SelectedListItem" @bind-SelectedItems="@SelectedListItems"
115+
Clickable="true" Color="@Color" Dense="@Dense" ItemCollection="@ItemCollection" Virtualize="@Virtualize" Padding="@EnablePopoverPadding" EnableSelectedItemStyle="@EnableSelectedItemStyle"
116+
MultiSelection="@MultiSelection" MultiSelectionComponent="@MultiSelectionComponent" MultiSelectionAlign="@MultiSelectionAlign" SelectAll="@SelectAll" SelectAllPosition="@SelectAllPosition" SelectAllText="@SelectAllText"
117+
CheckedIcon="@CheckedIcon" UncheckedIcon="@UncheckedIcon" IndeterminateIcon="@IndeterminateIcon" SelectValueOnTab="@SelectValueOnTab" Comparer="@Comparer"
118+
ItemTemplate="@ItemTemplate" ItemSelectedTemplate="@ItemSelectedTemplate" ItemDisabledTemplate="@ItemDisabledTemplate" SearchBox="@SearchBox" SearchBoxAutoFocus="@SearchBoxAutoFocus" SearchFunc="@SearchFunc" SearchBoxPlaceholder="@SearchBoxPlaceholder"
119+
SearchBoxClearable="@SearchBoxClearable" SearchBoxVariant="@SearchBoxVariant" SearchBoxAdornment="SearchBoxAdornment" ToStringFunc="@ToStringFunc" OnSearchStringChange="@OnSearchStringChange">
120+
@ChildContent
121+
</MudListExtended>
122+
</CascadingValue>
123+
}
124+
121125

122126
@if (StaticContent != null && ShowStaticContentAtEnd)
123127
{

‎CodeBeam.MudBlazor.Extensions/Components/TextFieldExtended/MudTextFieldExtended.razor‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
Pattern="@Pattern"
5656
AutoSize="AutoSize"
5757
ShrinkLabel="@ShrinkLabel"
58+
Typo="@Typo"
5859
ShowVisualiser="@(DataVisualiser != null && ShowVisualiser)"
5960
DataVisualiserStyle="@(DataVisualiser != null ? "min-height: 1.1876em" : null)">
6061
<DataVisualiser>

0 commit comments

Comments
 (0)