Skip to content

Commit

Permalink
Set sort column and direction with props (#649)
Browse files Browse the repository at this point in the history
* Set sort column and direction with props

* Use sort directions from SortableHeaderCell in prop type check

* Update ReactDataGrid.js

* Update ReactDataGrid.js

* Update ReactDataGrid.js
  • Loading branch information
tdzienniak authored and diogofcunha committed Mar 19, 2018
1 parent 603082f commit bcda4fc
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion packages/react-data-grid/src/ReactDataGrid.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ const KeyCodes = require('./KeyCodes');
const isFunction = require('./utils/isFunction');
import SelectAll from './formatters/SelectAll';
import AppConstants from './AppConstants';
import { DEFINE_SORT } from './cells/headerCells/SortableHeaderCell';
import { isKeyPrintable, isCtrlKeyHeldDown } from './utils/keyboardUtils';
const ColumnMetrics = require('./ColumnMetrics');
const ColumnMetrics = require('./ColumnMetrics');
require('../../../themes/react-data-grid-core.css');
require('../../../themes/react-data-grid-checkbox.css');

Expand Down Expand Up @@ -68,6 +69,8 @@ class ReactDataGrid extends React.Component {
getCellActions: PropTypes.func,
onAddFilter: PropTypes.func,
onGridSort: PropTypes.func,
sortColumn: React.PropTypes.string,
sortDirection: React.PropTypes.oneOf(Object.keys(DEFINE_SORT)),
onDragHandleDoubleClick: PropTypes.func,
onGridRowsUpdated: PropTypes.func,
onRowSelect: PropTypes.func,
Expand Down Expand Up @@ -156,6 +159,12 @@ class ReactDataGrid extends React.Component {
} else {
initialState.selected = {rowIdx: -1, idx: -1};
}

if (this.props.sortColumn && this.props.sortDirection) {
initialState.sortColumn = this.props.sortColumn;
initialState.sortDirection = this.props.sortDirection;
}

this.state = initialState;
}

Expand Down

0 comments on commit bcda4fc

Please sign in to comment.