Skip to content

Commit

Permalink
breaking: rename onDoubleRowClick to onRowDoubleClick
Browse files Browse the repository at this point in the history
  • Loading branch information
oze4 committed Aug 5, 2021
1 parent b1f8e61 commit 32a7f3a
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 21 deletions.
13 changes: 1 addition & 12 deletions __tests__/demo/demo-components/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -547,18 +547,7 @@ export function EventTargetErrorOnRowClick(props) {
tableRef={tableRef}
columns={cols}
data={datas}
components={{
Row: (props) => {
return (
<MTableBodyRow
{...props}
persistEvents={true}
onRowClick={onRowClicked}
onRowSelected={onRowSelectionChanged}
/>
);
}
}}
onRowDoubleClick={onRowClicked}
options={{
selection: true
}}
Expand Down
10 changes: 5 additions & 5 deletions src/components/MTableBodyRow/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default function MTableBodyRow(props) {
persistEvents,
scrollWidth,
onRowClick,
onDoubleRowClick,
onRowDoubleClick,
...rowProps
} = props;

Expand All @@ -60,7 +60,7 @@ export default function MTableBodyRow(props) {

const handleOnRowClick = useDoubleClick(
onRowClick ? (e) => onClick(e, onRowClick) : undefined,
onDoubleRowClick ? (e) => onClick(e, onDoubleRowClick) : undefined
onRowDoubleClick ? (e) => onClick(e, onRowDoubleClick) : undefined
);

const getRenderColumns = () => {
Expand Down Expand Up @@ -377,7 +377,7 @@ export default function MTableBodyRow(props) {
};
}

if (onRowClick || onDoubleRowClick) {
if (onRowClick || onRowDoubleClick) {
style.cursor = 'pointer';
}

Expand Down Expand Up @@ -448,7 +448,7 @@ export default function MTableBodyRow(props) {
}
handleOnRowClick(event);
}}
hover={onRowClick !== null || onDoubleRowClick !== null}
hover={onRowClick !== null || onRowDoubleClick !== null}
style={getStyle(props.index, props.level)}
>
{renderColumns}
Expand Down Expand Up @@ -537,7 +537,7 @@ MTableBodyRow.propTypes = {
columns: PropTypes.array,
onToggleDetailPanel: PropTypes.func.isRequired,
onRowClick: PropTypes.func,
onDoubleRowClick: PropTypes.func,
onRowDoubleClick: PropTypes.func,
onEditingApproved: PropTypes.func,
onEditingCanceled: PropTypes.func,
errorState: PropTypes.oneOfType([PropTypes.object, PropTypes.bool])
Expand Down
3 changes: 2 additions & 1 deletion src/components/m-table-body.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class MTableBody extends React.Component {
path={[index + this.props.pageSize * this.props.currentPage]}
onToggleDetailPanel={this.props.onToggleDetailPanel}
onRowClick={this.props.onRowClick}
onDoubleRowClick={this.props.onDoubleRowClick}
onRowDoubleClick={this.props.onRowDoubleClick}
isTreeData={this.props.isTreeData}
onTreeExpandChanged={this.props.onTreeExpandChanged}
onEditingCanceled={this.props.onEditingCanceled}
Expand Down Expand Up @@ -323,6 +323,7 @@ MTableBody.propTypes = {
onFilterChanged: PropTypes.func,
onGroupExpandChanged: PropTypes.func,
onRowClick: PropTypes.func,
onRowDoubleClick: PropTypes.func,
onRowSelected: PropTypes.func,
onToggleDetailPanel: PropTypes.func.isRequired,
onTreeExpandChanged: PropTypes.func.isRequired,
Expand Down
11 changes: 10 additions & 1 deletion src/material-table.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,15 @@ export default class MaterialTable extends React.Component {
if (this.isRemoteData()) {
this.onQueryChange(this.state.query);
}
/**
* THIS WILL NEED TO BE REMOVED EVENTUALLY.
* Warn consumer of renamed prop.
*/
if (this.props.onDoubleRowClick !== undefined) {
console.error(
'Property `onDoubleRowClick` has been renamed to `onRowDoubleClick`'
);
}
}
);
}
Expand Down Expand Up @@ -942,7 +951,7 @@ export default class MaterialTable extends React.Component {
...this.props.localization.body
}}
onRowClick={this.props.onRowClick}
onDoubleRowClick={this.props.onDoubleRowClick}
onRowDoubleClick={this.props.onRowDoubleClick}
showAddRow={this.state.showAddRow}
hasAnyEditingRow={
!!(this.state.lastEditingRow || this.state.showAddRow)
Expand Down
2 changes: 1 addition & 1 deletion src/prop-types.js
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ export const propTypes = {
onChangeColumnHidden: PropTypes.func,
onOrderChange: PropTypes.func,
onRowClick: PropTypes.func,
onDoubleRowClick: PropTypes.func,
onRowDoubleClick: PropTypes.func,
onTreeExpandChange: PropTypes.func,
onQueryChange: PropTypes.func,
onBulkEditOpen: PropTypes.func,
Expand Down
2 changes: 1 addition & 1 deletion types/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export interface MaterialTableProps<RowData extends object> {
rowData?: RowData,
toggleDetailPanel?: (panelIndex?: number) => void
) => void;
onDoubleRowClick?: (
onRowDoubleClick?: (
event?: React.MouseEvent,
rowData?: RowData,
toggleDetailPanel?: (panelIndex?: number) => void
Expand Down

0 comments on commit 32a7f3a

Please sign in to comment.