Skip to content

Commit 3845bcc

Browse files
committed
feat: accept disabled in confirmation modal config
1 parent 558cb61 commit 3845bcc

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

src/Shared/Components/BulkOperations/BulkOperations.component.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,13 +177,13 @@ const BulkOperations = ({
177177
primaryButtonConfig: {
178178
...confirmationModalConfig.buttonConfig.primaryButtonConfig,
179179
onClick: handleBulkOperations,
180-
disabled: apiCallInProgress,
180+
disabled: apiCallInProgress || confirmationModalConfig.buttonConfig.primaryButtonConfig.disabled,
181181
isLoading: apiCallInProgress,
182182
},
183183
secondaryButtonConfig: {
184184
...confirmationModalConfig.buttonConfig.secondaryButtonConfig,
185185
onClick: handleModalClose,
186-
disabled: apiCallInProgress,
186+
disabled: apiCallInProgress || confirmationModalConfig.buttonConfig.secondaryButtonConfig.disabled,
187187
},
188188
}}
189189
/>

src/Shared/Components/ConfirmationModal/types.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ export enum ConfirmationModalVariantType {
99
}
1010

1111
type CommonButtonProps<isConfig extends boolean, isCustomVariant extends boolean> = Pick<ButtonProps, 'text'> &
12-
Partial<Pick<ButtonProps, 'startIcon' | 'endIcon'>> &
13-
(isConfig extends false
14-
? Pick<ButtonProps, 'disabled'> & { onClick: (...args: Partial<Parameters<ButtonProps['onClick']>>) => void }
15-
: {}) &
12+
Partial<Pick<ButtonProps, 'startIcon' | 'endIcon' | 'disabled'>> &
13+
(isConfig extends false ? { onClick: (...args: Partial<Parameters<ButtonProps['onClick']>>) => void } : {}) &
1614
(isCustomVariant extends true ? Pick<ButtonProps, 'style'> : {})
1715

1816
interface CustomInputConfig {

0 commit comments

Comments
 (0)