From f01503764aa662bb4646c421c223053c10fb3a34 Mon Sep 17 00:00:00 2001 From: Casey Charleston Date: Mon, 7 Oct 2024 16:50:48 -0500 Subject: [PATCH 1/3] fix: disabled [Object object] hover message on Dialog component --- src/views/components/common/Dialog.tsx | 4 ++-- src/views/components/common/DialogProvider/DialogProvider.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/components/common/Dialog.tsx b/src/views/components/common/Dialog.tsx index a1e08f62c..577738199 100644 --- a/src/views/components/common/Dialog.tsx +++ b/src/views/components/common/Dialog.tsx @@ -15,7 +15,7 @@ import ExtensionRoot from './ExtensionRoot/ExtensionRoot'; export interface _DialogProps { className?: string; - title?: JSX.Element; + headline?: JSX.Element; description?: JSX.Element; } @@ -60,7 +60,7 @@ export default function Dialog(props: PropsWithChildren): JSX.Eleme className )} > - {props.title && {props.title}} + {props.headline && {props.headline}} {props.description && {props.description}} {children} diff --git a/src/views/components/common/DialogProvider/DialogProvider.tsx b/src/views/components/common/DialogProvider/DialogProvider.tsx index 0f0274380..5c2062425 100644 --- a/src/views/components/common/DialogProvider/DialogProvider.tsx +++ b/src/views/components/common/DialogProvider/DialogProvider.tsx @@ -87,7 +87,7 @@ export default function DialogProvider(props: { children: ReactNode }): JSX.Elem key={id} onClose={handleClose} afterLeave={onLeave} - title=<>{infoUnwrapped.title} + headline=<>{infoUnwrapped.title} description=<>{infoUnwrapped.description} appear show={show} From 4e1bbab15eeb0bce54a7e7788f53efe8b1dc4d41 Mon Sep 17 00:00:00 2001 From: Casey Charleston Date: Tue, 8 Oct 2024 17:05:10 -0500 Subject: [PATCH 2/3] Revert "fix: disabled [Object object] hover message on Dialog component" This reverts commit f01503764aa662bb4646c421c223053c10fb3a34. --- src/views/components/common/Dialog.tsx | 4 ++-- src/views/components/common/DialogProvider/DialogProvider.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/components/common/Dialog.tsx b/src/views/components/common/Dialog.tsx index 577738199..a1e08f62c 100644 --- a/src/views/components/common/Dialog.tsx +++ b/src/views/components/common/Dialog.tsx @@ -15,7 +15,7 @@ import ExtensionRoot from './ExtensionRoot/ExtensionRoot'; export interface _DialogProps { className?: string; - headline?: JSX.Element; + title?: JSX.Element; description?: JSX.Element; } @@ -60,7 +60,7 @@ export default function Dialog(props: PropsWithChildren): JSX.Eleme className )} > - {props.headline && {props.headline}} + {props.title && {props.title}} {props.description && {props.description}} {children} diff --git a/src/views/components/common/DialogProvider/DialogProvider.tsx b/src/views/components/common/DialogProvider/DialogProvider.tsx index 5c2062425..0f0274380 100644 --- a/src/views/components/common/DialogProvider/DialogProvider.tsx +++ b/src/views/components/common/DialogProvider/DialogProvider.tsx @@ -87,7 +87,7 @@ export default function DialogProvider(props: { children: ReactNode }): JSX.Elem key={id} onClose={handleClose} afterLeave={onLeave} - headline=<>{infoUnwrapped.title} + title=<>{infoUnwrapped.title} description=<>{infoUnwrapped.description} appear show={show} From 9b263b55e83fbbe629267089a04894f8c0c3e690 Mon Sep 17 00:00:00 2001 From: Casey Charleston Date: Tue, 8 Oct 2024 17:08:05 -0500 Subject: [PATCH 3/3] fix: properly destruct title and description for Dialog --- src/views/components/common/Dialog.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/components/common/Dialog.tsx b/src/views/components/common/Dialog.tsx index a1e08f62c..7f7a8bcc0 100644 --- a/src/views/components/common/Dialog.tsx +++ b/src/views/components/common/Dialog.tsx @@ -28,7 +28,7 @@ export type DialogProps = _DialogProps & Omit): JSX.Element { - const { children, className, open, ...rest } = props; + const { children, className, open, title, description, ...rest } = props; return ( @@ -60,8 +60,8 @@ export default function Dialog(props: PropsWithChildren): JSX.Eleme className )} > - {props.title && {props.title}} - {props.description && {props.description}} + {title && {title}} + {description && {description}} {children}