[Shell] fix queryParam navigation (#4843)

when navigating to pages, not shell-section, handle the queryParams

- fixes #4837

diff --git a/Xamarin.Forms.Core/Shell/Shell.cs b/Xamarin.Forms.Core/Shell/Shell.cs
index 3a58b76..aa3946b 100644 (file)
--- a/Xamarin.Forms.Core/Shell/Shell.cs
+++ b/Xamarin.Forms.Core/Shell/Shell.cs
@@ -409,11 +409,7 @@ namespace Xamarin.Forms
                        }
 
                        if (!(element is BaseShellItem baseShellItem))
-                       {
                                baseShellItem = element?.Parent as BaseShellItem;
-                               if(baseShellItem == null)
-                                       return;
-                       }
 
                        //filter the query to only apply the keys with matching prefix
                        var filteredQuery = new Dictionary<string, string>(query.Count);
@@ -426,7 +422,10 @@ namespace Xamarin.Forms
                                filteredQuery.Add(key, q.Value);
                        }
 
-                       baseShellItem.ApplyQueryAttributes(filteredQuery);
+                       if (baseShellItem != null)
+                               baseShellItem.ApplyQueryAttributes(filteredQuery);
+                       else if (isLastItem)
+                               ShellContent.ApplyQueryAttributes(element, query);
                }
 
                ShellNavigationState GetNavigationState(ShellItem shellItem, ShellSection shellSection, ShellContent shellContent, IReadOnlyList<Page> sectionStack)

diff --git a/Xamarin.Forms.Core/Shell/ShellContent.cs b/Xamarin.Forms.Core/Shell/ShellContent.cs
index 9c4e7d9..524d6e8 100644 (file)
--- a/Xamarin.Forms.Core/Shell/ShellContent.cs
+++ b/Xamarin.Forms.Core/Shell/ShellContent.cs
@@ -168,7 +168,7 @@ namespace Xamarin.Forms
                        ApplyQueryAttributes(Content as Page, query);
                }
 
-               static void ApplyQueryAttributes(object content, IDictionary<string, string> query)
+               internal static void ApplyQueryAttributes(object content, IDictionary<string, string> query)
                {
                        if (content is IQueryAttributable attributable)
                                attributable.ApplyQueryAttributes(query);