Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
48 changes: 22 additions & 26 deletions components/lib/datatable/TableBody.js
Original file line number Diff line number Diff line change
Expand Up @@ -910,34 +910,30 @@ export const TableBody = React.memo(
});

const createEmptyContent = () => {
if (!props.loading) {
const colSpan = getColumnsLength();
const content = ObjectUtils.getJSXElement(props.emptyMessage, { props: props.tableProps, frozen: props.frozenRow }) || localeOption('emptyMessage');
const emptyMessageProps = mergeProps(
{
className: cx('emptyMessage'),
role: 'row'
},
ptm('emptyMessage')
);

const bodyCellProps = mergeProps(
{
colSpan,
role: 'cell'
},
getColumnPTOptions('root'),
getColumnPTOptions('bodyCell')
);
const colSpan = getColumnsLength();
const content = ObjectUtils.getJSXElement(props.emptyMessage, { props: props.tableProps, frozen: props.frozenRow }) || localeOption('emptyMessage');
const emptyMessageProps = mergeProps(
{
className: cx('emptyMessage'),
role: 'row'
},
ptm('emptyMessage')
);

return (
<tr {...emptyMessageProps}>
<td {...bodyCellProps}>{content}</td>
</tr>
);
}
const bodyCellProps = mergeProps(
{
colSpan,
role: 'cell'
},
getColumnPTOptions('root'),
getColumnPTOptions('bodyCell')
);

return null;
return (
<tr {...emptyMessageProps}>
<td {...bodyCellProps}>{content}</td>
</tr>
);
};

const createGroupHeader = (rowData, rowIndex, expanded, colSpan) => {
Expand Down
20 changes: 8 additions & 12 deletions components/lib/dataview/DataView.js
Original file line number Diff line number Diff line change
Expand Up @@ -217,19 +217,15 @@ export const DataView = React.memo(
};

const createEmptyMessage = () => {
if (!props.loading) {
const content = props.emptyMessage || localeOption('emptyMessage');
const emptyMessageProps = mergeProps(
{
className: cx('emptyMessage')
},
ptm('emptyMessage')
);

return <div {...emptyMessageProps}>{content}</div>;
}
const content = props.emptyMessage || localeOption('emptyMessage');
const emptyMessageProps = mergeProps(
{
className: cx('emptyMessage')
},
ptm('emptyMessage')
);

return null;
return <div {...emptyMessageProps}>{content}</div>;
};

const createHeader = () => {
Expand Down
4 changes: 0 additions & 4 deletions components/lib/treetable/TreeTableBody.js
Original file line number Diff line number Diff line change
Expand Up @@ -232,10 +232,6 @@ export const TreeTableBody = React.memo((props) => {
};

const createEmptyMessage = () => {
if (props.loading) {
return null;
}

const colSpan = props.columns ? props.columns.length : null;
const content = ObjectUtils.getJSXElement(props.emptyMessage, { props: props.tableProps }) || localeOption('emptyMessage');
const emptyMessageProps = mergeProps(
Expand Down
Loading