selection.grid.CellRowModel: switch to store record ids instead of row DOM ids #6673

Author: tobiu

src/selection/grid/BaseModel.mjs

@@ -80,14 +80,13 @@ class BaseModel extends Model {
     /**
      * Get the record for a given event path
      * @param {Object[]} path
-     * @param {String}   nodeId
      * @returns {Number|String|null}
      */
-    getRecord(path, nodeId) {
+    getRecord(path) {
         let node, rowIndex;
 
         for (node of path) {
-            if (node.id === nodeId) {
+            if (node.aria.rowindex) {
                 rowIndex = parseInt(node.aria.rowindex);
 
                 // aria-rowindex is 1 based & also includes the header
@@ -100,6 +99,14 @@ class BaseModel extends Model {
         return null
     }
 
+    /**
+     * @param {Record} record
+     * @returns {Boolean}
+     */
+    hasAnnotations(record) {
+        return !!Object.getOwnPropertyDescriptor(record.__proto__, this.view.selectedRecordField)
+    }
+
     /**
      * Checks if an event path contains a grid cell editor
      * @param {Object}   data
@@ -157,6 +164,20 @@ class BaseModel extends Model {
     toggleRowSelection(recordId, silent=false) {
         this[this.isSelectedRow(recordId) ? 'deselectRow' : 'selectRow'](recordId, silent)
     }
+
+    /**
+     *
+     */
+    unregister() {
+        let me        = this,
+            countRows = me.selectedRows.length;
+
+        me.selectedRows = [];
+
+        countRows > 0 && me.view.createViewData();
+
+        super.unregister()
+    }
 }
 
 export default Neo.setupClass(BaseModel);

src/selection/grid/CellRowModel.mjs

@@ -20,13 +20,7 @@ class CellRowModel extends CellModel {
          * @member {String} cls='neo-selection-cellrowmodel'
          * @protected
          */
-        cls: 'neo-selection-cellrowmodel',
-        /**
-         * Storing the node ids
-         * @member {String[]} selectedRows=[]
-         * @protected
-         */
-        selectedRows: []
+        cls: 'neo-selection-cellrowmodel'
     }
 
     /**
@@ -35,12 +29,14 @@ class CellRowModel extends CellModel {
     onCellClick(data) {
         let me     = this,
             {view} = me,
-            record = view.getRecord(data.data.currentTarget),
-            rowId  = view.getRowId(record);
+            record = me.getRecord(data.data.path);
 
-        if (rowId) {
-            me.selectedRows = [rowId];
-            view.createViewData(true)
+        if (record) {
+            if (me.hasAnnotations(record)) {
+                me.updateAnnotations(record)
+            } else {
+                me.toggleRowSelection(record[view.store.getKeyProperty()], true) // silent
+            }
         }
 
         super.onCellClick(data)
@@ -54,35 +50,30 @@ class CellRowModel extends CellModel {
             {view}       = me,
             {store}      = view,
             countRecords = store.getCount(),
-            rowId        = me.selectedRows[0] || view.getRowId(store.getAt(0)),
-            record       = view.getRecord(rowId),
+            keyProperty  = store.getKeyProperty(),
+            recordId     = me.selectedRows[0] || store.getAt(0)[keyProperty],
+            record       = store.get(recordId),
             index        = store.indexOf(record),
-            newIndex     = (index + step) % countRecords,
-            id;
+            newIndex     = (index + step) % countRecords;
 
         while (newIndex < 0) {
             newIndex += countRecords
         }
 
-        id = view.getRowId(store.getAt(newIndex));
+        record = store.getAt(newIndex);
 
-        if (id) {
-            me.selectedRows = [id];
-            view.createViewData(true)
+        if (me.hasAnnotations(record)) {
+            me.updateAnnotations(record)
+        } else {
+            recordId = record[keyProperty];
+
+            if (recordId) {
+                me.selectRow(recordId, true) // silent
+            }
         }
 
         super.onNavKeyRow(step)
     }
-
-    /**
-     *
-     */
-    unregister() {
-        this.selectedRows = [];
-        this.view.createViewData();
-
-        super.unregister()
-    }
 }
 
 export default Neo.setupClass(CellRowModel);

src/selection/grid/RowModel.mjs

@@ -43,14 +43,6 @@ class RowModel extends BaseModel {
         super.destroy(...args)
     }
 
-    /**
-     * @param {Record} record
-     * @returns {Boolean}
-     */
-    hasAnnotations(record) {
-        return !!Object.getOwnPropertyDescriptor(record.__proto__, this.view.selectedRecordField)
-    }
-
     /**
      * @param {Object} data
      */
@@ -104,9 +96,8 @@ class RowModel extends BaseModel {
      */
     onRowClick({data}) {
         let me     = this,
-            id     = data.currentTarget,
             {view} = me,
-            record = id && me.getRecord(data.path, id),
+            record = me.getRecord(data.path),
             recordId;
 
         if (record) {