Revert "feat(ListView): use grid layout instead of flex (#5409)"

ArgoZhang · ArgoZhang · commit 1c9648f86b75 · 2025-02-22T18:14:20.000+08:00
This reverts commit e1a8f53.
diff --git a/src/BootstrapBlazor.Server/Components/Samples/ListViews.razor b/src/BootstrapBlazor.Server/Components/Samples/ListViews.razor
@@ -17,7 +17,7 @@
         <BodyTemplate>
             <Card>
                 <BodyTemplate>
-                    <img class="lv-demo-img" src="@context.ImageUrl" />
+                    <img src="@context.ImageUrl" />
                     <div class="lv-demo-desc">@context.Description</div>
                 </BodyTemplate>
             </Card>
@@ -42,7 +42,7 @@
         <BodyTemplate>
             <Card>
                 <BodyTemplate>
-                    <img class="lv-demo-img" src="@context.ImageUrl" />
+                    <img src="@context.ImageUrl" />
                     <div class="lv-demo-desc">@context.Description</div>
                 </BodyTemplate>
             </Card>
@@ -60,7 +60,7 @@
         <BodyTemplate>
             <Card>
                 <BodyTemplate>
-                    <img class="lv-demo-img" src="@context.ImageUrl" />
+                    <img src="@context.ImageUrl" />
                     <div class="lv-demo-desc">@context.Description</div>
                 </BodyTemplate>
             </Card>
@@ -78,7 +78,7 @@
         <BodyTemplate>
             <Card>
                 <BodyTemplate>
-                    <img class="lv-demo-img" src="@context.ImageUrl" />
+                    <img src="@context.ImageUrl" />
                     <div class="lv-demo-desc">@context.Description</div>
                 </BodyTemplate>
             </Card>
@@ -96,7 +96,7 @@
         <BodyTemplate>
             <Card>
                 <BodyTemplate>
-                    <img class="lv-demo-img" src="@context.ImageUrl" />
+                    <img src="@context.ImageUrl" />
                     <div class="lv-demo-desc">@context.Description</div>
                 </BodyTemplate>
             </Card>
