From e02f4c839e99008e9007b0a3d5095d90c608dc6e Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Wed, 21 Jul 2021 14:25:02 +0100
Subject: [PATCH 1/3] Remove icon from definition of fields to avoid icon
 issues

---
 packages/builder/src/constants/backend/index.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/packages/builder/src/constants/backend/index.js b/packages/builder/src/constants/backend/index.js
index de49883cf1..88152deb0f 100644
--- a/packages/builder/src/constants/backend/index.js
+++ b/packages/builder/src/constants/backend/index.js
@@ -1,7 +1,6 @@
 export const FIELDS = {
   STRING: {
     name: "Text",
-    icon: "ri-text",
     type: "string",
     constraints: {
       type: "string",
@@ -11,7 +10,6 @@ export const FIELDS = {
   },
   LONGFORM: {
     name: "Long Form Text",
-    icon: "ri-file-text-line",
     type: "longform",
     constraints: {
       type: "string",
@@ -21,7 +19,6 @@ export const FIELDS = {
   },
   OPTIONS: {
     name: "Options",
-    icon: "ri-list-check-2",
     type: "options",
     constraints: {
       type: "string",
@@ -31,7 +28,6 @@ export const FIELDS = {
   },
   NUMBER: {
     name: "Number",
-    icon: "ri-number-1",
     type: "number",
     constraints: {
       type: "number",
@@ -41,7 +37,6 @@ export const FIELDS = {
   },
   BOOLEAN: {
     name: "Boolean",
-    icon: "ri-toggle-line",
     type: "boolean",
     constraints: {
       type: "boolean",
@@ -50,7 +45,6 @@ export const FIELDS = {
   },
   DATETIME: {
     name: "Date/Time",
-    icon: "ri-calendar-event-fill",
     type: "datetime",
     constraints: {
       type: "string",
@@ -64,7 +58,6 @@ export const FIELDS = {
   },
   ATTACHMENT: {
     name: "Attachment",
-    icon: "ri-file-line",
     type: "attachment",
     constraints: {
       type: "array",
@@ -73,7 +66,6 @@ export const FIELDS = {
   },
   LINK: {
     name: "Relationship",
-    icon: "ri-link",
     type: "link",
     constraints: {
       type: "array",
@@ -82,7 +74,6 @@ export const FIELDS = {
   },
   FORMULA: {
     name: "Formula",
-    icon: "ri-braces-line",
     type: "formula",
     constraints: {
       type: "string",

From c48300b1594e54467a5bd1b8eef9a30f64f19a7a Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Wed, 21 Jul 2021 14:35:37 +0100
Subject: [PATCH 2/3] Set default getOptionIcon prop to avoid crash when using
 core select, like in client apps

---
 packages/bbui/src/Form/Core/Select.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/bbui/src/Form/Core/Select.svelte b/packages/bbui/src/Form/Core/Select.svelte
index 398672af10..a815ae2948 100644
--- a/packages/bbui/src/Form/Core/Select.svelte
+++ b/packages/bbui/src/Form/Core/Select.svelte
@@ -10,7 +10,7 @@
   export let options = []
   export let getOptionLabel = option => option
   export let getOptionValue = option => option
-  export let getOptionIcon = null
+  export let getOptionIcon = () => null
   export let readonly = false
   export let quiet = false
   export let autoWidth = false

From e44a82bb72947eaf7e6fbe0deac0478201eec527 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Wed, 21 Jul 2021 14:35:55 +0100
Subject: [PATCH 3/3] Set default getOptionIcon prop in core Picker to avoid
 crash

---
 packages/bbui/src/Form/Core/Picker.svelte | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
index e7de91a7ab..e2456271c7 100644
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@@ -18,7 +18,7 @@
   export let onSelectOption = () => {}
   export let getOptionLabel = option => option
   export let getOptionValue = option => option
-  export let getOptionIcon = null
+  export let getOptionIcon = () => null
   export let open = false
   export let readonly = false
   export let quiet = false
@@ -45,7 +45,7 @@
 >
   {#if fieldIcon}
     <span class="icon-Placeholder-Padding">
-      <img src={fieldIcon} alt="Picker Icon" width="20" height="15" />
+      <img src={fieldIcon} alt="icon" width="20" height="15" />
     </span>
   {/if}
 
@@ -115,7 +115,7 @@
               <span class="icon-Padding">
                 <img
                   src={getOptionIcon(option, idx)}
-                  alt="test"
+                  alt="icon"
                   width="20"
                   height="15"
                 />