Skip to content

Commit

Permalink
feat(igxCollapsible): add disabled functionality #307
Browse files Browse the repository at this point in the history
  • Loading branch information
IvayloG committed Aug 24, 2018
1 parent 895d912 commit f86a73c
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,11 @@ export class IgxCollapsibleHeaderComponent {
@HostListener('keydown.Space', ['$event'])
@HostListener('click', ['$event'])
public onAction(evt?: Event) {
this.onInterraction.emit({ event: evt });
if (this.collapsible.disabled) {
evt.stopPropagation();
return;
}
this.onInterraction.emit({ event: evt });
this.collapsible.toggle(evt);
evt.preventDefault();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ export class IgxCollapsibleComponent {
return !this.collapsed;
}

@Input()
public disabled;
@HostBinding('class.igx-collapsible--disabled')
@Input() public disabled = false;

@Input()
public headerButtons;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ import { IgxButtonModule } from '../directives/button/button.directive';
import { IgxAvatarModule } from '../avatar/avatar.component';
import { IgxIconModule } from '../icon';
import { IgxCollapsibleComponent, IgxCollapsibleDescriptionDirective, IgxCollapsibleTitleDirective,
IgxCollapsibleBodyDirective } from './collapsible.component';
IgxCollapsibleBodyDirective, IgxCollapsibleHeaderDirective } from './collapsible.component';
import { IgxCollapsibleHeaderComponent } from './collapsible-header.component';


@NgModule({
declarations: [
IgxCollapsibleComponent,
IgxCollapsibleHeaderComponent,
IgxCollapsibleHeaderDirective,
IgxCollapsibleDescriptionDirective,
IgxCollapsibleTitleDirective,
IgxCollapsibleBodyDirective
Expand Down
4 changes: 2 additions & 2 deletions src/app/collapsible/collapsible-sample.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<app-page-header title="Collapsible" description="Collapsible lets you display content with a toggleable details view"></app-page-header>
<section>
<div class="game-board">
<igx-collapsible class="game-board__collapsible">
<igx-collapsible class="game-board__collapsible" [disabled]="false">
<igx-collapsible-header (onInterraction)="onInterraction($event)">
<igx-collapsible-title>Current Winning Player:</igx-collapsible-title>
<igx-collapsible-description>{{ getWinningPlayer }}</igx-collapsible-description>
Expand Down Expand Up @@ -42,4 +42,4 @@
</igx-collapsible-body>
</igx-collapsible>
</section> -->
</div>
</div>

0 comments on commit f86a73c

Please sign in to comment.