Merge pull request #75 from mikproto/master

row index added
revolist · Oct 7, 2020 · c14745d · c14745d
2 parents 8de3bc7 + c95ef00
commit c14745d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@revolist/revogrid",
-  "version": "1.6.12",
+  "version": "1.6.13",
   "description": "Virtual reactive data grid component - RevoGrid.",
   "license": "MIT",
   "bugs": {

diff --git a/src/components/data/columnService.ts b/src/components/data/columnService.ts
@@ -112,16 +112,16 @@ export default class ColumnService implements ColumnServiceI {
     return this.columns[c]?.editor;
   }
 
-  rowDataModel(r: number, c: number): ColumnDataSchemaModel {
+  rowDataModel(rowIndex: number, c: number): ColumnDataSchemaModel {
     const column = this.columns[c];
     const prop: ColumnProp | undefined = column?.prop;
 
     const data: DataSource = this.dataStore.get('items');
-    if (!data[r]) {
+    if (!data[rowIndex]) {
       console.error('unexpected count');
     }
-    const model: DataType = data[r] || {};
-    return {prop, model, data, column};
+    const model: DataType = data[rowIndex] || {};
+    return {prop, model, data, column, rowIndex};
   }
 
   getRangeData(d: Selection.ChangedRange): RevoGrid.DataLookup {

diff --git a/src/interfaces.d.ts b/src/interfaces.d.ts
@@ -29,10 +29,16 @@ export declare namespace RevoGrid {
   // --------------------------------------------------------------------------
 
   type ColumnDataSchemaModel = {
+    // property
     prop: ColumnProp;
+    // row model
     model: DataType;
-    data: DataSource;
+    // column data
     column: ColumnRegular;
+    // index in grid datasource
+    rowIndex: number;
+    // grid datasource
+    data: DataSource;
   };
 
   type ReadOnlyFormat = boolean | ((params: ColumnDataSchemaModel) => boolean);