neo.mjs 9.15.0 → 10.0.0-alpha.1

package/src/tree/Accordion.mjs

@@ -272,18 +272,18 @@ class AccordionTree extends TreeList {
                         cls  : [itemCls + '-content'],
                         id   : id + '__item-content',
                         style: {pointerEvents: 'none'},
-                        cn   : [{
-                            flag     : 'name',
-                            tag      : 'span',
-                            cls      : [itemCls + '-content-header'],
-                            id       : id + '__item-content-header',
-                            innerHTML: item[me.fields.header]
+                        cn: [{
+                            flag: 'name',
+                            tag : 'span',
+                            cls : [itemCls + '-content-header'],
+                            id  : id + '__item-content-header',
+                            html: item[me.fields.header]
                         }, {
-                            flag     : 'content',
-                            tag      : 'span',
-                            cls      : [itemCls + '-content-text'],
-                            id       : id + '__item-content-text',
-                            innerHTML: item[me.fields.text]
+                            flag: 'content',
+                            tag : 'span',
+                            cls : [itemCls + '-content-text'],
+                            id  : id + '__item-content-text',
+                            html: item[me.fields.text]
                         }]
                     }],
                     style: {

package/src/tree/List.mjs

@@ -184,8 +184,15 @@ class Tree extends Base {
         let me                   = this,
             {folderCls, itemCls} = me,
             cls                  = [itemCls],
+            contentCls           = [itemCls + '-content'],
             itemVdom;
 
+        if (record.iconCls) {
+            contentCls.push(
+                Array.isArray(record.iconCls) ? record.iconCls : record.iconCls.split(' ')
+            )
+        }
+
         if (record.isLeaf) {
             cls.push(itemCls + (record.singleton ? '-leaf-singleton' : '-leaf'))
         } else {
@@ -201,10 +208,10 @@ class Tree extends Base {
             cls,
             id : me.getItemId(record.id),
             cn : [{
-                tag      : 'span',
-                cls      : [itemCls + '-content', record.iconCls],
-                innerHTML: record.name,
-                style    : {pointerEvents: 'none'}
+                tag  : 'span',
+                cls  : contentCls,
+                html : record.name,
+                style: {pointerEvents: 'none'}
             }],
             style: {
                 display : record.hidden ? 'none' : 'flex',
@@ -329,7 +336,7 @@ class Tree extends Base {
                 directMatch = false;
                 node        = me.getVdomChild(me.getItemId(item.id), me.vdom);
 
-                node.cn[0].innerHTML = item[property].replace(valueRegEx, match => {
+                node.cn[0].html = item[property].replace(valueRegEx, match => {
                     directMatch = true;
                     return `<span class="neo-highlight-search">${match}</span>`
                 });