Merge pull request reactiveui#1115 from kentcb/icanactivate-for-XF-ac…

…tivation-for-view-fetcher Add support for ICanActivate.
tong-1324 · Jun 24, 2016 · fe66f9c · fe66f9c
2 parents 7d64916 + 39047a7
commit fe66f9c
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/ReactiveUI.XamForms/XamForms/ActivationForViewFetcher.cs b/ReactiveUI.XamForms/XamForms/ActivationForViewFetcher.cs
@@ -20,6 +20,7 @@ public int GetAffinityForView(Type view)
         public IObservable<bool> GetActivationForView(IActivatable view)
         {
             var activation =
+                GetActivationFor(view as ICanActivate) ??
                 GetActivationFor(view as Page) ??
                 GetActivationFor(view as View) ??
                 GetActivationFor(view as Cell) ??
@@ -28,6 +29,17 @@ public IObservable<bool> GetActivationForView(IActivatable view)
             return activation.DistinctUntilChanged();
         }
 
+        private static IObservable<bool> GetActivationFor(ICanActivate canActivate)
+        {
+            if (canActivate == null) {
+                return null;
+            }
+
+            return Observable.Merge(
+                canActivate.Activated.Select(_ => true),
+                canActivate.Deactivated.Select(_ => false));
+        }
+
         private static IObservable<bool> GetActivationFor(Page page)
         {
             if (page == null) {