Skip to content

Commit 4dbcc34

Browse files
committed
fix: review comments
1 parent bf9c4da commit 4dbcc34

File tree

4 files changed

+14
-27
lines changed

4 files changed

+14
-27
lines changed

src/Assets/Icon/ic-medium-pause.svg

Lines changed: 1 addition & 1 deletion
Loading

src/Shared/Components/ConfirmationModal/ConfirmationModal.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const ConfirmationModalBody = ({
1414
Icon,
1515
variant,
1616
buttonConfig,
17-
customInputConfig,
17+
confirmationConfig,
1818
children,
1919
handleClose,
2020
shouldCloseOnEscape = true,
@@ -23,8 +23,8 @@ const ConfirmationModalBody = ({
2323

2424
const [confirmationText, setConfirmationText] = useState<string>('')
2525

26-
const customInputIdentifier = customInputConfig?.identifier
27-
const confirmationKeyword = customInputConfig?.confirmationKeyword
26+
const customInputIdentifier = confirmationConfig?.identifier
27+
const confirmationKeyword = confirmationConfig?.confirmationKeyword
2828

2929
const { primaryButtonConfig, secondaryButtonConfig } = buttonConfig
3030

@@ -76,7 +76,9 @@ const ConfirmationModalBody = ({
7676
subtitle
7777
)}
7878

79-
{customInputConfig && (
79+
{children}
80+
81+
{confirmationConfig && (
8082
<CustomInput
8183
name={customInputIdentifier}
8284
value={confirmationText}
@@ -88,8 +90,6 @@ const ConfirmationModalBody = ({
8890
autoFocus
8991
/>
9092
)}
91-
92-
{children}
9393
</div>
9494
<div className="p-16 dc__gap-12 flexbox dc__content-end">
9595
{secondaryButtonConfig && (
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
export { default as ConfirmationModal } from './ConfirmationModal'
2-
export { ConfirmationModalVariantType } from './types'
2+
export { ConfirmationModalVariantType, type ConfirmationModalProps } from './types'

src/Shared/Components/ConfirmationModal/types.ts

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ReactElement, ReactNode, SyntheticEvent } from 'react'
1+
import { PropsWithChildren, ReactElement, ReactNode, SyntheticEvent } from 'react'
22
import { ButtonProps } from '../Button'
33

44
export enum ConfirmationModalVariantType {
@@ -13,7 +13,7 @@ type CommonButtonProps<isConfig extends boolean, isCustomVariant extends boolean
1313
(isConfig extends false ? { onClick: (...args: Partial<Parameters<ButtonProps['onClick']>>) => void } : {}) &
1414
(isCustomVariant extends true ? Pick<ButtonProps, 'style'> : {})
1515

16-
interface CustomInputConfig {
16+
interface ConfirmationConfigType {
1717
identifier: string
1818
confirmationKeyword: string
1919
}
@@ -32,20 +32,6 @@ type ButtonConfig<isConfig extends boolean, isCustomVariant extends boolean> =
3232
secondaryButtonConfig?: CommonButtonProps<isConfig, isCustomVariant>
3333
}
3434

35-
type CustomInputConfigOrChildrenType =
36-
| {
37-
customInputConfig: CustomInputConfig
38-
children?: never
39-
}
40-
| {
41-
customInputConfig?: never
42-
children: ReactNode
43-
}
44-
| {
45-
customInputConfig?: never
46-
children?: never
47-
}
48-
4935
type ButtonConfigAndVariantType<isConfig extends boolean> =
5036
| {
5137
variant: Exclude<ConfirmationModalVariantType, ConfirmationModalVariantType.custom>
@@ -58,15 +44,16 @@ type ButtonConfigAndVariantType<isConfig extends boolean> =
5844
buttonConfig: ButtonConfig<isConfig, true>
5945
}
6046

61-
export type ConfirmationModalProps<isConfig extends boolean = false> = {
47+
export type ConfirmationModalProps<isConfig extends boolean = false> = PropsWithChildren<{
6248
title: string
6349
subtitle: ReactNode
6450
/**
6551
* @default true
6652
*/
6753
shouldCloseOnEscape?: boolean
68-
} & ButtonConfigAndVariantType<isConfig> &
69-
CustomInputConfigOrChildrenType &
54+
confirmationConfig?: ConfirmationConfigType
55+
}> &
56+
ButtonConfigAndVariantType<isConfig> &
7057
(isConfig extends false
7158
? {
7259
handleClose: (e?: SyntheticEvent) => void

0 commit comments

Comments
 (0)