[Lists] Change Option<TType>.Text to string? (#2063)

* In Option<TType> change the type of `Text` to string? If it is TType it only adds value for TType of string otherwise it makes no sense if Text is some Ojbect. * Update the demo apps to use Text as a string. * Use string literal instead of ToString. * Now we can remove redundant .ToString --------- Co-authored-by: Vincent Baaij <[email protected]>
microsoft · May 16, 2024 · a43b7c3 · a43b7c3
1 parent 88f055f
commit a43b7c3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/examples/Demo/Shared/Pages/List/Combobox/Examples/ComboboxFromListOfOptions.razor b/examples/Demo/Shared/Pages/List/Combobox/Examples/ComboboxFromListOfOptions.razor
@@ -20,8 +20,8 @@
 
 <FluentCombobox Items=@intOptions 
                 TOption="Option<int>"
-                OptionText="@(i => i.Text.ToString())" 
-                OptionValue="@(i => i.Value.ToString())" 
+                OptionText="@(i => i.Text)"
+                OptionValue="@(i => i.Value.ToString())"
                 OptionDisabled="@(i => i.Disabled)"
                 @bind-SelectedOption="@selectedIntOption"
                 @bind-Value="@intValue" />
@@ -48,9 +48,9 @@
 
     List<Option<int>> intOptions = new()
         {
-            { new Option<int> { Value = 1, Text = 1, Disabled = true } },
-            { new Option<int> { Value = 2, Text = 2 } },
-            { new Option<int> { Value = 3, Text = 3 } }
+            { new Option<int> { Value = 1, Text = "1", Disabled = true } },
+            { new Option<int> { Value = 2, Text = "2" } },
+            { new Option<int> { Value = 3, Text = "3" } }
 
         };
 }
diff --git a/examples/Demo/Shared/Pages/List/Listbox/Examples/ListboxFromListOfOptions.razor b/examples/Demo/Shared/Pages/List/Listbox/Examples/ListboxFromListOfOptions.razor
@@ -16,7 +16,7 @@
 
 <FluentListbox Items=@intOptions 
                TOption="Option<int>"
-               OptionText="@(i => i.Text.ToString())" 
+               OptionText="@(i => i.Text)"
                OptionValue="@(i => i.Value.ToString())"
                OptionDisabled="@(i => i.Disabled)"
                @bind-SelectedOption="@selectedIntOption"
@@ -43,9 +43,9 @@
 
 List<Option<int>> intOptions = new()
     {
-        { new Option<int> { Value = 1, Text = 1, Disabled = true } },
-        { new Option<int> { Value = 2, Text = 2 } },
-        { new Option<int> { Value = 3, Text = 3 } }
+        { new Option<int> { Value = 1, Text = "1", Disabled = true } },
+        { new Option<int> { Value = 2, Text = "2" } },
+        { new Option<int> { Value = 3, Text = "3" } }
 
     };
 }
diff --git a/examples/Demo/Shared/Pages/List/Select/Examples/SelectFromListOfOptions.razor b/examples/Demo/Shared/Pages/List/Select/Examples/SelectFromListOfOptions.razor
@@ -15,7 +15,7 @@
 <p><em>Note that the second option in the list is automatically highlighted but it has <strong>NOT</strong> been selected. It's just the first item in the list available for selection</em></p>
 <FluentSelect Items=@intOptions
               TOption="Option<int>"
-              OptionText="@(i => i.Text.ToString())"
+              OptionText="@(i => i.Text)"
               OptionValue="@(i => i.Value.ToString())"
               OptionDisabled="@(i => i.Disabled)"
 @bind-SelectedOption="@selectedIntOption"
@@ -81,9 +81,9 @@
 
     List<Option<int>> intOptions = new()
     {
-        { new Option<int> { Value = 1, Text = 1, Disabled = true, Icon = (new Icons.Regular.Size24.NumberCircle1(), Color.Neutral, "start" ) } },
-        { new Option<int> { Value = 2, Text = 2, Icon = (new Icons.Regular.Size24.NumberCircle2(), Color.Neutral, "end" ) } },
-        { new Option<int> { Value = 3, Text = 3, Icon = (new Icons.Regular.Size24.NumberCircle3(), Color.Neutral, "start" ) } }
+        { new Option<int> { Value = 1, Text = "1", Disabled = true, Icon = (new Icons.Regular.Size24.NumberCircle1(), Color.Neutral, "start" ) } },
+        { new Option<int> { Value = 2, Text = "2", Icon = (new Icons.Regular.Size24.NumberCircle2(), Color.Neutral, "end" ) } },
+        { new Option<int> { Value = 3, Text = "3", Icon = (new Icons.Regular.Size24.NumberCircle3(), Color.Neutral, "start" ) } }
 
     };
 }
diff --git a/src/Core/Components/List/Option.cs b/src/Core/Components/List/Option.cs
@@ -4,7 +4,7 @@ public class Option<TType> : IOptionIcon
 {
     public TType? Value { get; set; }
 
-    public TType? Text { get; set; }
+    public string? Text { get; set; }
 
     public (Icon Value, Color? Color, string? Slot)? Icon { get; set; }