diff --git a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
index 2b63cdd748..c4eb3f04e6 100644
--- a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
+++ b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
@@ -23,11 +23,12 @@
export let info = null
export let disableBindings = false
export let wide
+ export let isolated = false
let highlightType
$: highlightedProp = $builderStore.highlightedSetting
- $: allBindings = getAllBindings(bindings, componentBindings, nested)
+ $: allBindings = getAllBindings(bindings, componentBindings, nested, isolated)
$: safeValue = getSafeValue(value, defaultValue, allBindings)
$: replaceBindings = val => readableToRuntimeBinding(allBindings, val)
@@ -36,7 +37,10 @@
highlightedProp?.key === key ? `highlighted-${highlightedProp?.type}` : ""
}
- const getAllBindings = (bindings, componentBindings, nested) => {
+ const getAllBindings = (bindings, componentBindings, nested, isolated) => {
+ if (isolated) {
+ bindings = []
+ }
if (!nested) {
return bindings
}
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte
index de6993c661..020f86357b 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte
@@ -147,6 +147,7 @@
{componentInstance}
{componentDefinition}
{bindings}
+ {componentBindings}
/>
{/if}
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
index 0b147e867c..6940c8b6fc 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
@@ -151,6 +151,7 @@
propertyFocus={$builderStore.propertyFocus === setting.key}
info={setting.info}
disableBindings={setting.disableBindings}
+ isolated={setting.isolated}
props={{
// Generic settings
placeholder: setting.placeholder || null,
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUIDrawer.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUIDrawer.svelte
index 863333e91d..4b39022880 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUIDrawer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUIDrawer.svelte
@@ -19,6 +19,7 @@
export let conditions = []
export let bindings = []
+ export let componentBindings = []
const flipDurationMs = 150
const actionOptions = [
@@ -55,6 +56,7 @@
]
let dragDisabled = true
+
$: settings = componentStore
.getComponentSettings($selectedComponent?._component)
?.concat({
@@ -213,7 +215,10 @@
options: definition.options,
placeholder: definition.placeholder,
}}
+ nested={definition.nested}
+ isolated={definition.isolated}
{bindings}
+ {componentBindings}
/>
{:else}
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUISection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUISection.svelte
index 07b9d35a64..550d7042a7 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUISection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUISection.svelte
@@ -64,7 +64,12 @@
Show, hide and update components in response to conditions being met.
-
+