another parameter fix

TinyStuff · Jun 27, 2022 · 8bc2793 · 8bc2793
1 parent 941399c
commit 8bc2793
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/MAUI/TinyMvvm.Maui/TinyViewModel.cs b/src/MAUI/TinyMvvm.Maui/TinyViewModel.cs
@@ -170,6 +170,7 @@ protected bool Set<T>(ref T field, T newValue, [CallerMemberName] string? proper
         return false;
     }
 
+    private const string TinyParameterKey = "tinyParameter";
     /// <inheritdoc />
     public async void ApplyQueryAttributes(IDictionary<string, object> query)
     {
@@ -178,9 +179,26 @@ public async void ApplyQueryAttributes(IDictionary<string, object> query)
             return;
         }
 
-        if (query.ContainsKey("tinyParameter"))
+        if (query.ContainsKey(TinyParameterKey))
         {
-            NavigationParameter = query["tinyParameter"];
+            NavigationParameter = query[TinyParameterKey];
+
+            if (query.Count > 1)
+            {
+                var queryParameters = new Dictionary<string, object>();
+
+                foreach (var item in query)
+                {
+                    if (item.Key == TinyParameterKey)
+                    {
+                        continue;
+                    }
+
+                    queryParameters.Add(item.Key, item.Value);
+                }
+
+                QueryParameters = queryParameters;
+            }
         }
         else
         {

diff --git a/src/MAUI/TinyMvvm.Sample/ViewModels/MainViewModel.cs b/src/MAUI/TinyMvvm.Sample/ViewModels/MainViewModel.cs
@@ -39,7 +39,7 @@ public string Text
     private ICommand show;
     public ICommand Show => show ??= new TinyCommand<City>(async (city) =>
     {
-        await Navigation.NavigateTo(nameof(DetailsViewModel), city);
+        await Navigation.NavigateTo($"{nameof(DetailsViewModel)}?id=1", city);
     });
 
     private ObservableCollection<City> cities = new ObservableCollection<City>();