Fix <WithRecord> render prop type

examples/demo/src/orders/NbItemsField.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
-import { FunctionField, RenderRecordFunction } from 'react-admin';
+import { FunctionField } from 'react-admin';
 import { Order } from '../types';
 
-const render: RenderRecordFunction<Order> = record => record.basket.length;
+const render = (record: Order) => record.basket.length;
 
 const NbItemsField = () => <FunctionField<Order> render={render} />;
 

packages/ra-core/src/controller/record/WithRecord.tsx

@@ -1,4 +1,5 @@
-import { RenderRecordFunction } from '../../types';
+import * as React from 'react';
+import { ReactNode } from 'react';
 import { useRecordContext } from './useRecordContext';
 
 /**
@@ -17,12 +18,12 @@ export const WithRecord = <RecordType extends Record<string, unknown> = any>({
     render,
 }: WithRecordProps<RecordType>) => {
     const record = useRecordContext<RecordType>();
-    return record ? render(record) : null;
+    return record ? <>{render(record)}</> : null;
 };
 
 export interface WithRecordProps<
     RecordType extends Record<string, unknown> = any
 > {
-    render: RenderRecordFunction<RecordType>;
+    render: (record: RecordType) => ReactNode;
     label?: string;
 }

packages/ra-core/src/types.ts

@@ -361,10 +361,6 @@ export interface ResourceProps {
     children?: ReactNode;
 }
 
-export type RenderRecordFunction<
-    RecordType extends Record<string, unknown> = any
-> = (record: RecordType, source?: string) => ReactNode;
-
 export type Exporter = (
     data: any,
     fetchRelatedRecords: (

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { useMemo } from 'react';
-import { RenderRecordFunction, useRecordContext } from 'ra-core';
+import { useMemo, ReactNode } from 'react';
+import { useRecordContext } from 'ra-core';
 import PropTypes from 'prop-types';
 import Typography, { TypographyProps } from '@mui/material/Typography';
 
@@ -50,5 +50,5 @@ export interface FunctionFieldProps<
     RecordType extends Record<string, unknown> = any
 > extends FieldProps<RecordType>,
         Omit<TypographyProps, 'textAlign'> {
-    render: RenderRecordFunction<RecordType>;
+    render: (record: RecordType, source?: string) => ReactNode;
 }