Skip to content

Resolve parameter value extraction issues for custom item mode in components with list-inputs (#4080) #4081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
msynk merged 1 commit into from
Mar 13, 2023
Merged

Resolve parameter value extraction issues for custom item mode in components with list-inputs (#4080) #4081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions src/BlazorUI/Bit.BlazorUI/Components/Breadcrumb/BitBreadcrumb.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@
{
<a href="@GetItemHref(item)"
aria-current="@(GetIsSelected(item) ? "page" : null)"
style="@GetItemStyles(item)"
class="@GetItemClasses(item)">
style="@GetStyles(item)"
class="@GetClasses(item)">
@GetItemText(item)
</a>
}
else
{
<button aria-current="@(GetIsSelected(item) ? "page" : null)"
style="@GetItemStyles(item)"
class="@GetItemClasses(item)" @onclick="() => HandleOnItemClick(item)">
style="@GetStyles(item)"
class="@GetClasses(item)" @onclick="() => HandleOnItemClick(item)">
@GetItemText(item)
</button>
}
Expand Down Expand Up @@ -76,16 +76,16 @@
{
<a href="@GetItemHref(item)"
aria-current="@(GetIsSelected(item) ? "page" : null)"
style="@GetItemStyles(item)"
class="@GetItemClasses(item)">
style="@GetStyles(item)"
class="@GetClasses(item)">
@GetItemText(item)
</a>
}
else
{
<button aria-current="@(GetIsSelected(item) ? "page" : null)"
style="@GetItemStyles(item)"
class="@GetItemClasses(item)" @onclick="() => HandleOnItemClick(item)">
style="@GetStyles(item)"
class="@GetClasses(item)" @onclick="() => HandleOnItemClick(item)">
@GetItemText(item)
</button>
}
Expand Down
25 changes: 14 additions & 11 deletions src/BlazorUI/Bit.BlazorUI/Components/Breadcrumb/BitBreadcrumb.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
using System.Linq.Expressions;
using System.Globalization;
using System.Linq.Expressions;
using System.Text;

namespace Bit.BlazorUI;

public partial class BitBreadcrumb<TItem> : IDisposable where TItem : class
public partial class BitBreadcrumb<TItem> : IDisposable where TItem : class
{
protected override bool UseVisual => false;

Expand Down Expand Up @@ -259,15 +260,16 @@ private void SetItemsToShow()
}
}

private string GetItemClasses(TItem item)
private string GetClasses(TItem item)
{
StringBuilder itemClasses = new();

itemClasses.Append("item");

if (GetItemClass(item).HasValue())
{
itemClasses.Append($" {GetItemClass(item)}");
itemClasses.Append(' ')
.Append(GetItemClass(item)!);
}

if (GetIsSelected(item))
Expand All @@ -277,7 +279,8 @@ private string GetItemClasses(TItem item)

if (GetIsSelected(item) && SelectedItemClass.HasValue())
{
itemClasses.Append($" {SelectedItemClass}");
itemClasses.Append(' ')
.Append(SelectedItemClass!);
}

if (GetIsEnabled(item) is false)
Expand All @@ -288,7 +291,7 @@ private string GetItemClasses(TItem item)
return itemClasses.ToString();
}

private string GetItemStyles(TItem item)
private string GetStyles(TItem item)
{
StringBuilder itemStyles = new();

Expand Down Expand Up @@ -317,10 +320,10 @@ private string GetItemStyles(TItem item)
return bitBreadcrumbOption.Href;
}

return item.GetValueAsObjectFromProperty(_internalHrefField)?.ToString();
return item.GetValueFromProperty<string?>(_internalHrefField);
}

private string? GetItemClass(TItem item)
private string? GetItemClass(TItem item)
{
if (item is BitBreadcrumbItem breadcrumbItem)
{
Expand All @@ -332,7 +335,7 @@ private string GetItemStyles(TItem item)
return bitBreadcrumbOption.Class;
}

return item.GetValueAsObjectFromProperty(_internalClassField)?.ToString();
return item.GetValueFromProperty<string?>(_internalClassField);
}

private string? GetItemStyle(TItem item)
Expand All @@ -347,7 +350,7 @@ private string GetItemStyles(TItem item)
return bitBreadcrumbOption.Style;
}

