Update JsonDisplay.cs

loresoft · Apr 12, 2024 · 8718249 · 8718249
1 parent 61d2008
commit 8718249
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/LoreSoft.Blazor.Controls/JsonDisplay.cs b/src/LoreSoft.Blazor.Controls/JsonDisplay.cs
@@ -1,4 +1,6 @@
-using System.Text.Json;
+#nullable enable
+
+using System.Text.Json;
 
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Rendering;
@@ -8,10 +10,10 @@ namespace LoreSoft.Blazor.Controls;
 public class JsonDisplay : ComponentBase
 {
     [Parameter]
-    public string Json { get; set; }
+    public string? Json { get; set; }
 
     [Parameter]
-    public JsonElement JsonElement { get; set; }
+    public JsonElement? JsonElement { get; set; }
 
     [Parameter(CaptureUnmatchedValues = true)]
     public Dictionary<string, object>? Attributes { get; set; }
@@ -24,9 +26,9 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
             var document = JsonDocument.Parse(Json);
             AppendValue(builder, document.RootElement);
         }
-        else
+        else if (JsonElement.HasValue)
         {
-            AppendValue(builder, JsonElement);
+            AppendValue(builder, JsonElement.Value);
         }
     }
 
@@ -59,6 +61,7 @@ private void AppendObject(RenderTreeBuilder builder, JsonElement jsonElement)
         builder.OpenElement(3, "table");
         builder.AddAttribute(4, "class", "json-object");
         builder.AddMultipleAttributes(5, Attributes);
+        builder.SetKey(jsonElement);
 
         foreach (var jsonProperty in jsonElement.EnumerateObject())
         {