Skip to content

Commit aeeb21d

Browse files
authored
Merge pull request #11027 from marmelab/fix-Datagrid-ReactElement
[TypeScript] Fix inconsistency in `Datagrid` expand type
2 parents 2d6bb1c + 44eef20 commit aeeb21d

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

packages/ra-core/src/form/useInput.stories.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import * as React from 'react';
2-
import { useForm, FormProvider, useFieldArray } from 'react-hook-form';
32
import { CoreAdminContext } from '../core';
43
import { Form } from './Form';
54
import { InputProps, useInput } from './useInput';

packages/ra-ui-materialui/src/list/datagrid/DatagridBody.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import { cloneElement, memo, FC, ReactElement } from 'react';
2+
import { cloneElement, memo, FC, ReactElement, ReactNode } from 'react';
33
import { SxProps, TableBody, TableBodyProps } from '@mui/material';
44
import clsx from 'clsx';
55
import { Identifier, RaRecord, RecordContextProvider } from 'ra-core';
@@ -76,7 +76,7 @@ export interface DatagridBodyProps extends Omit<TableBodyProps, 'classes'> {
7676
className?: string;
7777
data?: any[];
7878
expand?:
79-
| ReactElement
79+
| ReactNode
8080
| FC<{
8181
id: Identifier;
8282
record: RaRecord;

packages/ra-ui-materialui/src/list/datagrid/DatagridRow.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import React, {
66
useCallback,
77
memo,
88
FC,
9-
ReactElement,
9+
ReactNode,
1010
} from 'react';
1111
import clsx from 'clsx';
1212
import { TableCell, TableRow, TableRowProps, Checkbox } from '@mui/material';
@@ -254,7 +254,7 @@ export interface DatagridRowProps
254254
extends Omit<TableRowProps, 'id' | 'classes'> {
255255
className?: string;
256256
expand?:
257-
| ReactElement
257+
| ReactNode
258258
| FC<{
259259
id: Identifier;
260260
record: RaRecord;

0 commit comments

Comments
 (0)