pne-ui 3.0.88 → 3.0.90
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/cjs/component/search-ui/SearchUI.js +2 -2
- package/cjs/component/search-ui/SearchUI.js.map +1 -1
- package/cjs/component/table/AbstractTable.js +38 -14
- package/cjs/component/table/AbstractTable.js.map +1 -1
- package/cjs/component/table/useTable.d.ts +1 -0
- package/cjs/component/table/useTable.js +14 -1
- package/cjs/component/table/useTable.js.map +1 -1
- package/esm/component/search-ui/SearchUI.js +2 -2
- package/esm/component/search-ui/SearchUI.js.map +1 -1
- package/esm/component/table/AbstractTable.js +39 -15
- package/esm/component/table/AbstractTable.js.map +1 -1
- package/esm/component/table/useTable.d.ts +1 -0
- package/esm/component/table/useTable.js +14 -1
- package/esm/component/table/useTable.js.map +1 -1
- package/package.json +1 -1
|
@@ -24,7 +24,7 @@ const SearchUI = (props) => {
|
|
|
24
24
|
...tableParams?.displayOptions,
|
|
25
25
|
});
|
|
26
26
|
const fetchDataExtraDeps = (0, react_1.useMemo)(() => [searchCriteria], [searchCriteria]);
|
|
27
|
-
const { paginator, data, setData, sortIndex, setSortIndex, order, setOrder, onSortChange, } = (0, __1.useTable)({
|
|
27
|
+
const { loading, paginator, data, setData, sortIndex, setSortIndex, order, setOrder, onSortChange, } = (0, __1.useTable)({
|
|
28
28
|
rowsPerPageOptions: tableParams?.rowsPerPageOptions,
|
|
29
29
|
duplicatePagination: tableParams?.duplicatePagination,
|
|
30
30
|
paginatorActiveActionSx: tableParams?.paginatorActiveActionSx,
|
|
@@ -56,7 +56,7 @@ const SearchUI = (props) => {
|
|
|
56
56
|
sortIndex,
|
|
57
57
|
setSortIndex,
|
|
58
58
|
onSortChange,
|
|
59
|
-
}, createRow: (item, index, arr) => createTableRow(item, index, arr, setData), paginator: paginator })));
|
|
59
|
+
}, createRow: (item, index, arr) => createTableRow(item, index, arr, setData), paginator: paginator, loading: loading })));
|
|
60
60
|
};
|
|
61
61
|
exports.SearchUI = SearchUI;
|
|
62
62
|
const initialDisplayOptions = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SearchUI.js","sourceRoot":"","sources":["../../../src/component/search-ui/SearchUI.tsx"],"names":[],"mappings":";;;;AAAA,uDAA0E;AAC1E,+DAAkF;AAElF,4CAAqD;AAErD,6BAAsF;AACtF,yCAAgD;AA6EhD;;;;GAIG;AACI,MAAM,QAAQ,GAAG,CAAmB,KAAe,EAAsB,EAAE;IAC9E,MAAM,EACF,mBAAmB,EACnB,gBAAgB,EAChB,kBAAkB,EAClB,iBAAiB,EACjB,uBAAuB,EACvB,gBAAgB,EAChB,UAAU,EACV,iBAAiB,EACjB,cAAc,EACd,WAAW,EACX,YAAY,EACZ,MAAM,GACT,GAAG,KAAK,CAAA;IAET,MAAM,EACF,cAAc,EACd,iBAAiB,GACpB,GAAG,IAAA,wBAAgB,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC7B,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;KAC7C,CAAC,CAAC,CAAA;IAEH,sDAAsD;IACtD,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,IAAA,gBAAQ,EAAsB;QACtE,GAAG,qBAAqB;QACxB,GAAG,WAAW,EAAE,cAAc;KACjC,CAAC,CAAA;IAEF,MAAM,kBAAkB,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE,CAAC,CAAC,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAA;IAE5E,MAAM,EACF,SAAS,EACT,IAAI,EAAE,OAAO,EACb,SAAS,EAAE,YAAY,EACvB,KAAK,EAAE,QAAQ,EACf,YAAY,GACf,GAAG,IAAA,YAAQ,EAAI;QACZ,kBAAkB,EAAE,WAAW,EAAE,kBAAkB;QACnD,mBAAmB,EAAE,WAAW,EAAE,mBAAmB;QACrD,uBAAuB,EAAE,WAAW,EAAE,uBAAuB;QAC7D,cAAc,EAAE,cAAc;QAC9B,sBAAsB,EAAE,iBAAiB;QACzC,mBAAmB,EAAE,mBAAmB;QACxC,YAAY,EAAE,YAAY;QAC1B,kBAAkB,EAAE,kBAAkB;QACtC,SAAS,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE;YAChD,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC;gBAC9B,OAAO,OAAO,CAAC,OAAO,CAAM,EAAE,CAAC,CAAA;YACnC,CAAC;YAED,MAAM,YAAY,GAAG,IAAA,0BAAkB,EAAC,cAAc,EAAE;gBACpD,IAAI;gBACJ,QAAQ;gBACR,KAAK;gBACL,SAAS;aACZ,CAAC,CAAA;YAEF,OAAO,UAAU,CAAC,YAAY,CAAC,CAAA;QACnC,CAAC;KACJ,CAAC,CAAA;IAEF,OAAO;QACH,8BAAC,iCAAe,IACZ,mBAAmB,EAAE,mBAAmB,EACxC,gBAAgB,EAAE,gBAAgB,EAClC,kBAAkB,EAAE,kBAAkB,EACtC,iBAAiB,EAAE,iBAAiB,EACpC,uBAAuB,EAAE,uBAAuB,EAChD,gBAAgB,EAAE,gBAAgB,EAClC,eAAe,EAAE,iBAAiB,EAClC,MAAM,EAAE,MAAM,GAChB;QACF,8BAAC,kBAAO,OAAE;QACV,8BAAC,cAAG,IAAC,EAAE,EAAE,UAAU;YACf,8BAAC,YAAQ,IACL,IAAI,EAAE,IAAI,EACV,iBAAiB,EAAE,iBAAiB,EACpC,WAAW,EAAE;oBACT,KAAK;oBACL,QAAQ;oBACR,SAAS;oBACT,YAAY;oBACZ,YAAY;iBACf,EACD,SAAS,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,EAC1E,SAAS,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"SearchUI.js","sourceRoot":"","sources":["../../../src/component/search-ui/SearchUI.tsx"],"names":[],"mappings":"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"}
|
|
@@ -7,27 +7,38 @@ const TableBody_1 = tslib_1.__importDefault(require("@mui/material/TableBody"));
|
|
|
7
7
|
const TableContainer_1 = tslib_1.__importDefault(require("@mui/material/TableContainer"));
|
|
8
8
|
const TableHead_1 = tslib_1.__importDefault(require("@mui/material/TableHead"));
|
|
9
9
|
const Box_1 = tslib_1.__importDefault(require("@mui/material/Box"));
|
|
10
|
+
const Skeleton_1 = tslib_1.__importDefault(require("@mui/material/Skeleton"));
|
|
10
11
|
const PneTableRow_1 = tslib_1.__importDefault(require("./PneTableRow"));
|
|
11
12
|
const PneTableCell_1 = tslib_1.__importDefault(require("./PneTableCell"));
|
|
12
13
|
const PneTablePagination_1 = tslib_1.__importDefault(require("./PneTablePagination"));
|
|
13
14
|
const PneTablePaginationActions_1 = tslib_1.__importDefault(require("./PneTablePaginationActions"));
|
|
14
15
|
const react_i18next_1 = require("react-i18next");
|
|
15
16
|
const AbstractTable = (props) => {
|
|
16
|
-
const { data, createTableHeader, sortOptions, createRow, lastRow = null, paginator, stickyHeader = false, showNothingIsFoundRow = true, tableSx = {}, boxSx = {}, noRowsMessage, } = props;
|
|
17
|
+
const { data, createTableHeader, sortOptions, createRow, lastRow = null, paginator, loading = false, stickyHeader = false, showNothingIsFoundRow = true, tableSx = {}, boxSx = {}, noRowsMessage, } = props;
|
|
17
18
|
const { t } = (0, react_i18next_1.useTranslation)();
|
|
18
19
|
const containerRef = (0, react_1.useRef)(null);
|
|
19
|
-
const
|
|
20
|
+
const tableContainerRef = (0, react_1.useRef)(null);
|
|
21
|
+
const lastContentHeightRef = (0, react_1.useRef)(undefined);
|
|
22
|
+
const lastHeaderHeightRef = (0, react_1.useRef)(0);
|
|
23
|
+
const [columnCount, setColumnCount] = (0, react_1.useState)(100);
|
|
20
24
|
const visibleRows = react_1.default.useMemo(() => data, [data, sortOptions?.order, sortOptions?.sortIndex]);
|
|
21
25
|
(0, react_1.useEffect)(() => {
|
|
22
|
-
if (
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
setNothingRowColSpan(header.childElementCount);
|
|
27
|
-
}
|
|
26
|
+
if (containerRef?.current) {
|
|
27
|
+
const header = containerRef.current.querySelector('table thead tr');
|
|
28
|
+
if (header) {
|
|
29
|
+
setColumnCount(header.childElementCount);
|
|
28
30
|
}
|
|
29
31
|
}
|
|
30
|
-
}
|
|
32
|
+
});
|
|
33
|
+
(0, react_1.useLayoutEffect)(() => {
|
|
34
|
+
if (!loading && tableContainerRef.current) {
|
|
35
|
+
lastContentHeightRef.current = tableContainerRef.current.offsetHeight;
|
|
36
|
+
const thead = containerRef.current?.querySelector('table thead');
|
|
37
|
+
if (thead) {
|
|
38
|
+
lastHeaderHeightRef.current = thead.getBoundingClientRect().height;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
});
|
|
31
42
|
const getPneTablePagination = (position) => {
|
|
32
43
|
if (!paginator) {
|
|
33
44
|
return null;
|
|
@@ -40,18 +51,31 @@ const AbstractTable = (props) => {
|
|
|
40
51
|
disabled: !paginator.hasNext,
|
|
41
52
|
}, rowsPerPageOptions: paginator.rowsPerPageOptions, rowsPerPage: paginator.rowsPerPage, page: paginator.page, onPageChange: paginator.onPageChange, ActionsComponent: (props) => react_1.default.createElement(PneTablePaginationActions_1.default, { ...props, paginator: paginator, shouldRequestScroll: position === 'bottom' }) });
|
|
42
53
|
};
|
|
54
|
+
const skeletonRowCount = paginator?.rowsPerPage || 10;
|
|
55
|
+
const skeletonTableHeight = loading && lastContentHeightRef.current
|
|
56
|
+
? lastContentHeightRef.current
|
|
57
|
+
: undefined;
|
|
58
|
+
const cellPadding = 16; // 8px top + 8px bottom
|
|
59
|
+
const skeletonItemHeight = skeletonTableHeight
|
|
60
|
+
? Math.max(16, (skeletonTableHeight - lastHeaderHeightRef.current) / skeletonRowCount - cellPadding)
|
|
61
|
+
: undefined;
|
|
62
|
+
const skeletonWidth = (row, col) => {
|
|
63
|
+
const hash = Math.sin(row * 127.1 + col * 311.7) * 43758.5453;
|
|
64
|
+
return `${40 + Math.floor((hash - Math.floor(hash)) * 40)}%`;
|
|
65
|
+
};
|
|
43
66
|
return react_1.default.createElement(Box_1.default, { sx: { ...boxSx }, ref: containerRef },
|
|
44
67
|
paginator && paginator.duplicatePagination && getPneTablePagination('top'),
|
|
45
|
-
react_1.default.createElement(TableContainer_1.default,
|
|
46
|
-
react_1.default.createElement(Table_1.default, { stickyHeader: stickyHeader, sx: { ...tableSx } },
|
|
68
|
+
react_1.default.createElement(TableContainer_1.default, { ref: tableContainerRef },
|
|
69
|
+
react_1.default.createElement(Table_1.default, { stickyHeader: stickyHeader, sx: { ...tableSx, ...(skeletonTableHeight ? { height: skeletonTableHeight } : {}) } },
|
|
47
70
|
react_1.default.createElement(TableHead_1.default, null, createTableHeader({
|
|
48
71
|
sortOptions: sortOptions
|
|
49
72
|
})),
|
|
50
|
-
react_1.default.createElement(TableBody_1.default, null,
|
|
73
|
+
react_1.default.createElement(TableBody_1.default, null, loading ? (Array.from({ length: skeletonRowCount }).map((_, rowIndex) => (react_1.default.createElement(PneTableRow_1.default, { key: `skeleton-${rowIndex}`, hover: false }, Array.from({ length: columnCount }).map((_, colIndex) => (react_1.default.createElement(PneTableCell_1.default, { key: `skeleton-${rowIndex}-${colIndex}` },
|
|
74
|
+
react_1.default.createElement(Skeleton_1.default, { variant: "rounded", width: skeletonWidth(rowIndex, colIndex), height: skeletonItemHeight })))))))) : (react_1.default.createElement(react_1.default.Fragment, null,
|
|
51
75
|
visibleRows.map(createRow),
|
|
52
76
|
visibleRows.length === 0 && showNothingIsFoundRow && (react_1.default.createElement(PneTableRow_1.default, { hover: false },
|
|
53
|
-
react_1.default.createElement(PneTableCell_1.default, { colSpan:
|
|
54
|
-
lastRow))),
|
|
77
|
+
react_1.default.createElement(PneTableCell_1.default, { colSpan: columnCount }, noRowsMessage || t('advancedSearch.noRows')))),
|
|
78
|
+
lastRow))))),
|
|
55
79
|
paginator && getPneTablePagination('bottom'));
|
|
56
80
|
};
|
|
57
81
|
exports.default = AbstractTable;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractTable.js","sourceRoot":"","sources":["../../../src/component/table/AbstractTable.tsx"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"AbstractTable.js","sourceRoot":"","sources":["../../../src/component/table/AbstractTable.tsx"],"names":[],"mappings":"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"}
|
|
@@ -47,6 +47,7 @@ const useTable = (params = {}) => {
|
|
|
47
47
|
const [pageSize, setPageSize] = (0, react_1.useState)(initialPageSize);
|
|
48
48
|
const [hasNext, setHasNext] = (0, react_1.useState)(false);
|
|
49
49
|
const [disableActions, setDisableActions] = (0, react_1.useState)(false);
|
|
50
|
+
const [loading, setLoading] = (0, react_1.useState)(!!fetchData);
|
|
50
51
|
const [data, setData] = (0, react_1.useState)([]);
|
|
51
52
|
const [sortIndex, setSortIndex] = (0, react_1.useState)(initialSortIndex);
|
|
52
53
|
const [order, setOrder] = (0, react_1.useState)(initialSortOrder);
|
|
@@ -145,6 +146,7 @@ const useTable = (params = {}) => {
|
|
|
145
146
|
const afterDataFetch = (dataList) => {
|
|
146
147
|
getSetData()(dataList.slice(0, pageSize));
|
|
147
148
|
wrapSetHasNext(dataList.length === pageSize + 1);
|
|
149
|
+
setLoading(false);
|
|
148
150
|
scrollToPagination();
|
|
149
151
|
};
|
|
150
152
|
const fetchDataDeps = [pageNumber, pageSize, order, sortIndex];
|
|
@@ -158,6 +160,7 @@ const useTable = (params = {}) => {
|
|
|
158
160
|
shouldSkipFetchDate.current = false;
|
|
159
161
|
return;
|
|
160
162
|
}
|
|
163
|
+
setLoading(true);
|
|
161
164
|
const asyncFetchData = async (args) => {
|
|
162
165
|
if (fetchData) {
|
|
163
166
|
try {
|
|
@@ -184,6 +187,9 @@ const useTable = (params = {}) => {
|
|
|
184
187
|
}
|
|
185
188
|
catch (err) {
|
|
186
189
|
console.error(err);
|
|
190
|
+
if (mounted) {
|
|
191
|
+
setLoading(false);
|
|
192
|
+
}
|
|
187
193
|
}
|
|
188
194
|
}
|
|
189
195
|
};
|
|
@@ -203,12 +209,19 @@ const useTable = (params = {}) => {
|
|
|
203
209
|
throw new Error('useTable: Do not use useSimpleFetch hook and dataGetter param together! It makes no sense');
|
|
204
210
|
}
|
|
205
211
|
(0, react_1.useEffect)(() => {
|
|
206
|
-
|
|
212
|
+
setLoading(true);
|
|
213
|
+
getter()
|
|
214
|
+
.then(afterDataFetch)
|
|
215
|
+
.catch((err) => {
|
|
216
|
+
console.error(err);
|
|
217
|
+
setLoading(false);
|
|
218
|
+
});
|
|
207
219
|
}, fetchDataDeps);
|
|
208
220
|
};
|
|
209
221
|
return {
|
|
210
222
|
page: pageNumber,
|
|
211
223
|
pageSize,
|
|
224
|
+
loading,
|
|
212
225
|
setHasNext: wrapSetHasNext,
|
|
213
226
|
paginator,
|
|
214
227
|
data: getData(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useTable.js","sourceRoot":"","sources":["../../../src/component/table/useTable.ts"],"names":[],"mappings":";;;AAAA,iCAA4E;AAG5E,gDAAoD;AAEpD,yCAA+C;AAE/C,MAAM,sBAAsB,GAAG,WAAW,CAAA;AAC1C,MAAM,wBAAwB,GAAG,aAAa,CAAA;AAC9C,MAAM,uBAAuB,GAAG,YAAY,CAAA;AAC5C,MAAM,2BAA2B,GAAG,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"useTable.js","sourceRoot":"","sources":["../../../src/component/table/useTable.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ export const SearchUI = (props) => {
|
|
|
20
20
|
...tableParams?.displayOptions,
|
|
21
21
|
});
|
|
22
22
|
const fetchDataExtraDeps = useMemo(() => [searchCriteria], [searchCriteria]);
|
|
23
|
-
const { paginator, data, setData, sortIndex, setSortIndex, order, setOrder, onSortChange, } = useTable({
|
|
23
|
+
const { loading, paginator, data, setData, sortIndex, setSortIndex, order, setOrder, onSortChange, } = useTable({
|
|
24
24
|
rowsPerPageOptions: tableParams?.rowsPerPageOptions,
|
|
25
25
|
duplicatePagination: tableParams?.duplicatePagination,
|
|
26
26
|
paginatorActiveActionSx: tableParams?.paginatorActiveActionSx,
|
|
@@ -52,7 +52,7 @@ export const SearchUI = (props) => {
|
|
|
52
52
|
sortIndex,
|
|
53
53
|
setSortIndex,
|
|
54
54
|
onSortChange,
|
|
55
|
-
}, createRow: (item, index, arr) => createTableRow(item, index, arr, setData), paginator: paginator })));
|
|
55
|
+
}, createRow: (item, index, arr) => createTableRow(item, index, arr, setData), paginator: paginator, loading: loading })));
|
|
56
56
|
};
|
|
57
57
|
const initialDisplayOptions = {
|
|
58
58
|
pageSize: 50,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SearchUI.js","sourceRoot":"","sources":["../../../src/component/search-ui/SearchUI.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SearchUI.js","sourceRoot":"","sources":["../../../src/component/search-ui/SearchUI.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,30 +1,41 @@
|
|
|
1
|
-
import React, { useState, useEffect, useRef } from 'react';
|
|
1
|
+
import React, { useState, useEffect, useLayoutEffect, useRef } from 'react';
|
|
2
2
|
import Table from '@mui/material/Table';
|
|
3
3
|
import TableBody from '@mui/material/TableBody';
|
|
4
4
|
import TableContainer from '@mui/material/TableContainer';
|
|
5
5
|
import TableHead from '@mui/material/TableHead';
|
|
6
6
|
import Box from '@mui/material/Box';
|
|
7
|
+
import Skeleton from '@mui/material/Skeleton';
|
|
7
8
|
import PneTableRow from './PneTableRow';
|
|
8
9
|
import PneTableCell from './PneTableCell';
|
|
9
10
|
import PneTablePagination from './PneTablePagination';
|
|
10
11
|
import PneTablePaginationActions from './PneTablePaginationActions';
|
|
11
12
|
import { useTranslation } from "react-i18next";
|
|
12
13
|
const AbstractTable = (props) => {
|
|
13
|
-
const { data, createTableHeader, sortOptions, createRow, lastRow = null, paginator, stickyHeader = false, showNothingIsFoundRow = true, tableSx = {}, boxSx = {}, noRowsMessage, } = props;
|
|
14
|
+
const { data, createTableHeader, sortOptions, createRow, lastRow = null, paginator, loading = false, stickyHeader = false, showNothingIsFoundRow = true, tableSx = {}, boxSx = {}, noRowsMessage, } = props;
|
|
14
15
|
const { t } = useTranslation();
|
|
15
16
|
const containerRef = useRef(null);
|
|
16
|
-
const
|
|
17
|
+
const tableContainerRef = useRef(null);
|
|
18
|
+
const lastContentHeightRef = useRef(undefined);
|
|
19
|
+
const lastHeaderHeightRef = useRef(0);
|
|
20
|
+
const [columnCount, setColumnCount] = useState(100);
|
|
17
21
|
const visibleRows = React.useMemo(() => data, [data, sortOptions?.order, sortOptions?.sortIndex]);
|
|
18
22
|
useEffect(() => {
|
|
19
|
-
if (
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
setNothingRowColSpan(header.childElementCount);
|
|
24
|
-
}
|
|
23
|
+
if (containerRef?.current) {
|
|
24
|
+
const header = containerRef.current.querySelector('table thead tr');
|
|
25
|
+
if (header) {
|
|
26
|
+
setColumnCount(header.childElementCount);
|
|
25
27
|
}
|
|
26
28
|
}
|
|
27
|
-
}
|
|
29
|
+
});
|
|
30
|
+
useLayoutEffect(() => {
|
|
31
|
+
if (!loading && tableContainerRef.current) {
|
|
32
|
+
lastContentHeightRef.current = tableContainerRef.current.offsetHeight;
|
|
33
|
+
const thead = containerRef.current?.querySelector('table thead');
|
|
34
|
+
if (thead) {
|
|
35
|
+
lastHeaderHeightRef.current = thead.getBoundingClientRect().height;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
});
|
|
28
39
|
const getPneTablePagination = (position) => {
|
|
29
40
|
if (!paginator) {
|
|
30
41
|
return null;
|
|
@@ -37,18 +48,31 @@ const AbstractTable = (props) => {
|
|
|
37
48
|
disabled: !paginator.hasNext,
|
|
38
49
|
}, rowsPerPageOptions: paginator.rowsPerPageOptions, rowsPerPage: paginator.rowsPerPage, page: paginator.page, onPageChange: paginator.onPageChange, ActionsComponent: (props) => React.createElement(PneTablePaginationActions, { ...props, paginator: paginator, shouldRequestScroll: position === 'bottom' }) });
|
|
39
50
|
};
|
|
51
|
+
const skeletonRowCount = paginator?.rowsPerPage || 10;
|
|
52
|
+
const skeletonTableHeight = loading && lastContentHeightRef.current
|
|
53
|
+
? lastContentHeightRef.current
|
|
54
|
+
: undefined;
|
|
55
|
+
const cellPadding = 16; // 8px top + 8px bottom
|
|
56
|
+
const skeletonItemHeight = skeletonTableHeight
|
|
57
|
+
? Math.max(16, (skeletonTableHeight - lastHeaderHeightRef.current) / skeletonRowCount - cellPadding)
|
|
58
|
+
: undefined;
|
|
59
|
+
const skeletonWidth = (row, col) => {
|
|
60
|
+
const hash = Math.sin(row * 127.1 + col * 311.7) * 43758.5453;
|
|
61
|
+
return `${40 + Math.floor((hash - Math.floor(hash)) * 40)}%`;
|
|
62
|
+
};
|
|
40
63
|
return React.createElement(Box, { sx: { ...boxSx }, ref: containerRef },
|
|
41
64
|
paginator && paginator.duplicatePagination && getPneTablePagination('top'),
|
|
42
|
-
React.createElement(TableContainer,
|
|
43
|
-
React.createElement(Table, { stickyHeader: stickyHeader, sx: { ...tableSx } },
|
|
65
|
+
React.createElement(TableContainer, { ref: tableContainerRef },
|
|
66
|
+
React.createElement(Table, { stickyHeader: stickyHeader, sx: { ...tableSx, ...(skeletonTableHeight ? { height: skeletonTableHeight } : {}) } },
|
|
44
67
|
React.createElement(TableHead, null, createTableHeader({
|
|
45
68
|
sortOptions: sortOptions
|
|
46
69
|
})),
|
|
47
|
-
React.createElement(TableBody, null,
|
|
70
|
+
React.createElement(TableBody, null, loading ? (Array.from({ length: skeletonRowCount }).map((_, rowIndex) => (React.createElement(PneTableRow, { key: `skeleton-${rowIndex}`, hover: false }, Array.from({ length: columnCount }).map((_, colIndex) => (React.createElement(PneTableCell, { key: `skeleton-${rowIndex}-${colIndex}` },
|
|
71
|
+
React.createElement(Skeleton, { variant: "rounded", width: skeletonWidth(rowIndex, colIndex), height: skeletonItemHeight })))))))) : (React.createElement(React.Fragment, null,
|
|
48
72
|
visibleRows.map(createRow),
|
|
49
73
|
visibleRows.length === 0 && showNothingIsFoundRow && (React.createElement(PneTableRow, { hover: false },
|
|
50
|
-
React.createElement(PneTableCell, { colSpan:
|
|
51
|
-
lastRow))),
|
|
74
|
+
React.createElement(PneTableCell, { colSpan: columnCount }, noRowsMessage || t('advancedSearch.noRows')))),
|
|
75
|
+
lastRow))))),
|
|
52
76
|
paginator && getPneTablePagination('bottom'));
|
|
53
77
|
};
|
|
54
78
|
export default AbstractTable;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractTable.js","sourceRoot":"","sources":["../../../src/component/table/AbstractTable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAmB,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"AbstractTable.js","sourceRoot":"","sources":["../../../src/component/table/AbstractTable.tsx"],"names":[],"mappings":"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"}
|
|
@@ -44,6 +44,7 @@ const useTable = (params = {}) => {
|
|
|
44
44
|
const [pageSize, setPageSize] = useState(initialPageSize);
|
|
45
45
|
const [hasNext, setHasNext] = useState(false);
|
|
46
46
|
const [disableActions, setDisableActions] = useState(false);
|
|
47
|
+
const [loading, setLoading] = useState(!!fetchData);
|
|
47
48
|
const [data, setData] = useState([]);
|
|
48
49
|
const [sortIndex, setSortIndex] = useState(initialSortIndex);
|
|
49
50
|
const [order, setOrder] = useState(initialSortOrder);
|
|
@@ -142,6 +143,7 @@ const useTable = (params = {}) => {
|
|
|
142
143
|
const afterDataFetch = (dataList) => {
|
|
143
144
|
getSetData()(dataList.slice(0, pageSize));
|
|
144
145
|
wrapSetHasNext(dataList.length === pageSize + 1);
|
|
146
|
+
setLoading(false);
|
|
145
147
|
scrollToPagination();
|
|
146
148
|
};
|
|
147
149
|
const fetchDataDeps = [pageNumber, pageSize, order, sortIndex];
|
|
@@ -155,6 +157,7 @@ const useTable = (params = {}) => {
|
|
|
155
157
|
shouldSkipFetchDate.current = false;
|
|
156
158
|
return;
|
|
157
159
|
}
|
|
160
|
+
setLoading(true);
|
|
158
161
|
const asyncFetchData = async (args) => {
|
|
159
162
|
if (fetchData) {
|
|
160
163
|
try {
|
|
@@ -181,6 +184,9 @@ const useTable = (params = {}) => {
|
|
|
181
184
|
}
|
|
182
185
|
catch (err) {
|
|
183
186
|
console.error(err);
|
|
187
|
+
if (mounted) {
|
|
188
|
+
setLoading(false);
|
|
189
|
+
}
|
|
184
190
|
}
|
|
185
191
|
}
|
|
186
192
|
};
|
|
@@ -200,12 +206,19 @@ const useTable = (params = {}) => {
|
|
|
200
206
|
throw new Error('useTable: Do not use useSimpleFetch hook and dataGetter param together! It makes no sense');
|
|
201
207
|
}
|
|
202
208
|
useEffect(() => {
|
|
203
|
-
|
|
209
|
+
setLoading(true);
|
|
210
|
+
getter()
|
|
211
|
+
.then(afterDataFetch)
|
|
212
|
+
.catch((err) => {
|
|
213
|
+
console.error(err);
|
|
214
|
+
setLoading(false);
|
|
215
|
+
});
|
|
204
216
|
}, fetchDataDeps);
|
|
205
217
|
};
|
|
206
218
|
return {
|
|
207
219
|
page: pageNumber,
|
|
208
220
|
pageSize,
|
|
221
|
+
loading,
|
|
209
222
|
setHasNext: wrapSetHasNext,
|
|
210
223
|
paginator,
|
|
211
224
|
data: getData(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useTable.js","sourceRoot":"","sources":["../../../src/component/table/useTable.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAG5E,OAAO,EAAC,MAAM,EAAQ,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAC,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAE/C,MAAM,sBAAsB,GAAG,WAAW,CAAA;AAC1C,MAAM,wBAAwB,GAAG,aAAa,CAAA;AAC9C,MAAM,uBAAuB,GAAG,YAAY,CAAA;AAC5C,MAAM,2BAA2B,GAAG,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"useTable.js","sourceRoot":"","sources":["../../../src/component/table/useTable.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAG5E,OAAO,EAAC,MAAM,EAAQ,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAC,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAE/C,MAAM,sBAAsB,GAAG,WAAW,CAAA;AAC1C,MAAM,wBAAwB,GAAG,aAAa,CAAA;AAC9C,MAAM,uBAAuB,GAAG,YAAY,CAAA;AAC5C,MAAM,2BAA2B,GAAG,UAAU,CAAA;AAsC9C,MAAM,QAAQ,GAAG,CAAM,SAA4B,EAAE,EAAsB,EAAE;IACzE,MAAM,EACF,cAAc,EACd,sBAAsB,EACtB,uBAAuB,GAAG,EAAE,EAC5B,kBAAkB,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAA,6BAA6B,CAAC,EAC9D,mBAAmB,EACnB,YAAY,EACZ,SAAS,EACT,kBAAkB,EAClB,mBAAmB,GACtB,GAAG,MAAM,CAAC;IAEX,MAAM,EACF,wBAAwB,EACxB,2BAA2B,GAC9B,GAAG,gBAAgB,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC7B,wBAAwB,EAAE,KAAK,CAAC,wBAAwB;QACxD,2BAA2B,EAAE,KAAK,CAAC,2BAA2B;KACjE,CAAC,CAAC,CAAA;IAEH,4FAA4F;IAC5F,oBAAoB;IACpB,0BAA0B;IAC1B,oBAAoB;IACpB,KAAK;IACL,IAAI,eAAe,GAAG,kBAAkB,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IACvE,IAAI,cAAc,EAAE,QAAQ,IAAI,kBAAkB,CAAC,QAAQ,CAAC,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC;QACpF,eAAe,GAAG,cAAc,EAAE,QAAQ,CAAA;IAC9C,CAAC;IACD,IAAI,gBAAgB,GAAG,cAAc,EAAE,eAAe,IAAI,CAAC,CAAA;IAC3D,IAAI,gBAAgB,GAAU,KAAK,CAAA;IACnC,IAAI,OAAO,cAAc,EAAE,OAAO,KAAK,WAAW,EAAE,CAAC;QACjD,gBAAgB,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAA;IAC9D,CAAC;IACD,IAAI,iBAAiB,GAAG,CAAC,CAAA;IAEzB,IAAI,mBAAmB,EAAE,CAAC;QACtB,IAAI,cAAc,CAAC,cAAc,CAAC,mBAAmB,GAAG,sBAAsB,CAAC,EAAE,CAAC;YAC9E,eAAe,GAAG,CAAC,MAAM,CACrB,cAAc,CAAC,OAAO,CAAC,mBAAmB,GAAG,sBAAsB,CAAC,CACvE,CAAA;QACL,CAAC;QACD,IAAI,cAAc,CAAC,cAAc,CAAC,mBAAmB,GAAG,wBAAwB,CAAC,EAAE,CAAC;YAChF,iBAAiB,GAAG,CAAC,MAAM,CACvB,cAAc,CAAC,OAAO,CAAC,mBAAmB,GAAG,wBAAwB,CAAC,CACzE,CAAA;QACL,CAAC;QACD,IAAI,cAAc,CAAC,cAAc,CAAC,mBAAmB,GAAG,uBAAuB,CAAC,EAAE,CAAC;YAC/E,gBAAgB,GAAG,CAAC,MAAM,CACtB,cAAc,CAAC,OAAO,CAAC,mBAAmB,GAAG,uBAAuB,CAAC,CACxE,CAAA;QACL,CAAC;QACD,IAAI,cAAc,CAAC,cAAc,CAAC,mBAAmB,GAAG,2BAA2B,CAAC,EAAE,CAAC;YACnF,gBAAgB,GAAG,MAAM,CACrB,cAAc,CAAC,OAAO,CAAC,mBAAmB,GAAG,2BAA2B,CAAC,CACnE,CAAA;QACd,CAAC;IACL,CAAC;IAED,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAA;IAC/D,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,eAAe,CAAC,CAAA;IACzD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IAC7C,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IAC3D,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IACnD,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAM,EAAE,CAAC,CAAA;IACzC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAS,gBAAgB,CAAC,CAAA;IACpE,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAQ,gBAAgB,CAAC,CAAA;IAE3D,MAAM,OAAO,GAAG,GAAQ,EAAE;QACtB,OAAO,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAChD,CAAC,CAAA;IAED,MAAM,UAAU,GAAG,GAAkC,EAAE;QACnD,OAAO,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;IACnD,CAAC,CAAA;IAED,SAAS,CAAC,GAAG,EAAE;QACX,WAAW,CAAC,eAAe,CAAC,CAAA;IAChC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAA;IAErB,SAAS,CAAC,GAAG,EAAE;QACX,aAAa,CAAC,iBAAiB,CAAC,CAAA;IACpC,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAA;IAEvB,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IACxC,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,CAAC,aAAa,EAAE,CAAC;YACjB,IAAI,OAAO,EAAE,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;gBAC7C,aAAa,CAAC,CAAC,CAAC,CAAA;YACpB,CAAC;QACL,CAAC;IACL,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,CAAA;IAEtB,MAAM,kBAAkB,GAAG,GAAG,EAAE;QAC5B,IAAI,OAAO,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;gBACnB,OAAO,GAAG,CAAC;YACf,CAAC;iBAAM,CAAC;gBACJ,OAAO,CAAC,UAAU,GAAG,QAAQ,GAAG,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,UAAU,GAAG,QAAQ,GAAG,QAAQ,CAAC,CAAA;YACnF,CAAC;QACL,CAAC;QACD,OAAO,CAAC,UAAU,GAAG,QAAQ,GAAG,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,UAAU,GAAG,QAAQ,GAAG,OAAO,EAAE,CAAC,MAAM,CAAC,CAAA;IAC3F,CAAC,CAAA;IAED,MAAM,YAAY,GAAG,CAAC,SAAiB,EAAE,SAAgB,EAAE,EAAE;QACzD,IAAI,mBAAmB,EAAE,CAAC;YACtB,cAAc,CAAC,OAAO,CAAC,mBAAmB,GAAG,uBAAuB,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAChG,CAAC;QACD,IAAI,mBAAmB,EAAE,CAAC;YACtB,cAAc,CAAC,OAAO,CAAC,mBAAmB,GAAG,2BAA2B,EAAE,SAAS,CAAC,CAAC;QACzF,CAAC;IACL,CAAC,CAAA;IAED,MAAM,cAAc,GAAG,CAAC,OAAgC,EAAE,EAAE;QACxD,UAAU,CAAC,OAAO,CAAC,CAAA;QACnB,iBAAiB,CAAC,KAAK,CAAC,CAAA;IAC5B,CAAC,CAAA;IAED,MAAM,aAAa,GAAG,MAAM,CAAwB,IAAI,CAAC,CAAA;IACzD,MAAM,kBAAkB,GAAG,GAAG,EAAE;QAC5B,IAAI,wBAAwB,EAAE,CAAC;YAC3B,UAAU,CAAC,GAAG,EAAE;gBACZ,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC;oBACxB,aAAa,CAAC,OAAO,CAAC,cAAc,CAAC,EAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAC,CAAC,CAAA;gBAC5E,CAAC;YACL,CAAC,EAAE,GAAG,CAAC,CAAA;YACP,2BAA2B,CAAC,KAAK,CAAC,CAAA;QACtC,CAAC;IACL,CAAC,CAAA;IAED,MAAM,SAAS,GAAmB;QAC9B,kBAAkB,EAAE,kBAAkB;QACtC,WAAW,EAAE,QAAQ;QACrB,IAAI,EAAE,UAAU;QAChB,cAAc,EAAE,cAAc;QAC9B,YAAY,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YAC7B,iBAAiB,CAAC,IAAI,CAAC,CAAA;YACvB,aAAa,CAAC,OAAO,CAAC,CAAC;YACvB,IAAI,mBAAmB,EAAE,CAAC;gBACtB,cAAc,CAAC,OAAO,CAAC,mBAAmB,GAAG,wBAAwB,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC/F,CAAC;QACL,CAAC;QACD,gBAAgB,EAAE,CAAC,QAAQ,EAAE,EAAE;YAC3B,eAAe;YACf,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;gBACf,WAAW,CAAC,GAAG,CAAC,CAAC;gBACjB,cAAc,CAAC,OAAO,CAAC,mBAAmB,GAAG,sBAAsB,EAAE,KAAK,CAAC,CAAC;YAChF,CAAC;iBAAM,CAAC;gBACJ,WAAW,CAAC,QAAQ,CAAC,CAAC;gBACtB,cAAc,CAAC,OAAO,CAAC,mBAAmB,GAAG,sBAAsB,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC9F,CAAC;YACD,aAAa,CAAC,CAAC,CAAC,CAAC;YACjB,cAAc,CAAC,OAAO,CAAC,mBAAmB,GAAG,wBAAwB,EAAE,GAAG,CAAC,CAAC;YAC5E,IAAI,sBAAsB,EAAE,CAAC;gBACzB,sBAAsB,CAAC;oBACnB,QAAQ,EAAE,QAAQ;oBAClB,eAAe,EAAE,SAAS;oBAC1B,OAAO,EAAE,KAAK,KAAK,KAAK;iBAC3B,CAAC,CAAC;YACP,CAAC;QACL,CAAC;QACD,OAAO;QACP,kBAAkB,EAAE,kBAAkB,EAAE;QACxC,cAAc,EAAE,uBAAuB;QACvC,mBAAmB,EAAE,mBAAmB;QACxC,aAAa,EAAE,aAAa;KAC/B,CAAC;IAEF,MAAM,cAAc,GAAG,CAAC,QAAa,EAAE,EAAE;QACrC,UAAU,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAA;QACzC,cAAc,CAAC,QAAQ,CAAC,MAAM,KAAK,QAAQ,GAAG,CAAC,CAAC,CAAA;QAChD,UAAU,CAAC,KAAK,CAAC,CAAA;QACjB,kBAAkB,EAAE,CAAA;IACxB,CAAC,CAAA;IAED,MAAM,aAAa,GAAc,CAAC,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,CAAC,CAAA;IACzE,IAAI,kBAAkB,EAAE,CAAC;QACrB,aAAa,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,CAAA;IAC7C,CAAC;IAED,MAAM,mBAAmB,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;IACzC,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,OAAO,GAAG,IAAI,CAAA;QAElB,IAAI,mBAAmB,CAAC,OAAO,EAAE,CAAC;YAC9B,mBAAmB,CAAC,OAAO,GAAG,KAAK,CAAA;YACnC,OAAM;QACV,CAAC;QAED,UAAU,CAAC,IAAI,CAAC,CAAA;QAEhB,MAAM,cAAc,GAAG,KAAK,EAAE,IAAmB,EAAE,EAAE;YACjD,IAAI,SAAS,EAAE,CAAC;gBACZ,IAAI,CAAC;oBACD,IAAI,IAAI,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,CAAA;oBAEhC;;;;;;uBAMG;oBACH,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;wBACrC,sEAAsE;wBACtE,IAAI,GAAG,MAAM,SAAS,CAAC,EAAC,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC,EAAC,CAAC,CAAA;wBAC1C,wEAAwE;wBACxE,IAAI,OAAO,EAAE,CAAC;4BACV,mBAAmB,CAAC,OAAO,GAAG,IAAI,CAAA;4BAClC,aAAa,CAAC,CAAC,CAAC,CAAA;wBACpB,CAAC;oBACL,CAAC;oBACD,IAAI,OAAO,EAAE,CAAC;wBACV,cAAc,CAAC,IAAI,CAAC,CAAA;oBACxB,CAAC;gBACL,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACX,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;oBAClB,IAAI,OAAO,EAAE,CAAC;wBACV,UAAU,CAAC,KAAK,CAAC,CAAA;oBACrB,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC,CAAA;QAED,cAAc,CAAC;YACX,IAAI,EAAE,UAAU;YAChB,QAAQ;YACR,KAAK;YACL,SAAS;YACT,SAAS,EAAE,kBAAkB;SAChC,CAAC,CAAA;QAEF,OAAO,GAAG,EAAE;YACR,OAAO,GAAG,KAAK,CAAA;QACnB,CAAC,CAAA;IACL,CAAC,EAAE,aAAa,CAAC,CAAA;IAEjB,MAAM,cAAc,GAAG,CAAC,MAA0B,EAAE,EAAE;QAClD,IAAI,SAAS,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,2FAA2F,CAAC,CAAA;QAChH,CAAC;QAED,SAAS,CAAC,GAAG,EAAE;YACX,UAAU,CAAC,IAAI,CAAC,CAAA;YAChB,MAAM,EAAE;iBACH,IAAI,CAAC,cAAc,CAAC;iBACpB,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACX,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBAClB,UAAU,CAAC,KAAK,CAAC,CAAA;YACrB,CAAC,CAAC,CAAA;QACV,CAAC,EAAE,aAAa,CAAC,CAAA;IACrB,CAAC,CAAA;IAED,OAAO;QACH,IAAI,EAAE,UAAU;QAChB,QAAQ;QACR,OAAO;QACP,UAAU,EAAE,cAAc;QAC1B,SAAS;QACT,IAAI,EAAE,OAAO,EAAE;QACf,OAAO,EAAE,UAAU,EAAE;QACrB,SAAS;QACT,YAAY;QACZ,KAAK;QACL,QAAQ;QACR,YAAY;QACZ,cAAc;KACjB,CAAA;AACL,CAAC,CAAA;AAED,eAAe,QAAQ,CAAA;AAEvB,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACjC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;IAE/B,SAAS,CAAC,GAAG,EAAE;QACX,UAAU,CAAC,OAAO,GAAG,KAAK,CAAA;IAC9B,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,UAAU,CAAC,OAAO,CAAA;AAC7B,CAAC,CAAA"}
|