Skip to content

fix(Table): Pass calculated rows to body wrapper to eliminate re-renders #1406

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
tlabaj merged 1 commit into from
Feb 19, 2019
+10,793 −429
Merged

fix(Table): Pass calculated rows to body wrapper to eliminate re-renders #1406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/patternfly-4/react-table/src/components/Table/Body.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class ContextBody extends React.Component {
}));
return (
<React.Fragment>
{mappedRows && <Body {...props} rows={mappedRows} onRow={this.onRow} rowKey={rowKey} className={className} />}
{mappedRows && <Body {...props} mappedRows={mappedRows} rows={mappedRows} onRow={this.onRow} rowKey={rowKey} className={className} />}
</React.Fragment>
)
}
Expand Down
43 changes: 24 additions & 19 deletions packages/patternfly-4/react-table/src/components/Table/BodyWrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,35 @@ import React, { Component, Children, Fragment } from 'react';
import styles from '@patternfly/patternfly/components/Table/table.css';
import { css } from '@patternfly/react-styles';
import { mapOpenedRows } from './utils/headerUtils';
import PropTypes from 'prop-types';

const BodyWrapper = (rows, onCollapse) => {
class TableBody extends Component {
render() {
if (onCollapse) {
return (
<Fragment>
{mapOpenedRows(rows, Children.toArray(this.props.children)).map((oneRow, key) => (
<tbody {...this.props} className={css(oneRow.isOpen && styles.modifiers.expanded)} key={`tbody-${key}`}>
{oneRow.rows}
</tbody>
))}
</Fragment>
)
}
class BodyWrapper extends Component {
render() {
const { mappedRows, ...props } = this.props;
if (mappedRows.some(row => row.hasOwnProperty('isOpen'))) {
return (
<tbody {...this.props} className={css(
rows.some(row => row.isOpen && !row.hasOwnProperty('parent')) && styles.modifiers.expanded
)} />
<Fragment>
{mapOpenedRows(mappedRows, this.props.children).map((oneRow, key) => (
<tbody {...props} className={css(oneRow.isOpen && styles.modifiers.expanded)} key={`tbody-${key}`}>
{oneRow.rows}
</tbody>
))}
</Fragment>
)
}
};
return (
<tbody {...props} />
)
}
}

BodyWrapper.propTypes = {
rows: PropTypes.array,
onCollapse: PropTypes.func
}

return TableBody;
BodyWrapper.defaultProps = {
rows: []
}

export default BodyWrapper;
2 changes: 1 addition & 1 deletion packages/patternfly-4/react-table/src/components/Table/Table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ class Table extends React.Component {
{...props}
renderers={{
body: {
wrapper: BodyWrapper(rows, onCollapse),
wrapper: BodyWrapper,
row: RowWrapper,
cell: BodyCell
},
Expand Down
Loading