Improve

dotnet · Jul 26, 2024 · 62e85c0 · 62e85c0
1 parent 62b0853
commit 62e85c0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Core/src/Handlers/View/ViewHandler.Windows.cs b/src/Core/src/Handlers/View/ViewHandler.Windows.cs
@@ -128,7 +128,10 @@ internal static void MapContextFlyout(IElementHandler handler, IContextFlyoutEle
 				}
 				else
 				{
-					uiElement.ClearValue(UIElement.ContextFlyoutProperty);
+					if (contextFlyoutContainer is not IView view || !view.IsPlatformViewNew)
+					{
+						uiElement.ClearValue(UIElement.ContextFlyoutProperty);
+					}
 				}
 			}
 		}

diff --git a/src/Core/src/Platform/Windows/ViewExtensions.cs b/src/Core/src/Platform/Windows/ViewExtensions.cs
@@ -126,7 +126,7 @@ public static void UpdateBackground(this FrameworkElement platformView, IView vi
 
 		public static void UpdateFlowDirection(this FrameworkElement platformView, IView view)
 		{
-			if (!view.IsPlatformViewNew || view.FlowDirection != FlowDirection.LeftToRight)
+			if (!view.IsPlatformViewNew || view.FlowDirection != FlowDirection.MatchParent)
 			{
 				var flowDirection = view.FlowDirection;
 				switch (flowDirection)
-Original file line number
+Diff line change
@@ Expand Up @@
     				}
     				else
     				{
-    					uiElement.ClearValue(UIElement.ContextFlyoutProperty);
+    					if (contextFlyoutContainer is not IView view || !view.IsPlatformViewNew)
+    					{
+    						uiElement.ClearValue(UIElement.ContextFlyoutProperty);
+    					}
     				}
     			}
     		}
@@ Expand Down @@