neo.mjs 6.17.2 → 6.18.1

package/src/grid/Container.mjs

@@ -101,7 +101,7 @@ class Container extends BaseContainer {
 
         me.vdom.id = me.id + 'wrapper';
 
-        me.createColumns(me.columns);
+        me.createColumns(me.columns)
     }
 
     /**
@@ -111,7 +111,7 @@ class Container extends BaseContainer {
      * @protected
      */
     afterSetSelectionModel(value, oldValue) {
-        this.rendered && value.register(this);
+        this.rendered && value.register(this)
     }
 
     /**
@@ -122,10 +122,10 @@ class Container extends BaseContainer {
      */
     beforeSetColumns(value, oldValue) {
         if (this.configsApplied) {
-            return this.createColumns(value);
+            return this.createColumns(value)
         }
 
-        return value;
+        return value
     }
 
     /**
@@ -137,7 +137,7 @@ class Container extends BaseContainer {
     beforeSetSelectionModel(value, oldValue) {
         oldValue?.destroy();
 
-        return ClassSystemUtil.beforeSetInstance(value, RowModel);
+        return ClassSystemUtil.beforeSetInstance(value, RowModel)
     }
 
     /**
@@ -161,20 +161,20 @@ class Container extends BaseContainer {
 
             if (value instanceof Store) {
                 value.on(listeners);
-                value.getCount() > 0 && me.onStoreLoad(value.items);
+                value.getCount() > 0 && me.onStoreLoad(value.items)
             } else {
                 value = ClassSystemUtil.beforeSetInstance(value, Store, {
                     listeners
-                });
+                })
             }
 
             // in case we dynamically change the store, the view needs to get the new reference
             if (me.view) {
-                me.view.store = value;
+                me.view.store = value
             }
         }
 
-        return value;
+        return value
     }
 
     /**
@@ -182,13 +182,13 @@ class Container extends BaseContainer {
      * @returns {*}
      */
     createColumns(columns) {
-        let me             = this,
-            columnDefaults = me.columnDefaults,
-            sorters        = me.store?.sorters,
+        let me               = this,
+            {columnDefaults} = me,
+            sorters          = me.store?.sorters,
             renderer;
 
         if (!columns || !columns.length) {
-            Neo.logError('Attempting to create a grid.Container without defined columns', me.id);
+            Neo.logError('Attempting to create a grid.Container without defined columns', me.id)
         }
 
         columns.forEach(column => {
@@ -197,35 +197,35 @@ class Container extends BaseContainer {
             columnDefaults && Neo.assignDefaults(column, columnDefaults);
 
             if (column.dock && !column.width) {
-                Neo.logError('Attempting to create a docked column without a defined width', column, me.id);
+                Neo.logError('Attempting to create a docked column without a defined width', column, me.id)
             }
 
             if (renderer && Neo.isString(renderer) && me[renderer]) {
-                column.renderer = me[renderer];
+                column.renderer = me[renderer]
             }
 
             if (sorters?.[0]) {
                 if (column.field === sorters[0].property) {
-                    column.isSorted = sorters[0].direction;
+                    column.isSorted = sorters[0].direction
                 }
             }
 
             column.listeners = {
                 sort : me.onSortColumn,
                 scope: me
-            };
+            }
         });
 
         me.items[0].items = columns;
 
-        return columns;
+        return columns
     }
 
     /**
      * @param {Object[]} inputData
      */
     createViewData(inputData) {
-        this.getView().createViewData(inputData);
+        this.getView().createViewData(inputData)
     }
 
     /**
@@ -233,21 +233,21 @@ class Container extends BaseContainer {
      * @returns {*}
      */
     getVdomRoot() {
-        return this.vdom.cn[0];
+        return this.vdom.cn[0]
     }
 
     /**
      * @returns {Object[]} The new vdom items root
      */
     getVdomItemsRoot() {
-        return this.vdom.cn[0];
+        return this.vdom.cn[0]
     }
 
     /**
      * @returns {Neo.grid.View}
      */
     getView() {
-        return Neo.getComponent(this.viewId) || Neo.get(this.viewId);
+        return Neo.getComponent(this.viewId) || Neo.get(this.viewId)
     }
 
     /**
@@ -255,7 +255,7 @@ class Container extends BaseContainer {
      * @returns {Neo.vdom.VNode}
      */
     getVnodeRoot() {
-        return this.vnode.childNodes[0];
+        return this.vnode.childNodes[0]
     }
 
     /**
@@ -263,7 +263,7 @@ class Container extends BaseContainer {
      */
     onConstructed() {
         super.onConstructed();
-        this.selectionModel?.register(this);
+        this.selectionModel?.register(this)
     }
 
     /**
@@ -277,14 +277,14 @@ class Container extends BaseContainer {
 
         me.store.sort(opts);
         me.removeSortingCss(opts.property);
-        me.onStoreLoad(me.store.items);
+        me.onStoreLoad(me.store.items)
     }
 
     /**
      *
      */
     onStoreFilter() {
-        this.onStoreLoad(this.store.items);
+        this.onStoreLoad(this.store.items)
     }
 
     /**
@@ -299,15 +299,15 @@ class Container extends BaseContainer {
             me.createViewData(data);
 
             if (me.store.sorters.length < 1) {
-                me.removeSortingCss();
+                me.removeSortingCss()
             }
         } else {
             listenerId = me.on('rendered', () => {
                 me.un('rendered', listenerId);
                 setTimeout(() => {
-                    me.createViewData(data);
-                }, 50);
-            });
+                    me.createViewData(data)
+                }, 50)
+            })
         }
     }
 
@@ -322,7 +322,7 @@ class Container extends BaseContainer {
      * @param {*} opts.value
      */
     onStoreRecordChange(opts) {
-        this.getView().onStoreRecordChange(opts);
+        this.getView().onStoreRecordChange(opts)
     }
 
     /**
@@ -331,8 +331,8 @@ class Container extends BaseContainer {
      */
     removeSortingCss(field) {
         this.items[0].items.forEach(column => {
-            column.field !== field && column.removeSortingCss();
-        });
+            column.field !== field && column.removeSortingCss()
+        })
     }
 }
 

