Skip to content
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

Jump to bottom

fix(collapse): respect display input value #6071

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

fix(collapse): respect display input value #6071

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions .../ngx-bootstrap-docs/src/app/components/+collapse/demos/inline-display/inline-display.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<button type="button" class="btn btn-success" (click)="collapse.display='inline-block'"
<button type="button" class="btn btn-success" (click)="isCollapsed = false"
aria-controls="collapseBasic">Inline-block
</button>
<button type="button" class="btn btn-primary" (click)="collapse.display='none'"
<button type="button" class="btn btn-primary" (click)="isCollapsed = true"
aria-controls="collapseBasic">None
</button>
<hr>
<div id="collapseBasic" [collapse]="!isCollapsed" #collapse="bs-collapse">
<div id="collapseBasic" [collapse]="isCollapsed" [display]="'inline-block'">
<div class="well well-lg card card-block card-header">Some content</div>
</div>
42 changes: 16 additions & 26 deletions src/collapse/collapse.directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ import {
EventEmitter,
HostBinding,
Input,
OnChanges,
Output,
Renderer2
Renderer2,
SimpleChanges
} from '@angular/core';

import {
Expand All @@ -28,7 +30,7 @@ import {
'[class.collapse]': 'true'
}
})
export class CollapseDirective implements AfterViewChecked {
export class CollapseDirective implements OnChanges, AfterViewChecked {
/** This event fires as soon as content collapses */
@Output() collapsed: EventEmitter<CollapseDirective> = new EventEmitter();
/** This event fires when collapsing is started */
Expand All @@ -50,41 +52,20 @@ export class CollapseDirective implements AfterViewChecked {
// animation state
@HostBinding('class.collapsing') isCollapsing = false;

@Input()
set display(value: string) {
if (!this.isAnimated) {
this._renderer.setStyle(this._el.nativeElement, 'display', value);

return;
}

this._display = value;

if (value === 'none') {
this.hide();

return;
}

this.show();
}
/** display value used when collapse is visible */
@Input() display = 'block';
/** turn on/off animation */
@Input() isAnimated = false;
/** A flag indicating visibility of content (shown or hidden) */
@Input()
set collapse(value: boolean) {
this.collapseNewValue = value;
if (!this._player || this._isAnimationDone) {
this.isExpanded = value;
this.toggle();
}
}

get collapse(): boolean {
return this.isExpanded;
}

private _display = 'block';
private _isAnimationDone?: boolean;
private _player?: AnimationPlayer;
private _stylesLoaded = false;
Expand All @@ -104,6 +85,15 @@ export class CollapseDirective implements AfterViewChecked {
this._factoryExpandAnimation = _builder.build(expandAnimation);
}

ngOnChanges(changes: SimpleChanges): void {
if ('collapse' in changes) {
if (!this._player || this._isAnimationDone) {
this.isExpanded = this.collapseNewValue;
this.toggle();
}
}
}

ngAfterViewChecked(): void {
this._stylesLoaded = true;

Expand Down Expand Up @@ -148,7 +138,7 @@ export class CollapseDirective implements AfterViewChecked {
}
/** allows to manually show collapsed content */
show(): void {
this._renderer.setStyle(this._el.nativeElement, 'display', this._display);
this._renderer.setStyle(this._el.nativeElement, 'display', this.display);

this.isCollapsing = true;
this.isExpanded = true;
Expand Down