Merge pull request #7770 from marmelab/issue7702

[Typescript] Fix `FunctionField` generic typing restriction
marmelab · Jun 2, 2022 · c3a354a · c3a354a
2 parents c0d3aa9 + 913d40d
commit c3a354a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/packages/ra-ui-materialui/src/field/FunctionField.tsx b/packages/ra-ui-materialui/src/field/FunctionField.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { useMemo } from 'react';
-import { RaRecord, useRecordContext } from 'ra-core';
+import { useRecordContext } from 'ra-core';
 import PropTypes from 'prop-types';
 import Typography, { TypographyProps } from '@mui/material/Typography';
 
@@ -17,7 +17,8 @@ import { PublicFieldProps, InjectedFieldProps, fieldPropTypes } from './types';
  *     render={record => record && `${record.first_name} ${record.last_name}`}
  * />
  */
-export const FunctionField = <RecordType extends RaRecord = any>(
+
+export const FunctionField = <RecordType extends unknown = any>(
     props: FunctionFieldProps<RecordType>
 ) => {
     const { className, source = '', render, ...rest } = props;
@@ -45,7 +46,7 @@ FunctionField.propTypes = {
     render: PropTypes.func.isRequired,
 };
 
-export interface FunctionFieldProps<RecordType extends RaRecord = any>
+export interface FunctionFieldProps<RecordType extends unknown = any>
     extends PublicFieldProps,
         InjectedFieldProps<RecordType>,
         Omit<TypographyProps, 'textAlign'> {

diff --git a/packages/ra-ui-materialui/src/field/types.ts b/packages/ra-ui-materialui/src/field/types.ts
@@ -25,8 +25,7 @@ export interface PublicFieldProps {
     fullWidth?: boolean;
 }
 
-// Props injected by react-admin
-export interface InjectedFieldProps<RecordType extends RaRecord = any> {
+export interface InjectedFieldProps<RecordType = any> {
     record?: RecordType;
     resource?: string;
 }