bug fix

main_UI.js

@@ -394,49 +394,48 @@ class Router {
     /**
      * @param {string} route
      */
-    async routeTo(path) {
+    handleRouting = async (page) => {
+        if (this.routingStart) {
+            this.routingStart(this.state)
+        }
+        if (this.routes[page]) {
+            await this.routes[page](this.state)
+            this.lastPage = page
+        } else {
+            if (this.routes['404']) {
+                this.routes['404'](this.state);
+            } else {
+                console.error(`No route found for '${page}' and no '404' route is defined.`);
+            }
+        }
+        if (this.routingEnd) {
+            this.routingEnd(this.state)
+        }
+    }
+    async routeTo(destination) {
         try {
             let page
             let wildcards = []
-            let queryString
+            let params = {}
-            let params
+            let [path, queryString] = destination.split('?');
-            [path, queryString] = path.split('?');
             if (path.includes('#'))
                 path = path.split('#')[1];
             if (path.includes('/'))
                 [, page, ...wildcards] = path.split('/')
             else
                 page = path
-            this.state = { page, wildcards, lastPage: this.lastPage }
+            this.state = { page, wildcards, lastPage: this.lastPage, params }
             if (queryString) {
                 params = new URLSearchParams(queryString)
                 this.state.params = Object.fromEntries(params)
             }
-            if (this.routingStart) {
+            if (document.startViewTransition) {
-                this.routingStart(this.state)
-            }
-            if (this.routes[page]) {
-                // Fallback for browsers that don't support View transition API:
-                if (!document.startViewTransition) {
-                    await this.routes[page](this.state)
-                    this.lastPage = page
-                    return;
-                }
-
-                // With a transition:
                 document.startViewTransition(async () => {
-                    await this.routes[page](this.state)
+                    await this.handleRouting(page)
-                    this.lastPage = page
+                })
-                });
             } else {
-                if (this.routes['404']) {
+                // Fallback for browsers that don't support View transition API:
-                    this.routes['404'](this.state);
+                await this.handleRouting(page)
-                } else {
-                    console.error(`No route found for '${page}' and no '404' route is defined.`);
-                }
-            }
-            if (this.routingEnd) {
-                this.routingEnd(this.state)
             }
         } catch (e) {
             console.error(e)