Skip to content

Fix pass Confirm props to the underlying MUI Dialog component #8176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 16, 2022
Merged

Fix pass Confirm props to the underlying MUI Dialog component #8176

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b53173
Fix pass Confirm props to the underlying MUI Dialog
WiXSL Sep 16, 2022
cbe9518
Fix types
WiXSL Sep 16, 2022
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
10 changes: 4 additions & 6 deletions packages/ra-ui-materialui/src/layout/Confirm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react';
import { styled } from '@mui/material/styles';
import { useCallback, MouseEventHandler } from 'react';
import PropTypes, { ReactComponentLike } from 'prop-types';
import Dialog from '@mui/material/Dialog';
import Dialog, { DialogProps } from '@mui/material/Dialog';
import DialogActions from '@mui/material/DialogActions';
import DialogContent from '@mui/material/DialogContent';
import DialogContentText from '@mui/material/DialogContentText';
Expand All @@ -13,7 +13,6 @@ import ActionCheck from '@mui/icons-material/CheckCircle';
import AlertError from '@mui/icons-material/ErrorOutline';
import clsx from 'clsx';
import { useTranslate } from 'ra-core';
import { SxProps } from '@mui/system';

/**
* Confirmation dialog
Expand Down Expand Up @@ -47,7 +46,7 @@ export const Confirm = (props: ConfirmProps) => {
onClose,
onConfirm,
translateOptions = {},
sx,
...rest
} = props;

const translate = useTranslate();
Expand All @@ -71,7 +70,7 @@ export const Confirm = (props: ConfirmProps) => {
onClose={onClose}
onClick={handleClick}
aria-labelledby="alert-dialog-title"
sx={sx}
{...rest}
>
<DialogTitle id="alert-dialog-title">
{translate(title, { _: title, ...translateOptions })}
Expand Down Expand Up @@ -112,7 +111,7 @@ export const Confirm = (props: ConfirmProps) => {
);
};

export interface ConfirmProps {
export interface ConfirmProps extends Omit<DialogProps, 'open' | 'onClose'> {
cancel?: string;
className?: string;
confirm?: string;
Expand All @@ -126,7 +125,6 @@ export interface ConfirmProps {
onConfirm: MouseEventHandler;
title: string;
translateOptions?: object;
sx?: SxProps;
}

Confirm.propTypes = {
Expand Down