Skip to content

Commit cece4fb

Browse files
[fixed] Use latest props in column metrics generator
1 parent c9c0a65 commit cece4fb

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/ColumnMetricsMixin.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ module.exports = {
4545
componentWillReceiveProps(nextProps: ColumnMetricsType) {
4646
if (nextProps.columns) {
4747
if (!ColumnMetrics.sameColumns(this.props.columns, nextProps.columns, this.props.columnEquality)) {
48-
var columnMetrics = this.createColumnMetrics();
48+
var columnMetrics = this.createColumnMetrics(nextProps);
4949
this.setState({columnMetrics: columnMetrics});
5050
}
5151
}
@@ -95,9 +95,9 @@ module.exports = {
9595
this.setState({columnMetrics});
9696
},
9797

98-
createColumnMetrics(initialRun){
99-
var gridColumns = this.setupGridColumns();
100-
return this.getColumnMetricsType({columns:gridColumns, minColumnWidth: this.props.minColumnWidth}, initialRun);
98+
createColumnMetrics(props = this.props){
99+
var gridColumns = this.setupGridColumns(props);
100+
return this.getColumnMetricsType({columns:gridColumns, minColumnWidth: this.props.minColumnWidth});
101101
},
102102

103103
onColumnResize(index: number, width: number) {

src/addons/grids/ReactDataGrid.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ var ReactDataGrid = React.createClass({
9393
},
9494

9595
getInitialState: function(): {selected: SelectedType; copied: ?{idx: number; rowIdx: number}; selectedRows: Array<Row>; expandedRows: Array<Row>; canFilter: boolean; columnFilters: any; sortDirection: ?SortType; sortColumn: ?ExcelColumn; dragged: ?DraggedType; } {
96-
var columnMetrics = this.createColumnMetrics(true);
96+
var columnMetrics = this.createColumnMetrics();
9797
var initialState = {columnMetrics, selectedRows : this.getInitialSelectedRows(), copied : null, expandedRows : [], canFilter : false, columnFilters : {}, sortDirection: null, sortColumn: null, dragged : null, scrollOffset: 0}
9898
if(this.props.enableCellSelect){
9999
initialState.selected = {rowIdx: 0, idx: 0};
@@ -344,9 +344,9 @@ var ReactDataGrid = React.createClass({
344344

345345
},
346346

347-
setupGridColumns : function(): Array<any>{
348-
var cols = this.props.columns.slice(0);
349-
if(this.props.enableRowSelect){
347+
setupGridColumns : function(props = this.props): Array<any>{
348+
var cols = props.columns.slice(0);
349+
if(props.enableRowSelect){
350350
var selectColumn = {
351351
key: 'select-row',
352352
name: '',

0 commit comments

Comments
 (0)