🐛 fix(ListItem): do not render the element when there is not subtitle

masastack · Aug 24, 2024 · 51bb38e · 51bb38e
1 parent 8c6ef3b
commit 51bb38e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/src/Masa.Blazor/Components/List/MListItem.razor b/src/Masa.Blazor/Components/List/MListItem.razor
@@ -4,14 +4,14 @@
 
 <CascadingValue Value="IsDark" Name="IsDark">
     <MElement Class="@GetClass()"
-             Style="@GetStyle()"
-             Tag="@Tag"
-             ReferenceCaptureAction="r => Ref = r"
-             id="@Id"
-             @onclick="HandleOnClick"
-             __internal_stopPropagation_onclick="@OnClickStopPropagation"
-             __internal_preventDefault_onclick="@OnClickPreventDefault"
-             @attributes="@Attributes">
+              Style="@GetStyle()"
+              Tag="@Tag"
+              ReferenceCaptureAction="r => Ref = r"
+              id="@Id"
+              @onclick="HandleOnClick"
+              __internal_stopPropagation_onclick="@OnClickStopPropagation"
+              __internal_preventDefault_onclick="@OnClickPreventDefault"
+              @attributes="@Attributes">
         @if (ItemContent != null)
         {
             @ItemContent?.Invoke(GenItemContext())
@@ -52,15 +52,25 @@
 
     RenderFragment GenContent() => __builder =>
     {
-        if (HasBuiltInContent)
+        var hasTitle = !string.IsNullOrWhiteSpace(Title);
+        var hasSubtitle = !string.IsNullOrWhiteSpace(Subtitle);
+
+        if (hasTitle || hasSubtitle)
         {
             <MListItemContent>
-                <MListItemTitle>
-                    @Title
-                </MListItemTitle>
-                <MListItemSubtitle>
-                    @Subtitle
-                </MListItemSubtitle>
+                @if (hasTitle)
+                {
+                    <MListItemTitle>
+                        @Title
+                    </MListItemTitle>
+                }
+
+                @if (hasSubtitle)
+                {
+                    <MListItemSubtitle>
+                        @Subtitle
+                    </MListItemSubtitle>
+                }
             </MListItemContent>
         }
     };

diff --git a/src/Masa.Blazor/Components/List/MListItem.razor.cs b/src/Masa.Blazor/Components/List/MListItem.razor.cs
@@ -125,8 +125,6 @@ public bool IsDark
 
     protected override bool IsRoutable => Href != null && List?.Routable is true;
 
-    private bool HasBuiltInContent => !string.IsNullOrWhiteSpace(Title) || !string.IsNullOrWhiteSpace(Subtitle);
-
     protected override bool AfterHandleEventShouldRender() => false;
 
     protected virtual async Task HandleOnClick(MouseEventArgs args)