return item.GetValueAsObjectFromProperty(_internalStyleField)?.ToString();
return item.GetValueFromProperty<string?>(_internalStyleField);
}

private string? GetItemText(TItem item)
Expand All @@ -362,7 +365,7 @@ private string GetItemStyles(TItem item)
return bitBreadcrumbOption.Text;
}

return item.GetValueAsObjectFromProperty(_internalTextField)?.ToString();
return item.GetValueFromProperty<string?>(_internalTextField);
}

private bool GetIsSelected(TItem item)
Expand Down
4 changes: 3 additions & 1 deletion src/BlazorUI/Bit.BlazorUI/Components/Breadcrumb/BitBreadcrumb.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
const dropDownWrapperX = dropDownWrapper.getBoundingClientRect().x;
const dropDownX = dropDown.getBoundingClientRect().x;

dropDownCallout.style.maxWidth = dropDownWrapperWidth + dropDownWrapperX - dropDownX + "px";
const maxWidth = dropDownWrapperWidth + dropDownWrapperX - dropDownX;
const minWidth = 150;
dropDownCallout.style.maxWidth = `${Math.max(maxWidth, minWidth)}px`;

const dropDownCalloutHeight = dropDownCallout.offsetHeight;
const dropDownCalloutWidth = dropDownCallout.offsetWidth;
Expand Down
10 changes: 5 additions & 5 deletions src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitMenuButton/BitMenuButton.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public partial class BitMenuButton<TItem> where TItem : class
private string _internalIsEnabledField = IS_ENABLED_FIELD;
private string _internalIconNameField = ICON_NAME_FIELD;
private string _internalTextField = TEXT_FIELD;
private string _internalkeyField = KEY_FIELD;
private string _internalKeyField = KEY_FIELD;

private string _menuButtonId => $"{RootElementClass}-{UniqueId}";
private string _menuButtonCalloutId => $"{RootElementClass}-callout-{UniqueId}";
Expand Down Expand Up @@ -198,7 +198,7 @@ protected override async Task OnInitializedAsync()
_internalIsEnabledField = IsEnabledFieldSelector?.GetName() ?? IsEnabledField;
_internalIconNameField = IconNameFieldSelector?.GetName() ?? IconNameField;
_internalTextField = TextFieldSelector?.GetName() ?? TextField;
_internalkeyField = KeyFieldSelector?.GetName() ?? KeyField;
_internalKeyField = KeyFieldSelector?.GetName() ?? KeyField;

await base.OnInitializedAsync();
}
Expand Down Expand Up @@ -250,7 +250,7 @@ protected override void RegisterComponentClasses()
return menuButtonOption.IconName;
}

return item.GetValueFromProperty<BitIconName>(_internalIconNameField);
return item.GetValueFromProperty<BitIconName?>(_internalIconNameField);
}

private string? GetText(TItem item)
Expand All @@ -265,7 +265,7 @@ protected override void RegisterComponentClasses()
return menuButtonOption.Text;
}

return item.GetValueAsObjectFromProperty(_internalTextField)?.ToString();
return item.GetValueFromProperty<string?>(_internalTextField);
}

private string? GetKey(TItem item)
Expand All @@ -280,7 +280,7 @@ protected override void RegisterComponentClasses()
return menuButtonOption.Key;
}

return item.GetValueAsObjectFromProperty(_internalkeyField)?.ToString();
return item.GetValueFromProperty<string?>(_internalKeyField);
}

private bool GetIsEnabled(TItem item)
Expand Down
10 changes: 5 additions & 5 deletions src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitSplitButton/BitSplitButton.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public partial class BitSplitButton<TItem> where TItem : class
private string _internalIsEnabledField = IS_ENABLED_FIELD;
private string _internalIconNameField = ICON_NAME_FIELD;
private string _internalTextField = TEXT_FIELD;
private string _internalkeyField = KEY_FIELD;
private string _internalKeyField = KEY_FIELD;

