@bluemarble/bm-components 0.0.75 → 0.0.78

package/dist/esm/index.js

@@ -15032,21 +15032,31 @@ const GridPagination = ({ currentPage, totalNumberOfPages, onPageChange, rowsPer
                 React__default.createElement(MdArrowForwardIos, { size: 8 * 2 })))));
 };
 
-function BaseGrid({ columns, children, fixedColumns, paperProps, tableBodyProps, tableHeadProps, tableProps, sortedDirection, sortedBy, onSortBy, dense = true, striped, bordered, currentPage, totalNumberOfPages, onPageChange, rowsPerPage, setRowsPerPage, rowsPerPageOptions }) {
+function BaseGrid({ columns, children, fixedColumns, paperProps, tableBodyProps, tableHeadProps, tableProps, sortedDirection, sortedBy, onSortBy, dense = true, striped, bordered, currentPage, totalNumberOfPages, onPageChange, rowsPerPage, setRowsPerPage, rowsPerPageOptions, hideFooter, isLoading }) {
     return (React__default.createElement(Paper, Object.assign({}, paperProps, { sx: Object.assign({ 'tr td': {
-                py: dense ? 0.23 : 0.7,
-                border: bordered ? '1px solid' : '',
+                py: dense ? 0.23 : 0.7
+            }, 'tr td:not(:last-child), tr th:not(:last-child)': {
+                borderRight: bordered ? '1px solid' : '',
                 borderColor: 'divider'
             }, 'tr:nth-of-type(even)': {
                 transition: 'background-color ease 200ms',
                 bgcolor: striped ? 'divider' : 'initial'
-            }, width: fixedColumns ? 'fit-content' : '100' }, paperProps === null || paperProps === void 0 ? void 0 : paperProps.sx) }),
+            }, 'tbody tr:last-child td': {
+                borderBottomWidth: hideFooter ? 0 : 1
+            } }, paperProps === null || paperProps === void 0 ? void 0 : paperProps.sx) }),
         React__default.createElement(Table, Object.assign({ size: "small", stickyHeader: true }, tableProps, { sx: Object.assign({}, tableProps === null || tableProps === void 0 ? void 0 : tableProps.sx) }),
             React__default.createElement(TableHead, Object.assign({}, tableHeadProps),
                 React__default.createElement(TableRow, null, columns.map((column) => (React__default.createElement(TableCell, { key: column.name, padding: dense ? 'none' : 'normal', sx: Object.assign({ pl: 2 }, column === null || column === void 0 ? void 0 : column.sx) },
-                    React__default.createElement(TableSortLabel, { active: sortedBy === column.name, direction: sortedDirection, onClick: () => onSortBy(column.name), disabled: column.canSort === false, sx: { position: 'relative', right: '-9px' } }, column.label)))))),
+                    React__default.createElement(TableSortLabel, { active: sortedBy === column.name, direction: sortedDirection, onClick: () => onSortBy(column.name), disabled: column.canSort === false }, column.label))))),
+                isLoading && (React__default.createElement(TableRow, null,
+                    React__default.createElement(TableCell, { colSpan: columns.length, sx: { p: 0, border: 'none' } },
+                        React__default.createElement(LinearProgress, null))))),
             React__default.createElement(TableBody, Object.assign({}, tableBodyProps), children)),
-        React__default.createElement(GridPagination, { rowsPerPageOptions: rowsPerPageOptions, currentPage: currentPage, totalNumberOfPages: totalNumberOfPages, onPageChange: onPageChange, setRowsPerPage: setRowsPerPage, rowsPerPage: rowsPerPage, dense: dense })));
+        !hideFooter && (React__default.createElement(GridPagination, { rowsPerPageOptions: rowsPerPageOptions, currentPage: currentPage, totalNumberOfPages: totalNumberOfPages, onPageChange: onPageChange, setRowsPerPage: setRowsPerPage, rowsPerPage: rowsPerPage, dense: dense }))));
+}
+
+function getObjectValue(obj) {
+    return (prop) => prop.split('.').reduce((o, k) => o[k], obj);
 }
 
 function useFilter() {
@@ -15075,9 +15085,6 @@ function useFilter() {
         clearAllFilters
     };
 }
-function getObjectValue(obj) {
-    return (prop) => prop.split('.').reduce((o, k) => o[k], obj);
-}
 function isDate(date) {
     if (date instanceof Date)
         return true;
@@ -15161,7 +15168,8 @@ function useGrid({ columns, filters = [], rowsPerPageOptions = [30, 60, 100] })
     function sortData(data) {
         if (sortedBy) {
             return data.sort((a, b) => {
-                const compare = b[sortedBy] > a[sortedBy];
+                const rowValue = (row) => getObjectValue(row)(sortedBy);
+                const compare = rowValue(b) > rowValue(a);
                 if (sortedDirection === 'desc')
                     return compare ? 1 : -1;
                 return compare ? -1 : 1;