Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set sort column and direction with props #649

Merged
merged 7 commits into from
Mar 19, 2018
Merged

Set sort column and direction with props #649

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cbab591
Set sort column and direction with props
tdzienniak Feb 8, 2017
86ba455
Use sort directions from SortableHeaderCell in prop type check
tdzienniak Apr 27, 2017
2db8015
Merge branch 'master' into master
tdzienniak Nov 8, 2017
8f1933c
Merge branch 'master' into master
malonecj Feb 8, 2018
245766d
Update ReactDataGrid.js
malonecj Feb 8, 2018
67cb89a
Update ReactDataGrid.js
malonecj Feb 8, 2018
2586f39
Update ReactDataGrid.js
malonecj Feb 8, 2018
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
9 changes: 9 additions & 0 deletions packages/react-data-grid/src/ReactDataGrid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const RowUtils = require('./RowUtils');
const ColumnUtils = require('./ColumnUtils');
const KeyCodes = require('./KeyCodes');
import AppConstants from './AppConstants';
import { DEFINE_SORT } from './cells/headerCells/SortableHeaderCell';
require('../../../themes/react-data-grid-core.css');
require('../../../themes/react-data-grid-checkbox.css');

Expand Down Expand Up @@ -67,6 +68,8 @@ const ReactDataGrid = React.createClass({
onCellsDragged: React.PropTypes.func,
onAddFilter: React.PropTypes.func,
onGridSort: React.PropTypes.func,
sortColumn: React.PropTypes.string,
sortDirection: React.PropTypes.oneOf(Object.keys(DEFINE_SORT)),
onDragHandleDoubleClick: React.PropTypes.func,
onGridRowsUpdated: React.PropTypes.func,
onRowSelect: React.PropTypes.func,
Expand Down Expand Up @@ -140,6 +143,12 @@ const ReactDataGrid = React.createClass({
} else {
initialState.selected = {rowIdx: -1, idx: -1};
}

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

return initialState;
},

Expand Down