From be41a855d103d81ab874f99bd5dc3419e1982c95 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 18 Oct 2021 12:02:08 +0100
Subject: [PATCH] Remove redundant fieldTypes

---
 .../design/PropertiesPanel/ComponentSettingsSection.svelte     | 1 -
 .../PropertiesPanel/PropertyControls/FormFieldSelect.svelte    | 3 +--
 .../PropertiesPanel/PropertyControls/PropertyControl.svelte    | 2 --
 packages/client/manifest.json                                  | 1 -
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/ComponentSettingsSection.svelte b/packages/builder/src/components/design/PropertiesPanel/ComponentSettingsSection.svelte
index ca6f0d24d1..f047e9316b 100644
--- a/packages/builder/src/components/design/PropertiesPanel/ComponentSettingsSection.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/ComponentSettingsSection.svelte
@@ -75,7 +75,6 @@
       {#if canRenderControl(setting)}
         <PropertyControl
           type={setting.type}
-          fieldTypes={setting.fieldTypes}
           control={getComponentForSettingType(setting.type)}
           label={setting.label}
           key={setting.key}
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FormFieldSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FormFieldSelect.svelte
index 65b698d779..5527941bd5 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FormFieldSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FormFieldSelect.svelte
@@ -10,7 +10,6 @@
   export let componentInstance
   export let value
   export let type
-  export let fieldTypes
 
   $: form = findClosestMatchingComponent(
     $currentAsset.props,
@@ -19,7 +18,7 @@
   )
   $: datasource = getDatasourceForProvider($currentAsset, form)
   $: schema = getSchemaForDatasource($currentAsset, datasource, true).schema
-  $: options = getOptions(schema, type, fieldTypes)
+  $: options = getOptions(schema, type)
 
   const getOptions = (schema, type) => {
     let entries = Object.entries(schema ?? {})
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte
index acfa057b01..91e67c1685 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte
@@ -13,7 +13,6 @@
   export let control = null
   export let key = ""
   export let type = ""
-  export let fieldTypes = []
   export let value = null
   export let props = {}
   export let onChange = () => {}
@@ -83,7 +82,6 @@
       name={key}
       text={label}
       {type}
-      {fieldTypes}
       {...props}
     />
     {#if bindable && !key.startsWith("_") && type === "text"}
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 393c906a55..2adfd96626 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -1950,7 +1950,6 @@
     "settings": [
       {
         "type": "field/options",
-        "fieldTypes": ["field/options", "field/string"],
         "label": "Field",
         "key": "field"
       },