From 22ae329a2a2f4125c7937bcf05fd13fc95f4f13f Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Mon, 3 Jul 2023 14:48:36 +0100
Subject: [PATCH] Fix to ensure screens are listed in the navigateTo button
 action and that any URL configured there is trimmed

---
 .../common/bindings/DrawerBindableCombobox.svelte         | 1 +
 .../controls/ButtonActionEditor/actions/NavigateTo.svelte | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte b/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte
index 55f7866453..edf65797c2 100644
--- a/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte
+++ b/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte
@@ -68,6 +68,7 @@
     on:blur={() => dispatch("blur")}
     {placeholder}
     {error}
+    options={allOptions}
   />
   {#if !disabled}
     <div class="icon" on:click={bindingDrawer.show}>
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte
index dca2887fb4..edbdc53083 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte
@@ -43,7 +43,9 @@
       title="Destination"
       placeholder="/screen"
       value={parameters.url}
-      on:change={value => (parameters.url = value.detail)}
+      on:change={value => {
+        parameters.url = value.detail ? value.detail.trim() : value.detail
+      }}
       {bindings}
       options={urlOptions}
       appendBindingsAsOptions={false}
@@ -55,7 +57,9 @@
       title="Destination"
       placeholder="/url"
       value={parameters.url}
-      on:change={value => (parameters.url = value.detail)}
+      on:change={value => {
+        parameters.url = value.detail ? value.detail.trim() : value.detail
+      }}
       {bindings}
     />
     <div />