Skip to content

Commit 8da2573

Browse files
committed
fix: fix tree appearance
1 parent 026a16f commit 8da2573

4 files changed

Lines changed: 20 additions & 71 deletions

File tree

apps/backend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@softarc/detective",
3-
"version": "1.0.0",
3+
"version": "1.0.2",
44
"bin": {
55
"detective": "./bin/main.js",
66
"@softarc/detective": "./bin/main.js"
Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +0,0 @@
1-
.example-tree-invisible {
2-
visibility: hidden;
3-
max-height: 0;
4-
overflow: hidden;
5-
transition: max-height 0.3s ease-out, visibility 0.3s ease-out;
6-
}
7-
8-
.example-tree ul,
9-
.example-tree li {
10-
margin-top: 0;
11-
margin-bottom: 0;
12-
list-style-type: none;
13-
padding-left: 0;
14-
}
15-
16-
.example-tree-node {
17-
display: block;
18-
line-height: 40px;
19-
position: relative;
20-
}
21-
22-
.example-tree-node .example-tree-node {
23-
padding-left: 20px;
24-
}
25-
26-
mat-icon {
27-
vertical-align: middle;
28-
margin-top: 2px;
29-
}
30-
31-
.node-with-children {
32-
cursor: pointer;
33-
}
34-
35-
@supports (-webkit-overflow-scrolling: touch) {
36-
.example-tree-node {
37-
display: flex;
38-
align-items: center;
39-
}
40-
}
Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,31 @@
1-
<cdk-tree #tree [dataSource]="dataSource" [childrenAccessor]="childrenAccessor">
2-
<cdk-nested-tree-node
3-
#treeNode="cdkNestedTreeNode"
4-
*cdkTreeNodeDef="let node"
5-
class="example-tree-node"
1+
<mat-tree #tree [dataSource]="dataSource" [childrenAccessor]="childrenAccessor">
2+
<mat-tree-node
3+
*matTreeNodeDef="let node"
4+
matTreeNodeToggle
5+
matTreeNodePadding
66
>
7+
<button mat-icon-button disabled></button>
78
<mat-checkbox
89
[checked]="isChecked(node)"
910
(change)="onCheckChange(node, $event)"
10-
></mat-checkbox>
11-
{{ node.name }}
12-
</cdk-nested-tree-node>
11+
>{{ node.name }}</mat-checkbox
12+
>
13+
</mat-tree-node>
1314

14-
<cdk-nested-tree-node
15-
#treeNode="cdkNestedTreeNode"
16-
*cdkTreeNodeDef="let node; when: hasChild"
17-
[cdkTreeNodeTypeaheadLabel]="node.name"
18-
isExpandable
19-
class="example-tree-node node-with-children"
20-
>
15+
<mat-tree-node *matTreeNodeDef="let node; when: hasChild" matTreeNodePadding>
2116
<button
22-
cdkTreeNodeToggle
2317
mat-icon-button
24-
[attr.aria-label]="'Toggle ' + node.name"
25-
cdkTreeNodeToggle
18+
matTreeNodeToggle
19+
[attr.aria-label]="'toggle ' + node.filename"
2620
>
27-
<mat-icon>
21+
<mat-icon class="mat-icon-rtl-mirror">
2822
{{ tree.isExpanded(node) ? 'expand_more' : 'chevron_right' }}
2923
</mat-icon>
3024
</button>
3125
<mat-checkbox
3226
[checked]="isChecked(node)"
3327
(change)="onCheckChange(node, $event)"
34-
(click)="$event.stopPropagation()"
35-
></mat-checkbox>
36-
<span cdkTreeNodeToggle>{{ node.name }}</span>
37-
38-
<div [class.example-tree-invisible]="!tree.isExpanded(node)">
39-
<ng-container cdkTreeNodeOutlet></ng-container>
40-
</div>
41-
</cdk-nested-tree-node>
42-
</cdk-tree>
28+
>{{ node.name }}</mat-checkbox
29+
>
30+
</mat-tree-node>
31+
</mat-tree>

apps/frontend/src/app/shell/filter-tree/filter-tree.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component, inject, OnInit, viewChild } from '@angular/core';
22
import { Folder } from '../../model/folder';
33
import { CdkTree, CdkTreeModule } from '@angular/cdk/tree';
4-
import { MatTreeNestedDataSource } from '@angular/material/tree';
4+
import { MatTreeModule, MatTreeNestedDataSource } from '@angular/material/tree';
55
import { FolderService } from '../../data/folder.service';
66
import { combineLatest, of } from 'rxjs';
77
import { MatIconModule } from '@angular/material/icon';
@@ -19,7 +19,7 @@ const MIN_OPEN_LEVEL = 2;
1919
@Component({
2020
selector: 'app-filter-tree',
2121
standalone: true,
22-
imports: [CdkTreeModule, MatIconModule, MatButtonModule, MatCheckboxModule],
22+
imports: [MatTreeModule, MatIconModule, MatButtonModule, MatCheckboxModule],
2323
templateUrl: './filter-tree.component.html',
2424
styleUrl: './filter-tree.component.css',
2525
})

0 commit comments

Comments
 (0)