Skip to content

Fix: TreeView icon swap + prevent getChildren on collapse #1256

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

Merged
f3l1x merged 1 commit into from
Mar 2, 2026
Merged

Fix: TreeView icon swap + prevent getChildren on collapse #1256

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
28 changes: 23 additions & 5 deletions assets/css/datagrid.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,6 @@
text-align: center;
position: relative;
margin: 0 5px 0 -27px;
transition: transform 0.2s ease-in-out
}

[data-datagrid-name] .datagrid-tree .datagrid-tree-item .datagrid-tree-item-content .datagrid-tree-item-left > .chevron:hover {
Expand All @@ -360,15 +359,34 @@
box-shadow: 0px 0px 3px 0px #b4b4b4
}

[data-datagrid-name] .datagrid-tree .datagrid-tree-item .datagrid-tree-item-content .datagrid-tree-item-left > .chevron.toggle-rotate {
transform: rotate(90deg)
}

[data-datagrid-name] .datagrid-tree .datagrid-tree-item .datagrid-tree-item-content .datagrid-tree-item-left > .chevron .fa {
font-size: 10px;
transform: translate(1px, 0)
}

[data-datagrid-name] .datagrid-tree .datagrid-tree-item .datagrid-tree-item-content .datagrid-tree-item-left > .chevron [data-tree-icon="expanded"],
[data-datagrid-name] .datagrid-tree .datagrid-tree-item .datagrid-tree-item-content .datagrid-tree-item-left > .chevron [data-tree-icon="loading"] {
display: none;
}

[data-datagrid-name] .datagrid-tree .datagrid-tree-item .datagrid-tree-item-content .datagrid-tree-item-left > .chevron.is-loading [data-tree-icon="collapsed"],
[data-datagrid-name] .datagrid-tree .datagrid-tree-item .datagrid-tree-item-content .datagrid-tree-item-left > .chevron.is-loading [data-tree-icon="expanded"] {
display: none;
}

[data-datagrid-name] .datagrid-tree .datagrid-tree-item .datagrid-tree-item-content .datagrid-tree-item-left > .chevron.is-loading [data-tree-icon="loading"] {
display: inline-block;
}

[data-datagrid-name] .datagrid-tree .datagrid-tree-item .datagrid-tree-item-content .datagrid-tree-item-left > .chevron.is-expanded [data-tree-icon="collapsed"],
[data-datagrid-name] .datagrid-tree .datagrid-tree-item .datagrid-tree-item-content .datagrid-tree-item-left > .chevron.is-expanded [data-tree-icon="loading"] {
display: none;
}

[data-datagrid-name] .datagrid-tree .datagrid-tree-item .datagrid-tree-item-content .datagrid-tree-item-left > .chevron.is-expanded [data-tree-icon="expanded"] {
display: inline-block;
}

[data-datagrid-name] .datagrid-tree .datagrid-tree-item .datagrid-tree-item-content .datagrid-tree-item-right {
position: relative;
order: 2;
Expand Down
45 changes: 34 additions & 11 deletions assets/plugins/features/treeView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,43 @@ import { Datagrid } from "../..";

export class TreeViewPlugin implements DatagridPlugin {
onDatagridInit(datagrid: Datagrid): boolean {
datagrid.ajax.addEventListener("success", ({detail: {payload}}) => {
if (!payload._datagrid_tree) return;
datagrid.ajax.addEventListener("interact", (event) => {
const element = event.detail.element;
if (!element.classList.contains('chevron')) return;

const id = payload._datagrid_tree;
const rowBlock = document.querySelector<HTMLElement>(`.datagrid-tree-item[data-id="${id}"]`);
const rowBlock = element.closest<HTMLElement>('.datagrid-tree-item');
const childrenBlock = rowBlock?.querySelector<HTMLElement>('.datagrid-tree-item-children');

if (!childrenBlock) return;

const isExpanded = childrenBlock.classList.contains('showed');
const chevron = rowBlock?.querySelector<HTMLAnchorElement>('a.chevron');

if (isExpanded) {
if (childrenBlock.classList.contains('showed')) {
childrenBlock.innerHTML = '';
childrenBlock.classList.remove('showed');
if (chevron) chevron.style.transform = "rotate(0deg)";
element.classList.remove('is-expanded');
event.preventDefault();
return;
}

element.classList.add('is-loading');
});

datagrid.ajax.addEventListener("success", ({detail: {payload}}) => {
if (!payload._datagrid_tree) return;

const id = payload._datagrid_tree;
const rowBlock = document.querySelector<HTMLElement>(`.datagrid-tree-item[data-id="${id}"]`);
const childrenBlock = rowBlock?.querySelector<HTMLElement>('.datagrid-tree-item-children');

if (!childrenBlock) return;

const chevron = rowBlock?.querySelector<HTMLElement>('a.chevron');

childrenBlock.classList.add('showed');
if (chevron) chevron.style.transform = "rotate(90deg)";

if (chevron) {
chevron.classList.remove('is-loading');
chevron.classList.add('is-expanded');
}

const childrenHtml: string[] = [];
for (const snippetName in payload.snippets) {
Expand All @@ -39,7 +55,14 @@ export class TreeViewPlugin implements DatagridPlugin {
}

childrenBlock.innerHTML = childrenHtml.join('');
})
});

datagrid.ajax.addEventListener("error", () => {
document.querySelectorAll<HTMLElement>('a.chevron.is-loading').forEach((chevron) => {
chevron.classList.remove('is-loading');
});
});

return true;
}
}
4 changes: 3 additions & 1 deletion src/templates/datagrid_tree.latte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@
<div n:class="datagrid-tree-item-content, $row->getControlClass()" data-id="{$row->getId()}" data-has-children="{$hasChildren ? true : false}">
<div class="datagrid-tree-item-left">
<a n:href="getChildren! parent => $row->getId()" data-bs-toggle-tree="true" n:class="!$hasChildren ? hidden, 'chevron ajax'">
<i n:block="icon-chevron" class="{$iconPrefix}chevron-right"></i>
<i n:block="icon-chevron-collapsed" data-tree-icon="collapsed" class="{$iconPrefix}chevron-right"></i>
<i n:block="icon-chevron-expanded" data-tree-icon="expanded" class="{$iconPrefix}chevron-down"></i>
<i n:block="icon-chevron-loading" data-tree-icon="loading" class="{$iconPrefix}spinner fa-spin"></i>
</a>
{foreach $columns as $key => $column}
{var $col = 'col-' . $key}
Expand Down