Add PureFooter, PureNavLink, enable Nullables

pureblazor · Apr 3, 2024 · f0ba4c2 · f0ba4c2
1 parent aa04e9a
commit f0ba4c2
Show file tree

Hide file tree

Showing 20 changed files with 450 additions and 173 deletions.
diff --git a/build.sh b/build.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# file: build.sh
+
+dotnet build src/Pure.Blazor.Components
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -0,0 +1,9 @@
+<Project>
+ <PropertyGroup>
+   <Nullable>enable</Nullable>
+   <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+   <WarningsAsErrors>Nullable</WarningsAsErrors>
+   <NuGetAuditMode>All</NuGetAuditMode>
+   <NuGetAuditLevel>low</NuGetAuditLevel>
+ </PropertyGroup>
+</Project>
diff --git a/src/Pure.Blazor.Components.Docs/Pages/Dev.razor b/src/Pure.Blazor.Components.Docs/Pages/Dev.razor
@@ -1,7 +1,32 @@
 @page "/dev"
+@inject ILogger<Dev> Logger
 <Header1 Styles="mt-4">Dev Page</Header1>
 <Paragraph Styles="mb-8">Kitchen sink page for testing.</Paragraph>
 <div class="flex flex-col gap-8">
+    <div>
+        <Header2>Radio Group</Header2>
+        <Header3 Styles="my-2">Basic</Header3>
+        <PureRadioGroup Name="test" SelectedRadio="@selectedRadio">
+            <PureRadio Checked="false" Title="Foo" Value="foo"></PureRadio>
+            <PureRadio Checked="false" Title="Bar" Value="bar"></PureRadio>
+            <PureRadio Checked="false" Title="Fuzz" Value="fuzz"></PureRadio>
+        </PureRadioGroup>
+        <PureLabel>Selected:</PureLabel>
+        <PureText>@selectedRadio?.Value</PureText>
+        <Header3 Styles="mb-2 mt-6">With Description</Header3>
+        <PureRadioGroup Name="test">
+            <PureRadio Checked="false"
+                       Description="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+                       Title="Foo"
+                       Value="foo">
+            </PureRadio>
+            <PureRadio Checked="false"
+                       Description="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+                       Title="Bar"
+                       Value="bar">
+            </PureRadio>
+        </PureRadioGroup>
+    </div>
     <div>
         <Header2>Status Indicators</Header2>
         <Header3 Styles="my-2">Minimal</Header3>
@@ -49,5 +74,11 @@
 </div>
 
 @code {
+    private PureRadio? selectedRadio = null;
+
+    private void Callback(PureRadio radio)
+    {
+        Logger.LogInformation("Radio changed to {0}", radio.Value);
+    }
 
 }
diff --git a/src/Pure.Blazor.Components.Docs/Pages/Forms.razor b/src/Pure.Blazor.Components.Docs/Pages/Forms.razor
@@ -2,14 +2,13 @@
 
 <div class="grid grid-cols-4 pt-10">
     <div class="hidden sm:block sm:col-span-1">
-        <PureVertNav />
+        <PureVertNav/>
     </div>
     <div class="col-span-4 sm:col-span-3">
         <Header2>Components</Header2>
-        <FormSample />
     </div>
 </div>
 
 @code {
 
-}
+}
diff --git a/src/Pure.Blazor.Components.Docs/Shared/Samples/DropdownSample.razor b/src/Pure.Blazor.Components.Docs/Shared/Samples/DropdownSample.razor
@@ -1,6 +1,4 @@
-@using Microsoft.Extensions.Logging
-
-@inject ILogger<PureDropdown> Log
+@inject ILogger<PureDropdown> Log
 
 <Header1 Id="dropdowns">Dropdowns</Header1>
 <div class="mb-10">
