Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
6 changes: 5 additions & 1 deletion src/app/treetable/component/treetable.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
<div *ngFor="let column of displayedColumns; first as isFirst;">
<ng-container matColumnDef="{{column}}">
<th mat-header-cell *matHeaderCellDef [ngClass]="{'vertical-separator': options.verticalSeparator}">
<span class="expand-all" *ngIf="isFirst" (click)="toggleAll()">
{{ allElementsVisible() ? '-' : '+'}}
</span>
{{options.capitalisedHeader ? (column | titlecase) : column}}
</th>
<td mat-cell *matCellDef="let element" [ngClass]="{'vertical-separator': options.verticalSeparator}">
<div *ngIf="isFirst">
<div class="value-cell">
<div [innerHTML]="formatIndentation(element)"></div>
<mat-icon [ngStyle]="{'visibility': element.children.length ? 'visible' : 'hidden'}" (click)="onNodeClick(element)">
<mat-icon [ngStyle]="{'visibility': element.children.length ? 'visible' : 'hidden'}"
(click)="onNodeClick(element, $event)">
{{element.isExpanded ? 'keyboard_arrow_down' : 'keyboard_arrow_right'}}
</mat-icon>
<div>{{element.value[column]}}</div>
Expand Down
7 changes: 7 additions & 0 deletions src/app/treetable/component/treetable.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@ mat-icon {
background-color: #f0f0f5;
}

.expand-all {
position: relative;
left: -15px;
cursor: pointer;
padding: 10px;
}

td[class*=' mat-column']{
width: 10vw;
min-width: 10vw;;
Expand Down
2 changes: 1 addition & 1 deletion src/app/treetable/component/treetable.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ describe('TreetableComponent', () => {
it('should emit an event when a node is clicked', () => {
const clickedNode = (component as any).treeTable[0];
component.nodeClicked.subscribe(n => expect(n).toBe(clickedNode));
component.onNodeClick(clickedNode);
component.onNodeClick(clickedNode, new Event('click'));
});

});
47 changes: 44 additions & 3 deletions src/app/treetable/component/treetable.component.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
import { Component, OnInit, Input, Output, ElementRef } from '@angular/core';
import {
Component,
OnInit,
Input,
Output,
ElementRef,
OnChanges,
SimpleChanges,
} from '@angular/core';
import { Node, TreeTableNode, Options, SearchableNode } from '../models';
import { TreeService } from '../services/tree/tree.service';
import { MatTableDataSource } from '@angular/material';
Expand All @@ -14,7 +22,7 @@ import { Subject } from 'rxjs';
templateUrl: './treetable.component.html',
styleUrls: ['./treetable.component.scss']
})
export class TreetableComponent<T> implements OnInit {
export class TreetableComponent<T> implements OnInit, OnChanges {
@Input() @Required tree: Node<T> | Node<T>[];
@Input() options: Options<T> = {};
@Output() nodeClicked: Subject<TreeTableNode<T>> = new Subject();
Expand Down Expand Up @@ -53,6 +61,17 @@ export class TreetableComponent<T> implements OnInit {
this.dataSource = this.generateDataSource();
}

ngOnChanges(changes: SimpleChanges) {
if (changes.tree.isFirstChange()) {
return;
}
this.tree = Array.isArray(this.tree) ? this.tree : [this.tree];
this.searchableTree = this.tree.map(t => this.converterService.toSearchableTree(t));
const treeTableTree = this.searchableTree.map(st => this.converterService.toTreeTableTree(st));
this.treeTable = flatMap(treeTableTree, this.treeService.flatten);
this.dataSource = this.generateDataSource();
}

extractNodeProps(tree: Node<T> & { value: { [k: string]: any } }): string[] {
return Object.keys(tree.value).filter(x => typeof tree.value[x] !== 'object');
}
Expand All @@ -69,7 +88,8 @@ export class TreetableComponent<T> implements OnInit {
return `mat-elevation-z${this.options.elevation}`;
}

onNodeClick(clickedNode: TreeTableNode<T>): void {
onNodeClick(clickedNode: TreeTableNode<T>, $event: Event): void {
$event.stopPropagation();
clickedNode.isExpanded = !clickedNode.isExpanded;
this.treeTable.forEach(el => {
el.isVisible = this.searchableTree.every(st => {
Expand All @@ -82,6 +102,27 @@ export class TreetableComponent<T> implements OnInit {
this.nodeClicked.next(clickedNode);
}

toggleAll() {
if (!this.allElementsVisible()) {
this.treeTable.forEach(item => {
item.isExpanded = true;
item.isVisible = true;
});
} else {
this.treeTable.forEach((item, index) => {
item.isExpanded = false;
if (index > 0) {
item.isVisible = false;
}
});
}
this.dataSource = this.generateDataSource();
}

allElementsVisible(): boolean {
return this.treeTable.slice(1).every(item => item.isVisible);
}

// Overrides default options with those specified by the user
parseOptions(defaultOpts: Options<T>): Options<T> {
return defaults(this.options, defaultOpts);
Expand Down