fix(ui5-tree): correctly pass mode to sub items (#6574)

* fix(ui5-tree): correctly pass mode to sub items * fix: improve test
SAP · Feb 23, 2023 · 92547be · 92547be
1 parent e0f89b9
commit 92547be
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/packages/main/src/TreeList.ts b/packages/main/src/TreeList.ts
@@ -34,7 +34,7 @@ const flattenTree = (items: Array<TreeItemBase>, result: Array<TreeItemBase>, in
 		result.push(item);
 
 		if ((item.expanded || includeCollapsed) && item.items) {
-			flattenTree(item.items, result);
+			flattenTree(item.items, result, includeCollapsed);
 		}
 	});
 };

diff --git a/packages/main/test/pages/Tree.html b/packages/main/test/pages/Tree.html
@@ -178,6 +178,19 @@
 			</ui5-tree-item-custom>
 		</ui5-tree-item-custom>
 	</ui5-tree>
+
+	<ui5-tree mode="MultiSelect" id="allItemsMultiSelect">
+		<ui5-tree-item text="Should have checkbox">
+			<ui5-tree-item text="Should have checkbox">
+				<ui5-tree-item
+					class="lastItem"
+					text="Should have checkbox"
+				></ui5-tree-item>
+				<ui5-tree-item text="Should have checkbox"></ui5-tree-item>
+			</ui5-tree-item>
+			<ui5-tree-item text="Should have checkbox"></ui5-tree-item>
+		</ui5-tree-item>
+	</ui5-tree>
 
 	<script>
 		const mouseOverInput = document.getElementById("mouseover-counter");

diff --git a/packages/main/test/specs/Tree.spec.js b/packages/main/test/specs/Tree.spec.js
@@ -81,6 +81,11 @@ describe("Tree proxies properties to list", () => {
 		});
 	});
 
+	it("Mode works recursively", async () => {
+		const lastItem = await browser.$(">>>#allItemsMultiSelect .lastItem");
+		assert.strictEqual(await lastItem.getAttribute("_mode"), "MultiSelect", "Mode applied to the last tree item");
+	});
+
 	it("headerText, footerText, noDataText work", async () => {
 		const tree = await browser.$("#tree");
 		const list = await tree.shadow$("ui5-tree-list");