Skip to content

Commit b91f247

Browse files
committed
docs/samples fixes, some tests
1 parent 0990582 commit b91f247

File tree

7 files changed

+49
-15
lines changed

7 files changed

+49
-15
lines changed

packages/main/src/Tree.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
<slot name="header" slot="header"></slot>
1616
{{#each _listItems}}
1717
<ui5-li-tree
18+
_id="{{this.treeItem._id}}"
1819
type="Active"
1920
level="{{this.level}}"
2021
icon="{{this.treeItem.icon}}"
2122
.treeItem="{{this.treeItem}}"
2223
.expanded="{{this.treeItem.expanded}}"
2324
.selected="{{this.treeItem.selected}}"
24-
._id="{{this.treeItem._id}}"
2525
.showToggleButton="{{this.treeItem.requiresToggleButton}}"
2626
@ui5-toggle="{{../_onListItemToggle}}"
2727
@ui5-stepIn="{{../_onListItemStepIn}}"

packages/main/src/Tree.js

+1
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ const metadata = {
211211
* @tagname ui5-tree
212212
* @appenddocs TreeItem
213213
* @public
214+
* @since 1.0.0-rc.8
214215
*/
215216
class Tree extends UI5Element {
216217
static get metadata() {

packages/main/src/TreeItem.js

+1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ const metadata = {
103103
* @extends UI5Element
104104
* @tagname ui5-tree-item
105105
* @public
106+
* @since 1.0.0-rc.8
106107
*/
107108
class TreeItem extends UI5Element {
108109
static get metadata() {

packages/main/src/TreeListItem.js

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ const metadata = {
131131
* @extends ListItem
132132
* @tagname ui5-li-tree
133133
* @public
134+
* @since 1.0.0-rc.8
134135
*/
135136
class TreeListItem extends ListItem {
136137
static get render() {

packages/main/test/pages/Tree.html

+7-7
Original file line numberDiff line numberDiff line change
@@ -125,49 +125,49 @@
125125

126126
document.getElementById("modeSelect").addEventListener("change", function(event) {
127127
var newMode = event.detail.selectedOption.textContent;
128-
const tree = document.getElementById("tree");
128+
var tree = document.getElementById("tree");
129129
tree.mode = newMode;
130130
});
131131

132132
document.getElementById("expandAll").addEventListener("click", function(event) {
133133
var trees = Array.prototype.slice.call(document.getElementsByTagName("ui5-tree"));
134-
const tree = document.getElementById("tree");
134+
var tree = document.getElementById("tree");
135135
tree.walk(function(node) {
136136
node.expanded = true;
137137
});
138138
});
139139

140140
document.getElementById("collapseAll").addEventListener("click", function(event) {
141-
const tree = document.getElementById("tree");
141+
var tree = document.getElementById("tree");
142142
tree.walk(function(node) {
143143
node.expanded = false;
144144
});
145145
});
146146

147147
document.getElementById("expandLevel1").addEventListener("click", function(event) {
148-
const tree = document.getElementById("tree");
148+
var tree = document.getElementById("tree");
149149
tree.walk(function(node, level) {
150150
node.expanded = (level === 1);
151151
});
152152
});
153153

154154
document.getElementById("expandLevel2").addEventListener("click", function(event) {
155-
const tree = document.getElementById("tree");
155+
var tree = document.getElementById("tree");
156156
tree.walk(function(node, level) {
157157
node.expanded = (level <= 2);
158158
});
159159
});
160160

161161
var dynamicTree = document.getElementById("treeDynamic");
162162
dynamicTree.addEventListener("itemToggle", function(event) {
163-
const item = event.detail.item; // get the node that is toggled
163+
var item = event.detail.item; // get the node that is toggled
164164

165165
// Only for the dynamic node, only when it's empty
166166
if (item.id === "dynamicNode" && item.children.length === 0) {
167167
dynamicTree.busy = true;
168168
event.preventDefault(); // do not let the toggle button switch yet
169169
setTimeout(function() {
170-
const newItem = document.createElement("ui5-tree-item"); // Fetching from db....
170+
var newItem = document.createElement("ui5-tree-item"); // Fetching from db....
171171
newItem.text = "Node fetched from DB after 2 sec";
172172
item.appendChild(newItem);
173173
item.toggle(); // now manually switch

packages/main/test/samples/Tree.sample.html

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
<header>
2-
<h2 class="control-header">Tree</h2>
1+
<header class="component-heading">
2+
<h2 class="control-header">Tree</h2>
3+
<div class="component-heading-since">
4+
<span><!--since_tag_marker--></span>
5+
</div>
36
</header>
47

58
<div class="component-package">@ui5/webcomponents</div>
@@ -146,14 +149,14 @@ <h3>Tree with dynamic content</h3>
146149
<script>
147150
var dynamicTree = document.getElementById("treeDynamic");
148151
dynamicTree.addEventListener("itemToggle", function(event) {
149-
const item = event.detail.item; // get the node that is toggled
152+
var item = event.detail.item; // get the node that is toggled
150153

151154
// Only for the dynamic node, and only when it's empty
152155
if (item.id === "dynamicNode" && item.children.length === 0) {
153156
dynamicTree.busy = true; // block the tree from the user
154157
event.preventDefault(); // do not let the toggle button switch yet
155158
setTimeout(function() {
156-
const newItem = document.createElement("ui5-tree-item"); // Fetching from db....
159+
var newItem = document.createElement("ui5-tree-item"); // Fetching from db....
157160
newItem.text = "Node fetched from DB after 2 sec";
158161
item.appendChild(newItem); // add the newly fetched node to the tree
159162
item.toggle(); // now manually switch the toggle button
@@ -167,14 +170,14 @@ <h3>Tree with dynamic content</h3>
167170
<script>
168171
var dynamicTree = document.getElementById("treeDynamic");
169172
dynamicTree.addEventListener("itemToggle", function(event) {
170-
const item = event.detail.item; // get the node that is toggled
173+
var item = event.detail.item; // get the node that is toggled
171174

172175
// Only for the dynamic node, and only when it's empty
173176
if (item.id === "dynamicNode" && item.children.length === 0) {
174177
dynamicTree.busy = true; // block the tree from the user
175178
event.preventDefault(); // do not let the toggle button switch yet
176179
setTimeout(function() {
177-
const newItem = document.createElement("ui5-tree-item"); // Fetching from db....
180+
var newItem = document.createElement("ui5-tree-item"); // Fetching from db....
178181
newItem.text = "Node fetched from DB after 2 sec";
179182
item.appendChild(newItem); // add the newly fetched node to the tree
180183
item.toggle(); // now manually switch the toggle button

packages/main/test/specs/Tree.spec.js

+29-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ describe("Tree general interaction", () => {
55

66
it("Tree is rendered", () => {
77
const treeRoot = browser.$("#tree").shadow$(".ui5-tree-root");
8-
98
assert.ok(treeRoot.isExisting(), "Tree is rendered.");
109
});
1110

@@ -27,6 +26,35 @@ describe("Tree general interaction", () => {
2726
toggleButton.click();
2827
const listItemsAfter = tree.shadow$$("ui5-li-tree").length;
2928
assert.ok(listItemsAfter > listItemsBefore, "After expanding a node, there are more items in the list");
29+
})
30+
31+
});
32+
33+
describe("Tree proxies properties to list", () => {
34+
browser.url("http://localhost:8080/test-resources/pages/Tree.html");
35+
36+
it("Mode works", () => {
37+
const tree = browser.$("#tree");
38+
const list = tree.shadow$("ui5-list");
39+
40+
const modes = ["None", "SingleSelect", "SingleSelectBegin", "SingleSelectEnd", "MultiSelect", "Delete"];
41+
modes.forEach(mode => {
42+
tree.setAttribute("mode", mode);
43+
assert.ok(list.getAttribute("mode") === mode, "Mode applied");
44+
});
3045
});
3146

47+
it("headerText, footerText, noDataText work", () => {
48+
const tree = browser.$("#tree");
49+
const list = tree.shadow$("ui5-list");
50+
51+
tree.setAttribute("header-text", "header text");
52+
tree.setAttribute("footer-text", "footer text");
53+
tree.setAttribute("no-data-text", "no data text");
54+
55+
assert.ok(list.getAttribute("header-text") === "header text", "header text applied");
56+
assert.ok(list.getAttribute("footer-text") === "footer text", "footer text applied");
57+
assert.ok(list.getAttribute("no-data-text") === "no data text", "no data text applied");
58+
})
59+
3260
});

0 commit comments

Comments
 (0)