neo.mjs 6.17.2 → 6.18.1

package/src/tree/Accordion.mjs

@@ -109,12 +109,10 @@ class AccordionTree extends TreeList {
      * @param {Boolean} oldValue
      */
     afterSetFirstParentIsVisible(value, oldValue) {
-        const toggleFn = !value ? 'addCls' : 'removeCls';
-
-        this[toggleFn]('first-parent-not-visible');
+        this[!value ? 'addCls' : 'removeCls']('first-parent-not-visible');
 
         if (this.store.first()) {
-            this.store.first().visible = value;
+            this.store.first().visible = value
         }
     }
 
@@ -126,17 +124,16 @@ class AccordionTree extends TreeList {
      * @param {Boolean} oldValue
      */
     afterSetRootParentsAreCollapsible(value, oldValue) {
-        const me       = this,
-              toggleFn = !value ? 'addCls' : 'removeCls';
+        let me = this;
 
-        me[toggleFn]('root-not-collapsible');
+        me[!value ? 'addCls' : 'removeCls']('root-not-collapsible');
 
         if (me.rendered && value === false) {
-            const store = me.store;
+            let {store} = me;
 
             store.items.forEach(record => {
                 if (record.parentId === null && !record.isLeaf) {
-                    me.expandItem(record);
+                    me.expandItem(record)
                 }
             })
         }
@@ -150,9 +147,9 @@ class AccordionTree extends TreeList {
      * @param {Boolean} oldValue
      */
     afterSetShowIcon(value, oldValue) {
-        const me    = this,
-              store = me.store,
-              hide  = !value;
+        const me      = this,
+              {store} = me,
+              hide    = !value;
 
         store.items.forEach((record) => {
             const itemId   = me.getItemId(record[me.getKeyProperty()]),
@@ -160,7 +157,7 @@ class AccordionTree extends TreeList {
                   itemVdom = VDomUtil.getByFlag(vdom, 'icon');
 
             if (record.isLeaf) {
-                itemVdom.removeDom = hide;
+                itemVdom.removeDom = hide
             }
         })
 
@@ -177,7 +174,7 @@ class AccordionTree extends TreeList {
     beforeSetSelectionModel(value, oldValue) {
         oldValue?.destroy();
 
-        return ClassSystemUtil.beforeSetInstance(value, TreeAccordionModel);
+        return ClassSystemUtil.beforeSetInstance(value, TreeAccordionModel)
     }
 
     /**
@@ -189,7 +186,7 @@ class AccordionTree extends TreeList {
     clear(withUpdate=true) {
         delete this.getVdomRoot().cn[0].cn
 
-        withUpdate && this.update();
+        withUpdate && this.update()
     }
 
     /**
@@ -207,15 +204,14 @@ class AccordionTree extends TreeList {
      * @protected
      */
     createItems(parentId, vdomRoot, level) {
-        let me        = this,
-            items     = me.store.find('parentId', parentId),
-            itemCls   = me.itemCls,
-            folderCls = me.folderCls,
+        let me                   = this,
+            {folderCls, itemCls} = me,
+            items                = me.store.find('parentId', parentId),
             cls, id, itemIconCls, tmpRoot;
 
         if (items.length > 0) {
             if (!vdomRoot.cn) {
-                vdomRoot.cn = [];
+                vdomRoot.cn = []
             }
 
             if (parentId !== null) {
@@ -226,45 +222,45 @@ class AccordionTree extends TreeList {
                     id : `${me.id}__${parentId}__ul`
                 });
 
-                tmpRoot = vdomRoot.cn[vdomRoot.cn.length - 1];
+                tmpRoot = vdomRoot.cn[vdomRoot.cn.length - 1]
             } else {
-                tmpRoot = vdomRoot;
+                tmpRoot = vdomRoot
             }
 
             items.forEach(item => {
-                cls = [itemCls];
-
+                cls         = [itemCls];
                 itemIconCls = ['neo-accordion-item-icon'];
+
                 if (item.iconCls) {
-                    NeoArray.add(itemIconCls, item.iconCls.split(' '));
+                    NeoArray.add(itemIconCls, item.iconCls.split(' '))
                 }
 
-
                 if (item.isLeaf) {
-                    cls.push(itemCls + (item.singleton ? '-leaf-singleton' : '-leaf'));
+                    cls.push(itemCls + (item.singleton ? '-leaf-singleton' : '-leaf'))
                 } else {
                     cls.push(folderCls);
 
                     if (!item.parentId && !me.rootParentsAreCollapsible) {
-
                         cls.push('neo-not-collapsible');
+
                         if (item.collapsed) {
-                            item.collapsed = false;
+                            item.collapsed = false
                         }
                     }
+
                     if (!item.collapsed) {
-                        cls.push('neo-folder-open');
+                        cls.push('neo-folder-open')
                     }
                 }
 
                 id = me.getItemId(item.id);
 
                 tmpRoot.cn.push({
-                    tabIndex : -1,
-                    tag      : 'li',
+                    tag     : 'li',
+                    tabIndex: -1,
                     cls,
                     id,
-                    cn : [{
+                    cn      : [{
                         flag     : 'iconCls',
                         tag      : 'span',
                         cls      : itemIconCls,
@@ -295,11 +291,11 @@ class AccordionTree extends TreeList {
                     }
                 });
 
-                tmpRoot = me.createItems(item.id, tmpRoot, level + 1);
-            });
+                tmpRoot = me.createItems(item.id, tmpRoot, level + 1)
+            })
         }
 
-        return vdomRoot;
+        return vdomRoot
     }
 
 
@@ -308,14 +304,14 @@ class AccordionTree extends TreeList {
      * @param {Object} record
      */
     expandItem(record) {
-        const me     = this,
-              itemId = me.getItemId(record[me.getKeyProperty()]),
-              item   = me.getVdomChild(itemId);
+        let me     = this,
+            itemId = me.getItemId(record[me.getKeyProperty()]),
+            item   = me.getVdomChild(itemId);
 
         record.collapsed = false;
 
         NeoArray.add(item.cls, 'neo-folder-open');
-        me.update();
+        me.update()
     }
 
     /**
@@ -325,11 +321,11 @@ class AccordionTree extends TreeList {
     onItemClick(item, data) {
         super.onItemClick(item, data);
 
-        const me             = this,
-              selectionModel = me.selectionModel,
-              itemId         = item.id,
-              id             = Number(itemId.split('__')[1]),
-              record         = me.store.get(id);
+        let me               = this,
+            {selectionModel} = me,
+            itemId           = item.id,
+            id               = Number(itemId.split('__')[1]),
+            record           = me.store.get(id);
 
         selectionModel.select(item.id);
 
@@ -351,7 +347,7 @@ class AccordionTree extends TreeList {
      * @returns {Object}
      */
     getListItemsRoot() {
-        return this.vdom.cn[0];
+        return this.vdom.cn[0]
     }
 
     /**
@@ -359,11 +355,11 @@ class AccordionTree extends TreeList {
      * @param {Object} data
      */
     onFocus(data) {
-        const me        = this,
-              selModel  = me.selectionModel,
-              selection = selModel.getSelection()[0];
+        let me               = this,
+            {selectionModel} = me,
+            selection        = selectionModel.getSelection()[0];
 
-        if (!selection) selModel.selectRoot();
+        !selection && selectionModel.selectRoot()
     }
 
     /**
@@ -371,17 +367,17 @@ class AccordionTree extends TreeList {
      * @param {String[]} value
      */
     onSelect(value) {
-        const me = this;
-        let records = [];
+        let me      = this,
+            records = [];
 
         value.forEach((selectItemId) => {
             let id     = me.getItemRecordId(selectItemId),
                 record = me.store.get(id);
 
-            records.push(record);
+            records.push(record)
         });
 
-        me.selection = records;
+        me.selection = records
     }
 
     /**
@@ -389,17 +385,15 @@ class AccordionTree extends TreeList {
      * @param {Record[]} records
      */
     onStoreLoad(records) {
-        let me = this,
-            listenerId;
+        let me = this;
 
         me.clear(false);
 
         if (!me.mounted && me.rendering) {
-            listenerId = me.on('mounted', () => {
-                me.un('mounted', listenerId);
+            me.on('mounted', () => {
                 me.createItems(null, me.getListItemsRoot(), 0);
                 me.update()
-            });
+            }, me, {once: true})
         } else {
             me.createItems(null, me.getListItemsRoot(), 0);
             me.update()
@@ -415,11 +409,10 @@ class AccordionTree extends TreeList {
      * @param {Record}         data.record
      */
     onStoreRecordChange(data) {
-        let me     = this,
-            record = data.record,
-            fields = data.fields,
-            itemId = me.getItemId(record[me.getKeyProperty()]),
-            vdom   = me.getVdomChild(itemId),
+        let me               = this,
+            {fields, record} = data,
+            itemId           = me.getItemId(record[me.getKeyProperty()]),
+            vdom             = me.getVdomChild(itemId),
             itemVdom;
 
         fields.forEach((field) => {
@@ -427,13 +420,13 @@ class AccordionTree extends TreeList {
 
             if (itemVdom) {
                 if (field.name === 'iconCls') {
-                    const clsItems = field.value.split(' '),
-                          cls      = ['neo-accordion-item-icon'];
+                    let clsItems = field.value.split(' '),
+                        cls      = ['neo-accordion-item-icon'];
 
                     NeoArray.add(cls, clsItems);
-                    itemVdom.cls = cls;
+                    itemVdom.cls = cls
                 } else {
-                    itemVdom.html = field.value;
+                    itemVdom.html = field.value
                 }
             }
         });
@@ -450,17 +443,18 @@ class AccordionTree extends TreeList {
     setSelection(value) {
         if (value === null) {
             this.clearSelection();
-            return;
+            return
         }
 
         // In case you pass in an array use only the first item
-        if (Neo.isArray(value)) value = value[0];
+        if (Neo.isArray(value)) {
+            value = value[0]
+        }
 
-        const me = this;
-        let recordKeyProperty, elId;
+        let me = this,
+            recordKeyProperty, elId;
 
-        if (Neo.isObject(value)) {
-            // Record
+        if (Neo.isRecord(value)) {
             recordKeyProperty = value[me.getKeyProperty()];
         } else {
             // RecordId
@@ -469,7 +463,7 @@ class AccordionTree extends TreeList {
 
         elId = me.getItemId(recordKeyProperty);
 
-        me.selectionModel.selectAndScrollIntoView(elId);
+        me.selectionModel.selectAndScrollIntoView(elId)
     }
 }
 

package/src/tree/List.mjs

@@ -76,7 +76,7 @@ class Tree extends Base {
 
         if (value) {
             if (me.sortable) {
-                console.error('tree.List can be either draggable or sortable, not both.', me.id);
+                console.error('tree.List can be either draggable or sortable, not both.', me.id)
             } else if (!me.dragZone) {
                 import('../draggable/tree/DragZone.mjs').then(module => {
                     me.dragZone = Neo.create({
@@ -84,8 +84,8 @@ class Tree extends Base {
                         appName: me.appName,
                         owner  : me,
                         ...me.dragZoneConfig
-                    });
-                });
+                    })
+                })
             }
         }
     }
@@ -101,7 +101,7 @@ class Tree extends Base {
 
         if (value) {
             if (me.draggable) {
-                console.error('tree.List can be either draggable or sortable, not both.', me.id);
+                console.error('tree.List can be either draggable or sortable, not both.', me.id)
             } else if (!me.sortZone) {
                 import('../draggable/tree/SortZone.mjs').then(module => {
                     me.sortZone = Neo.create({
@@ -110,8 +110,8 @@ class Tree extends Base {
                         boundaryContainerId: me.id,
                         owner              : me,
                         ...me.sortZoneConfig
-                    });
-                });
+                    })
+                })
             }
         }
     }
@@ -151,25 +151,24 @@ class Tree extends Base {
      * Collapses all folders
      * @param {Boolean} [silent]=false Set silent to true to prevent a vnode update
      */
-    collapseAll(silent = false) {
+    collapseAll(silent=false) {
         let me       = this,
-            vdom     = me.vdom,
             hasMatch = false,
             node;
 
         me.store.items.forEach(item => {
             if (!item.isLeaf) {
-                node = me.getVdomChild(me.getItemId(item.id), vdom);
+                node = me.getVdomChild(me.getItemId(item.id), me.vdom);
 
                 if (node.cls.includes('neo-folder-open')) {
                     NeoArray.remove(node.cls, 'neo-folder-open');
-                    hasMatch = true;
+                    hasMatch = true
                 }
             }
         });
 
         if (hasMatch) {
-            me[silent ? '_vdom' : 'vdom'] = vdom
+            !silent && me.update()
         }
     }
 
@@ -182,15 +181,14 @@ class Tree extends Base {
      * @protected
      */
     createItems(parentId, vdomRoot, level, hidden=false) {
-        let me        = this,
-            items     = me.store.find('parentId', parentId),
-            itemCls   = me.itemCls,
-            folderCls = me.folderCls,
+        let me                   = this,
+            items                = me.store.find('parentId', parentId),
+            {folderCls, itemCls} = me,
             cls, itemVdom, tmpRoot;
 
         if (items.length > 0) {
             if (!vdomRoot.cn) {
-                vdomRoot.cn = [];
+                vdomRoot.cn = []
             }
 
             if (parentId !== null) {
@@ -258,15 +256,14 @@ class Tree extends Base {
      * Expands all folders
      * @param {Boolean} silent=false Set silent to true to prevent a vnode update
      */
-    expandAll(silent = false) {
+    expandAll(silent=false) {
         let me       = this,
-            vdom     = me.vdom,
             hasMatch = false,
             node;
 
         me.store.items.forEach(item => {
             if (!item.isLeaf) {
-                node = me.getVdomChild(me.getItemId(item.id), vdom);
+                node = me.getVdomChild(me.getItemId(item.id), me.vdom);
 
                 if (!node.cls.includes('neo-folder-open')) {
                     NeoArray.add(node.cls, 'neo-folder-open');
@@ -276,7 +273,7 @@ class Tree extends Base {
         });
 
         if (hasMatch) {
-            me[silent ? '_vdom' : 'vdom'] = vdom
+            !silent && me.update()
         }
     }
 
@@ -380,11 +377,11 @@ class Tree extends Base {
      * @param {Object} data
      */
     onItemClick(node, data) {
-        let me    = this,
-            items = me.store.items,
-            i     = 0,
-            len   = items.length,
-            path  = data.path.map(e => e.id),
+        let me      = this,
+            {items} = me.store,
+            i       = 0,
+            len     = items.length,
+            path    = data.path.map(e => e.id),
             item, record, tmpItem, vnodeId;
 
         for (; i < len; i++) {

package/src/util/Array.mjs

@@ -21,7 +21,7 @@ class NeoArray extends Base {
      */
     static add(arr, items) {
         if (!Array.isArray(items)) {
-            items = [items];
+            items = [items]
         }
 
         items.forEach(item => {
@@ -29,7 +29,8 @@ class NeoArray extends Base {
                 arr.push(item);
             }
         });
-        return arr;
+
+        return arr
     }
 
     /**
@@ -39,7 +40,7 @@ class NeoArray extends Base {
      * @returns {Array}
      */
     static difference(array1=[], array2=[]) {
-        return array1.filter(item => !array2.includes(item));
+        return array1.filter(item => !array2.includes(item))
     }
 
     /**
@@ -48,7 +49,7 @@ class NeoArray extends Base {
      * @param {*} item
      */
     static hasItem(arr, item) {
-        return arr.includes(item);
+        return arr.includes(item)
     }
 
     /**
@@ -59,7 +60,7 @@ class NeoArray extends Base {
      * @returns {Array}
      */
     static intersection(array1=[], array2=[]) {
-        return array1.filter(item => array2.includes(item));
+        return array1.filter(item => array2.includes(item))
     }
 
     /**
@@ -70,15 +71,15 @@ class NeoArray extends Base {
      */
     static move(arr, fromIndex, toIndex) {
         if (fromIndex === toIndex) {
-            return arr;
+            return arr
         }
 
         if (fromIndex >= arr.length) {
-            fromIndex = arr.length - 1;
+            fromIndex = arr.length - 1
         }
 
         arr.splice(toIndex, 0, arr.splice(fromIndex, 1)[0]);
-        return arr;
+        return arr
     }
 
     /**
@@ -90,15 +91,16 @@ class NeoArray extends Base {
         let index;
 
         if (!Array.isArray(items)) {
-            items = [items];
+            items = [items]
         }
 
         items.forEach(item => {
             index = arr.indexOf(item);
 
-            index > -1 && arr.splice(index, 1);
+            index > -1 && arr.splice(index, 1)
         });
-        return arr;
+
+        return arr
     }
 
     /**
@@ -110,7 +112,7 @@ class NeoArray extends Base {
      */
     static removeAdd(arr, removeItems, addItems) {
         this.remove(arr, removeItems);
-        return this.add(arr, addItems);
+        return this.add(arr, addItems)
     }
 
     /**
@@ -127,12 +129,10 @@ class NeoArray extends Base {
      * Returns an array of items which are present in the passed arrays.
      * Multiple arrays may be passed.
      * Only supports primitive items
-     * @param {Array} array1
-     * @param {Array} array2
      * @returns {Array}
      */
     static union() {
-        return [...new Set(Array.prototype.concat(...arguments))];
+        return [...new Set(Array.prototype.concat(...arguments))]
     }
 
     /**
@@ -143,15 +143,16 @@ class NeoArray extends Base {
      */
     static unshift(arr, items) {
         if (!Array.isArray(items)) {
-            items = [items];
+            items = [items]
         }
 
         items.forEach(item => {
             if (!arr.includes(item)) {
-                arr.unshift(item);
+                arr.unshift(item)
             }
         });
-        return arr;
+
+        return arr
     }
 }
 

package/src/util/ClassSystem.mjs

@@ -24,24 +24,24 @@ class ClassSystem extends Base {
         let isInstance = config instanceof Neo.core.Base;
 
         if (Neo.isString(DefaultClass)) {
-            DefaultClass = Neo.ns(DefaultClass);
+            DefaultClass = Neo.ns(DefaultClass)
         }
 
         if (!config && DefaultClass) {
-            config = Neo.create(DefaultClass, defaultValues);
+            config = Neo.create(DefaultClass, defaultValues)
         } else if (config?.isClass) {
-            config = Neo.create(config, defaultValues);
+            config = Neo.create(config, defaultValues)
         } else if (Neo.isObject(config) && !isInstance) {
             if (config.ntype) {
                 config = Neo.ntype({
                     ...defaultValues,
                     ...config
-                });
+                })
             } else {
-                const newConfig = {};
+                let newConfig = {};
 
                 if (DefaultClass) {
-                    newConfig.module = DefaultClass;
+                    newConfig.module = DefaultClass
                 }
 
                 Object.assign(newConfig, {
@@ -49,15 +49,15 @@ class ClassSystem extends Base {
                     ...config
                 });
 
-                config = Neo.create(newConfig);
+                config = Neo.create(newConfig)
             }
         } else if (isInstance) {
             if (defaultValues?.listeners) {
-                config.on(defaultValues.listeners);
+                config.on(defaultValues.listeners)
             }
         }
 
-        return config;
+        return config
     }
 }
 

package/src/util/Css.mjs

@@ -20,7 +20,7 @@ class Css extends Base {
      */
     static deleteRules(appName, rules) {
         if (!Array.isArray(rules)) {
-            rules = [rules];
+            rules = [rules]
         }
 
         Neo.main.addon.Stylesheet.deleteCssRules({appName, rules})
@@ -32,7 +32,7 @@ class Css extends Base {
      */
     static insertRules(appName, rules) {
         if (!Array.isArray(rules)) {
-            rules = [rules];
+            rules = [rules]
         }
 
         Neo.main.addon.Stylesheet.insertCssRules({appName, rules})