Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions CodeBeam.MudBlazor.Extensions.Docs/Pages/VisualTest.razor
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
@page "/visualtest"

<MudStack>
<MudStack Row="true">
<MudSelect T="string" />
<MudSelectExtended T="string" />
</MudStack>
<MudStack Row="true">
<MudSelect T="string" Variant="Variant.Outlined" />
<MudSelectExtended T="string" Variant="Variant.Outlined" />
</MudStack>
<MudStack Row="true">
<MudSelect T="string" Variant="Variant.Filled" />
<MudSelectExtended T="string" Variant="Variant.Filled" />
</MudStack>

<MudStack Row="true">
<MudTextField T="string" />
<MudTextFieldExtended T="string" />
</MudStack>
<MudStack Row="true">
<MudTextField T="string" Variant="Variant.Outlined" />
<MudTextFieldExtended T="string" Variant="Variant.Outlined" />
</MudStack>
<MudStack Row="true">
<MudTextField T="string" Variant="Variant.Filled" />
<MudTextFieldExtended T="string" Variant="Variant.Filled" />
</MudStack>
</MudStack>

7 changes: 7 additions & 0 deletions CodeBeam.MudBlazor.Extensions/Base/MudBaseInputExtended.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,13 @@ protected MudBaseInputExtended() : base(new DefaultConverter<T>()) { }
/// </summary>
[Parameter] public EventCallback OnChange { get; set; }

/// <summary>
/// Set the text-align on the component.
/// </summary>
[Parameter]
[Category(CategoryTypes.Text.Appearance)]
public Typo Typo { get; set; } = Typo.subtitle1;

