Skip to content

Add the new Theme infrastructure for the BitDropDown component #4058 #4064

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 2 commits into from
Mar 10, 2023
Merged

Add the new Theme infrastructure for the BitDropDown component #4058 #4064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
653e54a
Add the new Theme infrastructure for the BitDropDown component #4058
Cyrus-Sushiant Mar 10, 2023
43ddef1
Resolve review comments
Cyrus-Sushiant Mar 10, 2023
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
408 changes: 146 additions & 262 deletions src/BlazorUI/Bit.BlazorUI.Tests/Inputs/BitDropDownTests.cs
View file
Open in desktop

Large diffs are not rendered by default.

787 changes: 0 additions & 787 deletions src/BlazorUI/Bit.BlazorUI/Components/DropDown/BitDropDown.Fluent.scss
View file
Open in desktop

This file was deleted.

58 changes: 28 additions & 30 deletions src/BlazorUI/Bit.BlazorUI/Components/DropDown/BitDropDown.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,19 @@
id="@UniqueId"
style="@StyleBuilder.Value"
class="@ClassBuilder.Value">
@if (LabelFragment is not null)
@if (LabelTemplate is not null)
{
<label class="lbl" id="@DropdownLabelId">@LabelFragment</label>
<label class="label" id="@_dropdownLabelId">@LabelTemplate</label>
}
else if (Label.HasValue())
{
<label class="lbl" id="@DropdownLabelId">@Label</label>
<label class="label" id="@_dropdownLabelId">@Label</label>
}

<div class="drp-overlay"
id="@DropDownOverlayId"
@onclick="CloseCallout"></div>
<div class="overlay" id="@_dropDownOverlayId" @onclick="CloseCallout"></div>

<div class="drp-wrapper"
id="@DropDownId"
<div class="wrapper"
id="@_dropDownId"
tabindex=@(IsEnabled ? 0 : -1)
role="combobox"
data-is-focusable="true"
Expand All @@ -27,23 +25,23 @@
aria-required="@IsRequired"
aria-disabled="@(IsEnabled is false)"
aria-haspopup="listbox"
aria-controls="@(IsOpen ? $"{DropDownId}-list" : null)"
aria-controls="@(IsOpen ? $"{_dropDownId}-list" : null)"
title="@Title"
@onclick="HandleClick">
<span class="drp-wrapper-txt"
id="@DropDownOptionId"
<span class="text-container"
id="@_dropDownOptionId"
aria-live="polite"
aria-atomic="true"
aria-invalid="false">
@if (Text.HasValue())
@if (_text.HasValue())
{
@if (TextTemplate is not null)
{
@TextTemplate(this)
}
else
{
@Text
@_text
}
}
else
Expand All @@ -58,10 +56,10 @@
}
}
</span>
<span class="drp-wrapper-ic">
@if (CaretDownFragment is not null)
<span class="icon-container">
@if (CaretDownTemplate is not null)
{
@CaretDownFragment
@CaretDownTemplate
}
else
{
Expand All @@ -71,20 +69,20 @@
</div>

<div class="items-wrapper"
id="@DropDownCalloutId"
id="@_dropDownCalloutId"
tabindex="0"
role="listbox"
aria-labelledby="@DropdownLabelId">
aria-labelledby="@_dropdownLabelId">
@if (IsResponsiveModeEnabled)
{
<div class="responsive-label-contianer">
@if (LabelFragment is not null)
<div class="responsive-label-container">
@if (LabelTemplate is not null)
{
<label class="lbl">@LabelFragment</label>
<label class="label">@LabelTemplate</label>
}
else if (Label.HasValue())
{
<label class="lbl">@Label</label>
<label class="label">@Label</label>
}
<button class="close-btn"
type="button"
Expand Down Expand Up @@ -117,8 +115,8 @@
@oninput="@HandleFilterChange" />
@if (_searchText.HasValue())
{
<div class="search-clear-btn-container">
<button class="search-clear-btn"
<div class="clear-btn-container">
<button class="clear-btn"
type="button"
aria-label="Clear text"
aria-hidden="true"
Expand All @@ -133,7 +131,7 @@
</div>
}

<div @ref="_scrollWrapperElement" id="@DropDownCalloutId" class="scroll-wrapper">
<div @ref="_scrollWrapperElement" id="@_dropDownCalloutId" class="scroll-wrapper">
@if (Virtualize)
{
if (ItemsProvider is null)
Expand Down Expand Up @@ -189,14 +187,14 @@
@if (IsMultiSelect)
{
<div style="@(dropDownItem.item.IsHidden ? "display: none" : string.Empty)" class="@GetCssClassForItem(dropDownItem.item)">
<label class="drp-chb-lbl" @onclick="@((e) => HandleItemClick(dropDownItem.item))">
<div class="drp-chb-checkbox">
<i class="drp-chb-checkmark bit-icon bit-icon--Accept"
<label class="checkbox-container" @onclick="@((e) => HandleItemClick(dropDownItem.item))">
<div class="checkbox">
<i class="checkmark bit-icon bit-icon--Accept"
aria-hidden="true"
aria-label="@dropDownItem.item.Text"></i>
</div>

<span class="drp-chb-txt no-text-select">
<span class="text no-text-select">
@if (ItemTemplate is not null)
{
@ItemTemplate(dropDownItem.item)
Expand All @@ -211,7 +209,7 @@
}
else
{
<button class="drp-item @(dropDownItem.item.IsSelected ? "drp-slc" : string.Empty)"
<button class="item @(dropDownItem.item.IsSelected ? "selected" : string.Empty)"
style="@(dropDownItem.item.IsHidden ? "display: none" : string.Empty)"
type="button"
role="option"
Expand Down
Loading