Skip to content

Commit ec5a9cf

Browse files
authored
fix(framework): remove white spaces from hbs parser (#1613)
1 parent ed8e6ee commit ec5a9cf

File tree

3 files changed

+112
-2
lines changed

3 files changed

+112
-2
lines changed

packages/main/test/pages/Kitchen.html

+56-1
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,17 @@
328328

329329
<section style="display: flex;flex-direction: row; justify-content: space-around">
330330
<ui5-datepicker style="width:40%" id="myDatepicker" value="Jun 06, 2018" popover-horizontal-align="Left"></ui5-datepicker>
331-
<ui5-datepicker style="width:40%" id="myDatepicker"></ui5-datepicker>
331+
<ui5-datepicker style="width:40%" id="myDatepicker1"></ui5-datepicker>
332+
</section>
333+
334+
<section style="display: flex;flex-direction: row; justify-content: space-around">
335+
<ui5-datetime-picker style="width:40%" id="myDateTimepicker" value="Jun 06, 2018" popover-horizontal-align="Left"></ui5-datetime-picker>
336+
<ui5-datetime-picker style="width:40%" id="myDateTimepicker1"></ui5-datetime-picker>
337+
</section>
338+
339+
<section style="display: flex;flex-direction: row; justify-content: space-around">
340+
<ui5-duration-picker value="05:10:02" seconds-step="5" id="duration-picker6"></ui5-duration-picker>
341+
<ui5-timepicker></ui5-timepicker>
332342
</section>
333343

334344
<section class="row">
@@ -381,6 +391,51 @@
381391
<ui5-button>Gravity</ui5-button>
382392
</ui5-tab>
383393
</ui5-tabcontainer>
394+
395+
396+
<ui5-tree id="tree" no-data-text="No data" mode="MultiSelect" style="margin-top: 5rem;">
397+
<div slot="header" style="margin: .25rem; display: flex; align-items: center; justify-content: space-around;">
398+
<ui5-title>My tree</ui5-title>
399+
<div class="spacer"></div>
400+
<ui5-select id="modeSelect">
401+
<ui5-option>None</ui5-option>
402+
<ui5-option>SingleSelect</ui5-option>
403+
<ui5-option>SingleSelectBegin</ui5-option>
404+
<ui5-option>SingleSelectEnd</ui5-option>
405+
<ui5-option selected>MultiSelect</ui5-option>
406+
407+
<ui5-option>Delete</ui5-option>
408+
</ui5-select>
409+
<ui5-button id="expandLevel1" icon="expand">Expand Level 1</ui5-button>
410+
<ui5-button id="expandLevel2" icon="expand">Expand Level 2</ui5-button>
411+
<ui5-button id="expandAll" icon="expand-all">Expand All</ui5-button>
412+
<ui5-button id="collapseAll" icon="collapse-all">Collapse All</ui5-button>
413+
</div>
414+
415+
<ui5-tree-item expanded text="Tree 1" icon="paste" selected>
416+
<ui5-tree-item expanded text="Tree 1.1" selected>
417+
<ui5-tree-item text="Tree 1.1.1"></ui5-tree-item>
418+
<ui5-tree-item text="Tree 1.1.2"></ui5-tree-item>
419+
</ui5-tree-item>
420+
</ui5-tree-item>
421+
422+
<ui5-tree-item text="Tree 2" icon="copy">
423+
<ui5-tree-item text="Tree 2.1">
424+
<ui5-tree-item text="Tree 2.1.1"></ui5-tree-item>
425+
<ui5-tree-item text="Tree 2.1.2">
426+
<ui5-tree-item text="Tree 2.1.2.1"></ui5-tree-item>
427+
<ui5-tree-item text="Tree 2.1.2.2"></ui5-tree-item>
428+
<ui5-tree-item text="Tree 2.1.2.3"></ui5-tree-item>
429+
<ui5-tree-item text="Tree 2.1.2.5"></ui5-tree-item>
430+
</ui5-tree-item>
431+
</ui5-tree-item>
432+
<ui5-tree-item text="Tree 2.2"></ui5-tree-item>
433+
</ui5-tree-item>
434+
435+
<ui5-tree-item expanded text="Tree 3 (no icon)">
436+
</ui5-tree-item>
437+
438+
</ui5-tree>
384439
</section>
385440

386441
<section class="row">

packages/main/test/pages/kitchen-scripts.js

+55
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,59 @@ document.addEventListener("DOMContentLoaded", function(event) {
182182
input.appendChild(li);
183183
});
184184
});
185+
186+
187+
// Tree
188+
document.getElementById("tree").addEventListener("itemClick", function(event) {
189+
console.log("Item clicked: ", event.detail.item);
190+
});
191+
192+
document.getElementById("tree").addEventListener("itemToggle", function(event) {
193+
console.log("Item toggled: ", event.detail.item);
194+
});
195+
196+
document.getElementById("tree").addEventListener("itemDelete", function(event) {
197+
console.log("Item delete button pressed: ", event.detail.item);
198+
var node = event.detail.item;
199+
node.parentElement.removeChild(node);
200+
});
201+
202+
document.getElementById("tree").addEventListener("selectionChange", function(event) {
203+
console.log("Selection changed from: ", event.detail.previouslySelectedItems, "to: ", event.detail.selectedItems);
204+
});
205+
206+
document.getElementById("modeSelect").addEventListener("change", function(event) {
207+
var newMode = event.detail.selectedOption.textContent;
208+
var tree = document.getElementById("tree");
209+
tree.mode = newMode;
210+
});
211+
212+
document.getElementById("expandAll").addEventListener("click", function(event) {
213+
var trees = Array.prototype.slice.call(document.getElementsByTagName("ui5-tree"));
214+
var tree = document.getElementById("tree");
215+
tree.walk(function(node) {
216+
node.expanded = true;
217+
});
218+
});
219+
220+
document.getElementById("collapseAll").addEventListener("click", function(event) {
221+
var tree = document.getElementById("tree");
222+
tree.walk(function(node) {
223+
node.expanded = false;
224+
});
225+
});
226+
227+
document.getElementById("expandLevel1").addEventListener("click", function(event) {
228+
var tree = document.getElementById("tree");
229+
tree.walk(function(node, level) {
230+
node.expanded = (level === 1);
231+
});
232+
});
233+
234+
document.getElementById("expandLevel2").addEventListener("click", function(event) {
235+
var tree = document.getElementById("tree");
236+
tree.walk(function(node, level) {
237+
node.expanded = (level <= 2);
238+
});
239+
});
185240
});

packages/tools/lib/hbs2lit/src/compiler.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const includesReplacer = require("./includesReplacer");
55
const svgProcessor = require("./svgProcessor");
66

77
const removeWhiteSpaces = (source) => {
8-
return source.replace(/\n+/g, "").replace(/\s+</g, "<").replace(/}}\s+{{/g, "}}{{");
8+
return source.replace(/\n+/g, "").replace(/\s+</g, "<").replace(/}}\s+{{/g, "}}{{").replace(/\t+/g, " ");
99
};
1010

1111
const compileString = async (sInput, config) => {

0 commit comments

Comments
 (0)