From f7a08635afc5d7e348a26735baf763a5f8a24128 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Mon, 27 Oct 2025 10:47:04 +0000
Subject: [PATCH 1/2] Add `asConfig` prop to `FieldsProvider`

---
 resources/js/components/ui/Publish/Fields.vue         | 7 +++++--
 resources/js/components/ui/Publish/FieldsProvider.vue | 5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/ui/Publish/Fields.vue b/resources/js/components/ui/Publish/Fields.vue
index 08c71eb8a8a..f3e23f79a9c 100644
--- a/resources/js/components/ui/Publish/Fields.vue
+++ b/resources/js/components/ui/Publish/Fields.vue
@@ -2,9 +2,12 @@
 import { injectContainerContext } from './Container.vue';
 import { injectFieldsContext } from './FieldsProvider.vue';
 import Field from './Field.vue';
+import { computed } from 'vue';
 
-const { asConfig } = injectContainerContext();
-const { fields, fieldPathPrefix } = injectFieldsContext();
+const { asConfig: containerAsConfig } = injectContainerContext();
+const { fields, asConfig: fieldsAsConfig } = injectFieldsContext();
+
+const asConfig = computed(() => fieldsAsConfig.value !== undefined ? fieldsAsConfig.value : containerAsConfig.value);
 </script>
 
 <template>
diff --git a/resources/js/components/ui/Publish/FieldsProvider.vue b/resources/js/components/ui/Publish/FieldsProvider.vue
index 46a47044253..da96e062c98 100644
--- a/resources/js/components/ui/Publish/FieldsProvider.vue
+++ b/resources/js/components/ui/Publish/FieldsProvider.vue
@@ -23,6 +23,10 @@ const props = defineProps({
         type: Boolean,
         default: false,
     },
+    asConfig: {
+        type: Boolean,
+        default: undefined,
+    },
 });
 
 provideFieldsContext({
@@ -30,6 +34,7 @@ provideFieldsContext({
     fieldPathPrefix: toRef(() => props.fieldPathPrefix),
     metaPathPrefix: toRef(() => props.metaPathPrefix),
     readOnly: toRef(() => props.readOnly),
+    asConfig: toRef(() => props.asConfig),
 });
 </script>
 

From 830b12e1a6def86a732508d67cab45695fd80e41 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Mon, 27 Oct 2025 10:47:33 +0000
Subject: [PATCH 2/2] Nested fields shouldn't use config layout

---
 resources/js/components/fieldtypes/GroupFieldtype.vue  | 1 +
 resources/js/components/fieldtypes/bard/Set.vue        | 1 +
 resources/js/components/fieldtypes/grid/Row.vue        | 1 +
 resources/js/components/fieldtypes/grid/StackedRow.vue | 1 +
 resources/js/components/fieldtypes/replicator/Set.vue  | 1 +
 5 files changed, 5 insertions(+)

diff --git a/resources/js/components/fieldtypes/GroupFieldtype.vue b/resources/js/components/fieldtypes/GroupFieldtype.vue
index 1a5bfc13b3c..6483cb10c51 100644
--- a/resources/js/components/fieldtypes/GroupFieldtype.vue
+++ b/resources/js/components/fieldtypes/GroupFieldtype.vue
@@ -13,6 +13,7 @@
                     <div :class="{ 'bg-white dark:bg-gray-800 dark:border-dark-900 rounded-lg border': config.border }">
                         <FieldsProvider
                             :fields="fields"
+                            :as-config="false"
                             :field-path-prefix="fieldPathPrefix ? `${fieldPathPrefix}.${handle}` : handle"
                             :meta-path-prefix="metaPathPrefix ? `${metaPathPrefix}.${handle}` : handle"
                         >
diff --git a/resources/js/components/fieldtypes/bard/Set.vue b/resources/js/components/fieldtypes/bard/Set.vue
index 84bc695efb6..c85b68dff4c 100644
--- a/resources/js/components/fieldtypes/bard/Set.vue
+++ b/resources/js/components/fieldtypes/bard/Set.vue
@@ -86,6 +86,7 @@
             >
                 <FieldsProvider
                     :fields="fields"
+                    :as-config="false"
                     :field-path-prefix="fieldPathPrefix"
                     :meta-path-prefix="metaPathPrefix"
                 >
diff --git a/resources/js/components/fieldtypes/grid/Row.vue b/resources/js/components/fieldtypes/grid/Row.vue
index 9ca6a648984..ada524d98fa 100644
--- a/resources/js/components/fieldtypes/grid/Row.vue
+++ b/resources/js/components/fieldtypes/grid/Row.vue
@@ -4,6 +4,7 @@
 
         <FieldsProvider
             :fields="fields"
+            :as-config="false"
             :field-path-prefix="`${fieldPathPrefix}.${index}`"
             :meta-path-prefix="`${metaPathPrefix}.existing.${values._id}`"
         >
diff --git a/resources/js/components/fieldtypes/grid/StackedRow.vue b/resources/js/components/fieldtypes/grid/StackedRow.vue
index 08bef208475..b891a37726e 100644
--- a/resources/js/components/fieldtypes/grid/StackedRow.vue
+++ b/resources/js/components/fieldtypes/grid/StackedRow.vue
@@ -30,6 +30,7 @@
         <div class="px-4 py-3">
             <FieldsProvider
                 :fields="fields"
+                :as-config="false"
                 :field-path-prefix="`${fieldPathPrefix}.${index}`"
                 :meta-path-prefix="`${metaPathPrefix}.existing.${values._id}`"
             >
diff --git a/resources/js/components/fieldtypes/replicator/Set.vue b/resources/js/components/fieldtypes/replicator/Set.vue
index b3e21d73966..966809e88c9 100644
--- a/resources/js/components/fieldtypes/replicator/Set.vue
+++ b/resources/js/components/fieldtypes/replicator/Set.vue
@@ -205,6 +205,7 @@ function destroy() {
             >
                 <FieldsProvider
                     :fields="config.fields"
+                    :as-config="false"
                     :field-path-prefix="fieldPathPrefix"
                     :meta-path-prefix="metaPathPrefix"
                 >