1.7.0 - better query string handling

craftedbygc · Sep 17, 2024 · c087799 · c087799
1 parent 4849723
commit c087799
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 12 deletions.
diff --git a/dist/taxi.esm.js b/dist/taxi.esm.js
diff --git a/dist/taxi.esm.js.map b/dist/taxi.esm.js.map
diff --git a/dist/taxi.js b/dist/taxi.js
diff --git a/dist/taxi.js.map b/dist/taxi.js.map
diff --git a/dist/taxi.modern.js b/dist/taxi.modern.js
diff --git a/dist/taxi.modern.js.map b/dist/taxi.modern.js.map
diff --git a/dist/taxi.umd.js b/dist/taxi.umd.js
diff --git a/dist/taxi.umd.js.map b/dist/taxi.umd.js.map
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@unseenco/taxi",
 	"description": "A modern page transition library which supports routing, preloading, and additional script reloading.",
-	"version": "1.6.0",
+	"version": "1.7.0",
 	"license": "GPL-3.0-or-later",
 	"source": "src/taxi.js",
 	"main": "src/taxi.js",

diff --git a/src/Core.d.ts b/src/Core.d.ts
@@ -73,6 +73,7 @@ export default class Core {
         raw: string;
         href: string;
         host: string;
+        search: string;
         hasHash: boolean;
         pathname: string;
     };
@@ -127,6 +128,7 @@ export default class Core {
         raw: string;
         href: string;
         host: string;
+        search: string;
         hasHash: boolean;
         pathname: string;
     };

diff --git a/src/Core.js b/src/Core.js
@@ -436,7 +436,11 @@ export default class Core {
 	 */
 	onPopstate = () => {
 		// don't trigger for on-page anchors
-		if (window.location.pathname === this.currentLocation.pathname && !this.isPopping) {
+		if (
+			window.location.pathname === this.currentLocation.pathname
+			&& window.location.search === this.currentLocation.search
+			&& !this.isPopping
+		) {
 			return false
 		}
 

diff --git a/src/helpers.d.ts b/src/helpers.d.ts
@@ -9,12 +9,13 @@ export function parseDom(html: string | Document): Document | any;
  * Extract details from a given URL string. Assumed to be on the current TLD.
  *
  * @param {string} url
- * @return {{raw: string, href: string, host: string, hasHash: boolean, pathname: string}}
+ * @return {{raw: string, href: string, host: string, search: string, hasHash: boolean, pathname: string}}
  */
 export function processUrl(url: string): {
     raw: string;
     href: string;
     host: string;
+    search: string;
     hasHash: boolean;
     pathname: string;
 };

diff --git a/src/helpers.js b/src/helpers.js
@@ -14,7 +14,7 @@ export function parseDom(html) {
  * Extract details from a given URL string. Assumed to be on the current TLD.
  *
  * @param {string} url
- * @return {{raw: string, href: string, host: string, hasHash: boolean, pathname: string}}
+ * @return {{raw: string, href: string, host: string, search: string, hasHash: boolean, pathname: string}}
  */
 export function processUrl(url) {
 	const details = new URL(url, window.location.origin)
@@ -24,6 +24,7 @@ export function processUrl(url) {
 		hasHash: details.hash.length > 0,
 		pathname: details.pathname,
 		host: details.host,
+		search: details.search,
 		raw: url,
 		href: normalized || details.href
 	}