From 44639fbd655d84bd8627ea88c30de5ad6219c31f Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Fri, 31 Mar 2023 08:14:22 +0200
Subject: [PATCH] Added failing layout test.

---
 .../Layout/LayoutManagerTests.cs               | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/Avalonia.Base.UnitTests/Layout/LayoutManagerTests.cs b/tests/Avalonia.Base.UnitTests/Layout/LayoutManagerTests.cs
index 21723ba182..98d2807db5 100644
--- a/tests/Avalonia.Base.UnitTests/Layout/LayoutManagerTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Layout/LayoutManagerTests.cs
@@ -41,6 +41,24 @@ namespace Avalonia.Base.UnitTests.Layout
             Assert.False(control.Arranged);
         }
 
+        [Fact]
+        public void Doesnt_Measure_And_Arrange_InvalidateMeasured_Control_When_Ancestor_Is_Not_Visible()
+        {
+            var control = new LayoutTestControl();
+            var parent = new Decorator { Child = control };
+            var root = new LayoutTestRoot { Child = parent };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            control.Measured = control.Arranged = false;
+
+            parent.IsVisible = false;
+            control.InvalidateMeasure();
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.False(control.Measured);
+            Assert.False(control.Arranged);
+        }
+
         [Fact]
         public void Arranges_InvalidateArranged_Control()
         {