Merge pull request #18430 from unoplatform/dev/youssef/tp-workaround

chore: Remove TemplatedParent workaround
unoplatform · Oct 10, 2024 · 34ed7a6 · 34ed7a6
2 parents d46dd14 + c2d375d
commit 34ed7a6
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Controls/ContentPresenter/ContentPresenter.cs b/src/Uno.UI/UI/Xaml/Controls/ContentPresenter/ContentPresenter.cs
@@ -664,10 +664,6 @@ protected override void OnApplyTemplate()
 #if ANDROID || __IOS__
 				&& this is not NativeCommandBarPresenter // Uno specific: NativeCommandBarPresenter breaks if you inherit from the TP
 #endif
-				// Uno Specific: Workaround to avoid creating a circular reference when TemplatedParent's
-				// Content being a FrameworkElement is incorrectly inherited.
-				// See https://github.com/unoplatform/uno/issues/17470.
-				&& !(pTemplatedParent.Content is FrameworkElement { IsLoaded: true })
 				)
 			{
 				// bool needsRefresh = false;