Merge branch 'canary' into ts42

Author: nstepien

README.md

@@ -1,9 +1,17 @@
-# react-data-grid [![npm-badge]][npm-url] [![ci-badge]][ci-url]
+# react-data-grid
+
+[![npm-badge]][npm-url]
+[![type-badge]][npm-url]
+[![size-badge]][size-url]
+[![ci-badge]][ci-url]
 
 [npm-badge]: https://img.shields.io/npm/v/react-data-grid
 [npm-url]: https://www.npmjs.com/package/react-data-grid
+[size-badge]: https://img.shields.io/bundlephobia/minzip/react-data-grid
+[size-url]: https://bundlephobia.com/result?p=react-data-grid
+[type-badge]: https://img.shields.io/npm/types/react-data-grid
 [ci-badge]: https://github.com/adazzle/react-data-grid/workflows/CI/badge.svg
-[ci-url]: https://github.com/adazzle/react-data-grid/actions?query=workflow%3ACI
+[ci-url]: https://github.com/adazzle/react-data-grid/actions
 
 ## Install
 

browserslist

@@ -2,3 +2,4 @@ last 2 chrome versions
 last 2 edge versions
 last 2 firefox versions
 last 2 safari versions
+maintained node versions

src/DataGrid.tsx

@@ -30,6 +30,7 @@ import type {
   Filters,
   Position,
   RowRendererProps,
+  RowsChangeData,
   SelectRowEvent,
   SelectedCellProps,
   EditCellProps,
@@ -87,7 +88,7 @@ export interface DataGridProps<R, SR = unknown> extends SharedDivProps {
   summaryRows?: readonly SR[];
   /** The getter should return a unique key for each row */
   rowKeyGetter?: (row: R) => React.Key;
-  onRowsChange?: (rows: R[]) => void;
+  onRowsChange?: (rows: R[], data: RowsChangeData<R, SR>) => void;
 
   /**
    * Dimensions props
@@ -454,7 +455,10 @@ function DataGrid<R, SR>({
     if (typeof onRowsChange !== 'function') return;
     const updatedRows = [...rawRows];
     updatedRows[rowIdx] = row;
-    onRowsChange(updatedRows);
+    onRowsChange(updatedRows, {
+      indexes: [rowIdx],
+      column: columns[selectedPosition.idx]
+    });
   }
 
   function commitEditorChanges() {
@@ -536,13 +540,17 @@ function DataGrid<R, SR>({
     const startRowIndex = rowIdx < overRowIdx ? rowIdx + 1 : overRowIdx;
     const endRowIndex = rowIdx < overRowIdx ? overRowIdx + 1 : rowIdx;
     const targetRows = rawRows.slice(startRowIndex, endRowIndex);
-
-    const updatedTargetRows = onFill({ columnKey: columns[idx].key, sourceRow, targetRows });
+    const column = columns[idx];
+    const updatedTargetRows = onFill({ columnKey: column.key, sourceRow, targetRows });
     const updatedRows = [...rawRows];
+    const indexes: number[] = [];
+
     for (let i = startRowIndex; i < endRowIndex; i++) {
       updatedRows[i] = updatedTargetRows[i - startRowIndex];
+      indexes.push(i);
     }
-    onRowsChange(updatedRows);
+
+    onRowsChange(updatedRows, { indexes, column });
     setDraggedOverRowIdx(undefined);
   }
 
@@ -574,13 +582,17 @@ function DataGrid<R, SR>({
     const { idx, rowIdx } = selectedPosition;
     const sourceRow = rawRows[rowIdx];
     const targetRows = rawRows.slice(rowIdx + 1);
-
-    const updatedTargetRows = onFill({ columnKey: columns[idx].key, sourceRow, targetRows });
+    const column = columns[idx];
+    const updatedTargetRows = onFill({ columnKey: column.key, sourceRow, targetRows });
     const updatedRows = [...rawRows];
+    const indexes: number[] = [];
+
     for (let i = rowIdx + 1; i < updatedRows.length; i++) {
       updatedRows[i] = updatedTargetRows[i - rowIdx - 1];
+      indexes.push(i);
     }
-    onRowsChange(updatedRows);
+
+    onRowsChange(updatedRows, { indexes, column });
   }
 
   function handleEditorRowChange(row: Readonly<R>, commitChanges?: boolean) {

src/index.ts

@@ -22,6 +22,7 @@ export type {
   RowRendererProps,
   FilterRendererProps,
   Filters,
+  RowsChangeData,
   SelectRowEvent,
   FillEvent,
   PasteEvent

src/types.ts

@@ -183,6 +183,11 @@ export interface FilterRendererProps<TRow, TFilterValue = unknown, TSummaryRow =
 
 export type Filters = Record<string, any>;
 
+export interface RowsChangeData<R, SR = unknown> {
+  indexes: number[];
+  column: CalculatedColumn<R, SR>;
+}
+
 export interface SelectRowEvent {
   rowIdx: number;
   checked: boolean;