Fix cherry-pick

microsoft · Jun 30, 2024 · 046218a · 046218a
1 parent 4c0d91c
commit 046218a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/Core/Components/List/FluentAutocomplete.razor b/src/Core/Components/List/FluentAutocomplete.razor
@@ -6,25 +6,24 @@
     <div class="@ClassValue fluent-autocomplete-multiselect"
          style="@StyleValue"
          auto-height="@(!string.IsNullOrEmpty(MaxAutoHeight))">
+        <FluentInputLabel ForId="@Id" Label="@Label" AriaLabel="@GetAriaLabel()" ChildContent="@LabelTemplate" Required="@Required" />
         <FluentKeyCode Anchor="@Id" OnKeyDown="@KeyDownHandlerAsync" Only="@CatchOnly" PreventDefaultOnly="@PreventOnly" />
 
         <FluentTextField role="combobox"
                          @ref="@Element"
                          Id="@Id"
-                         Name="@Name"
                          Embedded="true"
-                         Required="@Required"
                          AutoComplete="@AutoComplete"
                          Appearance="@Appearance"
                          Disabled="@Disabled"
-                         ReadOnly="@ReadOnly"
                          Label="@Label"
                          LabelTemplate="@LabelTemplate"
                          Placeholder="@(SelectedOptions?.Any() is false ? Placeholder : string.Empty)"
                          aria-expanded="@(IsMultiSelectOpened ? "true" : "false")"
                          aria-controls="@(IsMultiSelectOpened ? IdPopup : string.Empty)"
                          aria-label="@GetAutocompleteAriaLabel()"
                          Value="@ValueText"
+                         Required="@Required"
                          @onclick="@OnDropDownExpandedAsync"
                          @oninput="@InputHandlerAsync"
                          autofocus="@Autofocus"
@@ -68,7 +67,7 @@
                 }
 
             }
-            @if (!Disabled && !ReadOnly)
+            @if (!Disabled)
             {
                 if (this.SelectedOptions?.Any() == true || !string.IsNullOrEmpty(ValueText))
                 {
@@ -205,16 +204,16 @@
                 {
                     var text = @GetOptionText(item);
 
-                    if (ReadOnly || Disabled)
+                    if (Disabled)
                     {
-                        <FluentBadge Appearance="@AspNetCore.Components.Appearance.Neutral"
+                        <FluentBadge Appearance="@FluentUI.Appearance.Neutral"
                                      aria-label="@GetOptionText(item)">
                             @text
                         </FluentBadge>
                     }
                     else
                     {
-                        <FluentBadge Appearance="@AspNetCore.Components.Appearance.Neutral"
+                        <FluentBadge Appearance="@FluentUI.Appearance.Neutral"
                                      OnDismissClick="@(e => RemoveSelectedItemAsync(item))"
                                      DismissTitle="@(string.Format(AccessibilityRemoveItem, text))"
                                      aria-label="@GetOptionText(item)">

diff --git a/src/Core/Components/List/FluentAutocomplete.razor.cs b/src/Core/Components/List/FluentAutocomplete.razor.cs
@@ -270,7 +270,7 @@ private string ComponentWidth
     /// <summary />
     protected async Task InputHandlerAsync(ChangeEventArgs e)
     {
-        if (ReadOnly || Disabled)
+        if (Disabled)
         {
             return;
         }