package/src/grid/View.mjs

@@ -34,16 +34,14 @@ class View extends Component {
             colCount   = columns.length,
             data       = [],
             i          = 0,
-            vdom       = me.vdom,
+            {vdom}     = me,
             cellCls, cellStyle, config, column, dockLeftMargin, dockRightMargin, id, index, j, rendererOutput,
             record, rendererValue, selectedRows, trCls;
 
         me.recordVnodeMap = {}; // remove old data
 
-        // console.log('createViewData', me.id, inputData);
-
         if (container.selectionModel?.ntype === 'selection-grid-rowmodel') {
-            selectedRows = container.selectionModel.items || [];
+            selectedRows = container.selectionModel.items || []
         }
 
         for (; i < amountRows; i++) {
@@ -59,7 +57,7 @@ class View extends Component {
 
                 Neo.getComponent(me.containerId).fire('select', {
                     record
-                });
+                })
             }
 
             data.push({
@@ -79,7 +77,7 @@ class View extends Component {
                 rendererValue  = record[column.field];
 
                 if (rendererValue === undefined) {
-                    rendererValue = '';
+                    rendererValue = ''
                 }
 
                 rendererOutput = column.renderer.call(column.rendererScope || container, {
@@ -93,20 +91,20 @@ class View extends Component {
                 cellCls = rendererOutput?.cls || ['neo-grid-cell'];
 
                 if (column.align !== 'left') {
-                    cellCls.push('neo-' + column.align);
+                    cellCls.push('neo-' + column.align)
                 }
 
                 if (!Neo.isObject(rendererOutput)) {
                     rendererOutput = {
                         cls : cellCls,
                         html: rendererOutput?.toString()
-                    };
+                    }
                 }
 
                 cellStyle = rendererOutput.style || {};
 
                 if (column.width) {
-                    cellStyle.minWidth = `${column.width}px`;
+                    cellStyle.minWidth = `${column.width}px`
                 }
 
                 config = {
@@ -122,15 +120,15 @@ class View extends Component {
 
                     if (column.dock === 'left') {
                         config.style.left = dockLeftMargin + 'px';
-                        dockLeftMargin += column.width;
+                        dockLeftMargin += column.width
                     }
                 }
 
                 if (column.flex) {
-                    config.style.width = '100%';
+                    config.style.width = '100%'
                 }
 
-                data[i].cn.push(config);
+                data[i].cn.push(config)
             }
 
             j = 0;
@@ -141,7 +139,7 @@ class View extends Component {
 
                 if (column.dock === 'right') {
                     data[i].cn[index].style.right = dockRightMargin + 'px';
-                    dockRightMargin += (column.width + 1); // todo: borders fix
+                    dockRightMargin += (column.width + 1) // todo: borders fix
                 }
             }
         }
@@ -168,7 +166,7 @@ class View extends Component {
      */
     destroy(updateParentVdom, silent) {
         this.store = null;
-        super.destroy(updateParentVdom, silent);
+        super.destroy(updateParentVdom, silent)
     }
 
     /**
@@ -177,7 +175,7 @@ class View extends Component {
      * @returns {String}
      */
     getCellId(record, field) {
-        return this.id + '__' + record[this.store.keyProperty] + '__' + field;
+        return this.id + '__' + record[this.store.keyProperty] + '__' + field
     }
 
     /**
@@ -191,7 +189,7 @@ class View extends Component {
             node, parentNodes;
 
         if (record) {
-            return record;
+            return record
         }
 
         parentNodes = VDomUtil.getParentNodes(me.vdom, nodeId);
@@ -200,11 +198,11 @@ class View extends Component {
             record = me.getRecordByRowId(node.id);
 
             if (record) {
-                return record;
+                return record
             }
         }
 
-        return null;
+        return null
     }
 
     /**
@@ -212,7 +210,7 @@ class View extends Component {
      * @returns {Object}
      */
     getRecordByRowId(rowId) {
-        return this.store.getAt(this.recordVnodeMap[rowId]);
+        return this.store.getAt(this.recordVnodeMap[rowId])
     }
 
     /**
@@ -221,7 +219,7 @@ class View extends Component {
      * @returns {String}
      */
     getRowId(record, index) {
-        return `${this.id}__tr__${record[this.store.keyProperty]}`;
+        return `${this.id}__tr__${record[this.store.keyProperty]}`
     }
 
     /**
@@ -231,7 +229,7 @@ class View extends Component {
      * @returns {String[]}
      */
     getTrClass(record, rowIndex) {
-        return ['neo-grid-row'];
+        return ['neo-grid-row']
     }
 
     /**
@@ -259,7 +257,7 @@ class View extends Component {
             })
         });
 
-        deltas.length > 0 && Neo.applyDeltas(me.appName, deltas);
+        deltas.length > 0 && Neo.applyDeltas(me.appName, deltas)
     }
 }
 

package/src/grid/header/Button.mjs

@@ -71,7 +71,7 @@ class Button extends BaseButton {
         me.addDomListeners({
             click: me.onButtonClick,
             scope: me
-        });
+        })
     }
 
     /**
@@ -81,8 +81,8 @@ class Button extends BaseButton {
      * @protected
      */
     afterSetIsSorted(value, oldValue) {
-        let me  = this,
-            cls = me.cls;
+        let me    = this,
+            {cls} = me;
 
         switch(value) {
             case null:
@@ -105,7 +105,7 @@ class Button extends BaseButton {
         me.mounted && me.fire('sort', {
             direction: value,
             property : me.field
-        });
+        })
     }
 
     /**
@@ -115,7 +115,7 @@ class Button extends BaseButton {
      * @protected
      */
     beforeSetCellAlign(value, oldValue) {
-        return this.beforeSetEnumValue(value, oldValue, 'cellAlign', 'cellAlignValues');
+        return this.beforeSetEnumValue(value, oldValue, 'cellAlign', 'cellAlignValues')
     }
 
     /**
@@ -130,29 +130,29 @@ class Button extends BaseButton {
                 ASC : null,
                 DESC: 'ASC',
                 null: 'DESC'
-            };
+            }
         } else {
             map = {
                 ASC : 'DESC',
                 DESC: null,
                 null: 'ASC'
-            };
+            }
         }
 
-        me.isSorted = map[me.isSorted + ''];
+        me.isSorted = map[me.isSorted + '']
     }
 
     /**
      * @protected
      */
     removeSortingCss() {
-        let me  = this,
-            cls = me.cls;
+        let me    = this,
+            {cls} = me;
 
         NeoArray.add(cls, 'neo-sort-hidden');
 
         me.cls       = cls;
-        me._isSorted = null;
+        me._isSorted = null
     }
 
     /**
@@ -164,7 +164,7 @@ class Button extends BaseButton {
      * @returns {*}
      */
     renderer(data) {
-        return data.value;
+        return data.value
     }
 }
 

package/src/grid/header/Toolbar.mjs

@@ -57,10 +57,10 @@ class Toolbar extends BaseToolbar {
                 item.vdom.cls.push('neo-locked');
 
                 if (item.dock === 'left') {
-                    style.left = dockLeftWidth + 'px';
+                    style.left = dockLeftWidth + 'px'
                 }
 
-                dockLeftWidth += (item.width + 1); // todo: borders fix
+                dockLeftWidth += (item.width + 1) // todo: borders fix
             }
 
             item.wrapperStyle = style;
@@ -74,11 +74,11 @@ class Toolbar extends BaseToolbar {
 
                 item.wrapperStyle = style;
 
-                dockRightWidth += (item.width + 1); // todo: borders fix
+                dockRightWidth += (item.width + 1) // todo: borders fix
             }
         });
 
-        me.update();
+        me.update()
     }
 }
 