diff --git a/src/BootstrapBlazor.Server/Components/Samples/ListViews.razor.css b/src/BootstrapBlazor.Server/Components/Samples/ListViews.razor.css
@@ -1,5 +1,5 @@
-﻿.lv-demo-img {
-    width: 100%;
+﻿img {
+    margin-bottom: 1rem;
     border-radius: var(--bs-border-radius);
 }
 
diff --git a/src/BootstrapBlazor/Components/ListView/ListView.razor b/src/BootstrapBlazor/Components/ListView/ListView.razor
@@ -16,7 +16,12 @@
             {
                 if (GroupName == null)
                 {
-                    @RenderGroup(Rows)
+                    foreach (var item in Rows)
+                    {
+                        <div class="listview-item" @onclick="@(e => OnClick(item))">
+                            @BodyTemplate(item)
+                        </div>
+                    }
                 }
                 else if (Collapsible)
                 {
@@ -33,7 +38,12 @@
                         <div @key="@key.GroupName" class="accordion-item">
                             <div class="accordion-header">@key.GroupName</div>
                             <div class="accordion-body">
-                                @RenderGroup(key.Items)
+                                @foreach (var item in key.Items)
+                                {
+                                    <div class="listview-item" @onclick="@(e => OnClick(item))">
+                                        @BodyTemplate(item)
+                                    </div>
+                                }
                             </div>
                         </div>
                     }
@@ -67,19 +77,14 @@
 @code {
     RenderFragment RenderItem((object? GroupName, IOrderedEnumerable<TItem> Items) key, int index) =>
     @<CollapseItem Text="@GetGroupName(key.GroupName)" IsCollapsed="IsCollapsed(index, key.GroupName)">
-        @RenderGroup(key.Items)
-    </CollapseItem>;
-
-    RenderFragment<IEnumerable<TItem>> RenderGroup => items =>
-    @<div class="listview-item-group">
-        @foreach (var item in items)
+        @foreach (var item in key.Items)
         {
-            <div @key="item" class="listview-item" @onclick="@(e => OnClick(item))">
+            <div class="listview-item" @onclick="@(e => OnClick(item))">
                 @if(BodyTemplate != null)
                 {
                     @BodyTemplate(item)
                 }
             </div>
         }
-    </div>;
+    </CollapseItem>;
 }
diff --git a/src/BootstrapBlazor/Components/ListView/ListView.razor.cs b/src/BootstrapBlazor/Components/ListView/ListView.razor.cs
@@ -15,7 +15,7 @@ public partial class ListView<TItem> : BootstrapComponentBase
         .AddClassFromAttributes(AdditionalAttributes)
         .Build();
 
-    private string? BodyClassString => CssBuilder.Default("listview-body scroll")
+    private string? BodyClassString => CssBuilder.Default("listview-body")
         .AddClass("is-group", GroupName != null)
         .Build();
 
diff --git a/src/BootstrapBlazor/Components/ListView/ListView.razor.scss b/src/BootstrapBlazor/Components/ListView/ListView.razor.scss
@@ -6,7 +6,7 @@
     --bb-lv-item-border-hover-color: #{$bb-lv-item-border-hover-color};
     --bb-lv-item-shadow: #{$bb-lv-item-shadow};
     --bb-lv-body-padding: #{$bb-lv-body-padding};
-    --bb-lv-body-item-gap: #{$bb-lv-body-item-gap};
+    --bb-lv-body-item-margin: #{$bb-lv-body-item-margin};
     --bb-lv-footer-padding: #{$bb-lv-footer-padding};
     border: 1px solid var(--bb-lv-border-color);
     border-radius: var(--bs-border-radius);
@@ -29,17 +29,24 @@
 .listview .listview-body {
     padding: var(--bb-lv-body-padding);
     position: relative;
+    overflow: auto;
+    display: flex;
+    flex-flow: row wrap;
     flex: 1;
-    min-height: 0;
+    align-content: flex-start;
     height: 1%;
+    min-height: 0;
 }
 
 .listview .listview-body.is-group {
     padding: 0;
 }
 
+.listview .listview-body .listview-item {
+    margin: var(--bb-lv-body-item-margin);
+}
+
 .listview .listview-body .listview-item .card {
-    box-shadow: var(--bb-lv-item-shadow);
     transition: var(--bb-lv-item-trans);
 }
 
@@ -48,11 +55,15 @@
     border: 1px solid var(--bb-lv-item-border-hover-color);
 }
 
-.listview .listview-item-group {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
-    gap: var(--bb-lv-body-item-gap);
-    align-items: start;
+.listview .listview-body .listview-item .card {
+    box-shadow: var(--bb-lv-item-shadow);
+}
+
+.listview .listview-body .listview-item-group {
+    flex-basis: 100%;
+    margin: 1rem 0;
+    font-weight: bold;
+    position: relative;
 }
 
 .listview .listview-body .accordion {
@@ -71,9 +82,15 @@
 }
 
 .listview .listview-body .accordion-body {
+    display: flex;
+    flex-wrap: wrap;
     padding: var(--bb-lv-body-padding);
 }
 
+.listview .listview-body .accordion-item {
+    width: 100%;
+}
+
 .listview .listview-body .accordion-item:last-child .accordion-header {
     border-bottom: 1px solid var(--bb-lv-border-color);
 }
diff --git a/src/BootstrapBlazor/wwwroot/scss/theme/bootstrapblazor.scss b/src/BootstrapBlazor/wwwroot/scss/theme/bootstrapblazor.scss
@@ -381,9 +381,9 @@ $bb-lv-border-color: var(--bs-border-color);
 $bb-lv-item-trans: border .3s linear;
 $bb-lv-item-border-hover-color: #409eff;
 $bb-lv-item-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
-$bb-lv-body-padding: 0.5rem;
-$bb-lv-body-item-gap: 0.5rem;
-$bb-lv-footer-padding: 0.5rem;
+$bb-lv-body-padding: 1rem 0 0 1rem;
+$bb-lv-body-item-margin: 0 1rem 1rem 0;
+$bb-lv-footer-padding: 1rem;
 
 // Logout
 $bb-logout-avatar-width: 42px;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-.lv-demo-img {`
`2`		`- width: 100%;`
	`1`	`+img {`
	`2`	`+ margin-bottom: 1rem;`
`3`	`3`	`border-radius: var(--bs-border-radius);`
`4`	`4`	`}`
`5`	`5`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,12 @@`
`16`	`16`	`{`
`17`	`17`	`if (GroupName == null)`
`18`	`18`	`{`
`19`		`- @RenderGroup(Rows)`
	`19`	`+ foreach (var item in Rows)`
	`20`	`+ {`
	`21`	`+ <div class="listview-item" @onclick="@(e => OnClick(item))">`
	`22`	`+ @BodyTemplate(item)`
	`23`	`+ </div>`
	`24`	`+ }`
`20`	`25`	`}`
`21`	`26`	`else if (Collapsible)`
`22`	`27`	`{`
`@@ -33,7 +38,12 @@`
`33`	`38`	`<div @key="@key.GroupName" class="accordion-item">`
`34`	`39`	`<div class="accordion-header">@key.GroupName</div>`
`35`	`40`	`<div class="accordion-body">`
`36`		`- @RenderGroup(key.Items)`
	`41`	`+ @foreach (var item in key.Items)`
	`42`	`+ {`
	`43`	`+ <div class="listview-item" @onclick="@(e => OnClick(item))">`
	`44`	`+ @BodyTemplate(item)`
	`45`	`+ </div>`
	`46`	`+ }`
`37`	`47`	`</div>`
`38`	`48`	`</div>`
`39`	`49`	`}`
`@@ -67,19 +77,14 @@`
`67`	`77`	`@code {`
`68`	`78`	`RenderFragment RenderItem((object? GroupName, IOrderedEnumerable<TItem> Items) key, int index) =>`
`69`	`79`	`@<CollapseItem Text="@GetGroupName(key.GroupName)" IsCollapsed="IsCollapsed(index, key.GroupName)">`
`70`		`- @RenderGroup(key.Items)`
`71`		`- </CollapseItem>;`
`72`		`-`
`73`		`- RenderFragment<IEnumerable<TItem>> RenderGroup => items =>`
`74`		`- @<div class="listview-item-group">`
`75`		`- @foreach (var item in items)`
	`80`	`+ @foreach (var item in key.Items)`
`76`	`81`	`{`
`77`		`- <div @key="item" class="listview-item" @onclick="@(e => OnClick(item))">`
	`82`	`+ <div class="listview-item" @onclick="@(e => OnClick(item))">`
`78`	`83`	`@if(BodyTemplate != null)`
`79`	`84`	`{`
`80`	`85`	`@BodyTemplate(item)`
`81`	`86`	`}`
`82`	`87`	`</div>`
`83`	`88`	`}`
`84`		`- </div>;`
	`89`	`+ </CollapseItem>;`
`85`	`90`	`}`