From e3bb206b2dce18e5448aa73c3b0a78a554994a60 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Tue, 20 Apr 2021 12:48:37 +0100
Subject: [PATCH] Update new screen modal

---
 .../NavigationPanel/NewScreenModal.svelte     | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte b/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte
index 6594f4d90c..1253ab91bf 100644
--- a/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte
@@ -82,8 +82,8 @@
   }
 
   const routeChanged = event => {
-    if (!event.target.value.startsWith("/")) {
-      route = "/" + event.target.value
+    if (!event.detail.startsWith("/")) {
+      route = "/" + event.detail
     }
   }
 </script>
@@ -92,24 +92,22 @@
   <Select
     label="Choose a Template"
     bind:value={templateIndex}
-    secondary
-    on:change={ev => templateChanged(ev.target.value)}>
-    {#if templates}
-      {#each templates as template, index}
-        <option value={index}>{template.name}</option>
-      {/each}
-    {/if}
-  </Select>
+    on:change={ev => templateChanged(ev.detail)}
+    options={templates}
+    placeholder={null}
+    getOptionLabel={x => x.name}
+    getOptionValue={(x, idx) => idx} />
   <Input label="Name" bind:value={name} />
   <Input
     label="Url"
     error={routeError}
     bind:value={route}
     on:change={routeChanged} />
-  <Select label="Access" bind:value={roleId} secondary>
-    {#each $roles as role}
-      <option value={role._id}>{role.name}</option>
-    {/each}
-  </Select>
-  <Toggle text="Create link in navigation bar" bind:checked={createLink} />
+  <Select
+    label="Access"
+    bind:value={roleId}
+    options={$roles}
+    getOptionLabel={x => x.name}
+    getOptionValue={x => x._id} />
+  <Toggle text="Create link in navigation bar" bind:value={createLink} />
 </ModalContent>