Merge pull request #882 from unoplatform/dev/nr/modelsuffix

feat: Including Model in view model suffix
unoplatform · Nov 2, 2022 · 4f90d1b · 4f90d1b
2 parents 22b889a + f1f228e
commit 4f90d1b
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/Uno.Extensions.Navigation.UI/RouteResolverDefault.cs b/src/Uno.Extensions.Navigation.UI/RouteResolverDefault.cs
@@ -8,7 +8,7 @@ public class RouteResolverDefault : RouteResolver
 
 	public string[] ViewSuffixes { get; set; } = new[] { "View", "Page", "Control", "Flyout", "Dialog", "Popup" };
 
-	public string[] ViewModelSuffixes { get; set; } = new[] { "ViewModel", "VM" };
+	public string[] ViewModelSuffixes { get; set; } = new[] { "Model", "ViewModel", "VM" };
 
 	private IDictionary<string, Type>? loadedTypes;
 
@@ -189,12 +189,17 @@ private string TrimSuffices(string? path, IEnumerable<string> suffixes)
 			return string.Empty;
 		}
 
+		var best = path;
 		foreach (var item in suffixes)
 		{
-			path = path.TrimEnd(item, StringComparison.InvariantCultureIgnoreCase);
+			var candidate = path.TrimEnd(item, StringComparison.InvariantCultureIgnoreCase);
+			if (candidate.Length < best.Length)
+			{
+				best = candidate;
+			}
 		}
 
-		return path;
+		return best;
 	}
 
 	public IDictionary<string, Type> LoadedTypes