Skip to content

Remove the outer div and the max-height, max-width parameters in fluent-listbox #605

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
vnbaaij merged 3 commits into from
Aug 14, 2023
Merged

Remove the outer div and the max-height, max-width parameters in fluent-listbox #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2cda8bd
fix: Remove the outer div and the max-height, max-width parameters.
LuohuaRain Aug 10, 2023
4e70593
Merge branch 'main' of https://github.com/LuohuaRain/fast-blazor
LuohuaRain Aug 10, 2023
a49c80c
Merge branch 'main' into main
vnbaaij Aug 14, 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
10 changes: 0 additions & 10 deletions examples/FluentUI.Demo.Shared/Microsoft.Fast.Components.FluentUI.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions examples/FluentUI.Demo.Shared/Pages/Listbox/Examples/ListboxMultiple.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@

</p>

<div style="display: block; height: 300px;">
<label for="people-listbox2">Select persons</label>
<FluentListbox TOption="Person"
Items="@Data.People"
Id="people-listbox2"
Multiple="true"
OptionValue="@(p => p.PersonId.ToString())"
OptionText="@(p => p.LastName + ", " + p.FirstName)"
@bind-Value="@SelectedValue"
@bind-SelectedOptions="@SelectedOptions" />
<div style="display: block; height: 320px;">
<label for="people-listbox2">Select persons</label>
<FluentListbox TOption="Person"
Items="@Data.People"
Id="people-listbox2"
Multiple="true"
OptionValue="@(p => p.PersonId.ToString())"
OptionText="@(p => p.LastName + ", " + p.FirstName)"
@bind-Value="@SelectedValue"
@bind-SelectedOptions="@SelectedOptions" />

</div>

Expand Down
4 changes: 2 additions & 2 deletions examples/FluentUI.Demo.Shared/Pages/Listbox/Examples/ListboxSize.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
ο»Ώ<p>
<em>Size parameter not working correctly yet!</em> However, the component supports both Height and Width parameters
<em>Size parameter not working correctly yet!</em> However, the component supports Style parameters
which can be used to determine the size of the displayed listbox
</p>

<FluentListbox ValueChanged="@(e => listboxValue = e)" Size=7 TOption="string" Height="200px">
<FluentListbox ValueChanged="@(e => listboxValue = e)" Size=7 TOption="string" Style="width:15rem;">
<FluentOption Value="AL">Alabama</FluentOption>
<FluentOption Value="AK">Alaska</FluentOption>
<FluentOption Value="AZ">Arizona</FluentOption>
Expand Down
20 changes: 10 additions & 10 deletions examples/FluentUI.Demo.Shared/wwwroot/sources/ListboxMultiple.razor.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@

</p>

<div style="display: block; height: 300px;">
<label for="people-listbox2">Select persons</label>
<FluentListbox TOption="Person"
Items="@Data.People"
Id="people-listbox2"
Multiple="true"
OptionValue="@(p => p.PersonId.ToString())"
OptionText="@(p => p.LastName + ", " + p.FirstName)"
@bind-Value="@SelectedValue"
@bind-SelectedOptions="@SelectedOptions" />
<div style="display: block; height: 320px;">
<label for="people-listbox2">Select persons</label>
<FluentListbox TOption="Person"
Items="@Data.People"
Id="people-listbox2"
Multiple="true"
OptionValue="@(p => p.PersonId.ToString())"
OptionText="@(p => p.LastName + ", " + p.FirstName)"
@bind-Value="@SelectedValue"
@bind-SelectedOptions="@SelectedOptions" />

</div>

Expand Down
4 changes: 2 additions & 2 deletions examples/FluentUI.Demo.Shared/wwwroot/sources/ListboxSize.razor.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
ο»Ώ<p>
<em>Size parameter not working correctly yet!</em> However, the component supports both Height and Width parameters
<em>Size parameter not working correctly yet!</em> However, the component supports Style parameters
which can be used to determine the size of the displayed listbox
</p>

<FluentListbox ValueChanged="@(e => listboxValue = e)" Size=7 TOption="string" Height="200px">
<FluentListbox ValueChanged="@(e => listboxValue = e)" Size=7 TOption="string" Style="width:15rem;">
<FluentOption Value="AL">Alabama</FluentOption>
<FluentOption Value="AK">Alaska</FluentOption>
<FluentOption Value="AZ">Arizona</FluentOption>
Expand Down
28 changes: 13 additions & 15 deletions src/Microsoft.Fast.Components.FluentUI/Components/List/FluentListbox.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,17 @@
@inherits ListComponentBase<TOption>
@typeparam TOption
<CascadingValue Value="@_internalListContext" Name="ListContext" TValue="InternalListContext<TOption>" IsFixed="true">
<div style="overflow-y: auto; max-height: @Height; max-width: @Width;">
<fluent-listbox @ref=Element
id="@Id"
class="@ClassValue"
style="@StyleValue; width: calc(100% - 8px);"
disabled=@Disabled
size="@Size"
multiple="@Multiple"
selectedOptions="@(SelectedOptions != null && SelectedOptions.Any() ? string.Join(',', SelectedOptions.Select(i => GetOptionValue(i))) : null)"
aria-label="@(!string.IsNullOrWhiteSpace(Title) ? Title : "")"
@onchange="@OnChangedHandlerAsync"
@attributes="AdditionalAttributes">
@GetListOptions(Items)
</fluent-listbox>
</div>
<fluent-listbox @ref="Element"
id="@Id"
class="@ClassValue"
style="@StyleValue"
disabled="@Disabled"
size="@Size"
multiple="@Multiple"
selectedOptions="@(SelectedOptions != null && SelectedOptions.Any() ? string.Join(',', SelectedOptions.Select(i => GetOptionValue(i))) : null)"
aria-label="@(!string.IsNullOrWhiteSpace(Title) ? Title : "")"
@onchange="@OnChangedHandlerAsync"
@attributes="AdditionalAttributes">
@GetListOptions(Items)
</fluent-listbox>
</CascadingValue>
13 changes: 0 additions & 13 deletions src/Microsoft.Fast.Components.FluentUI/Components/List/FluentListbox.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,6 @@ namespace Microsoft.Fast.Components.FluentUI;
[CascadingTypeParameter(nameof(TOption))]
public partial class FluentListbox<TOption> : ListComponentBase<TOption>
{
/// <summary>
/// Width style
/// </summary>

[Parameter]
public string Width { get; set; } = "250px";

/// <summary>
/// Height style
/// </summary>
[Parameter]
public string Height { get; set; } = "350px";

/// <summary>
/// The maximum number of options that should be visible in the listbox scroll area.
/// </summary>
Expand Down