Merge branch 'dev'

microsoft · Jul 19, 2024 · 47b8c62 · 47b8c62
2 parents f72e289 + a62d9ce
commit 47b8c62
Show file tree

Hide file tree

Showing 98 changed files with 942 additions and 370 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -54,9 +54,9 @@ Please provide a summary of the tests affected by this work and any unique strat
 <!--- Remove this section if not applicable. -->
 
 - [ ] I have added a new component
-- [ ] I have added [Unit Tests](https://github.com/Microsoft/fluentui-blazor/blob/master/unit-tests.md) for my new compontent
+- [ ] I have added [Unit Tests](https://github.com/Microsoft/fluentui-blazor/blob/master/unit-tests.md) for my new component
 - [ ] I have modified an existing component
-- [ ] I have validated the [Unit Tests](https://github.com/Microsoft/fluentui-blazor/blob/master/unit-tests.md) for an existing component 
+- [ ] I have validated the [Unit Tests](https://github.com/Microsoft/fluentui-blazor/blob/master/unit-tests.md) for an existing component
 
 ## ⏭ Next Steps
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -12,8 +12,8 @@
 		<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
 		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 
-		<VersionFile>4.9.1</VersionFile>
-		<VersionPrefix>4.9.1</VersionPrefix>
+		<VersionFile>4.9.2</VersionFile>
+		<VersionPrefix>4.9.2</VersionPrefix>
 		<VersionSuffix></VersionSuffix>
 		<AssemblyVersion>$(VersionFile)</AssemblyVersion>
 		<FileVersion>$(VersionFile)</FileVersion>

diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@
 
 ## Introduction
 
-The `Microsoft.FluentUI.AspNetCore.Components` package provides a set of [Blazor](https://blazor.net) components which are used to build applications that have a Fluent design (i.e. have the look and feel or modern Microsoft applications). 
+The `Microsoft.FluentUI.AspNetCore.Components` package provides a set of [Blazor](https://blazor.net) components which are used to build applications that have a Fluent design (i.e. have the look and feel of modern Microsoft applications). 
 
 Some of the components in the library are wrappers around Microsoft's official Fluent UI Web Components. Others are components that leverage the Fluent Design System or make it easier to work with Fluent UI. To get up and running with the library, see the **Getting Started** section below.
 

diff --git a/eng/pipelines/version.yml b/eng/pipelines/version.yml
@@ -2,5 +2,5 @@ variables:
   # File and Package version
   # dev  branch: 1.2.4-Preview-23282-1'    (PackageSuffix is always ignored in Dev branch)
   # main branch: 1.2.4-RC.1'               (PackageSuffix is ignored, if empty, in Main branch)
-  FileVersion: '4.9.1'   # Set the next final version here.
+  FileVersion: '4.9.2'   # Set the next final version here.
   PackageSuffix: ''
diff --git a/examples/Demo/Shared/Components/ApiDocumentation.razor b/examples/Demo/Shared/Components/ApiDocumentation.razor
@@ -53,7 +53,7 @@
                     {
                         var id = Identifier.NewId();
                         <FluentStack Orientation="Orientation.Horizontal" HorizontalGap="0">
-                            <div>Preview:</div>
+                            <div>Preview:&nbsp;</div>
                             <FluentIcon Id="@id" Value="@context.Icon" Width="20px" />
                             <FluentTooltip Anchor="@id" Position="TooltipPosition.Right">
                                 @context.Default

diff --git a/examples/Demo/Shared/Components/ApiDocumentation.razor.cs b/examples/Demo/Shared/Components/ApiDocumentation.razor.cs
@@ -13,8 +13,8 @@ private class MemberDescription
         public MemberTypes MemberType { get; set; } = MemberTypes.Property;
         public string Name { get; set; } = "";
         public string Type { get; set; } = "";
-        public string[] EnumValues { get; set; } = Array.Empty<string>();
-        public string[] Parameters { get; set; } = Array.Empty<string>();
+        public string[] EnumValues { get; set; } = [];
+        public string[] Parameters { get; set; } = [];
         public string? Default { get; set; } = null;
         public string Description { get; set; } = "";
         public bool IsParameter { get; set; }
@@ -39,7 +39,7 @@ private class MemberDescription
     /// Default for this parameter is 'typeof(string)'
     /// </summary>
     [Parameter]
-    public Type[] InstanceTypes { get; set; } = new[] { typeof(string) };
+    public Type[] InstanceTypes { get; set; } = [typeof(string)];
 
     /// <summary>
     /// Gets or sets the label used for displaying the type parameter.
@@ -70,29 +70,37 @@ private IEnumerable<MemberDescription> GetMembers(MemberTypes type)
         {
             List<MemberDescription>? members = [];
 
-            object? obj;
-            if (Component.IsGenericType)
+            object? obj = null;
+            var created = false;
+
+            object? GetObjectValue(string propertyName)
             {
-                if (InstanceTypes is null)
+                if (!created)
                 {
-                    throw new ArgumentNullException(nameof(InstanceTypes), "InstanceTypes must be specified when Component is a generic type");
-                }
+                    if (Component.IsGenericType)
+                    {
+                        if (InstanceTypes is null)
+                        {
+                            throw new ArgumentNullException(nameof(InstanceTypes), "InstanceTypes must be specified when Component is a generic type");
+                        }
 
-                // Supply the type to create the generic instance with (needs to be an array)
-                Type[] typeArgs = InstanceTypes;
-                Type constructed = Component.MakeGenericType(typeArgs);
+                        // Supply the type to create the generic instance with (needs to be an array)
+                        obj = Activator.CreateInstance(Component.MakeGenericType(InstanceTypes));
+                    }
+                    else
+                    {
+                        obj = Activator.CreateInstance(Component);
+                    }
+                    created = true;
+                }
 
-                obj = Activator.CreateInstance(constructed);
-            }
-            else
-            {
-                obj = Activator.CreateInstance(Component);
-            }
+                return obj?.GetType().GetProperty(propertyName)?.GetValue(obj);
+            };
 
-            IEnumerable<MemberInfo>? allProperties = Component.GetProperties().Select(i => (MemberInfo)i);
-            IEnumerable<MemberInfo>? allMethods = Component.GetMethods().Where(i => !i.IsSpecialName).Select(i => (MemberInfo)i);
+            var allProperties = Component.GetProperties().Select(i => (MemberInfo)i);
+            var allMethods = Component.GetMethods().Where(i => !i.IsSpecialName).Select(i => (MemberInfo)i);
 
-            foreach (MemberInfo memberInfo in allProperties.Union(allMethods).OrderBy(m => m.Name))
+            foreach (var memberInfo in allProperties.Union(allMethods).OrderBy(m => m.Name))
             {
                 try
                 {
@@ -105,7 +113,7 @@ private IEnumerable<MemberDescription> GetMembers(MemberTypes type)
                         {
                             var isParameter = memberInfo.GetCustomAttribute<ParameterAttribute>() != null;
 
-                            Type t = propertyInfo.PropertyType;
+                            var t = propertyInfo.PropertyType;
                             var isEvent = t == typeof(EventCallback) || (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(EventCallback<>));
 
                             // Parameters/properties
@@ -115,11 +123,11 @@ private IEnumerable<MemberDescription> GetMembers(MemberTypes type)
                                 var defaultVaue = "";
                                 if (propertyInfo.PropertyType.IsValueType || propertyInfo.PropertyType == typeof(string))
                                 {
-                                    defaultVaue = obj?.GetType().GetProperty(propertyInfo.Name)?.GetValue(obj)?.ToString();
+                                    defaultVaue = GetObjectValue(propertyInfo.Name)?.ToString();
                                 }
                                 else if (propertyInfo.PropertyType == typeof(Icon))
                                 {
-                                    if (obj?.GetType().GetProperty(propertyInfo.Name)?.GetValue(obj) is Icon value)
+                                    if (GetObjectValue(propertyInfo.Name) is Icon value)
                                     {
                                         icon = value;
                                         defaultVaue = $"{value.Variant}.{value.Size}.{value.Name}";
@@ -201,6 +209,6 @@ private static string[] GetEnumValues(PropertyInfo? propertyInfo)
             }
         }
 
-        return Array.Empty<string>();
+        return [];
     }
 }