feat: Allow pass-through of URL hash parameters to card

micwallace · micwallace · commit 723894063b28 · 2024-10-31T00:35:29.000+11:00
diff --git a/javascript/engine-js/src/view/TokenViewData.ts b/javascript/engine-js/src/view/TokenViewData.ts
@@ -72,18 +72,14 @@ export class TokenViewData {
 			body = this.processTags(part, body);
 		}
 
-		// TODO: Due to a floor in the svelte template routing, card param injection for deeplinks will need to be added
-		//       to the card SDK so it does not conflict with current usage of document.location.hash which would break existing TokenScripts
-		//const browserParams = new URLSearchParams(document.location.hash.substring(1));
-
 		return `
 			<!DOCTYPE html>
 				<html lang="en">
 				<head>
 					<title>TokenScript</title>
 					<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 					<script>
-						document.location.hash = '${(this.card.urlFragment ? "#" + this.card.urlFragment : "")}';
+						document.location.hash = '${"#" + this.getCardUrlParameters()}';
 					</script>
 				</head>
 				<body>
@@ -93,6 +89,22 @@ export class TokenViewData {
 		`;
 	}
 
+	public getCardUrlParameters(){
+
+		let urlParams: string;
+
+		if (this.card.urlFragment){
+			urlParams = this.card.urlFragment;
+		} else {
+			const browserHashParams = new URLSearchParams(document.location.hash.substring(1));
+			browserHashParams.set("card", this.card.name);
+			browserHashParams.set("tsViewerType", (new URLSearchParams(document.location.search)).get("viewType") ?? "default");
+			urlParams = browserHashParams.toString();
+		}
+
+		return urlParams;
+	}
+
 	/**
 	 * Process tags to ensure the correct HTML formatting for styles & scripts, reverting entity escaping where necessary.
 	 * @param part
diff --git a/javascript/tokenscript-viewer/src/integration/abstractViewBinding.ts b/javascript/tokenscript-viewer/src/integration/abstractViewBinding.ts
@@ -102,7 +102,7 @@ export abstract class AbstractViewBinding implements IViewBinding {
 
 			if (new URLSearchParams(document.location.search).has("___b64url")){
 				const blob = new Blob([html], {type: "text/html"});
-				iframe.src = URL.createObjectURL(blob) + (card.urlFragment ? "#" + card.urlFragment : "");
+				iframe.src = URL.createObjectURL(blob) + ("#" + viewController.tokenViewData.getCardUrlParameters());
 			} else {
 				iframe.srcdoc = html;
 			}

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ export abstract class AbstractViewBinding implements IViewBinding {`
`102`	`102`
`103`	`103`	`if (new URLSearchParams(document.location.search).has("___b64url")){`
`104`	`104`	`const blob = new Blob([html], {type: "text/html"});`
`105`		`- iframe.src = URL.createObjectURL(blob) + (card.urlFragment ? "#" + card.urlFragment : "");`
	`105`	`+ iframe.src = URL.createObjectURL(blob) + ("#" + viewController.tokenViewData.getCardUrlParameters());`
`106`	`106`	`} else {`
`107`	`107`	`iframe.srcdoc = html;`
`108`	`108`	`}`