Skip to content

Commit cfa143d

Browse files
committed
fix: Merge remaining properties for fields with subfield
1 parent d269d92 commit cfa143d

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

packages/payload-authjs/src/payload/utils/mergeFields.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,15 @@ export const mergeFields = ({
3636

3737
// Merge subfields if both have subfields
3838
if ("fields" in field && "fields" in existingField) {
39-
// Merge subfields
39+
// Merge the field and subfields (existing field has always priority)
4040
const result = mergeFields({
4141
path: `${path}.${field.name}`,
4242
baseFields: existingField.fields,
4343
patchFields: field.fields,
4444
});
4545
existingField.fields = [...result.mergedFields, ...result.restFields];
46+
const { fields: _, ...restField } = field;
47+
Object.assign(existingField, deepMerge<Field>(restField, existingField));
4648
} else {
4749
// Merge the field (existing field has always priority)
4850
Object.assign(existingField, deepMerge<Field>(field, existingField));

0 commit comments

Comments
 (0)