Alternative fix committed

dotnet · Nov 1, 2024 · a1e68e5 · a1e68e5
1 parent e76059f
commit a1e68e5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/Controls/src/Core/Shell/Shell.cs b/src/Controls/src/Core/Shell/Shell.cs
@@ -1860,9 +1860,9 @@ ShellAppearance GetAppearanceForPivot(Element pivot)
 			return null;
 		}
 
-		void NotifyFlyoutBehaviorObservers()
+		internal void NotifyFlyoutBehaviorObservers()
 		{
-			if (CurrentItem is null || CurrentItem.CurrentItem is not IShellSectionController)
+			if (CurrentItem == null || GetVisiblePage() == null)
 				return;
 
 			var behavior = (this as IFlyoutView).FlyoutBehavior;

diff --git a/src/Controls/src/Core/Shell/ShellContent.cs b/src/Controls/src/Core/Shell/ShellContent.cs
@@ -228,11 +228,14 @@ internal void EvaluateDisconnect()
 
 			// If the user has set the IsVisible property on this shell content to false
 			bool disconnect = true;
-
-			if(Parent is ShellSection shellSection &&
+
+			Shell shell = null;
+
+			if (Parent is ShellSection shellSection &&
 				shellSection.Parent is ShellItem shellItem &&
-				shellItem.Parent is Shell shell)
+				shellItem.Parent is Shell shellInstance)
 			{
+				shell = shellInstance;
 				disconnect = 
 					!this.IsVisible || // user has set the IsVisible property to false
 					(_contentCache is not null && !_contentCache.IsVisible) || // user has set IsVisible on the Page to false
@@ -243,6 +246,7 @@ shellSection.Parent is ShellItem shellItem &&
 
 			if (!disconnect)
 			{
+				shell?.NotifyFlyoutBehaviorObservers();
 				return;
 			}