Skip to content

fix(tree-view): align items with and without folder state toggle #2618

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

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

fix(tree-view): align items with and without folder state toggle #2618

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
2 changes: 1 addition & 1 deletion projects/element-ng/tree-view/si-tree-view-item/si-tree-view-item.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<ng-container
[ngTemplateOutlet]="toggleTemplate"
[ngTemplateOutletContext]="{
biggerPaddingStart: '-' + biggerPaddingStart,
biggerPaddingStart: negativeBiggerPaddingStart,
paddingStart: paddingStart,
toggleIcon: 'si-tree-view-item-dropdown-caret'
}"
Expand Down
26 changes: 17 additions & 9 deletions projects/element-ng/tree-view/si-tree-view-item/si-tree-view-item.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,19 +192,27 @@ export class SiTreeViewItemComponent implements OnInit, AfterViewInit, Focusable

protected readonly deleteChildrenOnCollapse = this.treeViewComponent.deleteChildrenOnCollapse;

protected get paddingStart(): string {
private get indentation(): number {
return this.siTreeViewService.groupedList
? '0'
: this.indentLevel * this.siTreeViewService.childrenIndentation + 'px';
? 0
: this.indentLevel * this.siTreeViewService.childrenIndentation;
}

protected get paddingStart(): string {
return `${this.indentation}px`;
}

/** Indentation plus the space the start toggle occupies, so leaf items align with foldable ones. */
protected get biggerPaddingStart(): string {
const basePadding = this.showFolderStateStart ? 24 : 0;
return (
(this.siTreeViewService.groupedList
? basePadding
: this.indentLevel * this.siTreeViewService.childrenIndentation + basePadding) + 'px'
);
return this.showFolderStateStart
? `calc(${this.indentation}px + var(--si-tree-view-icon-size))`
: `${this.indentation}px`;
}

protected get negativeBiggerPaddingStart(): string {
return this.showFolderStateStart
? `calc(${-this.indentation}px - var(--si-tree-view-icon-size))`
: `${-this.indentation}px`;
}

protected get isGroupedItem(): boolean {
Expand Down
Loading