Merge branch 'master' into master-deprecated

liferay · Jun 26, 2021 · 6aa025f · 6aa025f
2 parents 540b4b5 + e41fc96
commit 6aa025f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/aui-tree/HISTORY.md b/src/aui-tree/HISTORY.md
@@ -4,6 +4,7 @@
 
 ## @VERSION@
 
+* [AUI-3200](https://issues.liferay.com/browse/AUI-3200) AUI-3200 Fix tree is built without children nodes (aui-tree-view) regression of AUI-3196 Prevent tree to create empty ul container with no children, remove previous condition and add ul element only when is expanded (has children).
 * [AUI-3196](https://issues.liferay.com/browse/AUI-3196) An empty unordered list item (ul) is generated after each child list item (li)
 
 ## [3.0.3](https://github.com/liferay/alloy-ui/releases/tag/3.0.3)

diff --git a/src/aui-tree/js/aui-tree-data.js b/src/aui-tree/js/aui-tree-data.js
@@ -784,7 +784,7 @@ A.mix(TreeData.prototype, {
 
         instance.childrenLength = v.length;
 
-        if (instance.childrenLength && !container) {
+        if (!container) {
             container = instance._createNodeContainer();
         }
 

diff --git a/src/aui-tree/js/aui-tree-node.js b/src/aui-tree/js/aui-tree-node.js
@@ -569,11 +569,7 @@ var TreeNode = A.Component.create({
 
             var nodeContainer = instance.get('container');
 
-            if (nodeContainer) {
-                if (!instance.get('expanded')) {
-                    nodeContainer.hide();
-                }
-
+            if (nodeContainer && instance.get('expanded')) {
                 boundingBox.append(nodeContainer);
             }