private List<TItem> _children = new();
private IEnumerable<TItem> _oldItems;
Expand Down Expand Up @@ -195,7 +195,7 @@ protected override async Task OnInitializedAsync()
_internalIsEnabledField = IsEnabledFieldSelector?.GetName() ?? IsEnabledField;
_internalIconNameField = IconNameFieldSelector?.GetName() ?? IconNameField;
_internalTextField = TextFieldSelector?.GetName() ?? TextField;
_internalkeyField = KeyFieldSelector?.GetName() ?? KeyField;
_internalKeyField = KeyFieldSelector?.GetName() ?? KeyField;

await base.OnInitializedAsync();
}
Expand Down Expand Up @@ -228,7 +228,7 @@ protected override Task OnParametersSetAsync()
return menuButtonOption.IconName;
}

return item.GetValueFromProperty<BitIconName>(_internalIconNameField);
return item.GetValueFromProperty<BitIconName?>(_internalIconNameField);
}

private string? GetText(TItem item)
Expand All @@ -243,7 +243,7 @@ protected override Task OnParametersSetAsync()
return menuButtonOption.Text;
}

return item.GetValueAsObjectFromProperty(_internalTextField)?.ToString();
return item.GetValueFromProperty<string?>(_internalTextField);
}

private string? GetKey(TItem item)
Expand All @@ -258,7 +258,7 @@ protected override Task OnParametersSetAsync()
return menuButtonOption.Key;
}

return item.GetValueAsObjectFromProperty(_internalkeyField)?.ToString();
return item.GetValueFromProperty<string?>(_internalKeyField);
}

private bool GetIsEnabled(TItem item)
Expand Down
14 changes: 7 additions & 7 deletions src/BlazorUI/Bit.BlazorUI/Components/ChoiceGroup/BitChoiceGroup.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ protected override void RegisterComponentClasses()
return choiceGroupOption.AriaLabel;
}

return item.GetValueFromProperty<string>(_internalAriaLabelField);
return item.GetValueFromProperty<string?>(_internalAriaLabelField);
}

private string? GetId(TItem item)
Expand All @@ -314,7 +314,7 @@ protected override void RegisterComponentClasses()
return choiceGroupOption.Id;
}

return item.GetValueFromProperty<string>(_internalIdField);
return item.GetValueFromProperty<string?>(_internalIdField);
}

private bool GetIsEnabled(TItem item)
Expand Down Expand Up @@ -344,7 +344,7 @@ private bool GetIsEnabled(TItem item)
return choiceGroupOption.ImageSrc;
}

return item.GetValueFromProperty<string>(_internalImageSrcField);
return item.GetValueFromProperty<string?>(_internalImageSrcField);
}

private string? GetImageAlt(TItem item)
Expand All @@ -359,7 +359,7 @@ private bool GetIsEnabled(TItem item)
return choiceGroupOption.ImageAlt;
}

return item.GetValueFromProperty<string>(_internalImageAltField);
return item.GetValueFromProperty<string?>(_internalImageAltField);
}

private Size GetImageSize(TItem item)
Expand Down Expand Up @@ -404,7 +404,7 @@ private Size GetImageSize(TItem item)
return choiceGroupOption.SelectedImageSrc;
}

return item.GetValueFromProperty<string>(_internalSelectedImageSrcField);
return item.GetValueFromProperty<string?>(_internalSelectedImageSrcField);
}

private string? GetText(TItem item)
Expand All @@ -419,7 +419,7 @@ private Size GetImageSize(TItem item)
return choiceGroupOption.Text;
}

return item.GetValueFromProperty<string>(_internalTextField);
return item.GetValueFromProperty<string?>(_internalTextField);
}

private TValue? GetValue(TItem item)
Expand All @@ -434,7 +434,7 @@ private Size GetImageSize(TItem item)
return choiceGroupOption.Value;
}

return item.GetValueFromProperty<TValue>(_internalValueField);
return item.GetValueFromProperty<TValue?>(_internalValueField);
}

private string? GetInputId(TItem item) => GetId(item) ?? $"ChoiceGroup-{UniqueId}-Input-{GetValue(item)}";
Expand Down
16 changes: 8 additions & 8 deletions src/BlazorUI/Bit.BlazorUI/Components/Nav/BitNav.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ internal bool GetForceAnchor(TItem item)
return navOption.Title;
}

