@keenmate/svelte-spa-router 1.0.8 → 2.0.1

package/Router.svelte

@@ -218,14 +218,16 @@
 			throw Error("Action 'link' can only be used with <a> tags")
 		}
 
-		updateLink(node, opts)
+		const self = {}
 
-		return {
-			update(updated) {
-				updated = linkOpts(updated)
-				updateLink(node, updated)
-			}
+		self.update = function(updated) {
+			updated = linkOpts(updated)
+			updateLink.call(self, node, updated)
 		}
+
+		updateLink.call(self, node, opts)
+
+		return self
 	}
 
 	/**
@@ -248,7 +250,7 @@
 	function updateLink(node, opts) {
 		const basePath = get(BasePath)
 
-		let href = opts.href || node.getAttribute("href")
+		let href = opts.href || node.dataset["href"]
 
 		if (get(HashRoutingEnabled)) {
 			if (href && href.charAt(0) == "/") {
@@ -266,39 +268,46 @@
 		}
 
 		node.setAttribute("href", href)
-		node.addEventListener("click", ev => {
-			if (get(HashRoutingEnabled)) {
-				// Prevent default anchor onclick behaviour
-				ev.preventDefault()
-				if (!opts.disabled) {
-					scrollstateHistoryHandler(ev.currentTarget.getAttribute("href"))
-				}
-			}
-			else {
-				// console.log("Handling link click event")
-				const linkTarget = ev.target.getAttribute("target")
-				if (linkTarget && linkTarget !== "_self") {
-					// console.log("Link has special target attr, opening href instead")
-					ev.preventDefault()
-					// prevent pushState when link is perhaps going outside of this window
-					window.open(node.getAttribute("href"), linkTarget)
 
-					return
-				}
-				if (ev.ctrlKey || ev.shiftKey || ev.metaKey) {
-					// console.log("Modifier key has been held while opening link, keeping behaviour intact")
-					return
-				}
+		if (this.specialOnLinkClicked) {
+			node.removeEventListener("click", this.specialOnLinkClicked)
+		}
+		this.specialOnLinkClicked = ev => onLinkClicked(ev, node, opts)
+		node.addEventListener("click", this.specialOnLinkClicked)
+	}
 
-				// console.log("Custom link operation is in place")
+	function onLinkClicked(ev, node, opts) {
+		if (get(HashRoutingEnabled)) {
+			// Prevent default anchor onclick behaviour
+			ev.preventDefault()
+			if (!opts.disabled) {
+				scrollstateHistoryHandler(ev.currentTarget.getAttribute("href"))
+			}
+		}
+		else {
+			// console.log("Handling link click event")
+			const linkTarget = ev.target.getAttribute("target")
+			if (linkTarget && linkTarget !== "_self") {
+				// console.log("Link has special target attr, opening href instead")
 				ev.preventDefault()
+				// prevent pushState when link is perhaps going outside of this window
+				window.open(node.getAttribute("href"), linkTarget)
 
-				const shouldReplace = typeof opts !== "string" && opts.shouldReplace
-
-				jediForcePush(node.getAttribute("href"), shouldReplace)
-				// window.dispatchEvent(new Event(SvelteSPARouterNavigationEvent))
+				return
 			}
-		})
+			if (ev.ctrlKey || ev.shiftKey || ev.metaKey) {
+				// console.log("Modifier key has been held while opening link, keeping behaviour intact")
+				return
+			}
+
+			// console.log("Custom link operation is in place")
+			ev.preventDefault()
+
+			const shouldReplace = typeof opts !== "string" && opts.shouldReplace
+
+			jediForcePush(node.getAttribute("href"), shouldReplace)
+			// window.dispatchEvent(new Event(SvelteSPARouterNavigationEvent))
+		}
 	}
 
 	// Internal function that ensures the argument of the link action is always an object

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@keenmate/svelte-spa-router",
 	"private": false,
-	"version": "1.0.8",
+	"version": "2.0.1",
 	"description": "Router for SPAs using Svelte 4",
 	"main": "Router.svelte",
 	"svelte": "Router.svelte",