fix: use correct label for array and object subfields

measuredco · Jan 10, 2025 · c00ea00 · c00ea00
1 parent a5f2d08
commit c00ea00
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/packages/core/components/AutoField/fields/ArrayField/index.tsx b/packages/core/components/AutoField/fields/ArrayField/index.tsx
@@ -308,14 +308,20 @@ export const ArrayField = ({
                                       "undefined"
                                     ? readOnlyFields[subFieldName]
                                     : readOnlyFields[wildcardFieldName];
+
+                                  const label = subField.label || fieldName;
+
                                   return (
                                     <AutoFieldPrivate
                                       key={subFieldName}
                                       name={subFieldName}
-                                      label={subField.label || fieldName}
+                                      label={label}
                                       id={`${_arrayId}_${fieldName}`}
                                       readOnly={subReadOnly}
-                                      field={subField}
+                                      field={{
+                                        ...subField,
+                                        label, // May be used by custom fields
+                                      }}
                                       value={data[fieldName]}
                                       onChange={(val, ui) => {
                                         onChange(

diff --git a/packages/core/components/AutoField/fields/ObjectField/index.tsx b/packages/core/components/AutoField/fields/ObjectField/index.tsx
@@ -51,14 +51,19 @@ export const ObjectField = ({
               ? readOnlyFields[subFieldName]
               : readOnlyFields[wildcardFieldName];
 
+            const label = subField.label || fieldName;
+
             return (
               <AutoFieldPrivate
                 key={subFieldName}
                 name={subFieldName}
-                label={subField.label || fieldName}
+                label={label}
                 id={`${id}_${fieldName}`}
                 readOnly={subReadOnly}
-                field={subField}
+                field={{
+                  ...subField,
+                  label, // May be used by custom fields
+                }}
                 value={data[fieldName]}
                 onChange={(val, ui) => {
                   onChange(