neo.mjs 4.1.0 → 4.2.0

package/src/selection/grid/RowModel.mjs

@@ -0,0 +1,188 @@
+import Model    from '../Model.mjs';
+import VDomUtil from '../../util/VDom.mjs';
+
+/**
+ * @class Neo.selection.grid.RowModel
+ * @extends Neo.selection.Model
+ */
+class RowModel extends Model {
+    static getConfig() {return {
+        /**
+         * @member {String} className='Neo.selection.grid.RowModel'
+         * @protected
+         */
+        className: 'Neo.selection.grid.RowModel',
+        /**
+         * @member {String} ntype='selection-grid-rowmodel'
+         * @protected
+         */
+        ntype: 'selection-grid-rowmodel',
+        /**
+         * @member {String} cls='selection-rowmodel'
+         * @protected
+         */
+        cls: 'neo-selection-rowmodel'
+    }}
+
+    /**
+     *
+     */
+    addDomListener() {
+        let me           = this,
+            view         = me.view,
+            domListeners = view.domListeners;
+
+        domListeners.push({
+            click   : me.onRowClick,
+            delegate: '.neo-grid-row',
+            scope   : me
+        });
+
+        view.domListeners = domListeners;
+    }
+
+    /**
+     * Finds the matching table row for a given row index
+     * @param {Number} index row index
+     * @returns {String|null} The table row node id
+     */
+    getRowId(index) {
+        if (index < 0 || this.view.store.getCount() < index) {
+            return null;
+        }
+
+        return this.view.vdom.cn[0].cn[1].cn[index].id;
+    }
+
+    /**
+     * Finds the matching table row for a given event path
+     * @param {Object} path The event path
+     * @returns {Object|null} The node containing the table row class or null
+     * @protected
+     */
+    static getRowNode(path) {
+        let i    = 0,
+            len  = path.length,
+            node = null;
+
+        for (; i < len; i++) {
+            if (path[i].cls.includes('neo-grid-row')) {
+                node = path[i];
+            }
+        }
+
+        return node;
+    }
+
+    /**
+     * @param {Object} data
+     */
+    onKeyDownDown(data) {
+        this.onNavKeyRow(data, 1);
+    }
+
+    /**
+     * @param {Object} data
+     */
+    onKeyDownUp(data) {
+        this.onNavKeyRow(data, -1);
+    }
+
+    /**
+     * @param {Object} data
+     * @param {Number} step
+     */
+    onNavKeyRow(data, step) {
+        let me         = this,
+            node       = RowModel.getRowNode(data.path),
+            view       = me.view,
+            store      = view.store,
+            vdomNode   = VDomUtil.findVdomChild(view.vdom, node.id),
+            newIndex   = (vdomNode.index + step) % store.getCount(),
+            parentNode = vdomNode.parentNode,
+            id;
+
+        while (newIndex < 0) {
+            newIndex += store.getCount();
+        }
+
+        id = parentNode.cn[newIndex].id;
+
+        if (id) {
+            me.select(id);
+            view.focus(id);
+
+            view.fire('select', {
+                record: store.getAt(newIndex)
+            });
+        }
+    }
+
+    /**
+     * @param {Object} data
+     */
+    onRowClick(data) {
+        let me   = this,
+            node = RowModel.getRowNode(data.path),
+            id   = node?.id,
+            view = me.view,
+            isSelected, record;
+
+        if (id) {
+            me.toggleSelection(id);
+
+            isSelected = me.isSelected(id);
+            record     = view.store.getAt(VDomUtil.findVdomChild(view.vdom, id).index);
+
+            !isSelected && view.onDeselect?.(record);
+
+            view.fire(isSelected ? 'select' : 'deselect', {
+                record
+            });
+        }
+    }
+
+    /**
+     * @param {Neo.component.Base} component
+     */
+    register(component) {
+        super.register(component);
+
+        let id   = this.id,
+            view = this.view;
+
+        view.keys?._keys.push({
+            fn   : 'onKeyDownDown',
+            key  : 'Down',
+            scope: id
+        }, {
+            fn   : 'onKeyDownUp',
+            key  : 'Up',
+            scope: id
+        });
+    }
+
+    /**
+     *
+     */
+    unregister() {
+        let id   = this.id,
+            view = this.view;
+
+        view.keys?.removeKeys([{
+            fn   : 'onKeyDownDown',
+            key  : 'Down',
+            scope: id
+        }, {
+            fn   : 'onKeyDownUp',
+            key  : 'Up',
+            scope: id
+        }]);
+
+        super.unregister();
+    }
+}
+
+Neo.applyClassConfig(RowModel);
+
+export default RowModel;

