@jetbrains/ring-ui 6.0.60 → 6.0.61
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -113,9 +113,10 @@ export class Table extends PureComponent {
|
|
|
113
113
|
render() {
|
|
114
114
|
const { data, selection, columns, caption, getItemKey, selectable, focused, isItemSelectable, getItemLevel, getItemClassName, getMetaColumnClassName, getItemDataTest, draggable, alwaysShowDragHandle, dragHandleTitle, loading, onSort, sortKey, sortOrder, loaderClassName, stickyHeader, stickyHeaderOffset, isItemCollapsible, isParentCollapsible, isItemCollapsed, onItemCollapse, onItemExpand, isDisabledSelectionVisible, getCheckboxTooltip, onItemDoubleClick, onItemClick, renderEmpty, maxColSpan, RowComponent } = this.props;
|
|
115
115
|
// NOTE: Do not construct new object per render because it causes all rows rerendering
|
|
116
|
+
const columnsArray = typeof columns === 'function' ? columns(null) : columns;
|
|
116
117
|
const headerProps = {
|
|
117
118
|
caption, selectable, draggable,
|
|
118
|
-
columns:
|
|
119
|
+
columns: columnsArray, onSort, sortKey, sortOrder,
|
|
119
120
|
sticky: stickyHeader,
|
|
120
121
|
topStickOffset: stickyHeaderOffset, maxColSpan: this.props.maxColSpan
|
|
121
122
|
};
|
|
@@ -137,7 +138,7 @@ export class Table extends PureComponent {
|
|
|
137
138
|
});
|
|
138
139
|
const renderList = ({ children, props }) => {
|
|
139
140
|
const empty = (<tr>
|
|
140
|
-
<td colSpan={
|
|
141
|
+
<td colSpan={columnsArray.length || 1} className={style.tableMessage}>
|
|
141
142
|
{renderEmpty ? renderEmpty() : null}
|
|
142
143
|
</td>
|
|
143
144
|
</tr>);
|