Include query params in page navigations.

dillonkearns · Sep 7, 2023 · 84f5982 · 84f5982
1 parent 36ccccf
commit 84f5982
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/examples/end-to-end/app/Route/Index.elm b/examples/end-to-end/app/Route/Index.elm
@@ -10,7 +10,7 @@ import FatalError exposing (FatalError)
 import Head
 import Head.Seo as Seo
 import Html.Styled exposing (a, div, text)
-import Html.Styled.Attributes as Attr
+import Html.Styled.Attributes as Attr exposing (href)
 import Json.Decode as Decode
 import Json.Encode as Encode
 import Pages.PageUrl exposing (PageUrl)
@@ -101,6 +101,13 @@ view app shared =
  , div [] [ text <| "Greeting: " ++ app.data.greeting ]
  , div [] [ text <| "Greeting: " ++ app.data.portGreeting ]
  , div [] [ text <| "Random Data: " ++ Debug.toString app.data.randomTuple ]
+ , div []
+ [ a
+ [ href "/get-form?page=2"
+ ]
+ [ text "Page 2"
+ ]
+ ]
  , div []
  [ text <|
  "Now: "

diff --git a/examples/end-to-end/cypress/e2e/get-forms.cy.ts b/examples/end-to-end/cypress/e2e/get-forms.cy.ts
@@ -8,4 +8,9 @@ context("dev server with base path", () => {
  cy.contains("Page 2").click();
  cy.contains("Current page: 2");
  });
+ it("navigates to a page with query params from a different starting path", () => {
+ cy.visit("/");
+ cy.contains("Page 2").click();
+ cy.contains("Current page: 2");
+ });
 });
diff --git a/src/Pages/Internal/Platform.elm b/src/Pages/Internal/Platform.elm
@@ -392,7 +392,7 @@ update config appMsg model =
  let
  navigatingToSamePage : Bool
  navigatingToSamePage =
- url.path == model.url.path
+ url.path == model.url.path && url.query == model.url.query
  in
  if navigatingToSamePage then
  -- this is a workaround for an issue with anchor fragment navigation
@@ -403,7 +403,7 @@ update config appMsg model =
 
  else
  ( model
- , BrowserPushUrl url.path
+ , BrowserPushUrl (Url.toString url)
  )
 
  Browser.External href ->