@crystaldesign/diva-archive 24.15.0-beta.40 → 24.15.0-beta.42

package/build/esm/index.js

@@ -1,7 +1,7 @@
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import React, { useState, useMemo, createElement } from 'react';
 import { HelpButton, getLogger, useDivaCore, useTranslation, DivaUtils, DivaError } from '@crystaldesign/diva-core';
-import Grid from '@crystaldesign/grid';
+import Grid, { Loading, cellStyleHelper } from '@crystaldesign/grid';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { Typography } from '@mui/material';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
@@ -13,7 +13,6 @@ import createStyles from '@mui/styles/createStyles';
 import makeStyles from '@mui/styles/makeStyles';
 import TableRow from '@mui/material/TableRow';
 import TableCell from '@mui/material/TableCell';
-import Skeleton from '@mui/material/Skeleton';
 import { Histogram } from '@crystaldesign/analytics';
 
 (function() {
@@ -1166,86 +1165,74 @@ function SubRow$1 (_ref) {
     return /*#__PURE__*/jsx(Fragment, {});
   }
   if (loading) {
-    return /*#__PURE__*/jsxs(Fragment, {
-      children: [/*#__PURE__*/createElement(TableRow, _objectSpread(_objectSpread({}, row.getRowProps()), {}, {
-        key: "".concat(row.getRowProps().key, "-expanded-loading")
-      }), row.cells.map(function (cell) {
-        return /*#__PURE__*/jsx(TableCell, _objectSpread(_objectSpread({}, cell.getCellProps()), {}, {
-          children: /*#__PURE__*/jsx(Skeleton, {})
-        }));
-      })), /*#__PURE__*/createElement(TableRow, _objectSpread(_objectSpread({}, row.getRowProps()), {}, {
-        key: "".concat(row.getRowProps().key, "-expanded-loading1")
-      }), row.cells.map(function (cell) {
-        return /*#__PURE__*/jsx(TableCell, _objectSpread(_objectSpread({}, cell.getCellProps()), {}, {
-          children: /*#__PURE__*/jsx(Skeleton, {})
-        }));
-      })), /*#__PURE__*/createElement(TableRow, _objectSpread(_objectSpread({}, row.getRowProps()), {}, {
-        key: "".concat(row.getRowProps().key, "-expanded-loading2")
-      }), row.cells.map(function (cell) {
-        return /*#__PURE__*/jsx(TableCell, _objectSpread(_objectSpread({}, cell.getCellProps()), {}, {
-          children: /*#__PURE__*/jsx(Skeleton, {})
-        }));
-      }))]
+    return /*#__PURE__*/jsx(Loading, {
+      parentRow: row
     });
   }
   return /*#__PURE__*/jsx(Fragment, {
     children: data.map(function (x, i) {
       return /*#__PURE__*/createElement(TableRow, _objectSpread(_objectSpread({}, row.getRowProps()), {}, {
+        className: "childRow",
         key: "".concat(row.getRowProps().key, "-expanded-").concat(i)
-      }), row.cells.flatMap(function (cell) {
-        var cells = [];
-        if (cell.column.fixed) {
-          cells.push(/*#__PURE__*/jsx(TableCell, _objectSpread({}, cell.getCellProps({
-            style: {
-              width: 1,
-              padding: 0,
-              position: 'relative',
-              backgroundColor: 'white',
-              zIndex: 4
-            }
-          }))));
-          cells.push(/*#__PURE__*/jsx(TableCell, _objectSpread(_objectSpread({}, cell.getCellProps({
-            style: {
-              width: 1,
-              padding: 0,
-              position: 'sticky',
-              backgroundColor: 'white',
-              zIndex: 3,
-              right: 242
-            }
-          })), {}, {
-            children: /*#__PURE__*/jsx("div", {
+      }), function () {
+        var cellSettings = row.cells.flat();
+        return cellSettings.map(function (cell, i) {
+          var _cellSettings;
+          var lastFlexible = ((_cellSettings = cellSettings[i + 1]) === null || _cellSettings === void 0 ? void 0 : _cellSettings.column.fixed) === true;
+          var cells = [];
+          if (cell.column.fixed) {
+            cells.push(/*#__PURE__*/jsx(TableCell, _objectSpread(_objectSpread({}, cell.getCellProps({
               style: {
-                position: 'absolute',
-                top: 0,
-                left: 0,
-                bottom: 0,
-                width: 1,
-                boxShadow: '-1px 0px 0px 0px rgba(224, 224, 224, 1)'
+                width: 15,
+                minWidth: 15,
+                padding: 0,
+                position: 'relative',
+                zIndex: 4
               }
-            })
-          })));
-        }
-        cells.push(/*#__PURE__*/jsx(TableCell, _objectSpread(_objectSpread({}, cell.getCellProps({
-          style: {
-            width: cell.column.width,
-            padding: cell.column.padding,
-            position: cell.column.fixed ? 'sticky' : 'relative',
-            right: cell.column.fixed ? 0 : undefined,
-            backgroundColor: cell.column.fixed ? 'white' : undefined,
-            zIndex: cell.column.fixed ? 4 : 3
+            })), {}, {
+              className: "fixed"
+            })));
+            cells.push(/*#__PURE__*/jsx(TableCell, _objectSpread(_objectSpread({}, cell.getCellProps({
+              style: {
+                width: 5,
+                minWidth: 5,
+                padding: 0,
+                position: 'sticky',
+                backgroundColor: 'white',
+                zIndex: 3,
+                right: 247
+              }
+            })), {}, {
+              children: /*#__PURE__*/jsx("div", {
+                className: "fixed",
+                style: {
+                  position: 'absolute',
+                  top: 0,
+                  left: 5,
+                  bottom: 0,
+                  width: 15,
+                  boxShadow: 'rgb(224, 224, 224) -2px 0px 1px 0px'
+                }
+              })
+            })));
           }
-        })), {}, {
-          children: cell.render('Cell', {
-            value: cell.column.id != 'DivaNr' ? x[cell.column.id.replaceAll(/\[/g, '.').replaceAll(/\]/g, '')] : undefined,
-            row: _objectSpread(_objectSpread({}, row), {}, {
-              original: x,
-              canExpand: false
+          cells.push(/*#__PURE__*/jsx(TableCell, _objectSpread(_objectSpread({}, cell.getCellProps({
+            style: _objectSpread(_objectSpread({}, cellStyleHelper(cell)), {}, {
+              width: lastFlexible ? undefined : cell.column.width
             })
-          })
-        })));
-        return cells;
-      }));
+          })), {}, {
+            className: cell.column.fixed ? 'fixed' : '',
+            children: cell.render('Cell', {
+              value: cell.column.id != 'DivaNr' ? x[cell.column.id.replaceAll(/\[/g, '.').replaceAll(/\]/g, '')] : undefined,
+              row: _objectSpread(_objectSpread({}, row), {}, {
+                original: x,
+                canExpand: false
+              })
+            })
+          })));
+          return cells;
+        });
+      }());
     })
   });
 }

package/build/types/archive/src/ui/SubRow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SubRow.d.ts","sourceRoot":"","sources":["../../../../../src/ui/SubRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAE1C,MAAM,CAAC,OAAO,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAAE,GAAG,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,GAAG,EAAE,CAAA;CAAE,qBAuGjG"}
+{"version":3,"file":"SubRow.d.ts","sourceRoot":"","sources":["../../../../../src/ui/SubRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAA4B,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAEpE,MAAM,CAAC,OAAO,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAAE,GAAG,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,GAAG,EAAE,CAAA;CAAE,qBAsFjG"}

package/build/types/archive/src/useActions.d.ts

@@ -1,11 +1,10 @@
 import { ArchiveItem, Configuration } from './types';
-import { GridColumnActions } from '@crystaldesign/grid';
 interface Props {
     config: Configuration;
     trashed: boolean;
     showTrash: boolean;
     setReloadPage: React.Dispatch<React.SetStateAction<number>>;
 }
-export default function useActions({ config, trashed, showTrash, setReloadPage }: Props): GridColumnActions<ArchiveItem>[];
+export default function useActions({ config, trashed, showTrash, setReloadPage }: Props): import("@crystaldesign/grid").GridColumnAction<ArchiveItem>[];
 export {};
 //# sourceMappingURL=useActions.d.ts.map

package/build/types/archive/src/useActions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useActions.d.ts","sourceRoot":"","sources":["../../../../src/useActions.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAiB,WAAW,EAAE,aAAa,EAA0B,MAAM,SAAS,CAAC;AAC5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAGxD,UAAU,KAAK;IACb,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;CAC7D;AAID,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,EAAE,KAAK,oCAmEtF"}
+{"version":3,"file":"useActions.d.ts","sourceRoot":"","sources":["../../../../src/useActions.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAiB,WAAW,EAAE,aAAa,EAA0B,MAAM,SAAS,CAAC;AAI5F,UAAU,KAAK;IACb,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;CAC7D;AAID,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,EAAE,KAAK,iEAmEtF"}

package/build/types/archive/src/useArchive.d.ts

@@ -8,6 +8,6 @@ export default function useArchive({ config, trashed, hirarchy }: {
     options: GridOptions<ArchiveItem>;
     fetchHistory: (divaNr: string, version: string) => Promise<any>;
     prepareRow: (row: any) => void;
-    actions: import("@crystaldesign/grid").GridColumnActions<ArchiveItem>[];
+    actions: import("@crystaldesign/grid").GridColumnAction<ArchiveItem>[];
 };
 //# sourceMappingURL=useArchive.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-archive",
-  "version": "24.15.0-beta.40",
+  "version": "24.15.0-beta.42",
   "license": "COMMERCIAL",
   "devDependencies": {
     "@testing-library/jest-dom": "^6.5.0",
@@ -15,10 +15,10 @@
     "react-dom": "^18.3.1"
   },
   "dependencies": {
-    "@crystaldesign/grid": "24.15.0-beta.40",
+    "@crystaldesign/grid": "24.15.0-beta.42",
     "flat": "^5.0.2"
   },
   "module": "build/esm/index.js",
   "types": "./build/types/archive/src/index.d.ts",
-  "gitHead": "ed900e671d4442ebd8a0dc07ebf3b1013fc20dce"
+  "gitHead": "ed7ed9c457b7d34d8900c496ff608d60990d8ecd"
 }