File tree Expand file tree Collapse file tree 1 file changed +3
-1
lines changed
packages/payload-authjs/src/payload/utils Expand file tree Collapse file tree 1 file changed +3
-1
lines changed Original file line number Diff line number Diff line change @@ -36,13 +36,15 @@ export const mergeFields = ({
36
36
37
37
// Merge subfields if both have subfields
38
38
if ( "fields" in field && "fields" in existingField ) {
39
- // Merge subfields
39
+ // Merge the field and subfields (existing field has always priority)
40
40
const result = mergeFields ( {
41
41
path : `${ path } .${ field . name } ` ,
42
42
baseFields : existingField . fields ,
43
43
patchFields : field . fields ,
44
44
} ) ;
45
45
existingField . fields = [ ...result . mergedFields , ...result . restFields ] ;
46
+ const { fields : _ , ...restField } = field ;
47
+ Object . assign ( existingField , deepMerge < Field > ( restField , existingField ) ) ;
46
48
} else {
47
49
// Merge the field (existing field has always priority)
48
50
Object . assign ( existingField , deepMerge < Field > ( field , existingField ) ) ;
You can’t perform that action at this time.
0 commit comments