Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/DataTable/DataTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ function DataTable<T extends RowRecord>(props: TableProps<T>): JSX.Element {
expandableRows = defaultProps.expandableRows,
onRowClicked = defaultProps.onRowClicked,
onRowDoubleClicked = defaultProps.onRowDoubleClicked,
onRowHovered = defaultProps.onRowHovered,
sortIcon = defaultProps.sortIcon,
onSort = defaultProps.onSort,
sortFunction = defaultProps.sortFunction,
Expand Down Expand Up @@ -183,6 +184,8 @@ function DataTable<T extends RowRecord>(props: TableProps<T>): JSX.Element {

const handleRowDoubleClicked = React.useCallback((row, e) => onRowDoubleClicked(row, e), [onRowDoubleClicked]);

const handleRowHovered = React.useCallback((row, e) => onRowHovered(row, e), [onRowHovered]);

const handleChangePage = (page: number) =>
dispatch({
type: 'CHANGE_PAGE',
Expand Down Expand Up @@ -423,6 +426,7 @@ function DataTable<T extends RowRecord>(props: TableProps<T>): JSX.Element {
onRowExpandToggled={onRowExpandToggled}
onRowClicked={handleRowClicked}
onRowDoubleClicked={handleRowDoubleClicked}
onRowHovered={handleRowHovered}
onSelectedRow={handleSelectedRow}
/>
);
Expand Down
10 changes: 10 additions & 0 deletions src/DataTable/TableRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ type DProps<T> = Pick<
| 'keyField'
| 'onRowClicked'
| 'onRowDoubleClicked'
| 'onRowHovered'
| 'onRowExpandToggled'
| 'pointerOnHover'
| 'selectableRowDisabled'
Expand Down Expand Up @@ -100,6 +101,7 @@ function TableRow<T extends RowRecord>({
expandableInheritConditionalStyles,
keyField = defaultProps.keyField,
onRowClicked = noop,
onRowHovered = noop,
onRowDoubleClicked = noop,
onRowExpandToggled = noop,
onSelectedRow = noop,
Expand Down Expand Up @@ -154,6 +156,13 @@ function TableRow<T extends RowRecord>({
[defaultExpanderDisabled, expandOnRowDoubleClicked, expandableRows, handleExpanded, onRowDoubleClicked, row],
);

const handleRowHovered = React.useCallback(
e => {
onRowHovered(row, e);
},
[onRowHovered, row],
);

const extendedRowStyle = getConditionalStyle(row, conditionalRowStyles);
const hightlightSelected = selectableRowsHighlight && selected;
const inheritStyles = expandableInheritConditionalStyles ? extendedRowStyle : {};
Expand All @@ -170,6 +179,7 @@ function TableRow<T extends RowRecord>({
dense={dense}
onClick={handleRowClick}
onDoubleClick={handleRowDoubleClick}
onMouseEnter={handleRowHovered}
className="rdt_TableRow"
selected={hightlightSelected}
style={extendedRowStyle}
Expand Down
11 changes: 11 additions & 0 deletions src/DataTable/__tests__/DataTable.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,17 @@ describe('DataTable::columns', () => {
});
});

describe('DataTable:RowHover', () => {
test('should call onRowHovered callback when row is hovered', () => {
const onRowHoveredMock = jest.fn();
const mock = dataMock({});
const { container } = render(<DataTable data={mock.data} columns={mock.columns} onRowHovered={onRowHoveredMock} />);

fireEvent.mouseEnter(container.querySelector('div.rdt_TableRow') as HTMLElement);
expect(onRowHoveredMock).toHaveBeenCalled();
});
});

describe('DataTable:RowClicks', () => {
test('should not call onRowClicked when ignoreRowClick = true', () => {
const onRowClickedMock = jest.fn();
Expand Down
1 change: 1 addition & 0 deletions src/DataTable/defaultProps.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ export const defaultProps = {
onChangeRowsPerPage: noop,
onRowClicked: noop,
onRowDoubleClicked: noop,
onRowHovered: noop,
onRowExpandToggled: noop,
onSelectedRowsChange: noop,
onSort: noop,
Expand Down
1 change: 1 addition & 0 deletions src/DataTable/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ export type TableProps<T = RowRecord> = {
onChangePage?: ChangePage;
onChangeRowsPerPage?: ChangeRowsPerPage;
onRowClicked?: (row: T, e: React.MouseEvent) => void;
onRowHovered?: (row: T, e: React.MouseEvent) => void;
onRowDoubleClicked?: (row: T, e: React.MouseEvent) => void;
onRowExpandToggled?: ExpandRowToggled<T>;
onSelectedRowsChange?: (selected: { allSelected: boolean; selectedCount: number; selectedRows: T[] }) => void;
Expand Down