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

wip, update-query

Browse source
This commit is contained in:
Juho Teperi 2021-11-03 12:16:06 +02:00
parent ac68f0f726
commit 9a5f6a26a8
2 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/reitit-frontend/src/reitit/frontend/easy.cljs
View file

@ -94,3 +94,8 @@
(rfh/replace-state @history name path-params nil)) (rfh/replace-state @history name path-params nil))
([name path-params query-params] ([name path-params query-params]
(rfh/replace-state @history name path-params query-params))) (rfh/replace-state @history name path-params query-params)))
(defn
update-query
([f & args]
))

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

@ -3,8 +3,9 @@
events." events."
(:require [reitit.core :as reitit] (:require [reitit.core :as reitit]
[reitit.frontend :as rf] [reitit.frontend :as rf]
[goog.events :as gevents]) [goog.events :as gevents]
(:import goog.Uri)) goog.Uri
goog.Uri.QueryData))
(defprotocol History (defprotocol History
(-init [this] "Create event listeners") (-init [this] "Create event listeners")
@ -78,7 +79,7 @@
the page location is updated using History API." the page location is updated using History API."
[router e el uri] [router e el uri]
(let [current-domain (if (exists? js/location) (let [current-domain (if (exists? js/location)
(.getDomain (.parse Uri js/location)))] (.getDomain (.parse goog.Uri js/location)))]
(and (or (and (not (.hasScheme uri)) (not (.hasDomain uri))) (and (or (and (not (.hasScheme uri)) (not (.hasDomain uri)))
(= current-domain (.getDomain uri))) (= current-domain (.getDomain uri)))
(not (.-altKey e)) (not (.-altKey e))
@ -109,7 +110,7 @@
ignore-anchor-click (fn [e] ignore-anchor-click (fn [e]
;; Returns the next matching ancestor of event target ;; Returns the next matching ancestor of event target
(when-let [el (closest-by-tag (event-target e) "a")] (when-let [el (closest-by-tag (event-target e) "a")]
(let [uri (.parse Uri (.-href el))] (let [uri (.parse goog.Uri (.-href el))]
(when (ignore-anchor-click-predicate router e el uri) (when (ignore-anchor-click-predicate router e el uri)
(.preventDefault e) (.preventDefault e)
(let [path (str (.getPath uri) (let [path (str (.getPath uri)
@ -235,3 +236,22 @@
path (reitit/match->path match query-params)] path (reitit/match->path match query-params)]
(.replaceState js/window.history nil "" (-href history path)) (.replaceState js/window.history nil "" (-href history path))
(-on-navigate history path)))) (-on-navigate history path))))
(defn
update-query
"Parses query-string part of current URL into Clojure map,
and applies given function to that to create new query-string map,
and encodes those to create new URL, "
[history method f & args]
;; FIXME: Better way?
(assert (#{:replace :push} method))
(let [f (case method
:replace (.-replaceState js/window.history)
:push (.-pushState js/window.history))
^goog.Uri uri (goog.Uri/parse (-get-path history))
query (rf/query-params uri)
new-query (apply f query args)]
(.setQueryData uri (goog.Uri.QueryData/createFromMap (clj->js new-query)))
;; TODO: Not sure if this "/" handling is required, history -get-path maybe handles this?
(f (str (when (empty? (.getPath uri)) "/")
(.toString uri)))))