selection.table.RowModel: update record based annotations (in case th…

…ey exist) on manual selections #6347
neomjs · Jan 30, 2025 · 56f13cf · 56f13cf
1 parent 81b3416
commit 56f13cf
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 34 deletions.
diff --git a/src/grid/View.mjs b/src/grid/View.mjs
@@ -816,13 +816,12 @@ class GridView extends Component {
      * @param {Object} opts.record
      */
     onStoreRecordChange({fields, record}) {
-        let me               = this,
-            fieldNames       = fields.map(field => field.name),
-            needsUpdate      = false,
-            {gridContainer}  = me,
-            rowIndex         = me.store.indexOf(record),
-            {selectionModel} = gridContainer.view,
-            {vdom}           = me,
+        let me                     = this,
+            fieldNames             = fields.map(field => field.name),
+            needsUpdate            = false,
+            {gridContainer}        = me,
+            rowIndex               = me.store.indexOf(record),
+            {selectionModel, vdom} = me,
             cellId, cellNode, cellStyle, cellVdom, column, columnIndex;
 
         if (fieldNames.includes(me.colspanField)) {

diff --git a/src/selection/grid/RowModel.mjs b/src/selection/grid/RowModel.mjs
@@ -72,17 +72,18 @@ class RowModel extends BaseModel {
         let me           = this,
             {view}       = me,
             {store}      = view,
+            countRecords = store.getCount(),
             currentIndex = 0,
             newIndex, record, rowId;
 
         if (me.hasSelection()) {
             currentIndex = store.indexOf(view.getRecordByRowId(me.items[0]))
         }
 
-        newIndex = (currentIndex + step) % store.getCount();
+        newIndex = (currentIndex + step) % countRecords;
 
         while (newIndex < 0) {
-            newIndex += store.getCount()
+            newIndex += countRecords
         }
 
         record = store.getAt(newIndex);

diff --git a/src/selection/table/RowModel.mjs b/src/selection/table/RowModel.mjs
@@ -23,6 +23,14 @@ class RowModel extends BaseModel {
         cls: 'neo-selection-rowmodel'
     }
 
+    /**
+     * @param {Record} record
+     * @returns {Boolean}
+     */
+    hasAnnotations(record) {
+        return !!Object.getOwnPropertyDescriptor(record.__proto__, this.view.selectedRecordField)
+    }
+
     /**
      *
      */
@@ -64,28 +72,31 @@ class RowModel extends BaseModel {
         let me           = this,
             {view}       = me,
             {store}      = view,
+            countRecords = store.getCount(),
             currentIndex = 0,
-            newIndex, newRecord, rowId;
+            newIndex, record, rowId;
 
         if (me.hasSelection()) {
             currentIndex = store.indexOf(view.getRecordByRowId(me.items[0]))
         }
 
-        newIndex = (currentIndex + step) % store.getCount();
+        newIndex = (currentIndex + step) % countRecords;
 
         while (newIndex < 0) {
-            newIndex += store.getCount()
+            newIndex += countRecords
         }
 
-        newRecord = store.getAt(newIndex);
-        rowId     = view.getRowId(newRecord);
+        record = store.getAt(newIndex);
 
-        if (rowId) {
-            me.select(rowId);
+        if (me.hasAnnotations(record)) {
+            me.updateAnnotations(record)
+        } else {
+            rowId = view.getRowId(record);
 
-            view.fire('select', {
-                record: store.getAt(newIndex)
-            })
+            if (rowId) {
+                me.select(rowId);
+                view.fire('select', {record})
+            }
         }
     }
 
@@ -99,16 +110,19 @@ class RowModel extends BaseModel {
             isSelected, record;
 
         if (id) {
-            me.toggleSelection(id);
+            record = view.getRecord(id);
+
+            if (me.hasAnnotations(record)) {
+                me.updateAnnotations(record)
+            } else {
+                me.toggleSelection(id);
 
-            isSelected = me.isSelected(id);
-            record     = view.getRecord(id);
+                isSelected = me.isSelected(id);
 
-            !isSelected && view.onDeselect?.(record);
+                !isSelected && view.onDeselect?.(record);
 
-            view.fire(isSelected ? 'select' : 'deselect', {
-                record
-            })
+                view.fire(isSelected ? 'select' : 'deselect', {record})
+            }
         }
     }
 
@@ -139,6 +153,32 @@ class RowModel extends BaseModel {
 
         super.unregister()
     }
+
+    /**
+     * @param {Record} record
+     */
+    updateAnnotations(record) {
+        let me               = this,
+            {view}           = me,
+            rowId            = view.getRowId(record),
+            isSelected       = me.isSelected(rowId),
+            annotationsField = view.selectedRecordField;
+
+        if (me.singleSelect) {
+            if (isSelected) {
+                record[annotationsField] = false
+            } else {
+                me.items.forEach(rowId => {
+                    // We can use setSilent(), since the last change will trigger a view update
+                    view.getRecordByRowId(rowId).setSilent({[annotationsField]: false})
+                });
+
+                record[annotationsField] = true
+            }
+        } else {
+            record[annotationsField] = !record[annotationsField]
+        }
+    }
 }
 
 export default Neo.setupClass(RowModel);
diff --git a/src/table/View.mjs b/src/table/View.mjs
@@ -524,17 +524,16 @@ class View extends Component {
      * @param {Object} opts.record
      */
     onStoreRecordChange({fields, model, record}) {
-        let me               = this,
-            fieldNames       = fields.map(field => field.name),
-            needsUpdate      = false,
-            tableContainer   = me.parent,
-            rowIndex         = me.store.indexOf(record),
-            {selectionModel} = tableContainer,
-            {vdom}           = me,
+        let me                     = this,
+            fieldNames             = fields.map(field => field.name),
+            needsUpdate            = false,
+            tableContainer         = me.parent,
+            rowIndex               = me.store.indexOf(record),
+            {selectionModel, vdom} = me,
             cellId, cellNode, cellVdom, column, columnIndex, scope;
 
         if (fieldNames.includes(me.colspanField)) {
-            me.vdom.cn[index] = me.createRow({record, rowIndex});
+            me.vdom.cn[rowIndex] = me.createRow({record, rowIndex});
             me.update()
         } else {
             fields.forEach(field => {