From a02620174f19cb783cb9c3f9ab2983ef501fa993 Mon Sep 17 00:00:00 2001 From: DiegoAndai Date: Tue, 10 Dec 2024 09:12:17 -0300 Subject: [PATCH] Rescue backports missing due to mui-base code copy --- docs/src/components/markdown/MarkdownElement.tsx | 2 +- .../mui-material/src/ClickAwayListener/ClickAwayListener.tsx | 4 ++-- packages/mui-material/src/NoSsr/NoSsr.tsx | 2 +- packages/mui-material/src/Unstable_TrapFocus/FocusTrap.tsx | 2 +- packages/mui-material/src/utils/PolymorphicComponent.ts | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/src/components/markdown/MarkdownElement.tsx b/docs/src/components/markdown/MarkdownElement.tsx index 0fa3ed548afea2..2063079ec1dd77 100644 --- a/docs/src/components/markdown/MarkdownElement.tsx +++ b/docs/src/components/markdown/MarkdownElement.tsx @@ -34,7 +34,7 @@ const Root = styled('div')(({ theme }) => ({ type MarkdownElementProps = { renderedMarkdown: string; -} & Omit; +} & Omit; const MarkdownElement = React.forwardRef( function MarkdownElement(props, ref) { diff --git a/packages/mui-material/src/ClickAwayListener/ClickAwayListener.tsx b/packages/mui-material/src/ClickAwayListener/ClickAwayListener.tsx index 5c6ee0f77cc3ee..a0734b7a38744d 100644 --- a/packages/mui-material/src/ClickAwayListener/ClickAwayListener.tsx +++ b/packages/mui-material/src/ClickAwayListener/ClickAwayListener.tsx @@ -36,7 +36,7 @@ export interface ClickAwayListenerProps { /** * The wrapped element. */ - children: React.ReactElement; + children: React.ReactElement; /** * If `true`, the React tree is ignored and only the DOM tree is considered. * This prop changes how portaled elements are handled. @@ -72,7 +72,7 @@ export interface ClickAwayListenerProps { * * - [ClickAwayListener API](https://mui.com/material-ui/api/click-away-listener/) */ -function ClickAwayListener(props: ClickAwayListenerProps): JSX.Element { +function ClickAwayListener(props: ClickAwayListenerProps): React.JSX.Element { const { children, disableReactTree = false, diff --git a/packages/mui-material/src/NoSsr/NoSsr.tsx b/packages/mui-material/src/NoSsr/NoSsr.tsx index b8709e493343b4..0d8bc8c9c6b6c7 100644 --- a/packages/mui-material/src/NoSsr/NoSsr.tsx +++ b/packages/mui-material/src/NoSsr/NoSsr.tsx @@ -22,7 +22,7 @@ import { NoSsrProps } from './NoSsr.types'; * * - [NoSsr API](https://mui.com/material-ui/api/no-ssr/) */ -function NoSsr(props: NoSsrProps): JSX.Element { +function NoSsr(props: NoSsrProps): React.JSX.Element { const { children, defer = false, fallback = null } = props; const [mountedState, setMountedState] = React.useState(false); diff --git a/packages/mui-material/src/Unstable_TrapFocus/FocusTrap.tsx b/packages/mui-material/src/Unstable_TrapFocus/FocusTrap.tsx index df0e9476238f71..0632f426e6c17e 100644 --- a/packages/mui-material/src/Unstable_TrapFocus/FocusTrap.tsx +++ b/packages/mui-material/src/Unstable_TrapFocus/FocusTrap.tsx @@ -125,7 +125,7 @@ function defaultIsEnabled(): boolean { /** * @ignore - internal component. */ -function FocusTrap(props: FocusTrapProps): JSX.Element { +function FocusTrap(props: FocusTrapProps): React.JSX.Element { const { children, disableAutoFocus = false, diff --git a/packages/mui-material/src/utils/PolymorphicComponent.ts b/packages/mui-material/src/utils/PolymorphicComponent.ts index 0110cfc87ff530..abcc2682228f1f 100644 --- a/packages/mui-material/src/utils/PolymorphicComponent.ts +++ b/packages/mui-material/src/utils/PolymorphicComponent.ts @@ -10,7 +10,7 @@ import { DistributiveOmit, OverridableTypeMap } from '@mui/types'; export type PolymorphicComponent = { ( props: PolymorphicProps, - ): JSX.Element | null; + ): React.JSX.Element | null; propTypes?: any; displayName?: string | undefined; };