Skip to content
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.

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

[Lists] Pass Name parameter #2305

Merged
merged 6 commits into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from 5 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
1 change: 0 additions & 1 deletion examples/Demo/Shared/Pages/Lab/IssueTester.razor
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
@page "/issue-tester"

<FluentUI.Demo.Shared.Pages.DataGrid.Examples.DataGridTypical />
1 change: 1 addition & 0 deletions src/Core/Components/List/FluentCombobox.razor
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
required="@Required"
@onchange="@ChangeHandlerAsync"
autofocus="@Autofocus"
name="@Name"
@attributes="AdditionalAttributes">
@_renderOptions
</fluent-combobox>
Expand Down
1 change: 1 addition & 0 deletions src/Core/Components/List/FluentListbox.razor
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
size="@Size"
multiple="@Multiple"
required="@Required"
name="@Name"
selectedOptions="@(SelectedOptions != null && SelectedOptions.Any() ? string.Join(',', SelectedOptions.Select(i => GetOptionValue(i))) : null)"
@onchange="@ChangeHandlerAsync"
@onkeydown="@OnKeydownHandlerAsync"
Expand Down
1 change: 1 addition & 0 deletions src/Core/Components/List/FluentSelect.razor
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
appearance="@Appearance.ToAttributeValue()"
current-value="@Value"
required="@Required"
name="@Name"
@onchange="@ChangeHandlerAsync"
@onkeydown="@OnKeydownHandlerAsync"
@attributes="AdditionalAttributes">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

<div class=" fluent-autocomplete-multiselect" style="width: 100%;" b-hg72r5b4ox="">
<fluent-text-field style="width: 100%; min-width: 100%;" placeholder="" id="xxx" value="" current-value="" name="xxx" appearance="outline" blazor:onchange="1" role="combobox" aria-expanded="false" aria-controls="" blazor:onclick="2" blazor:oninput="3" blazor:elementreference="xxx">
<svg slot="end" style="width: 16px; fill: var(--accent-fill-rest); cursor: pointer;" focusable="false" viewBox="0 0 16 16" aria-hidden="true" blazor:onkeydown="4" blazor:onclick="5" blazor:onfocus="6" tabindex="0" role="button">
<title>Search</title>
<path d="M9.1 10.17a4.5 4.5 0 1 1 1.06-1.06l3.62 3.61a.75.75 0 1 1-1.06 1.06l-3.61-3.61Zm.4-3.67a3 3 0 1 0-6 0 3 3 0 0 0 6 0Z"></path>
</svg>
</fluent-text-field>
</div>
181 changes: 98 additions & 83 deletions tests/Core/List/FluentAutocompleteTests.razor
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
{
// Arrange
var cut = RenderComponent<FluentAutocomplete<Customer>>(parameters =>
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.Items, Customers.Get());
});
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.Items, Customers.Get());
});

// Assert
cut.Verify();
Expand All @@ -32,11 +32,11 @@
{
// Arrange
var cut = RenderComponent<FluentAutocomplete<Customer>>(parameters =>
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.Items, Customers.Get());
parameters.Add(p => p.Width, string.Empty);
});
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.Items, Customers.Get());
parameters.Add(p => p.Width, string.Empty);
});

// Assert
Assert.Contains("width: 250px", cut.Markup);
Expand All @@ -48,10 +48,10 @@
{
// Arrange
var cut = RenderComponent<FluentAutocomplete<Customer>>(parameters =>
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.Items, Customers.Get());
});
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.Items, Customers.Get());
});

// Act
cut.Find("fluent-text-field").Click();
Expand All @@ -78,11 +78,11 @@

// Arrange
var cut = RenderComponent<FluentAutocomplete<Customer>>(parameters =>
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.Items, Customers.Get());
parameters.Add(p => p.SelectedOptions, Customers.Get().Take(2));
});
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.Items, Customers.Get());
parameters.Add(p => p.SelectedOptions, Customers.Get().Take(2));
});

// Act
var input = cut.Find("fluent-text-field");
Expand All @@ -106,7 +106,7 @@
SelectValueOnTab="true"
@bind-SelectedOptions="@SelectedItems"
OnOptionsSearch="@OnSearchAsync" />
);
);

