Skip to content

Commit 77f7ed8

Browse files
authored
Merge pull request #10389 from dricholm/fix/reference-field-query-options
Align queryOptions type in reference components and controller
2 parents bc4a1e0 + 2b0498f commit 77f7ed8

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

packages/ra-core/src/controller/field/useReferenceFieldController.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,9 @@ export interface UseReferenceFieldControllerOptions<
5252
ReferenceRecordType extends RaRecord = RaRecord,
5353
> {
5454
source: string;
55-
queryOptions?: Partial<
56-
UseQueryOptions<ReferenceRecordType[], Error> & {
57-
meta?: any;
58-
}
55+
queryOptions?: Omit<
56+
UseQueryOptions<ReferenceRecordType[], Error>,
57+
'queryFn' | 'queryKey'
5958
>;
6059
reference: string;
6160
link?: LinkToType<ReferenceRecordType>;

packages/ra-ui-materialui/src/field/ReferenceArrayField.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,10 @@ export interface ReferenceArrayFieldProps<
126126
reference: string;
127127
sort?: SortPayload;
128128
sx?: SxProps;
129-
queryOptions?: UseQueryOptions<ReferenceRecordType[], Error>;
129+
queryOptions?: Omit<
130+
UseQueryOptions<ReferenceRecordType[], Error>,
131+
'queryFn' | 'queryKey'
132+
>;
130133
}
131134

132135
export interface ReferenceArrayFieldViewProps

packages/ra-ui-materialui/src/field/ReferenceField.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,9 @@ export interface ReferenceFieldProps<
8383
ReferenceRecordType extends RaRecord = RaRecord,
8484
> extends FieldProps<RecordType> {
8585
children?: ReactNode;
86-
queryOptions?: Partial<
87-
UseQueryOptions<ReferenceRecordType[], Error> & {
88-
meta?: any;
89-
}
86+
queryOptions?: Omit<
87+
UseQueryOptions<ReferenceRecordType[], Error>,
88+
'queryFn' | 'queryKey'
9089
>;
9190
reference: string;
9291
translateChoice?: Function | boolean;

0 commit comments

Comments
 (0)