Attempt to handle inheritance, fail

Author: anaisbetts

ReactiveUI.Tests/ActivationTest.cs

@@ -26,6 +26,19 @@ public ActivatingViewModel()
         }
     }
 
+    public class DerivedActivatingViewModel : ActivatingViewModel
+    {
+        public int IsActiveCountAlso { get; protected set; }
+
+        public DerivedActivatingViewModel()
+        {
+            Activator = this.WhenActivated(d => {
+                IsActiveCountAlso++;
+                d(Disposable.Create(() => IsActiveCountAlso--));
+            });
+        }
+    }
+
     public class ActivatingView : ReactiveObject, IViewFor<ActivatingViewModel>
     {
         ActivatingViewModel viewModel;
@@ -84,6 +97,26 @@ public void PreviousActivationsGetTrashedOnDoubleActivate()
             fixture.Activator.Deactivate();
             Assert.Equal(0, fixture.IsActiveCount);
         }
+
+        [Fact]
+        public void DerivedActivationsDontGetStomped()
+        {
+            var fixture = new DerivedActivatingViewModel();
+            Assert.Equal(0, fixture.IsActiveCount);
+            Assert.Equal(0, fixture.IsActiveCountAlso);
+
+            fixture.Activator.Activate();
+            Assert.Equal(1, fixture.IsActiveCount);
+            Assert.Equal(1, fixture.IsActiveCountAlso);
+
+            fixture.Activator.Activate();
+            Assert.Equal(1, fixture.IsActiveCount);
+            Assert.Equal(1, fixture.IsActiveCountAlso);
+
+            fixture.Activator.Deactivate();
+            Assert.Equal(0, fixture.IsActiveCount);
+            Assert.Equal(0, fixture.IsActiveCountAlso);
+        }
     }
 
     public class ActivatingViewTests

ReactiveUI/Activation.cs

@@ -40,14 +40,31 @@ public static class ViewForMixins
     {
         public static ViewModelActivator WhenActivated(this ISupportsActivation This, Func<IEnumerable<IDisposable>> block)
         {
-            return new ViewModelActivator(block);
+            var activator = This.Activator;
+
+            return new ViewModelActivator(() =>{
+                var list = block().ToList();
+
+                if (activator != null) {
+                    list.Add(activator.Activate());
+                }
+
+                return list;
+            });
         }
 
         public static ViewModelActivator WhenActivated(this ISupportsActivation This, Action<Action<IDisposable>> block)
         {
+            var activator = This.Activator;
+
             return new ViewModelActivator(() => {
                 var ret = new List<IDisposable>();
                 block(ret.Add);
+
+                if (activator != null) {
+                    ret.Add(activator.Activate());
+                }
+
                 return ret;
             });
         }