// Act: click to open -> Tab to select
var input = cut.Find("fluent-text-field");
Expand All @@ -124,13 +124,13 @@
{
// Arrange & Act
var ex = Assert.Throws<InvalidOperationException>(() =>
{
var cut = RenderComponent<FluentAutocomplete<Customer>>(parameters =>
{
var cut = RenderComponent<FluentAutocomplete<Customer>>(parameters =>
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.Multiple, false);
});
});
});

// Assert
Assert.Equal("For FluentAutocomplete, this property must be True. Set the MaximumSelectedOptions property to 1 to select just one item.", ex.InnerException?.Message);
Expand All @@ -141,30 +141,30 @@
{
// Arrange
var cut = RenderComponent<FluentAutocomplete<Customer>>(parameters =>
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.OptionValue, context => context.Id.ToString());
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.OptionValue, context => context.Id.ToString());

// Add a HeaderContent template
parameters.Add(p => p.HeaderContent, context =>
// Add a HeaderContent template
parameters.Add(p => p.HeaderContent, context =>
{
return $"<header>Please, select an item</header>";
});

// Add an Item template
parameters.Add(p => p.OptionTemplate, context =>
// Add an Item template
parameters.Add(p => p.OptionTemplate, context =>
{
return $"<div>{context?.Id} {context?.Name}</div>";
});

// Add a FooterContent template
parameters.Add(p => p.FooterContent, context =>
// Add a FooterContent template
parameters.Add(p => p.FooterContent, context =>
{
return $"<footer>{context.Count()} items found</footer>";
});

parameters.Add(p => p.Items, Customers.Get());
});
parameters.Add(p => p.Items, Customers.Get());
});

// Act
cut.Find("fluent-text-field").Click();
Expand All @@ -178,13 +178,13 @@
{
// Arrange
var cut = RenderComponent<FluentAutocomplete<Customer>>(parameters =>
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.OptionValue, context => context.Id.ToString());
parameters.Add(p => p.OptionText, context => context.Name);
parameters.Add(p => p.Items, Customers.Get());
parameters.Add(p => p.SelectedOptions, Customers.Get().Take(2));
});
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.OptionValue, context => context.Id.ToString());
parameters.Add(p => p.OptionText, context => context.Name);
parameters.Add(p => p.Items, Customers.Get());
parameters.Add(p => p.SelectedOptions, Customers.Get().Take(2));
});

// Act
cut.Find("fluent-text-field").Click();
Expand All @@ -198,19 +198,19 @@
{
// Arrange
var cut = RenderComponent<FluentAutocomplete<Customer>>(parameters =>
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.OptionValue, context => context.Id.ToString());
parameters.Add(p => p.OptionText, context => context.Name);
parameters.Add(p => p.Items, Customers.Get());
parameters.Add(p => p.SelectedOptions, Customers.Get().Take(2));
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.OptionValue, context => context.Id.ToString());
parameters.Add(p => p.OptionText, context => context.Name);
parameters.Add(p => p.Items, Customers.Get());
parameters.Add(p => p.SelectedOptions, Customers.Get().Take(2));

// Add an Item template
parameters.Add(p => p.OptionTemplate, context =>
// Add an Item template
parameters.Add(p => p.OptionTemplate, context =>
{
return $"<div>{context?.Id} {context?.Name}</div>";
});
});
});

// Act
cut.Find("fluent-text-field").Click();
Expand All @@ -224,13 +224,13 @@
{
// Arrange
var cut = RenderComponent<FluentAutocomplete<Customer>>(parameters =>
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.OptionValue, context => context.Id.ToString());
parameters.Add(p => p.OptionText, context => context.Name);
parameters.Add(p => p.Items, Customers.Get());
parameters.Add(p => p.SelectedOptions, Customers.Get().Take(2));
});
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.OptionValue, context => context.Id.ToString());
parameters.Add(p => p.OptionText, context => context.Name);
parameters.Add(p => p.Items, Customers.Get());
parameters.Add(p => p.SelectedOptions, Customers.Get().Take(2));
});

