Reduced duplicated code between Prism.Avalonia and Prism.Wpf `Navigat…

…ion.Region`
PrismLibrary · Dec 14, 2024 · 3e214f3 · 3e214f3
1 parent 6452d99
commit 3e214f3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 92 deletions.
diff --git a/src/Avalonia/Prism.Avalonia/Navigation/Regions/AllActiveRegion.cs b/src/Avalonia/Prism.Avalonia/Navigation/Regions/AllActiveRegion.cs
diff --git a/src/Avalonia/Prism.Avalonia/Navigation/Regions/ContentControlRegionAdapter.cs b/src/Avalonia/Prism.Avalonia/Navigation/Regions/ContentControlRegionAdapter.cs
diff --git a/src/Avalonia/Prism.Avalonia/Prism.Avalonia.csproj b/src/Avalonia/Prism.Avalonia/Prism.Avalonia.csproj
@@ -26,6 +26,8 @@ Prism.Avalonia helps you more easily design and build rich, flexible, and easy t
     <Compile Include="..\..\Wpf\Prism.Wpf\PrismInitializationExtensions.cs" Link="PrismInitializationExtensions.cs" />
     <Compile Include="..\..\Wpf\Prism.Wpf\Ioc\*.cs" LinkBase="Ioc" />
     <Compile Include="..\..\Wpf\Prism.Wpf\Mvvm\*.cs" LinkBase="Mvvm" />
+    <Compile Include="..\..\Wpf\Prism.Wpf\Navigation\Regions\AllActiveRegion.cs" LinkBase="Navigation\Regions" />
+    <Compile Include="..\..\Wpf\Prism.Wpf\Navigation\Regions\ContentControlRegionAdapter.cs" LinkBase="Navigation\Regions" />
 
     <Using Include="Prism.Extensions" />
   </ItemGroup>

diff --git a/src/Wpf/Prism.Wpf/Navigation/Regions/ContentControlRegionAdapter.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/ContentControlRegionAdapter.cs
@@ -29,7 +29,11 @@ protected override void Adapt(IRegion region, ContentControl regionTarget)
                 throw new ArgumentNullException(nameof(regionTarget));
 
             bool contentIsSet = regionTarget.Content != null;
+#if AVALONIA
+            contentIsSet = contentIsSet || regionTarget[ContentControl.ContentProperty] != null;
+#else
             contentIsSet = contentIsSet || regionTarget.HasBinding(ContentControl.ContentProperty);
+#endif
 
             if (contentIsSet)
                 throw new InvalidOperationException(Resources.ContentControlHasContentException);

diff --git a/src/Wpf/Prism.Wpf/PrismInitializationExtensions.cs b/src/Wpf/Prism.Wpf/PrismInitializationExtensions.cs
@@ -44,7 +44,6 @@ internal static void RegisterRequiredTypes(this IContainerRegistry containerRegi
         internal static void RegisterDefaultRegionBehaviors(this IRegionBehaviorFactory regionBehaviors)
         {
 #if AVALONIA
-            //// Avalonia to WPF Equivilant: BindRegionContextToAvaloniaObjectBehavior == BindRegionContextToDependencyObjectBehavior
             regionBehaviors.AddIfMissing<BindRegionContextToAvaloniaObjectBehavior>(BindRegionContextToAvaloniaObjectBehavior.BehaviorKey);
 #else
             regionBehaviors.AddIfMissing<BindRegionContextToDependencyObjectBehavior>(BindRegionContextToDependencyObjectBehavior.BehaviorKey);