package/src/selection/table/RowModel.mjs

@@ -124,7 +124,7 @@ class RowModel extends Model {
     onRowClick(data) {
         let me   = this,
             node = RowModel.getRowNode(data.path),
-            id   = node && node.id,
+            id   = node?.id,
             view = me.view,
             isSelected, record;
 
@@ -137,7 +137,7 @@ class RowModel extends Model {
             !isSelected && view.onDeselect?.(record);
 
             view.fire(isSelected ? 'select' : 'deselect', {
-                record: record
+                record
             });
         }
     }
@@ -148,42 +148,36 @@ class RowModel extends Model {
     register(component) {
         super.register(component);
 
-        let me   = this,
-            id   = me.id,
-            view = me.view;
-
-        if (view.keys) {
-            view.keys._keys.push({
-                fn   : 'onKeyDownDown',
-                key  : 'Down',
-                scope: id
-            }, {
-                fn   : 'onKeyDownUp',
-                key  : 'Up',
-                scope: id
-            });
-        }
+        let id   = this.id,
+            view = this.view;
+
+        view.keys?._keys.push({
+            fn   : 'onKeyDownDown',
+            key  : 'Down',
+            scope: id
+        }, {
+            fn   : 'onKeyDownUp',
+            key  : 'Up',
+            scope: id
+        });
     }
 
     /**
      *
      */
     unregister() {
-        let me   = this,
-            id   = me.id,
-            view = me.view;
-
-        if (view.keys) {
-            view.keys.removeKeys([{
-                fn   : 'onKeyDownDown',
-                key  : 'Down',
-                scope: id
-            }, {
-                fn   : 'onKeyDownUp',
-                key  : 'Up',
-                scope: id
-            }]);
-        }
+        let id   = this.id,
+            view = this.view;
+
+        view.keys?.removeKeys([{
+            fn   : 'onKeyDownDown',
+            key  : 'Down',
+            scope: id
+        }, {
+            fn   : 'onKeyDownUp',
+            key  : 'Up',
+            scope: id
+        }]);
 
         super.unregister();
     }

package/src/table/Container.mjs

@@ -5,7 +5,7 @@ import NeoArray        from '../util/Array.mjs';
 import RowModel        from '../selection/table/RowModel.mjs';
 import Store           from '../data/Store.mjs';
 import View            from './View.mjs';
-import * as header from './header/_export.mjs';
+import * as header     from './header/_export.mjs';
 
 /**
  * @class Neo.table.Container
@@ -39,11 +39,11 @@ class Container extends BaseContainer {
          */
         createRandomData: false,
         /**
-         * @member {Array} cls=['neo-table-container']
+         * @member {String[]} cls=['neo-table-container']
          */
         cls: ['neo-table-container'],
         /**
-         * @member {Array} columns_=[]
+         * @member {Object[]} columns_=[]
          */
         columns_: [],
         /**
@@ -147,9 +147,7 @@ class Container extends BaseContainer {
      * @protected
      */
     afterSetSelectionModel(value, oldValue) {
-        if (this.rendered) {
-            value.register(this);
-        }
+        this.rendered && value.register(this);
     }
 
     /**
@@ -199,8 +197,8 @@ class Container extends BaseContainer {
 
     /**
      * Triggered before the columns config gets changed.
-     * @param {Array} value
-     * @param {Array} oldValue
+     * @param {Object[]} value
+     * @param {Object[]} oldValue
      * @protected
      */
     beforeSetColumns(value, oldValue) {
@@ -294,12 +292,12 @@ class Container extends BaseContainer {
         }
 
         columns.forEach(column => {
+            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);
             }
 
-            columnDefaults && Neo.assignDefaults(column, columnDefaults);
-
             if (sorters?.[0]) {
                 if (column.dataField === sorters[0].property) {
                     column.isSorted = sorters[0].direction;
@@ -391,9 +389,7 @@ class Container extends BaseContainer {
 
         let me = this;
 
-        if (me.selectionModel) {
-            me.selectionModel.register(me);
-        }
+        me.selectionModel?.register(me);
 
         if (me.createRandomData) {
             // todo: if mounting apply after mount

package/src/table/header/Toolbar.mjs

@@ -35,7 +35,7 @@ class Toolbar extends BaseToolbar {
          */
         showHeaderFilters_: false,
         /**
-         * @member {Object} _vdom={tag: 'thead',cn : [{tag: 'tr',cn : []}]}
+         * @member {Object} _vdom={tag:'thead',cn:[{tag:'tr',cn:[]}]}
          */
         _vdom:
         {tag: 'thead', cn: [