Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/ra-ui-materialui/src/button/DeleteButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {
* @prop {string} label Button label. Defaults to 'ra.action.delete, translated.
* @prop {boolean} disabled Disable the button.
* @prop {string} variant Material UI variant for the button. Defaults to 'contained'.
* @prop {ReactElement} icon Override the icon. Defaults to the Delete icon from Material UI.
* @prop {ReactNode} icon Override the icon. Defaults to the Delete icon from Material UI.
*
* @param {Props} inProps
*
Expand Down
6 changes: 3 additions & 3 deletions packages/ra-ui-materialui/src/detail/CreateView.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import type { ElementType, ReactElement, ReactNode } from 'react';
import type { ElementType, ReactNode } from 'react';
import {
Card,
type ComponentsOverrides,
Expand Down Expand Up @@ -55,8 +55,8 @@ export const CreateView = (props: CreateViewProps) => {

export interface CreateViewProps
extends Omit<React.HTMLAttributes<HTMLDivElement>, 'title'> {
actions?: ReactElement | false;
aside?: ReactElement;
actions?: ReactNode | false;
aside?: ReactNode;
component?: ElementType;
sx?: SxProps<Theme>;
title?: ReactNode;
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-ui-materialui/src/detail/EditView.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import type { ReactElement, ElementType, ReactNode } from 'react';
import type { ElementType, ReactNode } from 'react';
import {
Card,
CardContent,
Expand Down Expand Up @@ -104,7 +104,7 @@ export const EditView = (props: EditViewProps) => {

export interface EditViewProps
extends Omit<React.HTMLAttributes<HTMLDivElement>, 'id' | 'title'> {
actions?: ReactElement | false;
actions?: ReactNode | false;
aside?: ReactNode;
component?: ElementType;
emptyWhileLoading?: boolean;
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-ui-materialui/src/detail/Show.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import { Loading } from '../layout';
* @typedef {(showContext: Object) => ReactNode} RenderProp
* @param {ShowProps} inProps
* @param {RenderProp} inProps.render A function rendering the page content, receive the show context as its argument.
* @param {ReactElement|false} inProps.actions An element to display above the page content, or false to disable actions.
* @param {ReactNode|false} inProps.actions An element to display above the page content, or false to disable actions.
* @param {string} inProps.className A className to apply to the page content.
* @param {ElementType} inProps.component The component to use as root component (div by default).
* @param {boolean} inProps.emptyWhileLoading Do not display the page content while loading the initial data.
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-ui-materialui/src/detail/Tab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ export interface TabProps extends Omit<MuiTabProps, 'children'> {
className?: string;
divider?: ReactNode;
icon?: ReactElement;
label: string | ReactElement;
label: ReactNode;
path?: string;
record?: RaRecord;
spacing?: ResponsiveStyleValue<number | string>;
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-ui-materialui/src/field/ReferenceOneField.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { ReactElement, ReactNode } from 'react';
import React, { ReactNode } from 'react';
import { UseQueryOptions } from '@tanstack/react-query';
import { Typography } from '@mui/material';
import {
Expand Down Expand Up @@ -106,7 +106,7 @@ export interface ReferenceOneFieldProps<
/**
* @deprecated Use the empty prop instead
*/
emptyText?: string | ReactElement;
emptyText?: ReactNode;
empty?: ReactNode;
offline?: ReactNode;
queryOptions?: Omit<
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-ui-materialui/src/form/SimpleForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ import { Toolbar } from './Toolbar';
* );
*
* @typedef {Object} Props the props you can use (other props are injected by Create or Edit)
* @prop {ReactElement[]} children Input elements
* @prop {ReactNode[]} children Input elements
* @prop {Object} defaultValues
* @prop {Function} validate
* @prop {ReactElement} toolbar The element displayed at the bottom of the form, containing the SaveButton
* @prop {ReactNode} toolbar The element displayed at the bottom of the form, containing the SaveButton
*
* @param {Props} props
*/
Expand Down
6 changes: 3 additions & 3 deletions packages/ra-ui-materialui/src/form/TabbedForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ import { FormTab } from './FormTab';
* );
*
* @typedef {Object} Props the props you can use (other props are injected by Create or Edit)
* @prop {ReactElement[]} FormTab elements
* @prop {ReactNode[]} FormTab elements
* @prop {Object} defaultValues
* @prop {Function} validate
* @prop {ReactElement} toolbar The element displayed at the bottom of the form, containing the SaveButton
* @prop {ReactNode} toolbar The element displayed at the bottom of the form, containing the SaveButton
*
* @param {Props} props
*/
Expand Down Expand Up @@ -126,7 +126,7 @@ export interface TabbedFormProps
resource?: string;
syncWithLocation?: boolean;
tabs?: ReactElement;
toolbar?: ReactElement | false;
toolbar?: ReactNode | false;
warnWhenUnsavedChanges?: boolean;
}

Expand Down
5 changes: 3 additions & 2 deletions packages/ra-ui-materialui/src/input/ReferenceError.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import * as React from 'react';
import { ReactElement } from 'react';
import { ReactNode } from 'react';
import TextField from '@mui/material/TextField';

// @deprecated
export const ReferenceError = ({
label,
error,
}: {
label?: string | ReactElement | false;
label?: ReactNode;
error: Error;
}) => (
<TextField
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-ui-materialui/src/input/SelectInput.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import {
type ReactElement,
type ReactNode,
useCallback,
useEffect,
type ChangeEvent,
Expand Down Expand Up @@ -415,7 +415,7 @@ export type SelectInputProps = Omit<CommonInputProps, 'source'> &
ChoicesProps &
Omit<SupportCreateSuggestionOptions, 'handleChange'> &
Omit<TextFieldProps, 'label' | 'helperText' | 'classes' | 'onChange'> & {
emptyText?: string | ReactElement;
emptyText?: ReactNode;
emptyValue?: any;
resettable?: boolean;
// Source is optional as AutocompleteInput can be used inside a ReferenceInput that already defines the source
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-ui-materialui/src/input/TranslatableInputs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
styled,
} from '@mui/material/styles';
import { StackProps, useThemeProps } from '@mui/material';
import { ReactElement, ReactNode } from 'react';
import type { ReactElement, ReactNode } from 'react';
import {
TranslatableContextProvider,
useTranslatable,
Expand Down
10 changes: 2 additions & 8 deletions packages/ra-ui-materialui/src/layout/MenuItemLink.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
import React, {
forwardRef,
useCallback,
useRef,
type ReactElement,
type ReactNode,
} from 'react';
import React, { forwardRef, useCallback, useRef, type ReactNode } from 'react';
import {
type ComponentsOverrides,
styled,
Expand Down Expand Up @@ -193,7 +187,7 @@ export type MenuItemLinkProps = Omit<
LinkProps & MenuItemProps<'li'>,
'placeholder' | 'onPointerEnterCapture' | 'onPointerLeaveCapture'
> & {
leftIcon?: ReactElement;
leftIcon?: ReactNode;
primaryText?: ReactNode;
/**
* @deprecated
Expand Down
6 changes: 3 additions & 3 deletions packages/ra-ui-materialui/src/list/filter/FilterListItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
styled,
useThemeProps,
} from '@mui/material/styles';
import { memo, type ReactElement } from 'react';
import { memo, type ReactNode } from 'react';
import {
IconButton,
ListItem,
Expand Down Expand Up @@ -262,9 +262,9 @@ const StyledListItem = styled(ListItem, {
});

export interface FilterListItemProps extends Omit<ListItemProps, 'value'> {
label: string | ReactElement;
label: ReactNode;
value: any;
icon?: ReactElement;
icon?: ReactNode;
toggleFilter?: (value: any, filters: any) => any;
isSelected?: (value: any, filters: any) => boolean;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import * as React from 'react';
import { ReactElement, useState } from 'react';
import { useState } from 'react';
import { IconButton, IconButtonProps } from '@mui/material';
import RemoveIcon from '@mui/icons-material/RemoveCircleOutline';
import { useTranslate } from 'ra-core';

import { RemoveSavedQueryDialog } from './RemoveSavedQueryDialog';

export const RemoveSavedQueryIconButton = (
props: IconButtonProps
): ReactElement => {
export const RemoveSavedQueryIconButton = (props: IconButtonProps) => {
const [confirmationOpen, setConfirmationOpen] = useState(false);
const handleConfirmationClose = (): void => {
setConfirmationOpen(false);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { type ReactElement, memo } from 'react';
import { memo } from 'react';
import {
IconButton,
ListItem,
Expand Down Expand Up @@ -27,7 +27,7 @@ const arePropsEqual = (
isEqual(prevProps.value, nextProps.value);

export const SavedQueryFilterListItem = memo(
(inProps: SavedQueryFilterListItemProps): ReactElement => {
(inProps: SavedQueryFilterListItemProps) => {
const props = useThemeProps({
props: inProps,
name: PREFIX,
Expand Down