dillonkearns/elm-pages-v3-beta
1
1
Fork 0
mirror of https://github.com/dillonkearns/elm-pages-v3-beta.git synced 2024-11-27 11:05:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Pass in new (not previous) pageStaticData to onPageChange.

Browse Source
This commit is contained in:
Dillon Kearns 2021-04-22 14:03:25 -07:00
parent d3b1fbad4a
commit af722c676f
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Pages/Internal/Platform.elm
View File

@ -362,10 +362,26 @@ update config appMsg model =
-- to keep track of the last url change
Ok ( ( _, contentJson, updatedCache ), pageData ) ->
let
updatedPageData =
updatedPageStaticData
|> Result.map
(\pageStaticData ->
{ userModel = userModel
, sharedStaticData = pageData.sharedStaticData
, pageStaticData = pageStaticData
}
)
updatedPageStaticData =
StaticHttpRequest.resolve ApplicationType.Browser
(config.staticData (config.urlToRoute url))
contentJson.staticData
|> Result.mapError (\_ -> "Http error")
( userModel, userCmd ) =
config.update
pageData.sharedStaticData
pageData.pageStaticData
(updatedPageStaticData |> Result.withDefault pageData.pageStaticData)
(Just model.key)
(config.onPageChange
{ path = urlToPagePath url model.baseUrl
@ -379,18 +395,7 @@ update config appMsg model =
( { model
| url = url
, contentCache = updatedCache
, pageData =
StaticHttpRequest.resolve ApplicationType.Browser
(config.staticData (config.urlToRoute url))
contentJson.staticData
|> Result.mapError (\_ -> "Http error")
|> Result.map
(\pageStaticData ->
{ userModel = userModel
, sharedStaticData = pageData.sharedStaticData
, pageStaticData = pageStaticData
}
)
, pageData = updatedPageData
}
, Cmd.batch
[ userCmd |> Cmd.map UserMsg