Skip to content

Commit 8ee8924

Browse files
Fix: DataTable: loading prop true hides empty message #8292 (#8297)
1 parent 64a485d commit 8ee8924

3 files changed

Lines changed: 30 additions & 42 deletions

File tree

components/lib/datatable/TableBody.js

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -910,34 +910,30 @@ export const TableBody = React.memo(
910910
});
911911

912912
const createEmptyContent = () => {
913-
if (!props.loading) {
914-
const colSpan = getColumnsLength();
915-
const content = ObjectUtils.getJSXElement(props.emptyMessage, { props: props.tableProps, frozen: props.frozenRow }) || localeOption('emptyMessage');
916-
const emptyMessageProps = mergeProps(
917-
{
918-
className: cx('emptyMessage'),
919-
role: 'row'
920-
},
921-
ptm('emptyMessage')
922-
);
923-
924-
const bodyCellProps = mergeProps(
925-
{
926-
colSpan,
927-
role: 'cell'
928-
},
929-
getColumnPTOptions('root'),
930-
getColumnPTOptions('bodyCell')
931-
);
913+
const colSpan = getColumnsLength();
914+
const content = ObjectUtils.getJSXElement(props.emptyMessage, { props: props.tableProps, frozen: props.frozenRow }) || localeOption('emptyMessage');
915+
const emptyMessageProps = mergeProps(
916+
{
917+
className: cx('emptyMessage'),
918+
role: 'row'
919+
},
920+
ptm('emptyMessage')
921+
);
932922

933-
return (
934-
<tr {...emptyMessageProps}>
935-
<td {...bodyCellProps}>{content}</td>
936-
</tr>
937-
);
938-
}
923+
const bodyCellProps = mergeProps(
924+
{
925+
colSpan,
926+
role: 'cell'
927+
},
928+
getColumnPTOptions('root'),
929+
getColumnPTOptions('bodyCell')
930+
);
939931

940-
return null;
932+
return (
933+
<tr {...emptyMessageProps}>
934+
<td {...bodyCellProps}>{content}</td>
935+
</tr>
936+
);
941937
};
942938

943939
const createGroupHeader = (rowData, rowIndex, expanded, colSpan) => {

components/lib/dataview/DataView.js

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -217,19 +217,15 @@ export const DataView = React.memo(
217217
};
218218

219219
const createEmptyMessage = () => {
220-
if (!props.loading) {
221-
const content = props.emptyMessage || localeOption('emptyMessage');
222-
const emptyMessageProps = mergeProps(
223-
{
224-
className: cx('emptyMessage')
225-
},
226-
ptm('emptyMessage')
227-
);
228-
229-
return <div {...emptyMessageProps}>{content}</div>;
230-
}
220+
const content = props.emptyMessage || localeOption('emptyMessage');
221+
const emptyMessageProps = mergeProps(
222+
{
223+
className: cx('emptyMessage')
224+
},
225+
ptm('emptyMessage')
226+
);
231227

232-
return null;
228+
return <div {...emptyMessageProps}>{content}</div>;
233229
};
234230

235231
const createHeader = () => {

components/lib/treetable/TreeTableBody.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,6 @@ export const TreeTableBody = React.memo((props) => {
232232
};
233233

234234
const createEmptyMessage = () => {
235-
if (props.loading) {
236-
return null;
237-
}
238-
239235
const colSpan = props.columns ? props.columns.length : null;
240236
const content = ObjectUtils.getJSXElement(props.emptyMessage, { props: props.tableProps }) || localeOption('emptyMessage');
241237
const emptyMessageProps = mergeProps(

0 commit comments

Comments
 (0)