Skip to content

Fix(#1371): Fix for null and undefined rendering in table cell #1621

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 2 commits into from
Mar 21, 2019
Merged

Fix(#1371): Fix for null and undefined rendering in table cell #1621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d31f0d
fix(react-table): Fix for null and undefined rendering in table cell
dlabaj Mar 21, 2019
0ee0a1a
Updated snapshots.
dlabaj Mar 21, 2019
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
67 changes: 43 additions & 24 deletions 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 @@ -2,7 +2,6 @@ import React from 'react';
import { Body } from 'reactabular-table';
import PropTypes from 'prop-types';
import { TableContext } from './Table';
import { isRowExpanded } from './utils';

const propTypes = {
/** Additional classes for table body. */
Expand Down Expand Up @@ -33,33 +32,50 @@ class ContextBody extends React.Component {
};
};

mapCells = (headerData, row, rowKey) => {
// column indexes start after generated optional columns
let additionalColsIndexShift = headerData[0].extraParams.firstUserColumnIndex;
parentsExpanded(parentId) {
const { rows } = this.props;
return rows[parentId].hasOwnProperty('parent')
? this.parentsExpanded(rows[parentId].parent)
: rows[parentId].isOpen;
}

mapCells = (row, rowKey) => {
const { headerData } = this.props;
let shiftKey = Boolean(headerData[0] && headerData[0].extraParams.onSelect);
shiftKey += Boolean(headerData[0] && headerData[0].extraParams.onCollapse);
return {
...(row &&
(row.cells || row).reduce(
(acc, cell, cellIndex) => {
const isCellObject = cell === Object(cell);

const mappedCell = {
[headerData[cellIndex + additionalColsIndexShift].property]: {
title: isCellObject ? cell.title : cell,
props: {
isVisible: true,
...(isCellObject ? cell.props : null)
}
(acc, curr, key) => {
const currShift = shiftKey;
if (curr) {
if (curr.props && curr.props.colSpan) {
shiftKey += shiftKey + curr.props && curr.props.colSpan - 1;
}
};

// increment the shift index when a cell spans multiple columns
if (isCellObject && cell.props && cell.props.colSpan) {
additionalColsIndexShift += cell.props.colSpan - 1;
return {
...acc,
...{
[headerData[currShift + key].property]: {
title: curr.title || curr,
props: {
isVisible: true,
...curr.props
}
}
}
};
}
console.warn(`Cell value at [ ${rowKey}, ${key} ] should not be set to ${curr}`);
return {
...acc,
...mappedCell
...{
[headerData[currShift + key].property]: {
title: curr,
props: {
isVisible: true
}
}
}
};
},
{ id: row.id !== undefined ? row.id : rowKey }
Expand All @@ -70,13 +86,16 @@ class ContextBody extends React.Component {
render() {
const { className, headerData, rows, rowKey, children, onRowClick, ...props } = this.props;
const mappedRows =
headerData.length > 0 &&
headerData.length !== 0 &&
rows.map((oneRow, oneRowKey) => ({
...oneRow,
...this.mapCells(headerData, oneRow, oneRowKey),
isExpanded: isRowExpanded(oneRow, rows)
...this.mapCells(oneRow, oneRowKey),
...(oneRow.parent !== undefined
? {
isExpanded: this.parentsExpanded(oneRow.parent) && rows[oneRow.parent].isOpen
}
: {})
}));

return (
<React.Fragment>
{mappedRows && (
Expand Down
Loading