@@ -18,7 +16,7 @@
 @code {
     public string MenuItemClicked { get; set; } = "Select a menu item";
 
-    public List<DropdownMenuItem> Items { get; set; } = new List<DropdownMenuItem>();
+    public List<DropdownMenuItem> Items { get; set; } = new();
 
     protected override void OnInitialized()
     {
@@ -30,7 +28,7 @@
 
     protected void ItemSelected(DropdownMenuItem item)
     {
-        MenuItemClicked = item.Text;
+        MenuItemClicked = item.Text ?? "";
     }
 
     private string Markup = @"<PureDropdown Items=""Items"">Settings</PureDropdown>

diff --git a/src/Pure.Blazor.Components.Docs/Utilities.cs b/src/Pure.Blazor.Components.Docs/Utilities.cs
@@ -7,13 +7,15 @@ namespace Pure.Blazor.Components.Docs;
 // src: https://learn.microsoft.com/en-us/archive/msdn-magazine/2019/october/csharp-accessing-xml-documentation-via-reflection
 public static class AssemblyExtensions
 {
-    internal static HashSet<Assembly> loadedAssemblies = new HashSet<Assembly>();
+    internal static HashSet<Assembly> loadedAssemblies = new();
 
-    public static string GetDirectoryPath(this Assembly assembly)
+    internal static Dictionary<string, string> loadedXmlDocumentation = new();
+
+    public static string? GetDirectoryPath(this Assembly assembly)
     {
-        string codeBase = assembly.CodeBase;
-        UriBuilder uri = new UriBuilder(codeBase);
-        string path = Uri.UnescapeDataString(uri.Path);
+        var codeBase = assembly.Location;
+        var uri = new UriBuilder(codeBase);
+        var path = Uri.UnescapeDataString(uri.Path);
         return Path.GetDirectoryName(path);
     }
 
@@ -23,33 +25,42 @@ internal static void LoadXmlDocumentation(Assembly assembly)
         {
             return; // Already loaded
         }
-        string directoryPath = assembly.GetDirectoryPath();
-        string xmlFilePath = Path.Combine(directoryPath, assembly.GetName().Name + ".xml");
+
+        var directoryPath = assembly.GetDirectoryPath();
+        if (directoryPath is null)
+        {
+            return;
+        }
+
+        var xmlFilePath = Path.Combine(directoryPath, assembly.GetName().Name + ".xml");
         if (File.Exists(xmlFilePath))
         {
             LoadXmlDocumentation(File.ReadAllText(xmlFilePath));
             loadedAssemblies.Add(assembly);
         }
     }
 
-    internal static Dictionary<string, string> loadedXmlDocumentation =
-      new Dictionary<string, string>();
     public static void LoadXmlDocumentation(string xmlDocumentation)
     {
-        using (XmlReader xmlReader = XmlReader.Create(new StringReader(xmlDocumentation)))
+        using (var xmlReader = XmlReader.Create(new StringReader(xmlDocumentation)))
         {
             while (xmlReader.Read())
             {
                 if (xmlReader.NodeType == XmlNodeType.Element && xmlReader.Name == "member")
                 {
-                    string raw_name = xmlReader["name"];
+                    var raw_name = xmlReader["name"];
+                    if (raw_name is null)
+                    {
+                        continue;
+                    }
+
                     loadedXmlDocumentation[raw_name] = xmlReader.ReadInnerXml();
                 }
             }
         }
     }
 
-    public static string GetDocumentation(this MemberInfo memberInfo)
+    public static string? GetDocumentation(this MemberInfo memberInfo)
     {
         try
         {
@@ -63,53 +74,49 @@ public static string GetDocumentation(this MemberInfo memberInfo)
             //}
             if (memberInfo.MemberType.HasFlag(MemberTypes.Event))
             {
-                return ((EventInfo) memberInfo).GetDocumentation();
-            }
-            else if (memberInfo.MemberType.HasFlag(MemberTypes.Constructor))
-            {
-                return ((ConstructorInfo) memberInfo).GetDocumentation();
+                return ((EventInfo)memberInfo).GetDocumentation();
             }
-            else if (memberInfo.MemberType.HasFlag(MemberTypes.Method))
+
+            if (memberInfo.MemberType.HasFlag(MemberTypes.Constructor))
             {
-                return ((MethodInfo) memberInfo).GetDocumentation();
+                return ((ConstructorInfo)memberInfo).GetDocumentation();
             }
-            else if (memberInfo.MemberType.HasFlag(MemberTypes.TypeInfo) ||
-                     memberInfo.MemberType.HasFlag(MemberTypes.NestedType))
+
+            if (memberInfo.MemberType.HasFlag(MemberTypes.Method))
             {
-                return ((TypeInfo) memberInfo).GetDocumentation();
+                return ((MethodInfo)memberInfo).GetDocumentation();
             }
-            else
+
+            if (memberInfo.MemberType.HasFlag(MemberTypes.TypeInfo) ||
+                memberInfo.MemberType.HasFlag(MemberTypes.NestedType))
             {
-                return null;
+                return ((TypeInfo)memberInfo).GetDocumentation();
             }
+
+            return null;
         }
-        catch (Exception ex)
+        catch (Exception)
         {
             return "";
         }
     }
 
-    public static string GetDocumentation(this ParameterInfo parameterInfo)
+    public static string? GetDocumentation(this ParameterInfo parameterInfo)
     {
-        string memberDocumentation = parameterInfo.Member.GetDocumentation();
+        var memberDocumentation = parameterInfo.Member.GetDocumentation();
         if (memberDocumentation != null)
         {
-            string regexPattern =
-              Regex.Escape(@"<param name=" + "\"" + parameterInfo.Name + "\"" + @">") +
-              ".*?" +
-              Regex.Escape(@"</param>");
-            Match match = Regex.Match(memberDocumentation, regexPattern);
+            var regexPattern =
+                Regex.Escape(@"<param name=" + "\"" + parameterInfo.Name + "\"" + @">") +
+                ".*?" +
+                Regex.Escape(@"</param>");
+            var match = Regex.Match(memberDocumentation, regexPattern);
             if (match.Success)
             {
                 return match.Value;
             }
         }
+
         return null;
     }
 }
-
-public class Utilities
-{
-
-
-}
diff --git a/src/Pure.Blazor.Components/Common/PureComponent.razor b/src/Pure.Blazor.Components/Common/PureComponent.razor
@@ -1,5 +1,4 @@
 @code {
-    string? prevStyles;
 
     protected override void OnParametersSet()
     {