Skip to content

Commit

Permalink
Refactor #3965 - For Button
Browse files Browse the repository at this point in the history
  • Loading branch information
tugcekucukoglu committed Jun 22, 2023
1 parent e677627 commit 0991a15
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion components/lib/button/BaseButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ const classes = {
{
'p-button-icon-only': instance.hasIcon && !props.label,
'p-button-vertical': (props.iconPos === 'top' || props.iconPos === 'bottom') && props.label,
'p-disabled': instance.$attrs.disabled || props.loading,
'p-disabled': instance.$attrs.disabled || instance.$attrs.disabled === '' || props.loading,
'p-button-loading': props.loading,
'p-button-loading-label-only': props.loading && !instance.hasIcon && props.label,
'p-button-link': props.link,
Expand Down
2 changes: 1 addition & 1 deletion components/lib/button/Button.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default {
extends: BaseButton,
computed: {
disabled() {
return this.$attrs.disabled || this.loading;
return this.$attrs.disabled || this.$attrs.disabled === '' || this.loading;
},
defaultAriaLabel() {
return this.label ? this.label + (this.badge ? ' ' + this.badge : '') : this.$attrs['aria-label'];
Expand Down

0 comments on commit 0991a15

Please sign in to comment.