Skip to content

fix(ui5-tree): noDataText is now properly rendered #11095

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
merged 8 commits into from
Mar 20, 2025
Merged

fix(ui5-tree): noDataText is now properly rendered #11095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bc6d4e1
fix(ui5-tree): noDataText is now properly rendered
plamenivanov91 Mar 13, 2025
7c56fbf
fix(ui5-tree): fixed lint and added cypress test
plamenivanov91 Mar 13, 2025
b29a0bf
Merge branch 'main' into tree-no-data-text-fix
plamenivanov91 Mar 15, 2025
40cd38c
fix(ui5-tree): noDataText is now properly rendered
plamenivanov91 Mar 15, 2025
a4ed21c
fix(ui5-tree): removed redundant line
plamenivanov91 Mar 15, 2025
9e8a88e
Merge branch 'main' into tree-no-data-text-fix
plamenivanov91 Mar 20, 2025
9658f45
fix(ui5-tree): noDataText is now properly rendered
plamenivanov91 Mar 20, 2025
16d2c04
fix(ui5-tree): noDataText is now properly rendered
plamenivanov91 Mar 20, 2025
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
18 changes: 18 additions & 0 deletions packages/main/cypress/specs/Tree.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,21 @@ describe("Tree Tests", () => {
.and("have.attr", "accessible-description-ref", "lblDesc2");
});
});

describe("Tree Props", () => {
it("noDataText is properly rendered", () => {
cy.mount(
<>
<Tree noDataText="No data"></Tree>
</>
);

cy.get("[ui5-tree]")
.shadow()
.find("[ui5-tree-list]")
.shadow()
.find("[ui5-busy-indicator]")
.find(".ui5-list-nodata")
.should("exist")
});
});
4 changes: 3 additions & 1 deletion packages/main/src/TreeList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ class TreeList extends List {
const slottedItems = this.getSlottedNodes<TreeItemBase>("items");
const flatItems: Array<TreeItemBase> = [];

flattenTree(slottedItems, flatItems, includeCollapsed);
if (!(slottedItems.length === 1 && slottedItems[0].hasAttribute("ui5-drop-indicator"))) {
flattenTree(slottedItems, flatItems, includeCollapsed);
}

return flatItems;
}
Expand Down