Skip to content

fix(button): 修复button为disabled状态时,host容器的click事件依旧触发 (#362) #363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
caoxicheng wants to merge 1 commit into from
Closed

fix(button): 修复button为disabled状态时,host容器的click事件依旧触发 (#362) #363

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 38 additions & 10 deletions devui/button/button.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import {
EventEmitter,
HostListener,
Input,
Output,
Output, Renderer2, SimpleChanges,
TemplateRef,
ViewChild
ViewChild, OnChanges
} from '@angular/core';
import { AnimationNumberDuration } from 'ng-devui/utils';
export type IButtonType = 'button' | 'submit' | 'reset';
Expand All @@ -21,14 +21,14 @@ export type IButtonPosition = 'left' | 'right' | 'default';
export type IButtonSize = 'lg' | 'md' | 'sm' | 'xs';

@Component({
selector: 'd-button',
templateUrl: './button.component.html',
styleUrls: ['./button.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
preserveWhitespaces: false,
standalone: false
selector: 'd-button',
templateUrl: './button.component.html',
styleUrls: ['./button.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
preserveWhitespaces: false,
standalone: false
})
export class ButtonComponent implements AfterContentChecked {
export class ButtonComponent implements AfterContentChecked, OnChanges {
@Input() id: string;
@Input() type: IButtonType = 'button';
@Input() bsStyle: IButtonStyle = 'primary';
Expand Down Expand Up @@ -62,7 +62,35 @@ export class ButtonComponent implements AfterContentChecked {
showWave = false;
isMouseDown = false;

constructor(private cd: ChangeDetectorRef) {
constructor(
private cd: ChangeDetectorRef,
private renderer: Renderer2,
private el: ElementRef
) {
}

ngOnChanges(changes: SimpleChanges) {
if (changes?.disabled?.currentValue) {
this.renderer.setStyle(
this.el.nativeElement,
'cursor',
'not-allowed'
);
this.renderer.setStyle(
this.el.nativeElement,
'pointer-events',
'none'
);
} else if (!changes?.disabled?.currentValue) {
this.renderer.removeStyle(
this.el.nativeElement,
'cursor'
);
this.renderer.removeStyle(
this.el.nativeElement,
'pointer-events'
);
}
}

// 新增click事件，解决直接在host上使用click，在disabled状态下还能触发事件
Expand Down