luciano/reitit
1
0
Fork 0
mirror of https://github.com/metosin/reitit.git synced 2025-12-23 02:41:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Apply query parameters encoding on rfe/set-query

Browse source
This commit is contained in:
Juho Teperi 2025-01-22 11:10:39 +02:00
parent 21e5840f13
commit 1ba77a7267
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/reitit-frontend/src/reitit/frontend/history.cljs
View file

@ -289,13 +289,18 @@
New query params can be given as a map, or a function taking New query params can be given as a map, or a function taking
the old params and returning the new modified params. the old params and returning the new modified params.
Note: The query parameter values aren't coereced, so the The current path is matched against the routing tree, and the match data
update fn will see string values for all query params." (schema, coercion) is used to encode the query parameters."
([history new-query-or-update-fn] ([history new-query-or-update-fn]
(set-query history new-query-or-update-fn nil)) (set-query history new-query-or-update-fn nil))
([history new-query-or-update-fn {:keys [replace] :as opts}] ([history new-query-or-update-fn {:keys [replace] :as opts}]
(let [current-path (-get-path history) (let [current-path (-get-path history)
new-path (rf/set-query-params current-path new-query-or-update-fn)] ;; FIXME: What if there is no match?
match (rf/match-by-path (.-router history) current-path)
query-params (if (fn? new-query-or-update-fn)
(new-query-or-update-fn (:query (:parameters match)))
new-query-or-update-fn)
new-path (rf/match->path match query-params (:fragment (:parameters match)))]
(if replace (if replace
(.replaceState js/window.history nil "" (-href history new-path)) (.replaceState js/window.history nil "" (-href history new-path))
(.pushState js/window.history nil "" (-href history new-path))) (.pushState js/window.history nil "" (-href history new-path)))

4
test/cljs/reitit/frontend/easy_test.cljs
View file

@ -69,11 +69,11 @@
;; 2. /bar/2?a=1 ;; 2. /bar/2?a=1
6 (do (is (= "/bar/2?a=1" url) 6 (do (is (= "/bar/2?a=1" url)
"update-query with map") "update-query with map")
(rfe/set-query #(assoc % :b "foo") {:replace true})) (rfe/set-query #(assoc % :q "x") {:replace true}))
;; 0. / ;; 0. /
;; 1. /bar/2 ;; 1. /bar/2
;; 2. /bar/2?a=1&b=foo ;; 2. /bar/2?a=1&b=foo
7 (do (is (= "/bar/2?a=1&b=foo" url) 7 (do (is (= "/bar/2?a=1&q=__x" url)
"update-query with fn") "update-query with fn")
(.go js/window.history -2)) (.go js/window.history -2))
;; 0. / ;; 0. /