Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<systelab-accordion [headerTitle]="'Accordion header'">
<showcase-progress-bar></showcase-progress-bar>
</systelab-accordion>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { Component } from '@angular/core';

@Component({
selector: 'showcase-accordion',
templateUrl: 'showcase-accordion.component.html'
})
export class ShowcaseAccordion {
constructor() {
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Empty constructor. Unnecessary?

}
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@
<showcase-title [href]="'progress-bar'">Progress bar</showcase-title>
<showcase-progress-bar></showcase-progress-bar>

<showcase-title [href]="'accordion'">Accordion</showcase-title>
<showcase-accordion></showcase-accordion>

<showcase-title [href]="'percentage-circle'">Percentage Circle</showcase-title>
<showcase-percentage-circle></showcase-percentage-circle>

Expand Down
2 changes: 2 additions & 0 deletions projects/showcase/src/app/showcase.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ import {
} from './components/progress-bars/progressbar-with-text-dialog/showcase-progressbar-with-text-dialog.component';
import { ShowcaseImageViewerComponent } from './components/image-viewer/showcase-image-viewer.component';
import { CdkTreeModule } from '@angular/cdk/tree';
import { ShowcaseAccordion } from './components/accordion/showcase-accordion.component';

@NgModule({ declarations: [
ShowcaseComponent,
Expand Down Expand Up @@ -204,6 +205,7 @@ import { CdkTreeModule } from '@angular/cdk/tree';
ShowcaseInteractiveComponent,
ShowcaseProgressBarWithTextDialog,
ShowcaseImageViewerComponent,
ShowcaseAccordion
],
bootstrap: [ShowcaseComponent],
imports: [
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<div class="slab-flex-1 d-flex flex-column">
<div class="mlab-accordion-header d-flex align-items-center font-weight-bold px-3" [ngStyle]="{'backgroundColor': headerColor}" (click)="isCollapsed = !isCollapsed">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change mlab- for slab- or no prefix better

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add also to documentation please.
Good job, thanks for the contrib!

<i class="d-flex justify-content-center align-items-center position-relative" [class.icon-chevron-circle-up]="!isCollapsed" [class.icon-chevron-circle-down]="isCollapsed" [ngClass]="{'text-primary': !iconColor}" [ngStyle]="{'color': iconColor}"></i>
<span class="d-block ml-3">{{ headerTitle }}</span>
</div>
<div class="collapsible-content d-flex" [class.collapsed]="isCollapsed" [class.p-3]="!isCollapsed"
[ngStyle]="{'max-height.px': isCollapsed ? '0' : contentMaxHeight, 'overflow': withOverflow ? 'auto' : 'hidden'}">
<ng-content />
</div>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
.mlab-accordion-header {
background-color: lightgrey;
border-radius: 4px 4px 0 0;
height: 40px;
i {
&:after {
content: '';
background-color: white;
width: 15px;
height: 15px;
z-index: 1;
position: absolute;
}
&:before {
z-index: 2;
}
font-size: 25px;
&:hover {
cursor: pointer;
}
}
}

.collapsible-content {
transition: max-height 0.3s ease-out, opacity 0.3s ease-out;
opacity: 1;
border: 1px solid var(--slab_table_border_color) !important;
}

.collapsed {
opacity: 0;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { BrowserModule, By } from '@angular/platform-browser';
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { Accordion } from './accordion.component';
import { PreferencesService } from 'systelab-preferences';

describe('Systelab Accordion', () => {
let fixture: ComponentFixture<Accordion>;
let component: Accordion;

beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [],
imports: [BrowserModule],
providers: [
PreferencesService,
provideHttpClient(withInterceptorsFromDi())
]
}).compileComponents();

});

beforeEach(() => {
fixture = TestBed.createComponent(Accordion);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should be instantiate', () => {
expect(fixture.componentInstance).toBeDefined();
});

it('should be height 0 when isCollapse is true', async () => {
component.isCollapsed = true;
fixture.detectChanges();
await fixture.whenStable();
const collapsibleContent = fixture.debugElement.query(By.css('.collapsible-content'));
const maxHeight = parseInt(getComputedStyle(collapsibleContent.nativeElement).maxHeight, 10);
expect(maxHeight).toEqual(0);
});

it('should be height contentMaxHeight when isCollapse is false', async () => {
component.isCollapsed = false;
fixture.detectChanges();
await fixture.whenStable();
const collapsibleContent = fixture.debugElement.query(By.css('.collapsible-content'));
const maxHeight = parseInt(getComputedStyle(collapsibleContent.nativeElement).maxHeight, 10);
expect(maxHeight).toEqual(component.contentMaxHeight);
});

it('should be collapsed if is expanded and clicks icon button', async () => {
component.isCollapsed = false;
const collapseExpandIcon = fixture.debugElement.query(By.css('.mlab-accordion-header'));
collapseExpandIcon.triggerEventHandler('click', null);
fixture.detectChanges();
await fixture.whenStable();
expect(component.isCollapsed).toBeTrue();
});

it('should be expanded if is collapsed and clicks icon button', async () => {
component.isCollapsed = true;
const collapseExpandIcon = fixture.debugElement.query(By.css('.mlab-accordion-header'));
collapseExpandIcon.triggerEventHandler('click', null);
fixture.detectChanges();
await fixture.whenStable();
expect(component.isCollapsed).toBeFalse();
});

it('should be get isCollapsed value from preferences id flag preferenceName exists', async () => {
const valueReturned: boolean = true;
const initianPreferenceName = 'testName';
component.isCollapsed = false;
component.preferenceName = initianPreferenceName;
const preferenceServiceGetSpy = spyOn<any>(component['preferenceService'], 'get').and.returnValue(valueReturned);
const preferenceServicePutSpy = spyOn<any>(component['preferenceService'], 'put').and.callThrough();
component.ngOnInit();
await fixture.whenStable();
expect(component.preferenceName).toEqual(`${component['preferencePrefix']}.${initianPreferenceName}`);
expect(preferenceServiceGetSpy).toHaveBeenCalledWith(component.preferenceName, false);
expect(component.isCollapsed).toEqual(valueReturned);
expect(preferenceServicePutSpy).toHaveBeenCalledWith(component.preferenceName, valueReturned);
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { Component, Input, OnInit } from '@angular/core';
import { PreferencesService } from 'systelab-preferences';

@Component({
selector: 'systelab-accordion',
templateUrl: './accordion.component.html',
styleUrls: ['./accordion.component.scss']
})
// eslint-disable-next-line @angular-eslint/component-class-suffix
export class Accordion implements OnInit {
@Input() headerTitle: string = '';
@Input() preferenceName: string;
@Input() contentMaxHeight: number = 300;
@Input() withOverflow: boolean = false;
@Input() headerColor: string;
@Input() iconColor: string;
public isCollapsed: boolean = false;
private preferencePrefix: string = 'accordionStatus';

constructor(private readonly preferenceService: PreferencesService) {
}

public ngOnInit() {
if(this.preferenceName) {
this.preferenceName = `${this.preferencePrefix}.${this.preferenceName}`;
this.isCollapsed = this.preferenceService.get(this.preferenceName, false);
this.preferenceService.put(this.preferenceName, this.isCollapsed);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ import {
PositiveIntegerInputCellEditorComponent
} from './grid/custom-cells/positive-integer/positive-integer-input-cell-editor.component';
import { TestIdDirective } from './directives/test-id.directive';
import { Accordion } from './accordion/accordion.component';

export const factory = () => {
const systelabComponentsModuleCreated = (factory as any)._systelabComponentsModuleCreated || false;
Expand Down Expand Up @@ -223,6 +224,7 @@ const providers = [
PositiveIntegerInputCellEditorComponent,
NumpadDecimalNumericDirective,
TestIdDirective,
Accordion,
],
exports: [
SliderComponent,
Expand Down Expand Up @@ -310,7 +312,8 @@ const providers = [
NumpadDecimalNumericDirective,
TestIdDirective,
NumpadDecimalNumericDirective,
PositiveIntegerInputCellEditorComponent
PositiveIntegerInputCellEditorComponent,
Accordion
],
})
export class SystelabComponentsModule {
Expand Down
1 change: 1 addition & 0 deletions projects/systelab-components/src/public-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ export * from './lib/listbox/abstract-listbox.component';
export * from './lib/listbox/abstract-api-listbox.component';
export * from './lib/listbox/abstract-api-tree-listbox.component';
export * from './lib/sortable-list/abstract-sortable-list.component';
export * from './lib/accordion/accordion.component';
export * from './lib/add-remove-list/abstract-add-remove-list.component';
export * from './lib/tree/tree-node';
export * from './lib/tree/abstract-tree.component';
Expand Down