added support for IDestructible

dprevato · Feb 22, 2019 · df7414c · df7414c
1 parent 982d21f
commit df7414c
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 1 deletion.
diff --git a/Source/Prism/Prism.csproj b/Source/Prism/Prism.csproj
@@ -32,6 +32,7 @@
 
   <ItemGroup>
     <Compile Condition=" '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'netcoreapp3.0' " Remove="Navigation/**" />
+    <Compile Include="Navigation/IDestructible.cs" />
     <Compile Update="Properties\Resources.Designer.cs" DesignTime="True" AutoGen="True" DependentUpon="Resources.resx" />
     <EmbeddedResource Update="Properties\Resources.resx" Generator="ResXFileCodeGenerator" LastGenOutput="Resources.Designer.cs" />
   </ItemGroup>

diff --git a/Source/Wpf/Prism.Wpf.Tests/BootstrapperFixture.cs b/Source/Wpf/Prism.Wpf.Tests/BootstrapperFixture.cs
@@ -163,7 +163,7 @@ public void ConfigureDefaultRegionBehaviorsShouldAddSevenDefaultBehaviors()
 
             bootstrapper.CallConfigureDefaultRegionBehaviors();
 
-            Assert.Equal(7, bootstrapper.DefaultRegionBehaviorTypes.Count());
+            Assert.Equal(8, bootstrapper.DefaultRegionBehaviorTypes.Count());
         }
 
         private static void CreateAndConfigureServiceLocatorWithDefaultRegionBehaviors()

diff --git a/Source/Wpf/Prism.Wpf/Bootstrapper.cs b/Source/Wpf/Prism.Wpf/Bootstrapper.cs
@@ -162,6 +162,8 @@ protected virtual IRegionBehaviorFactory ConfigureDefaultRegionBehaviors()
 
                 defaultRegionBehaviorTypesDictionary.AddIfMissing(AutoPopulateRegionBehavior.BehaviorKey,
                                                   typeof(AutoPopulateRegionBehavior));
+
+                defaultRegionBehaviorTypesDictionary.AddIfMissing(IDestructibleRegionBehavior.BehaviorKey, typeof(IDestructibleRegionBehavior));
             }
 
             return defaultRegionBehaviorTypesDictionary;

diff --git a/Source/Wpf/Prism.Wpf/PrismApplicationBase.cs b/Source/Wpf/Prism.Wpf/PrismApplicationBase.cs
@@ -152,6 +152,7 @@ protected virtual void ConfigureDefaultRegionBehaviors(IRegionBehaviorFactory re
                 regionBehaviors.AddIfMissing(RegionMemberLifetimeBehavior.BehaviorKey, typeof(RegionMemberLifetimeBehavior));
                 regionBehaviors.AddIfMissing(ClearChildViewsRegionBehavior.BehaviorKey, typeof(ClearChildViewsRegionBehavior));
                 regionBehaviors.AddIfMissing(AutoPopulateRegionBehavior.BehaviorKey, typeof(AutoPopulateRegionBehavior));
+                regionBehaviors.AddIfMissing(IDestructibleRegionBehavior.BehaviorKey, typeof(IDestructibleRegionBehavior));
             }
         }
 

diff --git a/Source/Wpf/Prism.Wpf/Regions/Behaviors/IDestructibleRegionBehavior.cs b/Source/Wpf/Prism.Wpf/Regions/Behaviors/IDestructibleRegionBehavior.cs
@@ -0,0 +1,29 @@
+using Prism.Common;
+using Prism.Navigation;
+using System;
+using System.Collections.Specialized;
+
+namespace Prism.Regions.Behaviors
+{
+    public class IDestructibleRegionBehavior : RegionBehavior
+    {
+        public const string BehaviorKey = "IDestructibleRegionBehavior";
+
+        protected override void OnAttach()
+        {
+            Region.Views.CollectionChanged += Views_CollectionChanged;
+        }
+
+        private void Views_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action == NotifyCollectionChangedAction.Remove)
+            {
+                foreach (var item in e.OldItems)
+                {
+                    Action<IDestructible> invocation = destructible => destructible.Destroy();
+                    MvvmHelpers.ViewAndViewModelAction(item, invocation);
+                }
+            }
+        }
+    }
+}