Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/aspnetcore.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMackinnon Buck <mackinnon.buck@gmail.com>2022-04-19 01:09:42 +0300
committerGitHub <noreply@github.com>2022-04-19 01:09:42 +0300
commit8ab4b36a4e734096520726fb43c376f7e728a757 (patch)
tree1ac052ad626d4cabbeae2b1282d62d902e07eb6b
parent7a1a1ebf86fb24d84cefd45e05534c79708c7947 (diff)
Simplify 'Virtualize' when using 'display: flex' on the scroll container (#41241)
-rw-r--r--src/Components/Web/src/Virtualization/Virtualize.cs4
-rw-r--r--src/Components/test/E2ETest/Tests/VirtualizationTest.cs6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Components/Web/src/Virtualization/Virtualize.cs b/src/Components/Web/src/Virtualization/Virtualize.cs
index 74618a8c76..2e9779ad9a 100644
--- a/src/Components/Web/src/Virtualization/Virtualize.cs
+++ b/src/Components/Web/src/Virtualization/Virtualize.cs
@@ -243,7 +243,7 @@ public sealed class Virtualize<TItem> : ComponentBase, IVirtualizeJsCallbacks, I
}
private string GetSpacerStyle(int itemsInSpacer)
- => $"height: {(itemsInSpacer * _itemSize).ToString(CultureInfo.InvariantCulture)}px;";
+ => $"height: {(itemsInSpacer * _itemSize).ToString(CultureInfo.InvariantCulture)}px; flex-shrink: 0;";
void IVirtualizeJsCallbacks.OnBeforeSpacerVisible(float spacerSize, float spacerSeparation, float containerSize)
{
@@ -390,7 +390,7 @@ public sealed class Virtualize<TItem> : ComponentBase, IVirtualizeJsCallbacks, I
private RenderFragment DefaultPlaceholder(PlaceholderContext context) => (builder) =>
{
builder.OpenElement(0, "div");
- builder.AddAttribute(1, "style", $"height: {_itemSize.ToString(CultureInfo.InvariantCulture)}px;");
+ builder.AddAttribute(1, "style", $"height: {_itemSize.ToString(CultureInfo.InvariantCulture)}px; flex-shrink: 0;");
builder.CloseElement();
};
diff --git a/src/Components/test/E2ETest/Tests/VirtualizationTest.cs b/src/Components/test/E2ETest/Tests/VirtualizationTest.cs
index 8b95aec781..1ba1c0174d 100644
--- a/src/Components/test/E2ETest/Tests/VirtualizationTest.cs
+++ b/src/Components/test/E2ETest/Tests/VirtualizationTest.cs
@@ -33,7 +33,7 @@ public class VirtualizationTest : ServerTestBase<ToggleExecutionModeServerFixtur
{
Browser.MountTestComponent<VirtualizationComponent>();
var topSpacer = Browser.Exists(By.Id("sync-container")).FindElement(By.TagName("div"));
- var expectedInitialSpacerStyle = "height: 0px;";
+ var expectedInitialSpacerStyle = "height: 0px; flex-shrink: 0;";
int initialItemCount = 0;
@@ -193,7 +193,7 @@ public class VirtualizationTest : ServerTestBase<ToggleExecutionModeServerFixtur
public void CanUseViewportAsContainer()
{
Browser.MountTestComponent<VirtualizationComponent>();
- var expectedInitialSpacerStyle = "height: 0px;";
+ var expectedInitialSpacerStyle = "height: 0px; flex-shrink: 0;";
var topSpacer = Browser.Exists(By.Id("viewport-as-root")).FindElement(By.TagName("div"));
Browser.ExecuteJavaScript("const element = document.getElementById('viewport-as-root'); element.scrollIntoView();");
@@ -216,7 +216,7 @@ public class VirtualizationTest : ServerTestBase<ToggleExecutionModeServerFixtur
{
Browser.MountTestComponent<VirtualizationComponent>();
var topSpacer = Browser.Exists(By.Id("incorrect-size-container")).FindElement(By.TagName("div"));
- var expectedInitialSpacerStyle = "height: 0px;";
+ var expectedInitialSpacerStyle = "height: 0px; flex-shrink: 0;";
// Wait until items have been rendered.
Browser.True(() => GetItemCount() > 0);