Merge pull request #1353 from reactiveui/develop

+semver: feature

Author: ghuntley

src/ReactiveUI.Tests/ViewLocatorTests.cs

@@ -1,5 +1,4 @@
 using System;
-using ReactiveUI;
 using Splat;
 using Xunit;
 
@@ -72,6 +71,29 @@ object IViewFor.ViewModel
         public IFooViewModel ViewModel { get; set; }
     }
 
+    public interface StrangeInterfaceNotFollowingConvention { }
+
+    public class StrangeClassNotFollowingConvention : StrangeInterfaceNotFollowingConvention { }
+
+    public interface IRoutableFooViewModel : IRoutableViewModel { }
+
+    public class RoutableFooViewModel : ReactiveObject, IRoutableFooViewModel
+    {
+        public IScreen HostScreen { get; set; }
+        public string UrlPathSegment { get; set; }
+    }
+
+    public class RoutableFooView : IViewFor<IRoutableFooViewModel>
+    {
+        object IViewFor.ViewModel
+        {
+            get { return ViewModel; }
+            set { ViewModel = (IRoutableFooViewModel)value; }
+        }
+        public IRoutableFooViewModel ViewModel { get; set; }
+    }
+
+
     public class DefaultViewLocatorTests
     {
         [Fact]
@@ -332,5 +354,40 @@ public void AnErrorIsRaisedIfTheCreationOfTheViewFails()
                 Assert.Equal("This is a test failure.", ex.Message);
             }
         }
+
+        [Fact]
+        public void WithOddInterfaceNameDoesntThrowException()
+        {
+            var resolver = new ModernDependencyResolver();
+
+            resolver.InitializeSplat();
+            resolver.InitializeReactiveUI();
+
+            using (resolver.WithResolver()) {
+                var fixture = new DefaultViewLocator();
+
+                var vm = new StrangeClassNotFollowingConvention();
+
+                fixture.ResolveView((StrangeInterfaceNotFollowingConvention)vm);
+            }
+        }
+
+        [Fact]
+        public void CanResolveViewFromViewModelWithIRoutableViewModelType()
+        {
+            var resolver = new ModernDependencyResolver();
+
+            resolver.InitializeSplat();
+            resolver.InitializeReactiveUI();
+            resolver.Register(() => new RoutableFooView(), typeof(IViewFor<IRoutableFooViewModel>));
+
+            using (resolver.WithResolver()) {
+                var fixture = new DefaultViewLocator();
+                var vm = new RoutableFooViewModel();
+
+                var result = fixture.ResolveView<IRoutableViewModel>(vm);
+                Assert.IsType<RoutableFooView>(result);
+            }
+        }
     }
 }

src/ReactiveUI/ViewLocator.cs

@@ -77,7 +77,7 @@ public DefaultViewLocator(Func<string, string> viewModelToViewFunc = null)
         /// </item>
         /// <item>
         /// <description>
-        /// Repeat steps 1 and 2 with the type resolved from the modified name.
+        /// Repeat steps 1-4 with the type resolved from the modified name.
         /// </description>
         /// </item>
         /// </list>
@@ -107,8 +107,13 @@ public IViewFor ResolveView<T>(T viewModel, string contract = null)
                 return view;
             }
 
-            var toggledType = ToggleViewModelType(viewModel);
-            view = this.AttemptViewResolutionFor(toggledType, contract);
+            view = this.AttemptViewResolutionFor(ToggleViewModelType(viewModel.GetType()), contract);
+
+            if (view != null) {
+                return view;
+            }
+
+            view = this.AttemptViewResolutionFor(ToggleViewModelType(typeof(T)), contract);
 
             if (view != null) {
                 return view;
@@ -120,6 +125,7 @@ public IViewFor ResolveView<T>(T viewModel, string contract = null)
 
         private IViewFor AttemptViewResolutionFor(Type viewModelType, string contract)
         {
+            if (viewModelType == null) return null;
             var viewModelTypeName = viewModelType.AssemblyQualifiedName;
             var proposedViewTypeName = this.ViewModelToViewFunc(viewModelTypeName);
             var view = this.AttemptViewResolution(proposedViewTypeName, contract);
@@ -169,9 +175,8 @@ private IViewFor AttemptViewResolution(string viewTypeName, string contract)
             }
         }
 
-        private static Type ToggleViewModelType<T>(T viewModel)
+        private static Type ToggleViewModelType(Type viewModelType)
         {
-            var viewModelType = typeof(T);
             var viewModelTypeName = viewModelType.AssemblyQualifiedName;
 
             if (viewModelType.GetTypeInfo().IsInterface) {

src/ReactiveUI/Xaml/ViewModelViewHost.cs

@@ -104,18 +104,17 @@ public ViewModelViewHost()
                     var view = viewLocator.ResolveView(x.ViewModel, x.Contract) ?? viewLocator.ResolveView(x.ViewModel, null);
 
                     if (view == null) {
-                        throw new Exception(String.Format("Couldn't find view for '{0}'.", x.ViewModel));
+                        throw new Exception($"Couldn't find view for '{x.ViewModel}'.");
                     }
 
                     view.ViewModel = x.ViewModel;
                     Content = view;
                 }));
-            });
 
-            this
-                .WhenAnyObservable(x => x.ViewContractObservable)
-                .ObserveOn(RxApp.MainThreadScheduler)
-                .Subscribe(x => this.viewContract = x);
+                d(this.WhenAnyObservable(x => x.ViewContractObservable)
+                    .ObserveOn(RxApp.MainThreadScheduler)
+                    .Subscribe(x => viewContract = x));
+            });
         }
 
         static void somethingChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)