return item.GetValueFromProperty<string>(_internalTitleField);
return item.GetValueFromProperty<string?>(_internalTitleField);
}

internal string? GetUrl(TItem item)
Expand All @@ -361,7 +361,7 @@ internal bool GetForceAnchor(TItem item)
return navOption.Url;
}

return item.GetValueFromProperty<string>(_internalUrlField);
return item.GetValueFromProperty<string?>(_internalUrlField);
}

internal BitNavAriaCurrent GetAriaCurrent(TItem item)
Expand Down Expand Up @@ -391,7 +391,7 @@ internal BitNavAriaCurrent GetAriaCurrent(TItem item)
return navOption.ExpandAriaLabel;
}

return item.GetValueFromProperty<string>(_internalExpandAriaLabelField);
return item.GetValueFromProperty<string?>(_internalExpandAriaLabelField);
}

internal string? GetCollapseAriaLabel(TItem item)
Expand All @@ -406,7 +406,7 @@ internal BitNavAriaCurrent GetAriaCurrent(TItem item)
return navOption.CollapseAriaLabel;
}

return item.GetValueFromProperty<string>(_internalCollapseAriaLabelField);
return item.GetValueFromProperty<string?>(_internalCollapseAriaLabelField);
}

internal string? GetAriaLabel(TItem item)
Expand All @@ -421,7 +421,7 @@ internal BitNavAriaCurrent GetAriaCurrent(TItem item)
return navOption.AriaLabel;
}

return item.GetValueFromProperty<string>(_internalAriaLabelField);
return item.GetValueFromProperty<string?>(_internalAriaLabelField);
}

internal BitIconName? GetIconName(TItem item)
Expand All @@ -436,7 +436,7 @@ internal BitNavAriaCurrent GetAriaCurrent(TItem item)
return navOption.IconName;
}

return item.GetValueFromProperty<BitIconName>(_internalIconNameField);
return item.GetValueFromProperty<BitIconName?>(_internalIconNameField);
}

private bool? GetIsExpanded(TItem item)
Expand Down Expand Up @@ -496,7 +496,7 @@ internal bool GetIsEnabled(TItem item)
return navOption.Style;
}

return item.GetValueFromProperty<string>(_internalStyleField);
return item.GetValueFromProperty<string?>(_internalStyleField);
}

internal string? GetTarget(TItem item)
Expand All @@ -511,7 +511,7 @@ internal bool GetIsEnabled(TItem item)
return navOption.Target;
}

return item.GetValueFromProperty<string>(_internalTargetField);
return item.GetValueFromProperty<string?>(_internalTargetField);
}

internal List<TItem> GetChildItems(TItem item)
Expand Down
6 changes: 3 additions & 3 deletions src/BlazorUI/Demo/Client/Shared/Pages/Components/Breadcrumb/BitBreadcrumbDemo.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
ComponentSubParameters="componentSubParameters">

<BitPivot>
<BitPivotItem HeaderText="BitBreadcrumbItem">
<BitPivotItem HeaderText="Item">
<ComponentExampleBox Title="Basic" HTMLSourceCode="@example1BreadcrumbItemHTMLCode" CSharpSourceCode="@example1BreadcrumbItemCSharpCode" ExampleId="example1">
<ExamplePreview>
<div class="example-box">
Expand Down Expand Up @@ -144,7 +144,7 @@
</ComponentExampleBox>
</BitPivotItem>

<BitPivotItem HeaderText="Custom Item">
<BitPivotItem HeaderText="Custom">
<ComponentExampleBox Title="Basic" HTMLSourceCode="@example1CustomItemHTMLCode" CSharpSourceCode="@example1CustomItemCSharpCode" ExampleId="example1">
<ExamplePreview>
<div class="example-box">
Expand Down Expand Up @@ -377,7 +377,7 @@
</ComponentExampleBox>
</BitPivotItem>

<BitPivotItem HeaderText="BitBreadcrumbOption">
<BitPivotItem HeaderText="Option">
<ComponentExampleBox Title="Basic" HTMLSourceCode="@example1BreadcrumbOptionHTMLCode" ExampleId="example1">
<ExamplePreview>
<div class="example-box">
Expand Down