@datarobot/design-system 28.9.2 → 28.9.3

package/cjs/table-react/hooks/useColumns.js

@@ -14,14 +14,21 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 function calculateDelta(columns, maxWidth, padding = 0, columnSizing = {}, visibility = {}) {
   // we are interested only in visible columns
   const visibleColumns = columns.filter(({
-    accessorKey
-  }) => visibility[accessorKey] !== false);
+    accessorKey,
+    id
+  }) => {
+    // visibility state uses column ids for setting visibility, and for most cases it's the same as accessorKey
+    // but for the case when either 1) user provided an explicit id to the columnDef or 2) accessorKey is a complex get object path like `<object_name>.<object_property_name>`
+    // accessorKey would be different from id. Thus we should add a check on columnDef.id here
+    const visibilityValue = visibility[id] ?? visibility[accessorKey];
+    return visibilityValue !== false;
+  });
   // we need to know columns that do have maxSize set, as it will influence how free space is distributed
   const columnsWithMaxSize = visibleColumns.filter(column => !!column.maxSize);
 
   // calculation of all current columns width
   const currentWidth = visibleColumns.reduce((acc, current) => {
-    const resizeValue = columnSizing[current.accessorKey];
+    const resizeValue = columnSizing[current.id] || columnSizing[current.accessorKey];
     const minWidth = current.minSize || _types.COLUMN_SIZE.MIN_WIDTH;
     const resizeWidth = resizeValue ? Math.max(resizeValue, minWidth) : 0;
     const columnSize = Math.max(current.size || _types.COLUMN_SIZE.WIDTH, minWidth);
@@ -39,8 +46,9 @@ function calculateDelta(columns, maxWidth, padding = 0, columnSizing = {}, visib
   // whose size was altered manually by drag-n-drop in UI)
   const notSettedColumns = visibleColumns.filter(({
     size,
-    accessorKey
-  }) => !size && !columnSizing[accessorKey]);
+    accessorKey,
+    id
+  }) => !size && !(columnSizing[id] || columnSizing[accessorKey]));
   const evenDistribution = delta / notSettedColumns.length;
 
   // if there is no max size on any columns - distribute free space evenly across columns

package/esm/table-react/hooks/useColumns.js

@@ -7,14 +7,21 @@ import { jsx as _jsx } from "react/jsx-runtime";
 function calculateDelta(columns, maxWidth, padding = 0, columnSizing = {}, visibility = {}) {
   // we are interested only in visible columns
   const visibleColumns = columns.filter(({
-    accessorKey
-  }) => visibility[accessorKey] !== false);
+    accessorKey,
+    id
+  }) => {
+    // visibility state uses column ids for setting visibility, and for most cases it's the same as accessorKey
+    // but for the case when either 1) user provided an explicit id to the columnDef or 2) accessorKey is a complex get object path like `<object_name>.<object_property_name>`
+    // accessorKey would be different from id. Thus we should add a check on columnDef.id here
+    const visibilityValue = visibility[id] ?? visibility[accessorKey];
+    return visibilityValue !== false;
+  });
   // we need to know columns that do have maxSize set, as it will influence how free space is distributed
   const columnsWithMaxSize = visibleColumns.filter(column => !!column.maxSize);
 
   // calculation of all current columns width
   const currentWidth = visibleColumns.reduce((acc, current) => {
-    const resizeValue = columnSizing[current.accessorKey];
+    const resizeValue = columnSizing[current.id] || columnSizing[current.accessorKey];
     const minWidth = current.minSize || COLUMN_SIZE.MIN_WIDTH;
     const resizeWidth = resizeValue ? Math.max(resizeValue, minWidth) : 0;
     const columnSize = Math.max(current.size || COLUMN_SIZE.WIDTH, minWidth);
@@ -32,8 +39,9 @@ function calculateDelta(columns, maxWidth, padding = 0, columnSizing = {}, visib
   // whose size was altered manually by drag-n-drop in UI)
   const notSettedColumns = visibleColumns.filter(({
     size,
-    accessorKey
-  }) => !size && !columnSizing[accessorKey]);
+    accessorKey,
+    id
+  }) => !size && !(columnSizing[id] || columnSizing[accessorKey]));
   const evenDistribution = delta / notSettedColumns.length;
 
   // if there is no max size on any columns - distribute free space evenly across columns

package/js/bundle/bundle.js

@@ -76937,8 +76937,14 @@ function calculateDelta(columns, maxWidth) {
   var visibility = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
   // we are interested only in visible columns
   var visibleColumns = columns.filter(function (_ref) {
-    var accessorKey = _ref.accessorKey;
-    return visibility[accessorKey] !== false;
+    var _visibility;
+    var accessorKey = _ref.accessorKey,
+      id = _ref.id;
+    // visibility state uses column ids for setting visibility, and for most cases it's the same as accessorKey
+    // but for the case when either 1) user provided an explicit id to the columnDef or 2) accessorKey is a complex get object path like `<object_name>.<object_property_name>`
+    // accessorKey would be different from id. Thus we should add a check on columnDef.id here
+    var visibilityValue = (_visibility = visibility[id]) !== null && _visibility !== void 0 ? _visibility : visibility[accessorKey];
+    return visibilityValue !== false;
   });
   // we need to know columns that do have maxSize set, as it will influence how free space is distributed
   var columnsWithMaxSize = visibleColumns.filter(function (column) {
@@ -76947,7 +76953,7 @@ function calculateDelta(columns, maxWidth) {
 
   // calculation of all current columns width
   var currentWidth = visibleColumns.reduce(function (acc, current) {
-    var resizeValue = columnSizing[current.accessorKey];
+    var resizeValue = columnSizing[current.id] || columnSizing[current.accessorKey];
     var minWidth = current.minSize || _types__WEBPACK_IMPORTED_MODULE_1__.COLUMN_SIZE.MIN_WIDTH;
     var resizeWidth = resizeValue ? Math.max(resizeValue, minWidth) : 0;
     var columnSize = Math.max(current.size || _types__WEBPACK_IMPORTED_MODULE_1__.COLUMN_SIZE.WIDTH, minWidth);
@@ -76965,8 +76971,9 @@ function calculateDelta(columns, maxWidth) {
   // whose size was altered manually by drag-n-drop in UI)
   var notSettedColumns = visibleColumns.filter(function (_ref2) {
     var size = _ref2.size,
-      accessorKey = _ref2.accessorKey;
-    return !size && !columnSizing[accessorKey];
+      accessorKey = _ref2.accessorKey,
+      id = _ref2.id;
+    return !size && !(columnSizing[id] || columnSizing[accessorKey]);
   });
   var evenDistribution = delta / notSettedColumns.length;