Skip to content

Commit

Permalink
Added missed isDisabled prop to button loader
Browse files Browse the repository at this point in the history
  • Loading branch information
abder committed Dec 26, 2024
1 parent c53364c commit a8d7c69
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion packages/assets/css/src/scss/_utils/_tokens.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Do not edit directly
// Generated on Thu, 26 Dec 2024 10:38:48 GMT
// Generated on Thu, 26 Dec 2024 13:45:21 GMT

$accordion-border-radius-sm: 10px;
$advanced-banner-background: linear-gradient(90deg, #222 0%, #383323 48.96%, #514524 100%);
Expand Down
6 changes: 5 additions & 1 deletion packages/ui/button/src/button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,11 @@ const Button: React.FC<ButtonProps> = forwardRef<

if (isLoading) {
isUnwrapped = true
children = <Loader colorScheme={colorScheme}>{children}</Loader>
children = (
<Loader colorScheme={colorScheme} isDisabled={isDisabled}>
{children}
</Loader>
)
}

// Manage interaction methods
Expand Down

0 comments on commit a8d7c69

Please sign in to comment.