// Act (click on the Dismiss button)
// The first SelectedOption is removed
Expand All @@ -245,10 +245,10 @@
{
// Arrange & Act
var cut = RenderComponent<FluentAutocomplete<Customer>>(parameters =>
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.ValueText, "Preselected value");
});
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.ValueText, "Preselected value");
});

// Assert
var textField = cut.Find("fluent-text-field");
Expand All @@ -271,10 +271,10 @@
// Arrange
var valueText = "Preselected value";
var cut = RenderComponent<FluentAutocomplete<Customer>>(parameters =>
{
parameters.Add(p => p.Id, "myComponent");
parameters.Bind(p => p.ValueText, valueText, x => valueText = x);
});
{
parameters.Add(p => p.Id, "myComponent");
parameters.Bind(p => p.ValueText, valueText, x => valueText = x);
});

valueText.Should().NotBeNullOrEmpty();

Expand All @@ -292,10 +292,10 @@
{
// Arrange
var cut = RenderComponent<FluentAutocomplete<Customer>>(parameters =>
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.ValueText, "Some text here");
});
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.ValueText, "Some text here");
});

// Act
cut.Find("svg").Click(); // Clear button
Expand All @@ -310,11 +310,11 @@
{
// Arrange
var cut = RenderComponent<FluentAutocomplete<Customer>>(parameters =>
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.ValueText, "Some text here");
parameters.Add(p => p.ShowOverlayOnEmptyResults, false);
});
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.ValueText, "Some text here");
parameters.Add(p => p.ShowOverlayOnEmptyResults, false);
});

// Act
cut.Find("svg").Click(); // Clear button
Expand All @@ -329,10 +329,10 @@
{
// Arrange && Act
var cut = RenderComponent<FluentAutocomplete<Customer>>(parameters =>
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.Autofocus, true);
});
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.Autofocus, true);
});

// Assert
cut.Verify();
Expand All @@ -343,11 +343,11 @@
{
// Arrange
var cut = RenderComponent<FluentAutocomplete<Customer>>(parameters =>
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.MaxAutoHeight, "200px");
parameters.Add(p => p.SelectedOptions, Customers.Get().Take(2));
});
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.MaxAutoHeight, "200px");
parameters.Add(p => p.SelectedOptions, Customers.Get().Take(2));
});

// Act
cut.Find("fluent-text-field").Click();
Expand All @@ -370,7 +370,7 @@
SelectValueOnTab="true"
@bind-SelectedOptions="@SelectedItems"
OnOptionsSearch="@OnSearchAsync" />
);
);

// Act: click to open -> KeyDow + Enter to select
var input = cut.Find("fluent-text-field");
Expand Down Expand Up @@ -412,6 +412,21 @@
Assert.Equal(2, SelectedItems.First().Id);
}

[Fact]
public void FluentAutocomplete_Name()
{
// Arrange
var cut = RenderComponent<FluentAutocomplete<Customer>>(parameters =>
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.Name, "myName");
parameters.Add(p => p.Items, Customers.Get());
});

// Assert
cut.Verify();
}

// Send a key code
private async Task PressKeyAsync(IRenderedComponent<FluentAutocomplete<Customer>> cut, KeyCode key, bool popoverOpened = false)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

<style>#myComponent::part(listbox) { z-index: 9995 }</style>
<fluent-combobox id="xxx" position="below" blazor:onchange="1" autofocus="" name="xxx" blazor:elementreference="xxx"></fluent-combobox>
15 changes: 15 additions & 0 deletions tests/Core/List/FluentComboboxTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,20 @@ public void FluentCombobox_AutofocusAttribute()
cut.Verify();
}

[Fact]
public void FluentCombobox_NameAttribute()
{
// Arrange && Act
var cut = TestContext.RenderComponent<FluentCombobox<Customer>>(parameters =>
{
parameters.Add(p => p.Id, "myComponent");
parameters.Add(p => p.Name, "myComponentName");
parameters.Add(p => p.Autofocus, true);
});

// Assert
cut.Verify();
vnbaaij marked this conversation as resolved.
Show resolved Hide resolved
}

private record Customer(int Id, string Name);
}
Loading