Skip to content

Commit

Permalink
fix(core): rebase next and fix merge conflict (#4861)
Browse files Browse the repository at this point in the history
  • Loading branch information
ninaandal authored Aug 31, 2023
1 parent 532e7eb commit a9c36c5
Showing 1 changed file with 4 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,10 @@ export function defaultResolveFieldComponent(
return PrimitiveField as React.ComponentType<Omit<FieldProps, 'renderDefault'>>
}

if (typeChain.some((t) => t.name === 'slug')) {
return PrimitiveField as React.ComponentType<Omit<FieldProps, 'renderDefault'>>
}

if (typeChain.some((t) => isReferenceSchemaType(t))) {
return ReferenceField as React.ComponentType<Omit<FieldProps, 'renderDefault'>>
}
Expand Down

2 comments on commit a9c36c5

@vercel
Copy link

@vercel vercel bot commented on a9c36c5 Aug 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

performance-studio – ./

performance-studio-git-next.sanity.build
performance-studio.sanity.build

@vercel
Copy link

@vercel vercel bot commented on a9c36c5 Aug 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

test-studio – ./

test-studio.sanity.build
test-studio-git-next.sanity.build

Please sign in to comment.