neo.mjs 8.9.1 → 8.10.1

package/src/selection/grid/ColumnModel.mjs

@@ -30,7 +30,7 @@ class ColumnModel extends BaseModel {
     addDomListener() {
         let me = this;
 
-        me.view.on('cellClick', me.onCellClick, me)
+        me.view.parent.on('cellClick', me.onCellClick, me)
     }
 
     /**
@@ -39,56 +39,24 @@ class ColumnModel extends BaseModel {
     destroy(...args) {
         let me = this;
 
-        me.view.un('cellClick', me.onCellClick, me);
+        me.view.parent.un('cellClick', me.onCellClick, me);
 
         super.destroy(...args)
     }
 
-    /**
-     * @param {Object} eventPath
-     * @returns {String|null} cellId
-     */
-    static getCellId(eventPath) {
-        let id   = null,
-            i    = 0,
-            len  = eventPath.length;
-
-        for (; i < len; i++) {
-            if (eventPath[i].cls.includes('neo-grid-cell')) {
-                id = eventPath[i].id;
-                break
-            }
-        }
-
-        return id
-    }
-
-    /**
-     * todo: move to grid.Container or view
-     * @param {String} cellId
-     * @param {Object[]} columns
-     * @returns {Number} index
-     */
-    static getColumnIndex(cellId, columns) {
-        let idArray       = cellId.split('__'),
-            currentColumn = idArray[2],
-            dataFields    = columns.map(c => c.dataField);
-
-        return dataFields.indexOf(currentColumn)
-    }
-
     /**
      * @param {Object} data
      */
     onCellClick(data) {
-        let me = this,
-            id = data.data.currentTarget,
-            columnNodeIds, index, tbodyNode;
+        let me     = this,
+            {view} = me,
+            cellId = data.data.currentTarget,
+            columnNodeIds, dataField, index;
 
-        if (id) {
-            index         = ColumnModel.getColumnIndex(id, me.view.items[0].items);
-            tbodyNode     = VDomUtil.find(me.view.vdom, {cls: 'neo-grid-view'}).vdom;
-            columnNodeIds = VDomUtil.getColumnNodesIds(tbodyNode, index);
+        if (cellId) {
+            dataField     = view.getDataField(cellId);
+            index         = view.getColumn(dataField, true);
+            columnNodeIds = VDomUtil.getColumnNodesIds(view.vdom.cn[0], index);
 
             me.select(columnNodeIds)
         }
@@ -98,41 +66,39 @@ class ColumnModel extends BaseModel {
      * @param {Object} data
      */
     onKeyDownLeft(data) {
-        this.onNavKeyColumn(data, -1)
+        this.onNavKeyColumn(-1)
     }
 
     /**
      * @param {Object} data
      */
     onKeyDownRight(data) {
-        this.onNavKeyColumn(data, 1)
+        this.onNavKeyColumn(1)
     }
 
     /**
-     * @param {Object} data
      * @param {Number} step
      */
-    onNavKeyColumn(data, step) {
-        let me            = this,
-            idArray       = ColumnModel.getCellId(data.path).split('__'),
-            currentColumn = idArray[2],
-            {view}        = me,
-            fields        = view.columns.map(c => c.dataField),
-            newIndex      = (fields.indexOf(currentColumn) + step) % fields.length,
-            columnNodeIds, id, tbodyNode;
-
-        while (newIndex < 0) {
-            newIndex += fields.length
+    onNavKeyColumn(step) {
+        let me                 = this,
+            {dataFields, view} = me,
+            columnNodeIds, currentColumn, index;
+
+        if (me.hasSelection()) {
+            currentColumn = view.getDataField(me.items[0])
+        } else {
+            currentColumn = dataFields[0]
         }
 
-        idArray[2] = fields[newIndex];
-        id = idArray.join('__');
+        index = (dataFields.indexOf(currentColumn) + step) % dataFields.length;
+
+        while (index < 0) {
+            index += dataFields.length
+        }
 
-        tbodyNode     = VDomUtil.find(me.view.vdom, {cls: 'neo-grid-view'}).vdom;
-        columnNodeIds = VDomUtil.getColumnNodesIds(tbodyNode, newIndex);
+        columnNodeIds = VDomUtil.getColumnNodesIds(view.vdom.cn[0], index);
 
-        me.select(columnNodeIds);
-        view.focus(id) // we have to focus one cell to ensure the keynav keeps working
+        me.select(columnNodeIds)
     }
 
     /**

package/src/selection/grid/RowModel.mjs

@@ -39,7 +39,7 @@ class RowModel extends BaseModel {
     destroy(...args) {
         let me = this;
 
-        me.view.un('rowClick', me.onRowClick, me);
+        me.view.gridContainer.un('rowClick', me.onRowClick, me);
 
         super.destroy(...args)
     }
@@ -103,7 +103,7 @@ class RowModel extends BaseModel {
             me.toggleSelection(id);
 
             isSelected = me.isSelected(id);
-            record     = view.store.getAt(VDomUtil.find(view.vdom, id).index);
+            record     = view.getRecord(id);
 
             !isSelected && view.onDeselect?.(record);
 

package/src/selection/table/BaseModel.mjs

@@ -14,48 +14,6 @@ class BaseModel extends Model {
          */
         className: 'Neo.selection.table.BaseModel'
     }
-
-    /**
-     * @param {Object} item
-     * @param {Boolean} [silent] true to prevent a vdom update
-     * @param {Object[]|String[]} itemCollection=this.items
-     * @param {String} [selectedCls]
-     */
-    deselect(item, silent, itemCollection=this.items, selectedCls) {
-        let {view} = this;
-
-        if (!silent) {
-            view.updateDepth = 2
-        }
-
-        super.deselect(item, silent, itemCollection, selectedCls)
-    }
-
-    /**
-     * @param {Boolean} [silent] true to prevent a vdom update
-     */
-    deselectAll(silent) {
-        let {view} = this;
-
-        if (!silent) {
-            view.updateDepth = 2
-        }
-
-        super.deselectAll(silent)
-    }
-
-    /**
-     * @param {Object} args
-     */
-    select(...args) {
-        let {view} = this;
-
-        if (!view.silentSelect) {
-            view.updateDepth = 2
-        }
-
-        super.select(...args)
-    }
 }
 
 export default Neo.setupClass(BaseModel);

package/src/selection/table/CellColumnModel.mjs

@@ -29,19 +29,10 @@ class CellColumnModel extends CellModel {
          */
         selectedColumnCellCls: 'selected-column-cell',
         /**
-         * @member {Array|null} selectedColumnCellIds=null
+         * @member {String[]} selectedColumnCellIds=[]
          * @protected
          */
-        selectedColumnCellIds: null
-    }
-
-    /**
-     * @param {Object} config
-     */
-    construct(config) {
-        super.construct(config);
-
-        this.selectedColumnCellIds = []
+        selectedColumnCellIds: []
     }
 
     /**
@@ -63,14 +54,14 @@ class CellColumnModel extends CellModel {
      * @param {Object} data
      */
     onCellClick(data) {
-        let me = this,
-            id = data.data.currentTarget,
-            columnNodeIds, index, tbodyNode;
+        let me              = this,
+            {headerToolbar} = me.view.parent,
+            id              = data.data.currentTarget,
+            columnNodeIds, index;
 
         if (id) {
-            index         = ColumnModel.getColumnIndex(id, me.view.items[0].items);
-            tbodyNode     = VDomUtil.find(me.view.vdom, {tag: 'tbody'}).vdom;
-            columnNodeIds = VDomUtil.getColumnNodesIds(tbodyNode, index);
+            index         = ColumnModel.getColumnIndex(id, headerToolbar.items);
+            columnNodeIds = VDomUtil.getColumnNodesIds(me.view.vdom, index);
 
             me.deselectAllCells(true);
             me.select(columnNodeIds, me.selectedColumnCellIds, me.selectedColumnCellCls)
@@ -88,7 +79,7 @@ class CellColumnModel extends CellModel {
             idArray       = ColumnModel.getCellId(data.path).split('__'),
             currentColumn = idArray[2],
             {view}        = me,
-            dataFields    = view.columns.map(c => c.dataField),
+            dataFields    = view.parent.columns.map(c => c.dataField),
             newIndex      = (dataFields.indexOf(currentColumn) + step) % dataFields.length,
             columnNodeIds, tbodyNode;
 

package/src/selection/table/CellColumnRowModel.mjs

@@ -29,19 +29,10 @@ class CellColumnRowModel extends CellRowModel {
          */
         selectedColumnCellCls: 'selected-column-cell',
         /**
-         * @member {Array|null} selectedColumnCellIds=null
+         * @member {String[]} selectedColumnCellIds=[]
          * @protected
          */
-        selectedColumnCellIds: null
-    }
-
-    /**
-     * @param {Object} config
-     */
-    construct(config) {
-        super.construct(config);
-
-        this.selectedColumnCellIds = []
+        selectedColumnCellIds: []
     }
 
     /**
@@ -63,14 +54,14 @@ class CellColumnRowModel extends CellRowModel {
      * @param {Object} data
      */
     onCellClick(data) {
-        let me = this,
-            id = data.data.currentTarget,
-            columnNodeIds, index, tbodyNode;
+        let me              = this,
+            {headerToolbar} = me.view.parent,
+            id              = data.data.currentTarget,
+            columnNodeIds, index;
 
         if (id) {
-            index         = ColumnModel.getColumnIndex(id, me.view.items[0].items);
-            tbodyNode     = VDomUtil.find(me.view.vdom, {tag: 'tbody'}).vdom;
-            columnNodeIds = VDomUtil.getColumnNodesIds(tbodyNode, index);
+            index         = ColumnModel.getColumnIndex(id, headerToolbar.items);
+            columnNodeIds = VDomUtil.getColumnNodesIds(me.view.vdom, index);
 
             me.deselectAllCells(true);
             me.select(columnNodeIds, me.selectedColumnCellIds, me.selectedColumnCellCls)
@@ -88,7 +79,7 @@ class CellColumnRowModel extends CellRowModel {
             idArray       = ColumnModel.getCellId(data.path).split('__'),
             currentColumn = idArray[2],
             {view}        = me,
-            dataFields    = view.columns.map(c => c.dataField),
+            dataFields    = view.parent.columns.map(c => c.dataField),
             newIndex      = (dataFields.indexOf(currentColumn) + step) % dataFields.length,
             columnNodeIds, tbodyNode;
 

package/src/selection/table/CellModel.mjs

@@ -29,7 +29,7 @@ class CellModel extends BaseModel {
     addDomListener() {
         let me = this;
 
-        me.view.on('cellClick', me.onCellClick, me)
+        me.view.parent.on('cellClick', me.onCellClick, me)
     }
 
     /**
@@ -38,7 +38,7 @@ class CellModel extends BaseModel {
     destroy(...args) {
         let me = this;
 
-        me.view.un('cellClick', me.onCellClick, me);
+        me.view.parent.un('cellClick', me.onCellClick, me);
 
         super.destroy(...args)
     }
@@ -87,7 +87,7 @@ class CellModel extends BaseModel {
             {view}        = me,
             idArray       = data.path[0].id.split('__'),
             currentColumn = idArray[2],
-            dataFields    = view.columns.map(c => c.dataField),
+            dataFields    = view.parent.columns.map(c => c.dataField),
             newIndex      = (dataFields.indexOf(currentColumn) + step) % dataFields.length,
             id;
 

package/src/selection/table/CellRowModel.mjs

@@ -25,19 +25,10 @@ class CellRowModel extends CellModel {
          */
         cls: 'neo-selection-cellrowmodel',
         /**
-         * @member {Array|null} selectedRowIds=null
+         * @member {String[]} selectedRowIds=[]
          * @protected
          */
-        selectedRowIds: null
-    }
-
-    /**
-     * @param {Object} config
-     */
-    construct(config) {
-        super.construct(config);
-
-        this.selectedRowIds = []
+        selectedRowIds: []
     }
 
     /**
@@ -73,10 +64,7 @@ class CellRowModel extends CellModel {
 
         NeoArray.remove(me.selectedRowIds, rowId);
 
-        if (!silent) {
-            view.updateDepth = 2;
-            view.update()
-        }
+        !silent && view.update()
     }
 
     /**
@@ -141,10 +129,7 @@ class CellRowModel extends CellModel {
             me.selectedRowIds.push(id)
         }
 
-        if (!silent) {
-            view.updateDepth = 2;
-            view.update()
-        }
+        !silent && view.update()
     }
 
     /**

package/src/selection/table/ColumnModel.mjs

@@ -30,7 +30,7 @@ class ColumnModel extends BaseModel {
     addDomListener() {
         let me = this;
 
-        me.view.on('cellClick', me.onCellClick, me)
+        me.view.parent.on('cellClick', me.onCellClick, me)
     }
 
     /**
@@ -39,7 +39,7 @@ class ColumnModel extends BaseModel {
     destroy(...args) {
         let me = this;
 
-        me.view.un('cellClick', me.onCellClick, me);
+        me.view.parent.un('cellClick', me.onCellClick, me);
 
         super.destroy(...args)
     }
@@ -81,14 +81,14 @@ class ColumnModel extends BaseModel {
      * @param {Object} data
      */
     onCellClick(data) {
-        let me = this,
-            id = data.data.currentTarget,
-            columnNodeIds, index, tbodyNode;
+        let me              = this,
+            {headerToolbar} = me.view.parent,
+            id              = data.data.currentTarget,
+            columnNodeIds, index;
 
         if (id) {
-            index         = ColumnModel.getColumnIndex(id, me.view.items[0].items);
-            tbodyNode     = VDomUtil.find(me.view.vdom, {tag: 'tbody'}).vdom;
-            columnNodeIds = VDomUtil.getColumnNodesIds(tbodyNode, index);
+            index         = ColumnModel.getColumnIndex(id, headerToolbar.items);
+            columnNodeIds = VDomUtil.getColumnNodesIds(me.view.vdom, index);
 
             me.select(columnNodeIds)
         }
@@ -117,7 +117,7 @@ class ColumnModel extends BaseModel {
             idArray       = ColumnModel.getCellId(data.path).split('__'),
             currentColumn = idArray[2],
             {view}        = me,
-            dataFields    = view.columns.map(c => c.dataField),
+            dataFields    = view.parent.columns.map(c => c.dataField),
             newIndex      = (dataFields.indexOf(currentColumn) + step) % dataFields.length,
             columnNodeIds, id, tbodyNode;
 

package/src/selection/table/RowModel.mjs

@@ -30,7 +30,7 @@ class RowModel extends BaseModel {
     addDomListener() {
         let me = this;
 
-        me.view.on('rowClick', me.onRowClick, me)
+        me.view.parent.on('rowClick', me.onRowClick, me)
     }
 
     /**
@@ -39,7 +39,7 @@ class RowModel extends BaseModel {
     destroy(...args) {
         let me = this;
 
-        me.view.un('rowClick', me.onRowClick, me);
+        me.view.parent.un('rowClick', me.onRowClick, me);
 
         super.destroy(...args)
     }

package/src/table/Container.mjs

@@ -2,7 +2,6 @@ import BaseContainer   from '../container/Base.mjs';
 import ClassSystemUtil from '../util/ClassSystem.mjs';
 import CssUtil         from '../util/Css.mjs';
 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';
@@ -50,11 +49,6 @@ class Container extends BaseContainer {
          * @member {String|null} headerToolbarId_=null
          */
         headerToolbarId_: null,
-        /**
-         * Additional used keys for the selection model
-         * @member {Object} keys
-         */
-        keys: {},
         /**
          * @member {String} layout='base'
          */
@@ -65,7 +59,9 @@ class Container extends BaseContainer {
          */
         scrollbarsCssApplied: false,
         /**
+         * Will get removed in neo v9, assign selection models to table.View instead
          * @member {Neo.selection.Model} selectionModel_=null
+         * @deprecated
          */
         selectionModel_: null,
         /**
@@ -143,10 +139,11 @@ class Container extends BaseContainer {
             sortable         : me.sortable,
             ...me.headerToolbarConfig
         }, {
-            module     : View,
-            containerId: me.id,
-            id         : me.viewId,
-            store      : me.store,
+            module        : View,
+            containerId   : me.id,
+            id            : me.viewId,
+            selectionModel: me.selectionModel, // todo: remove this line in neo v9
+            store         : me.store,
             ...me.viewConfig
         }];
 
@@ -204,9 +201,12 @@ class Container extends BaseContainer {
      * @param {Neo.selection.Model} value
      * @param {Neo.selection.Model} oldValue
      * @protected
+     * @deprecated
      */
     afterSetSelectionModel(value, oldValue) {
-        this.rendered && value.register(this)
+        if (value && this.view) {
+            this.view.selectionModel = value
+        }
     }
 
     /**
@@ -292,18 +292,6 @@ class Container extends BaseContainer {
         return value || oldValue
     }
 
-    /**
-     * Triggered before the selectionModel config gets changed.
-     * @param {Neo.selection.Model} value
-     * @param {Neo.selection.Model} oldValue
-     * @protected
-     */
-    beforeSetSelectionModel(value, oldValue) {
-        oldValue?.destroy();
-
-        return ClassSystemUtil.beforeSetInstance(value, RowModel)
-    }
-
     /**
      * Triggered before the store config gets changed.
      * @param {Neo.data.Store} value
@@ -461,14 +449,6 @@ class Container extends BaseContainer {
         return `${this.id}__wrapper`
     }
 
-    /**
-     *
-     */
-    onConstructed() {
-        super.onConstructed();
-        this.selectionModel?.register(this)
-    }
-
     /**
      * @param {Object} opts
      * @param {String} opts.direction

package/src/table/View.mjs

@@ -1,6 +1,8 @@
-import Component from '../component/Base.mjs';
-import NeoArray  from '../util/Array.mjs';
-import VDomUtil  from '../util/VDom.mjs';
+import ClassSystemUtil from '../util/ClassSystem.mjs';
+import Component       from '../component/Base.mjs';
+import NeoArray        from '../util/Array.mjs';
+import RowModel        from '../selection/table/RowModel.mjs';
+import VDomUtil        from '../util/VDom.mjs';
 
 /**
  * @class Neo.table.View
@@ -36,10 +38,19 @@ class View extends Component {
          * @member {Boolean} highlightModifiedCells_=false
          */
         highlightModifiedCells_: false,
+        /**
+         * Additional used keys for the selection model
+         * @member {Object} keys
+         */
+        keys: {},
         /**
          * @member {Object} recordVnodeMap={}
          */
         recordVnodeMap: {},
+        /**
+         * @member {Neo.selection.Model} selectionModel_=null
+         */
+        selectionModel_: null,
         /**
          * @member {String} selectedRecordField='annotations.selected'
          */
@@ -63,10 +74,8 @@ class View extends Component {
      * @member {String[]} selectedRows
      */
     get selectedRows() {
-        let tableContainer = this.parent;
-
-        if (tableContainer.selectionModel.ntype === 'selection-table-rowmodel') {
-            return tableContainer.selectionModel.items
+        if (this.selectionModel.ntype === 'selection-table-rowmodel') {
+            return this.selectionModel.items
         }
 
         return []
@@ -93,6 +102,16 @@ class View extends Component {
         }])
     }
 
+    /**
+     * Triggered after the selectionModel config got changed
+     * @param {Neo.selection.Model} value
+     * @param {Neo.selection.Model} oldValue
+     * @protected
+     */
+    afterSetSelectionModel(value, oldValue) {
+        this.rendered && value.register(this)
+    }
+
     /**
      * @param {Object} data
      * @param {String} [data.cellId]
@@ -190,6 +209,18 @@ class View extends Component {
         return cellConfig
     }
 
+    /**
+     * Triggered before the selectionModel config gets changed.
+     * @param {Neo.selection.Model} value
+     * @param {Neo.selection.Model} oldValue
+     * @protected
+     */
+    beforeSetSelectionModel(value, oldValue) {
+        oldValue?.destroy();
+
+        return ClassSystemUtil.beforeSetInstance(value, RowModel)
+    }
+
     /**
      * @param {Object} opts
      * @param {Object} opts.record
@@ -454,6 +485,14 @@ class View extends Component {
         this.fireCellEvent(data, 'cellDoubleClick')
     }
 
+    /**
+     *
+     */
+    onConstructed() {
+        super.onConstructed();
+        this.selectionModel?.register(this)
+    }
+
     /**
      * @param {Object} data
      */

package/src/table/plugin/CellEditing.mjs

@@ -65,7 +65,7 @@ class CellEditing extends Plugin {
             me.onSelectionModelChange({value: selectionModel})
         }
 
-        owner.keys.add({
+        owner.view.keys.add({
             Enter: 'onTableKeyDown',
             Space: 'onTableKeyDown',
             scope: me
@@ -156,7 +156,7 @@ class CellEditing extends Plugin {
 
         await view.promiseUpdate();
 
-        await me.timeout(10);
+        await me.timeout(30);
 
         editor.focus()
     }