package/src/layout/Base.mjs

@@ -55,15 +55,16 @@ class Base extends CoreBase {
      * @protected
      */
     afterSetAppName(value, oldValue) {
-        value && Neo.currentWorker.insertThemeFiles(value, this.container.windowId, this.__proto__);
+        value && Neo.currentWorker.insertThemeFiles(value, this.container.windowId, this.__proto__)
     }
 
     /**
      * Placeholder method
      * @param {Neo.component.Base} item
+     * @param {Number} index
      * @protected
      */
-    applyChildAttributes(item) {}
+    applyChildAttributes(item, index) {}
 
     /**
      * Placeholder method
@@ -88,7 +89,7 @@ class Base extends CoreBase {
      * @returns {Neo.model.Component|null}
      */
     getModel(ntype) {
-        return this.container.getModel();
+        return this.container.getModel()
     }
 
     /**
@@ -101,7 +102,7 @@ class Base extends CoreBase {
 
         let me = this;
 
-        me.bind && me.container.getModel()?.parseConfig(me);
+        me.bind && me.container.getModel()?.parseConfig(me)
     }
 
     /**

package/src/layout/Card.mjs

@@ -71,13 +71,12 @@ class Card extends Base {
      * @protected
      */
     async afterSetActiveIndex(value, oldValue) {
-        let me                  = this,
-            containerId         = me.containerId,
-            container           = Neo.getComponent(containerId) || Neo.get(containerId), // the instance might not be registered yet
-            sCfg                = me.constructor,
-            needsTransition     = me.slideDirection && oldValue !== undefined,
-            needsUpdate         = false,
-            removeInactiveCards = me.removeInactiveCards,
+        let me              = this,
+            {containerId, removeInactiveCards} = me,
+            container       = Neo.getComponent(containerId) || Neo.get(containerId), // the instance might not be registered yet
+            sCfg            = me.constructor,
+            needsTransition = me.slideDirection && oldValue !== undefined,
+            needsUpdate     = false,
             i, isActiveIndex, item, items, len, module, wrapperCls;
 
         if (Neo.isNumber(value) && container) {
@@ -123,7 +122,7 @@ class Card extends Base {
                         }
                     }
 
-                    item.wrapperCls = wrapperCls;
+                    item.wrapperCls = wrapperCls
                 }
             }
 
