Skip to content

Optimize row expanding #12

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

Merged
merged 3 commits into from
Oct 27, 2015
Merged

Optimize row expanding #12

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3041c2d
Dont check if the same row is expanded multiple times in the same render
queimadus Oct 26, 2015
ad961ed
Only call expandedRowRender if the row is expanded
queimadus Oct 26, 2015
d2fd4a0
move isRowExpanded function before render because of linting
queimadus Oct 26, 2015
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
21 changes: 11 additions & 10 deletions src/Table.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,9 @@ const Table = React.createClass({
const record = data[i];
const key = keyFn ? keyFn(record, i) : undefined;
const childrenColumn = record[childrenColumnName];
const isRowExpanded = this.isRowExpanded(record);
let expandedRowContent;
if (expandedRowRender) {
if (expandedRowRender && isRowExpanded) {
expandedRowContent = expandedRowRender(record, i);
}
const className = rowClassName(record, i);
Expand All @@ -138,13 +139,13 @@ const Table = React.createClass({
visible={visible}
onExpand={this.onExpanded}
expandable={childrenColumn || expandedRowContent}
expanded={this.isRowExpanded(record)}
expanded={isRowExpanded}
prefixCls={`${props.prefixCls}-row`}
childrenColumnName={childrenColumnName}
columns={columns}
key={key}/>);

const subVisible = visible && this.isRowExpanded(record);
const subVisible = visible && isRowExpanded;

if (expandedRowContent) {
rst.push(this.getExpandedRow(key, expandedRowContent, subVisible, expandedRowClassName(record, i)));
Expand All @@ -171,6 +172,13 @@ const Table = React.createClass({
return <colgroup>{cols}</colgroup>;
},

isRowExpanded(record) {
const info = this.state.expandedRows.filter((i) => {
return i.record === record;
});
return info[0] && info[0].expanded;
},

render() {
const props = this.props;
const prefixCls = props.prefixCls;
Expand Down Expand Up @@ -210,13 +218,6 @@ const Table = React.createClass({
</div>
);
},

isRowExpanded(record) {
const info = this.state.expandedRows.filter((i) => {
return i.record === record;
});
return info[0] && info[0].expanded;
},
});

export default Table;