Simply navigation URLs

packages/builder/src/components/commandPalette/CommandPalette.svelte

@@ -121,7 +121,7 @@
       type: "Screen",
       name: screen.routing.route,
       icon: "WebPage",
-      action: () => $goto(`./design/${screen._id}/components`),
+      action: () => $goto(`./design/${screen._id}`),
     })),
     ...($automationStore?.automations?.map(automation => ({
       type: "Automation",

packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte

@@ -207,10 +207,10 @@
   }
 
   const toggleAddComponent = () => {
-    if ($isActive(`./${selectedComponentId}/new`)) {
+    if ($isActive(`./:componentId/new`)) {
-      $goto(`./${selectedComponentId}`)
+      $goto(`./:componentId`)
     } else {
-      $goto(`./${selectedComponentId}/new`)
+      $goto(`./:componentId/new`)
     }
   }
 

packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentKeyHandler.svelte

@@ -36,7 +36,7 @@
       confirmEjectDialog.show()
     },
     ["Ctrl+Enter"]: () => {
-      $goto(`./${$store.selectedComponentId}/new`)
+      $goto(`./:componentId/new`)
     },
     ["Delete"]: component => {
       // Don't show confirmation for the screen itself

packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/index.svelte

@@ -14,10 +14,10 @@
   let scrolling = false
 
   const toNewComponentRoute = () => {
-    if ($isActive(`./${$store.selectedComponentId}/new`)) {
+    if ($isActive(`./:componentId/new`)) {
-      $goto(`./${$store.selectedComponentId}`)
+      $goto(`./:componentId`)
     } else {
-      $goto(`./${$store.selectedComponentId}/new`)
+      $goto(`./:componentId/new`)
     }
   }