@steroidsjs/bootstrap 2.1.20 → 2.1.21
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.
- package/list/Grid/GridView.js +2 -2
- package/list/List/ListView.js +1 -1
- package/package.json +1 -1
package/list/Grid/GridView.js
CHANGED
|
@@ -45,7 +45,7 @@ var react_1 = require("react");
|
|
|
45
45
|
var getFormId = function (props) { return get_1["default"](props, 'searchForm.formId', props.listId); };
|
|
46
46
|
exports.getFormId = getFormId;
|
|
47
47
|
function GridView(props) {
|
|
48
|
-
var _a;
|
|
48
|
+
var _a, _b;
|
|
49
49
|
var bem = hooks_1.useBem('GridView');
|
|
50
50
|
var renderInsideSearchForm = react_1.useCallback(function () {
|
|
51
51
|
if (!props.searchForm || !props.searchForm.fields || props.searchForm.layout !== 'table') {
|
|
@@ -69,7 +69,7 @@ function GridView(props) {
|
|
|
69
69
|
} }));
|
|
70
70
|
}, [props.onSort, (_a = props.list) === null || _a === void 0 ? void 0 : _a.sort]);
|
|
71
71
|
var emptyContent = react_1.useMemo(function () { return props.renderEmpty(); }, [props.renderEmpty]);
|
|
72
|
-
return props.renderList(React.createElement("div", { className: bem(bem.block({ loading: props.isLoading }), props.className) },
|
|
72
|
+
return props.renderList(React.createElement("div", { className: bem(bem.block({ loading: props.isLoading || ((_b = props.list) === null || _b === void 0 ? void 0 : _b.isLoading) }), props.className) },
|
|
73
73
|
props.renderSearchForm(),
|
|
74
74
|
props.renderPaginationSize(),
|
|
75
75
|
React.createElement("table", { className: 'table table-striped' },
|
package/list/List/ListView.js
CHANGED
|
@@ -37,7 +37,7 @@ function ListView(props) {
|
|
|
37
37
|
layout,
|
|
38
38
|
paginationSize)));
|
|
39
39
|
};
|
|
40
|
-
return props.renderList(React.createElement("div", { className: bem(bem.block({ loading: props.isLoading }), props.className) },
|
|
40
|
+
return props.renderList(React.createElement("div", { className: bem(bem.block({ loading: props.isLoading || props.list.isLoading }), props.className) },
|
|
41
41
|
props.renderSearchForm(),
|
|
42
42
|
renderPagination(['top', 'both'].includes(props.paginationPosition) && props.renderPagination(), ['top', 'both'].includes(props.paginationSizePosition) && props.renderPaginationSize(), ['top', 'both'].includes(props.layoutNamesPosition) && props.renderLayoutNames()),
|
|
43
43
|
React.createElement("div", { className: bem('mb-3', bem.element('content'), props.contentClassName) }, props.content),
|