File tree Expand file tree Collapse file tree 2 files changed +4
-6
lines changed Expand file tree Collapse file tree 2 files changed +4
-6
lines changed Original file line number Diff line number Diff line change @@ -177,13 +177,13 @@ const BulkOperations = ({
177
177
primaryButtonConfig : {
178
178
...confirmationModalConfig . buttonConfig . primaryButtonConfig ,
179
179
onClick : handleBulkOperations ,
180
- disabled : apiCallInProgress ,
180
+ disabled : apiCallInProgress || confirmationModalConfig . buttonConfig . primaryButtonConfig . disabled ,
181
181
isLoading : apiCallInProgress ,
182
182
} ,
183
183
secondaryButtonConfig : {
184
184
...confirmationModalConfig . buttonConfig . secondaryButtonConfig ,
185
185
onClick : handleModalClose ,
186
- disabled : apiCallInProgress ,
186
+ disabled : apiCallInProgress || confirmationModalConfig . buttonConfig . secondaryButtonConfig . disabled ,
187
187
} ,
188
188
} }
189
189
/>
Original file line number Diff line number Diff line change @@ -9,10 +9,8 @@ export enum ConfirmationModalVariantType {
9
9
}
10
10
11
11
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 } : { } ) &
16
14
( isCustomVariant extends true ? Pick < ButtonProps , 'style' > : { } )
17
15
18
16
interface CustomInputConfig {
You can’t perform that action at this time.
0 commit comments