/// <summary>
/// If true, the input will take up the full width of its container.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public static string GetClassname<T>(MudBaseInputExtended<T> baseInput, Func<boo
.AddClass("mud-disabled", baseInput.Disabled)
.AddClass("mud-input-error", baseInput.HasErrors)
.AddClass("mud-ltr", baseInput.GetInputType() == InputType.Email || baseInput.GetInputType() == InputType.Telephone)
//.AddClass($"mud-typography-{baseInput.Typo.ToDescriptionString()}")
.AddClass($"mud-typography-{baseInput.Typo.ToDescriptionString()}")
.AddClass(baseInput.Class)
.Build();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
@if (Strict && !IsValueInList)
{
//Show nothing
<MudText Typo="Typo.body1" Class="mud-text-secondary">@Placeholder</MudText>
<MudText Typo="@Typo" Class="mud-text-secondary">@Placeholder</MudText>
}
@if (ValuePresenter == ValuePresenter.Text)
{
if (string.IsNullOrEmpty(Text))
{
<MudText Typo="Typo.body1" Class="mud-text-secondary">@Placeholder</MudText>
<MudText Typo="@Typo" Class="mud-text-secondary">@Placeholder</MudText>
}

<MudRender>@GetSelectTextPresenter()</MudRender>
Expand All @@ -42,7 +42,7 @@
{
if (SelectedValues == null || !SelectedValues.Any())
{
<MudText Typo="Typo.body1" Class="mud-text-secondary">@Placeholder</MudText>
<MudText Typo="@Typo" Class="mud-text-secondary">@Placeholder</MudText>
}
<MudChipSet T="T" Class="d-flex flex-wrap mud-width-full" Style="row-gap: 4px" AllClosable="ChipCloseable" OnClose="ChipClosed">
@if (ItemCollection != null)
Expand All @@ -65,7 +65,7 @@
{
if (SelectedListItem == null)
{
<MudText Typo="Typo.body1" Class="mud-text-secondary">@Placeholder</MudText>
<MudText Typo="@Typo" Class="mud-text-secondary">@Placeholder</MudText>

}
else if (ItemTemplate != null)
Expand All @@ -76,7 +76,7 @@
}
else if (!string.IsNullOrEmpty(Placeholder))
{
<MudText Typo="Typo.body1" Class="mud-text-secondary">@Placeholder</MudText>
<MudText Typo="@Typo" Class="mud-text-secondary">@Placeholder</MudText>
}
}
else if (SelectedListItem.ChildContent != null)
Expand All @@ -87,7 +87,7 @@
{
@if (string.IsNullOrEmpty(Text))
{
<MudText Typo="Typo.body1" Class="mud-text-secondary">@Placeholder</MudText>
<MudText Typo="@Typo" Class="mud-text-secondary">@Placeholder</MudText>
}

<MudRender>@GetSelectTextPresenter()</MudRender>
Expand All @@ -108,16 +108,20 @@
@StaticContent(this)
}

<CascadingValue Value="@this" IsFixed="true">
<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"
Clickable="true" Color="@Color" Dense="@Dense" ItemCollection="@ItemCollection" Virtualize="@Virtualize" Padding="@EnablePopoverPadding" EnableSelectedItemStyle="@EnableSelectedItemStyle"
MultiSelection="@MultiSelection" MultiSelectionComponent="@MultiSelectionComponent" MultiSelectionAlign="@MultiSelectionAlign" SelectAll="@SelectAll" SelectAllPosition="@SelectAllPosition" SelectAllText="@SelectAllText"
CheckedIcon="@CheckedIcon" UncheckedIcon="@UncheckedIcon" IndeterminateIcon="@IndeterminateIcon" SelectValueOnTab="@SelectValueOnTab" Comparer="@Comparer"
ItemTemplate="@ItemTemplate" ItemSelectedTemplate="@ItemSelectedTemplate" ItemDisabledTemplate="@ItemDisabledTemplate" SearchBox="@SearchBox" SearchBoxAutoFocus="@SearchBoxAutoFocus" SearchFunc="@SearchFunc" SearchBoxPlaceholder="@SearchBoxPlaceholder"
SearchBoxClearable="@SearchBoxClearable" SearchBoxVariant="@SearchBoxVariant" SearchBoxAdornment="SearchBoxAdornment" ToStringFunc="@ToStringFunc" OnSearchStringChange="@OnSearchStringChange">
@ChildContent
</MudListExtended>
</CascadingValue>
@if (ItemCollection != null || ChildContent != null)
{
<CascadingValue Value="@this" IsFixed="true">
<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"
Clickable="true" Color="@Color" Dense="@Dense" ItemCollection="@ItemCollection" Virtualize="@Virtualize" Padding="@EnablePopoverPadding" EnableSelectedItemStyle="@EnableSelectedItemStyle"
MultiSelection="@MultiSelection" MultiSelectionComponent="@MultiSelectionComponent" MultiSelectionAlign="@MultiSelectionAlign" SelectAll="@SelectAll" SelectAllPosition="@SelectAllPosition" SelectAllText="@SelectAllText"
CheckedIcon="@CheckedIcon" UncheckedIcon="@UncheckedIcon" IndeterminateIcon="@IndeterminateIcon" SelectValueOnTab="@SelectValueOnTab" Comparer="@Comparer"
ItemTemplate="@ItemTemplate" ItemSelectedTemplate="@ItemSelectedTemplate" ItemDisabledTemplate="@ItemDisabledTemplate" SearchBox="@SearchBox" SearchBoxAutoFocus="@SearchBoxAutoFocus" SearchFunc="@SearchFunc" SearchBoxPlaceholder="@SearchBoxPlaceholder"
SearchBoxClearable="@SearchBoxClearable" SearchBoxVariant="@SearchBoxVariant" SearchBoxAdornment="SearchBoxAdornment" ToStringFunc="@ToStringFunc" OnSearchStringChange="@OnSearchStringChange">
@ChildContent
</MudListExtended>
</CascadingValue>
}


@if (StaticContent != null && ShowStaticContentAtEnd)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
Pattern="@Pattern"
AutoSize="AutoSize"
ShrinkLabel="@ShrinkLabel"
Typo="@Typo"
ShowVisualiser="@(DataVisualiser != null && ShowVisualiser)"
DataVisualiserStyle="@(DataVisualiser != null ? "min-height: 1.1876em" : null)">
<DataVisualiser>
Expand Down
Loading