@@ -146,7 +145,7 @@ class Card extends Base {
             isActiveIndex = me.activeIndex === index,
             sCfg          = me.constructor,
             childCls      = item.wrapperCls,
-            vdom          = item.vdom;
+            {vdom}        = item;
 
         NeoArray.add(childCls, sCfg.itemCls);
         NeoArray.add(childCls, isActiveIndex ? sCfg.activeItemCls : sCfg.inactiveItemCls);
@@ -195,13 +194,13 @@ class Card extends Base {
      * @returns {Neo.component.Base}
      */
     async loadModule(item, index) {
-        let me          = this,
-            containerId = me.containerId,
-            container   = Neo.getComponent(containerId) || Neo.get(containerId), // the instance might not be registered yet
-            items       = container.items,
-            sCfg        = me.constructor,
-            vdom        = container.vdom,
-            module      = item.module,
+        let me            = this,
+            {containerId} = me,
+            container     = Neo.getComponent(containerId) || Neo.get(containerId), // the instance might not be registered yet
+            items         = container.items,
+            sCfg          = me.constructor,
+            {vdom}        = container,
+            {module}      = item,
             proto, wrapperCls;
 
         if (!Neo.isNumber(index)) {

package/src/layout/Fit.mjs

@@ -21,12 +21,12 @@ class Fit extends Base {
 
     /**
      * Initially sets the CSS classes of the container items this layout is bound to.
-     * @param {Neo.component.Base} child
+     * @param {Neo.component.Base} item
      * @param {Number} index
      */
-    applyChildAttributes(child, index) {
-        if (!child.ignoreLayout) {
-            child.wrapperCls = NeoArray.union(child.wrapperCls, 'neo-layout-fit-item');
+    applyChildAttributes(item, index) {
+        if (!item.ignoreLayout) {
+            item.wrapperCls = NeoArray.union(item.wrapperCls, 'neo-layout-fit-item')
         }
     }
 
@@ -39,12 +39,26 @@ class Fit extends Base {
             wrapperCls = container?.wrapperCls || [];
 
         if (!container) {
-            Neo.logError('layout.Fit: applyRenderAttributes -> container not yet created', me.containerId);
+            Neo.logError('layout.Fit: applyRenderAttributes -> container not yet created', me.containerId)
         }
 
         NeoArray.add(wrapperCls, 'neo-layout-fit');
 
-        container.wrapperCls = wrapperCls;
+        container.wrapperCls = wrapperCls
+    }
+
+    /**
+     * Removes all CSS rules from a container item this layout is bound to.
+     * Gets called when switching to a different layout.
+     * @param {Neo.component.Base} item
+     */
+    removeChildAttributes(item) {
+        if (!item.ignoreLayout) {
+            let wrapperCls = item.wrapperCls;
+
+            NeoArray.remove(wrapperCls, 'neo-layout-fit-item');
+            item.wrapperCls = wrapperCls
+        }
     }
 
     /**
@@ -57,12 +71,12 @@ class Fit extends Base {
             wrapperCls = container?.wrapperCls || [];
 
         if (!container) {
-            Neo.logError('layout.Fit: removeRenderAttributes -> container not yet created', me.containerId);
+            Neo.logError('layout.Fit: removeRenderAttributes -> container not yet created', me.containerId)
         }
 
         NeoArray.remove(wrapperCls, 'neo-layout-fit');
 
-        container.wrapperCls = wrapperCls;
+        container.wrapperCls = wrapperCls
     }
 }