@carbon/ibm-products 2.43.2-canary.29 → 2.43.2-canary.292

package/lib/components/Datagrid/Datagrid/DatagridSelectAll.js

@@ -7,8 +7,6 @@
 
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
 var react = require('@carbon/react');
@@ -16,20 +14,16 @@ var cx = require('classnames');
 var settings = require('../../../settings.js');
 var stateReducer = require('./addons/stateReducer.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
-
 var _excluded = ["onChange"];
 var blockClass = "".concat(settings.pkg.prefix, "--datagrid");
 var SelectAll = function SelectAll(datagridState) {
   var _columns$;
-  var _useState = React.useState(typeof window !== 'undefined' ? window.innerWidth : ''),
+  var _useState = React.useState(),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     windowSize = _useState2[0],
     setWindowSize = _useState2[1];
   React.useLayoutEffect(function () {
+    setWindowSize(window.innerWidth);
     /* istanbul ignore next */
     function updateSize() {
       setWindowSize(window.innerWidth);
@@ -53,12 +47,11 @@ var SelectAll = function SelectAll(datagridState) {
     dispatch = datagridState.dispatch,
     rows = datagridState.rows,
     getRowId = datagridState.getRowId,
-    toggleAllRowsSelected = datagridState.toggleAllRowsSelected,
     onAllRowSelect = datagridState.onAllRowSelect;
   var isFirstColumnStickyLeft = ((_columns$ = columns[0]) === null || _columns$ === void 0 ? void 0 : _columns$.sticky) === 'left' && withStickyColumn;
   if (hideSelectAll || radio) {
-    return /*#__PURE__*/React__default["default"].createElement("div", {
-      className: cx__default["default"]("".concat(blockClass, "__head-hidden-select-all"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__select-all-sticky-left"), /* istanbul ignore next */
+    return /*#__PURE__*/React.createElement("th", {
+      className: cx("".concat(blockClass, "__head-hidden-select-all"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__select-all-sticky-left"), /* istanbul ignore next */
       isFirstColumnStickyLeft && Number(windowSize) > 671))
     });
   }
@@ -67,24 +60,8 @@ var SelectAll = function SelectAll(datagridState) {
     onChange = _ref.onChange,
     selectProps = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
   var indeterminate = selectProps.indeterminate;
-  var handleSelectAllChange = function handleSelectAllChange(event) {
-    if (indeterminate) {
-      stateReducer.handleSelectAllRowData({
-        dispatch: dispatch,
-        rows: rows,
-        getRowId: getRowId,
-        indeterminate: true,
-        isChecked: undefined
-      });
-      toggleAllRowsSelected(false);
-      onAllRowSelect === null || onAllRowSelect === void 0 || onAllRowSelect(rows, event);
-      return onChange === null || onChange === void 0 ? void 0 : onChange({
-        target: {
-          checked: false
-        }
-      });
-    }
-    stateReducer.handleSelectAllRowData({
+  var handleOnPageSelectAllChange = function handleOnPageSelectAllChange(event) {
+    stateReducer.handleOnPageSelectAllRowData({
       dispatch: dispatch,
       rows: rows,
       getRowId: getRowId,
@@ -94,15 +71,14 @@ var SelectAll = function SelectAll(datagridState) {
     onAllRowSelect === null || onAllRowSelect === void 0 || onAllRowSelect(rows, event);
     return onChange === null || onChange === void 0 ? void 0 : onChange(event);
   };
-  return /*#__PURE__*/React__default["default"].createElement("div", {
-    className: cx__default["default"]("".concat(blockClass, "__head-select-all"), "".concat(blockClass, "__checkbox-cell"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__checkbox-cell-sticky-left"), /* istanbul ignore next */
-    isFirstColumnStickyLeft && Number(windowSize) > 671))
-  }, /*#__PURE__*/React__default["default"].createElement(react.TableSelectAll, _rollupPluginBabelHelpers["extends"]({}, selectProps, {
+  return /*#__PURE__*/React.createElement(react.TableSelectAll, _rollupPluginBabelHelpers.extends({}, selectProps, {
+    className: cx("".concat(blockClass, "__head-select-all"), "".concat(blockClass, "__checkbox-cell"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__checkbox-cell-sticky-left"), /* istanbul ignore next */
+    isFirstColumnStickyLeft && Number(windowSize) > 671)),
     name: "".concat(tableId, "-select-all-checkbox-name"),
-    onSelect: handleSelectAllChange,
+    onSelect: handleOnPageSelectAllChange,
     disabled: isFetching || (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled),
     id: "".concat(tableId, "-select-all-checkbox-id")
-  })));
+  }));
 };
 
 exports.SelectAll = SelectAll;

package/lib/components/Datagrid/Datagrid/DatagridSelectAllWithToggle.js

@@ -11,17 +11,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
-var index = require('../../../node_modules/prop-types/index.js');
+var index = require('../../../_virtual/index.js');
 var cx = require('classnames');
 var react = require('@carbon/react');
 var icons = require('@carbon/react/icons');
 var settings = require('../../../settings.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
-
 var _excluded = ["onChange"];
 var blockClass = "".concat(settings.pkg.prefix, "--datagrid");
 var SELECT_ALL_PAGE_ROWS = 'pageRows';
@@ -52,11 +47,12 @@ var SelectAllWithToggle = function SelectAllWithToggle(_ref) {
       onSelectAllRows(isAllRowsSelected && selectAllMode === SELECT_ALL_ROWS);
     }
   }, [isAllRowsSelected, selectAllMode, onSelectAllRows]);
-  var _useState3 = React.useState(window.innerWidth),
+  var _useState3 = React.useState(),
     _useState4 = _rollupPluginBabelHelpers.slicedToArray(_useState3, 2),
     windowSize = _useState4[0],
     setWindowSize = _useState4[1];
   React.useLayoutEffect(function () {
+    setWindowSize(window.innerWidth);
     function updateSize() {
       setWindowSize(window.innerWidth);
     }
@@ -75,10 +71,10 @@ var SelectAllWithToggle = function SelectAllWithToggle(_ref) {
     selectProps = _rollupPluginBabelHelpers.objectWithoutProperties(_ref3, _excluded);
   var disabled = isFetching || selectProps.disabled;
   var isFirstColumnStickyLeft = (columns === null || columns === void 0 || (_columns$ = columns[0]) === null || _columns$ === void 0 ? void 0 : _columns$.sticky) === 'left' && withStickyColumn;
-  return /*#__PURE__*/React__default["default"].createElement("th", {
+  return /*#__PURE__*/React.createElement("th", {
     scope: "col",
-    className: cx__default["default"]("".concat(blockClass, "__select-all-toggle-on"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__select-all-sticky-left"), isFirstColumnStickyLeft && windowSize > 671))
-  }, /*#__PURE__*/React__default["default"].createElement("span", null, /*#__PURE__*/React__default["default"].createElement(react.Checkbox, _rollupPluginBabelHelpers["extends"]({}, selectProps, {
+    className: cx("".concat(blockClass, "__select-all-toggle-on"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__select-all-sticky-left"), isFirstColumnStickyLeft && (windowSize !== null && windowSize !== void 0 ? windowSize : 0) > 671))
+  }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(react.Checkbox, _rollupPluginBabelHelpers.extends({}, selectProps, {
     name: "".concat(tableId, "-select-all-checkbox-name"),
     onClick: function onClick(e) {
       onChange === null || onChange === void 0 || onChange(e);
@@ -87,16 +83,16 @@ var SelectAllWithToggle = function SelectAllWithToggle(_ref) {
     id: "".concat(tableId, "-select-all-checkbox-id"),
     labelText: allRowsLabel,
     hideLabel: true
-  }))), /*#__PURE__*/React__default["default"].createElement(react.OverflowMenu, {
+  }))), /*#__PURE__*/React.createElement(react.OverflowMenu, {
     renderIcon: function renderIcon(props) {
-      return /*#__PURE__*/React__default["default"].createElement(icons.CaretDown, _rollupPluginBabelHelpers["extends"]({
+      return /*#__PURE__*/React.createElement(icons.CaretDown, _rollupPluginBabelHelpers.extends({
         size: 16
       }, props));
     },
     size: "sm",
     "aria-label": allRowsLabel,
     menuOptionsClass: "".concat(blockClass, "__select-all-toggle-overflow")
-  }, /*#__PURE__*/React__default["default"].createElement(react.OverflowMenuItem, {
+  }, /*#__PURE__*/React.createElement(react.OverflowMenuItem, {
     itemText: allPageRowsLabel,
     requireTitle: true,
     disabled: disabled,
@@ -116,7 +112,7 @@ var SelectAllWithToggle = function SelectAllWithToggle(_ref) {
         }
       });
     }
-  }), /*#__PURE__*/React__default["default"].createElement(react.OverflowMenuItem, {
+  }), /*#__PURE__*/React.createElement(react.OverflowMenuItem, {
     itemText: allRowsLabel,
     requireTitle: true,
     disabled: disabled,
@@ -131,16 +127,16 @@ var SelectAllWithToggle = function SelectAllWithToggle(_ref) {
   })));
 };
 SelectAllWithToggle.propTypes = {
-  allPageRowsLabel: index["default"].string,
-  allRowsLabel: index["default"].string,
-  columns: index["default"].arrayOf(index["default"].object),
-  getToggleAllPageRowsSelectedProps: index["default"].func.isRequired,
-  getToggleAllRowsSelectedProps: index["default"].func.isRequired,
-  isAllRowsSelected: index["default"].bool.isRequired,
-  isFetching: index["default"].bool,
-  selectAllToggle: index["default"].object,
-  tableId: index["default"].string.isRequired,
-  withStickyColumn: index["default"].bool
+  allPageRowsLabel: index.default.string,
+  allRowsLabel: index.default.string,
+  columns: index.default.arrayOf(index.default.object),
+  getToggleAllPageRowsSelectedProps: index.default.func.isRequired,
+  getToggleAllRowsSelectedProps: index.default.func.isRequired,
+  isAllRowsSelected: index.default.bool.isRequired,
+  isFetching: index.default.bool,
+  selectAllToggle: index.default.object,
+  tableId: index.default.string.isRequired,
+  withStickyColumn: index.default.bool
 };
 
-exports["default"] = SelectAllWithToggle;
+exports.default = SelectAllWithToggle;

package/lib/components/Datagrid/Datagrid/DatagridSimpleBody.d.ts

@@ -1,3 +1,9 @@
+/**
+ * Copyright IBM Corp. 2024
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 import { DataGridState } from '../types';
 declare const DatagridSimpleBody: (datagridState: DataGridState) => import("react/jsx-runtime").JSX.Element;
 export default DatagridSimpleBody;

package/lib/components/Datagrid/Datagrid/DatagridSimpleBody.js

@@ -15,21 +15,16 @@ var react = require('@carbon/react');
 var cx = require('classnames');
 var settings = require('../../../settings.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
-
 var blockClass = "".concat(settings.pkg.prefix, "--datagrid");
 var DatagridSimpleBody = function DatagridSimpleBody(datagridState) {
   var getTableBodyProps = datagridState.getTableBodyProps,
     rows = datagridState.rows,
     prepareRow = datagridState.prepareRow;
-  return /*#__PURE__*/React__default["default"].createElement(react.TableBody, _rollupPluginBabelHelpers["extends"]({}, getTableBodyProps({
+  return /*#__PURE__*/React.createElement(react.TableBody, _rollupPluginBabelHelpers.extends({}, getTableBodyProps({
     role: undefined
   }), {
     "aria-live": undefined,
-    className: cx__default["default"]("".concat(blockClass, "__simple-body"), getTableBodyProps().className)
+    className: cx("".concat(blockClass, "__simple-body"), getTableBodyProps().className)
   }), rows.map(function (row) {
     var _row$RowRenderer;
     prepareRow(row);
@@ -42,4 +37,4 @@ var DatagridSimpleBody = function DatagridSimpleBody(datagridState) {
   }));
 };
 
-exports["default"] = DatagridSimpleBody;
+exports.default = DatagridSimpleBody;

package/lib/components/Datagrid/Datagrid/DatagridToolbar.js

@@ -11,18 +11,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
-var index = require('../../../node_modules/prop-types/index.js');
+var index = require('../../../_virtual/index.js');
 var react = require('@carbon/react');
 var useResizeObserver = require('../../../global/js/hooks/useResizeObserver.js');
 var settings = require('../../../settings.js');
 var cx = require('classnames');
 var stateReducer = require('./addons/stateReducer.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
-
 var _excluded = ["ariaToolbarLabel"];
 var blockClass = "".concat(settings.pkg.prefix, "--datagrid__table-toolbar");
 var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridState, width, ref) {
@@ -42,15 +37,27 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
     selectedRowIds = datagridState.state.selectedRowIds,
     toggleAllRowsSelected = datagridState.toggleAllRowsSelected,
     toolbarBatchActions = datagridState.toolbarBatchActions,
+    toolbarBatchActionsDisplayMin = datagridState.toolbarBatchActionsDisplayMin,
     setGlobalFilter = datagridState.setGlobalFilter,
     rows = datagridState.rows,
     dispatch = datagridState.dispatch,
     getRowId = datagridState.getRowId,
     batchActionMenuButtonLabel = datagridState.batchActionMenuButtonLabel,
     translateWithIdBatchActions = datagridState.translateWithIdBatchActions;
+  var _useState7 = React.useState(rows.length),
+    _useState8 = _rollupPluginBabelHelpers.slicedToArray(_useState7, 2),
+    availableRowsCount = _useState8[0],
+    setAvailableRowsCount = _useState8[1];
   var batchActionMenuButtonLabelText = batchActionMenuButtonLabel !== null && batchActionMenuButtonLabel !== void 0 ? batchActionMenuButtonLabel : 'More';
   var selectedKeys = Object.keys(selectedRowIds || {});
   var totalSelected = selectedKeys.length;
+  React.useEffect(function () {
+    var _rows$find, _rows$find$getRowProp;
+    var countDisabledRows = ((_rows$find = rows.find(function (row) {
+      return row.getRowProps;
+    })) === null || _rows$find === void 0 || (_rows$find$getRowProp = _rows$find.getRowProps) === null || _rows$find$getRowProp === void 0 || (_rows$find$getRowProp = _rows$find$getRowProp.call(_rows$find)) === null || _rows$find$getRowProp === void 0 || (_rows$find$getRowProp = _rows$find$getRowProp.nonselectablerows) === null || _rows$find$getRowProp === void 0 ? void 0 : _rows$find$getRowProp.length) || 0;
+    rows && setAvailableRowsCount(rows.length - countDisabledRows);
+  }, [rows]);
 
   // Get initial width of batch actions container,
   // used to measure when all items are put inside
@@ -89,11 +96,11 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
     var minWidthBeforeOverflowIcon = 380;
     // Do not render ButtonMenu when there are 3 or less items
     // and if there is enough available space to render all the items
-    if (toolbarBatchActions && (toolbarBatchActions === null || toolbarBatchActions === void 0 ? void 0 : toolbarBatchActions.length) <= 3 && !displayAllInMenu) {
+    if (toolbarBatchActions && !displayAllInMenu && (!toolbarBatchActionsDisplayMin && (toolbarBatchActions === null || toolbarBatchActions === void 0 ? void 0 : toolbarBatchActions.length) <= 3 || toolbarBatchActionsDisplayMin !== undefined && (toolbarBatchActions === null || toolbarBatchActions === void 0 ? void 0 : toolbarBatchActions.length) <= toolbarBatchActionsDisplayMin)) {
       return;
     }
     var renderItem = function renderItem(batchAction, index) {
-      return /*#__PURE__*/React__default["default"].createElement(react.MenuItem, {
+      return /*#__PURE__*/React.createElement(react.MenuItem, {
         key: "".concat(batchAction.label, "-").concat(index),
         label: batchAction.label,
         onClick: function onClick(event) {
@@ -101,13 +108,16 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
         }
       });
     };
-    return /*#__PURE__*/React__default["default"].createElement(react.MenuButton, {
+    return /*#__PURE__*/React.createElement(react.MenuButton, {
       label: batchActionMenuButtonLabelText,
-      className: cx__default["default"]([menuClass, _rollupPluginBabelHelpers.defineProperty({}, "".concat(menuClass, "-icon-only"), width <= minWidthBeforeOverflowIcon)]),
+      className: cx([menuClass, _rollupPluginBabelHelpers.defineProperty({}, "".concat(menuClass, "-icon-only"), width <= minWidthBeforeOverflowIcon)]),
       tabIndex: totalSelected > 0 ? 0 : -1,
       menuAlignment: "bottom"
     }, toolbarBatchActions === null || toolbarBatchActions === void 0 ? void 0 : toolbarBatchActions.map(function (batchAction, index) {
-      var hidden = index < 2 && !displayAllInMenu;
+      var hidden = toolbarBatchActionsDisplayMin === undefined && index < 2 && !displayAllInMenu;
+      if (toolbarBatchActionsDisplayMin !== undefined && index < toolbarBatchActionsDisplayMin && !displayAllInMenu) {
+        hidden = true;
+      }
       if (!hidden) {
         return renderItem(batchAction, index);
       }
@@ -145,21 +155,22 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
   // Only display the first two batch actions, the rest are
   // displayed inside of the ButtonMenu if there are more than
   // 3 batch actions
-  return /*#__PURE__*/React__default["default"].createElement(react.TableBatchActions, {
+  return /*#__PURE__*/React.createElement(react.TableBatchActions, {
     shouldShowBatchActions: totalSelected > 0,
     totalSelected: totalSelected,
     onCancel: onCancelHandler,
     onSelectAll: onSelectAllHandler,
-    totalCount: rows && rows.length,
+    totalCount: availableRowsCount,
     translateWithId: translateWithIdBatchActions
   }, !displayAllInMenu && toolbarBatchActions && (toolbarBatchActions === null || toolbarBatchActions === void 0 ? void 0 : toolbarBatchActions.map(function (batchAction, index) {
-    if (index < 2 && toolbarBatchActions.length > 3 || index < 3 && toolbarBatchActions.length <= 3) {
-      return /*#__PURE__*/React__default["default"].createElement(react.TableBatchAction, {
+    if (!toolbarBatchActionsDisplayMin && index < 2 && toolbarBatchActions.length > 3 || index < 3 && toolbarBatchActions.length <= 3 || toolbarBatchActionsDisplayMin !== undefined && index < toolbarBatchActionsDisplayMin) {
+      return /*#__PURE__*/React.createElement(react.TableBatchAction, {
         key: "".concat(batchAction.label, "-").concat(index),
         renderIcon: batchAction.renderIcon,
         onClick: function onClick(event) {
           return onClickHandler(event, batchAction);
         },
+        className: cx(_rollupPluginBabelHelpers.defineProperty({}, "".concat(settings.carbon.prefix, "--noLabel"), !batchAction.label || batchAction.label === '')),
         iconDescription: batchAction.label,
         tabIndex: totalSelected > 0 ? 0 : -1
       }, batchAction.label);
@@ -177,19 +188,19 @@ var DatagridToolbar = function DatagridToolbar(_ref2) {
     batchActions = datagridState.batchActions,
     rowSize = datagridState.rowSize;
   var getRowHeight = rowSize || 'lg';
-  return batchActions && DatagridActions ? /*#__PURE__*/React__default["default"].createElement("div", {
+  return batchActions && DatagridActions ? /*#__PURE__*/React.createElement("div", {
     ref: ref,
-    className: cx__default["default"]([blockClass, "".concat(blockClass, "--").concat(getRowHeight)])
-  }, /*#__PURE__*/React__default["default"].createElement(react.TableToolbar, {
+    className: cx([blockClass, "".concat(blockClass, "--").concat(getRowHeight)])
+  }, /*#__PURE__*/React.createElement(react.TableToolbar, {
     "aria-label": ariaToolbarLabel
-  }, DatagridActions && /*#__PURE__*/React__default["default"].createElement(DatagridActions, datagridState), DatagridBatchActionsToolbar === null || DatagridBatchActionsToolbar === void 0 ? void 0 : DatagridBatchActionsToolbar(datagridState, width, ref))) : DatagridActions ? /*#__PURE__*/React__default["default"].createElement("div", {
+  }, DatagridActions && /*#__PURE__*/React.createElement(DatagridActions, datagridState), DatagridBatchActionsToolbar === null || DatagridBatchActionsToolbar === void 0 ? void 0 : DatagridBatchActionsToolbar(datagridState, width, ref))) : DatagridActions ? /*#__PURE__*/React.createElement("div", {
     className: blockClass
-  }, /*#__PURE__*/React__default["default"].createElement(react.TableToolbar, {
+  }, /*#__PURE__*/React.createElement(react.TableToolbar, {
     "aria-label": ariaToolbarLabel
-  }, DatagridActions && /*#__PURE__*/React__default["default"].createElement(DatagridActions, datagridState), DatagridBatchActions === null || DatagridBatchActions === void 0 ? void 0 : DatagridBatchActions(datagridState))) : null;
+  }, DatagridActions && /*#__PURE__*/React.createElement(DatagridActions, datagridState), DatagridBatchActions === null || DatagridBatchActions === void 0 ? void 0 : DatagridBatchActions(datagridState))) : null;
 };
 DatagridToolbar.propTypes = {
-  ariaToolbarLabel: index["default"].string
+  ariaToolbarLabel: index.default.string
 };
 
-exports["default"] = DatagridToolbar;
+exports.default = DatagridToolbar;

package/lib/components/Datagrid/Datagrid/DatagridVirtualBody.js

@@ -16,10 +16,7 @@ var react = require('@carbon/react');
 var settings = require('../../../settings.js');
 var DatagridHead = require('./DatagridHead.js');
 var useResizeObserver = require('../../../global/js/hooks/useResizeObserver.js');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var useIsomorphicEffect = require('../../../global/js/hooks/useIsomorphicEffect.js');
 
 var blockClass = "".concat(settings.pkg.prefix, "--datagrid");
 var rowSizeMap = {
@@ -31,7 +28,7 @@ var rowSizeMap = {
 };
 var defaultRowHeight = rowSizeMap.lg;
 var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
-  var _gridRef$current, _gridRef$current2;
+  var _gridRef$current;
   var getTableBodyProps = datagridState.getTableBodyProps,
     rows = datagridState.rows,
     prepareRow = datagridState.prepareRow,
@@ -48,11 +45,15 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
     gridRef = datagridState.gridRef,
     tableId = datagridState.tableId,
     onVirtualScroll = datagridState.onVirtualScroll;
-
+  var headWrapRef = React.useRef(null);
+  var innerRef = React.useRef(null);
+  var gridWidth = gridRef === null || gridRef === void 0 || (_gridRef$current = gridRef.current) === null || _gridRef$current === void 0 ? void 0 : _gridRef$current.clientWidth;
   /* istanbul ignore next */
   var handleVirtualGridResize = function handleVirtualGridResize() {
     var gridRefElement = gridRef === null || gridRef === void 0 ? void 0 : gridRef.current;
-    if (gridRefElement) {
+    // isHidden checks for an edge case where if the table is hidden by something like a Tab that the width can't be calculated to 0
+    var isHidden = (gridRefElement === null || gridRefElement === void 0 ? void 0 : gridRefElement.offsetParent) === null;
+    if (gridRefElement && !isHidden) {
       var _gridRefElement$clien;
       gridRefElement.style.width = gridRefElement === null || gridRefElement === void 0 || (_gridRefElement$clien = gridRefElement.clientWidth) === null || _gridRefElement$clien === void 0 ? void 0 : _gridRefElement$clien.toString();
     }
@@ -66,37 +67,59 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
     if (listRef && listRef.current) {
       listRef.current.resetAfterIndex(0);
     }
-  }, [listRef]);
+  }, [listRef, rowHeight]);
   var visibleRows = DatagridPagination && page || rows;
   var testRef = React.useRef(null);
 
   // Sync the scrollLeft position of the virtual body to the table header
   React.useEffect(function () {
-    function handleScroll(event) {
-      var _document;
+    var _document;
+    var headWrapEl = (_document = document) === null || _document === void 0 ? void 0 : _document.querySelector("#".concat(tableId, " .").concat(blockClass, "__head-wrap"));
+
+    // Syncs header scroll position when virtual body is scrolled
+    function handleVirtualScrollX(event) {
       var virtualBody = event.target;
-      var headWrapEl = (_document = document) === null || _document === void 0 ? void 0 : _document.querySelector("#".concat(tableId, " .").concat(blockClass, "__head-wrap"));
       if (headWrapEl) {
         headWrapEl.scrollLeft = virtualBody === null || virtualBody === void 0 ? void 0 : virtualBody.scrollLeft;
       }
     }
+
+    // Syncs virtual body scroll position when header is scrolled
+    function handleHeaderScrollX(event) {
+      var header = event.target;
+      if (testRef && testRef.current) {
+        testRef.current.scrollLeft = header === null || header === void 0 ? void 0 : header.scrollLeft;
+        // this prevents the scroll bar from over exceeding the vertical scroll bar compensation in the right
+        header.scrollLeft = testRef.current.scrollLeft;
+      }
+    }
     var testRefValue = testRef === null || testRef === void 0 ? void 0 : testRef.current;
-    testRefValue === null || testRefValue === void 0 || testRefValue.addEventListener('scroll', handleScroll);
+    testRefValue === null || testRefValue === void 0 || testRefValue.addEventListener('scroll', handleVirtualScrollX);
+    headWrapEl === null || headWrapEl === void 0 || headWrapEl.addEventListener('scroll', handleHeaderScrollX);
     return function () {
-      testRefValue === null || testRefValue === void 0 || testRefValue.removeEventListener('scroll', handleScroll);
+      testRefValue === null || testRefValue === void 0 || testRefValue.removeEventListener('scroll', handleVirtualScrollX);
+      headWrapEl === null || headWrapEl === void 0 || headWrapEl.removeEventListener('scroll', handleHeaderScrollX);
     };
   });
-  return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "".concat(blockClass, "__head-wrap"),
-    style: {
-      width: gridRef === null || gridRef === void 0 || (_gridRef$current = gridRef.current) === null || _gridRef$current === void 0 ? void 0 : _gridRef$current.clientWidth,
-      overflow: 'hidden'
+  useIsomorphicEffect.useIsomorphicEffect(function () {
+    if (headWrapRef.current && headWrapRef.current.style) {
+      headWrapRef.current.style.width = "".concat(gridWidth, "px");
+      headWrapRef.current.style.overflow = "auto";
+    }
+  }, [headWrapRef, gridWidth]);
+  useIsomorphicEffect.useIsomorphicEffect(function () {
+    if (testRef !== null && testRef !== void 0 && testRef.current && testRef.current.style) {
+      testRef.current.style.width = "".concat(gridWidth, "px");
     }
-  }, /*#__PURE__*/React__default["default"].createElement(DatagridHead["default"], datagridState)), /*#__PURE__*/React__default["default"].createElement(react.TableBody, _rollupPluginBabelHelpers["extends"]({}, getTableBodyProps({
+  }, [testRef, gridWidth]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(blockClass, "__head-wrap"),
+    ref: headWrapRef
+  }, /*#__PURE__*/React.createElement(DatagridHead.default, datagridState)), /*#__PURE__*/React.createElement(react.TableBody, _rollupPluginBabelHelpers.extends({}, getTableBodyProps({
     role: undefined
   }), {
     "aria-live": undefined
-  }), /*#__PURE__*/React__default["default"].createElement(reactWindow.VariableSizeList, {
+  }), /*#__PURE__*/React.createElement(reactWindow.VariableSizeList, {
     height: virtualHeight || tableHeight,
     itemCount: visibleRows.length,
     itemSize: function itemSize(index) {
@@ -111,10 +134,7 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
     innerRef: innerListRef,
     outerRef: testRef,
     ref: listRef,
-    className: "".concat(blockClass, "__virtual-scrollbar"),
-    style: {
-      width: gridRef === null || gridRef === void 0 || (_gridRef$current2 = gridRef.current) === null || _gridRef$current2 === void 0 ? void 0 : _gridRef$current2.clientWidth
-    }
+    className: "".concat(blockClass, "__virtual-scrollbar")
   }, function (_ref) {
     var _row$RowRenderer;
     var index = _ref.index,
@@ -123,7 +143,8 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
     prepareRow(row);
     var _row$getRowProps = row.getRowProps(),
       key = _row$getRowProps.key;
-    return /*#__PURE__*/React__default["default"].createElement("div", {
+    return /*#__PURE__*/React.createElement("div", {
+      ref: innerRef,
       style: _rollupPluginBabelHelpers.objectSpread2({}, style)
     }, row === null || row === void 0 || (_row$RowRenderer = row.RowRenderer) === null || _row$RowRenderer === void 0 ? void 0 : _row$RowRenderer.call(row, _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, datagridState), {}, {
       row: row,
@@ -132,4 +153,4 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
   })));
 };
 
-exports["default"] = DatagridVirtualBody;
+exports.default = DatagridVirtualBody;

package/lib/components/Datagrid/Datagrid/DraggableElement.d.ts

@@ -1,3 +1,9 @@
+/**
+ * Copyright IBM Corp. 2024
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 import { PropsWithChildren, ReactNode } from 'react';
 import PropTypes from 'prop-types';
 interface DraggableElementProps extends PropsWithChildren {

package/lib/components/Datagrid/Datagrid/DraggableElement.js

@@ -11,18 +11,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
-var index = require('../../../node_modules/prop-types/index.js');
+var index = require('../../../_virtual/index.js');
 var icons = require('@carbon/react/icons');
 var cx = require('classnames');
 var settings = require('../../../settings.js');
 var utilities = require('@dnd-kit/utilities');
 var sortable = require('@dnd-kit/sortable');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
-
 var _Locked, _DraggableIcon;
 var blockClass = "".concat(settings.pkg.prefix, "--datagrid");
 var DraggableElement = function DraggableElement(_ref) {
@@ -43,41 +38,42 @@ var DraggableElement = function DraggableElement(_ref) {
     setNodeRef = _useSortable.setNodeRef,
     transform = _useSortable.transform,
     transition = _useSortable.transition;
-  var content = /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement("div", {
-    className: cx__default["default"]({
+  var content = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: cx({
       disabled: disabled
     }, "".concat(blockClass, "__draggable-handleStyle"))
-  }, isSticky ? _Locked || (_Locked = /*#__PURE__*/React__default["default"].createElement(icons.Locked, {
+  }, isSticky ? _Locked || (_Locked = /*#__PURE__*/React.createElement(icons.Locked, {
     size: 16
-  })) : _DraggableIcon || (_DraggableIcon = /*#__PURE__*/React__default["default"].createElement(icons.Draggable, {
+  })) : _DraggableIcon || (_DraggableIcon = /*#__PURE__*/React.createElement(icons.Draggable, {
     size: 16
   }))), children);
   var style = {
     transform: !disabled ? utilities.CSS.Transform.toString(transform) : undefined,
     transition: transition
   };
-  return /*#__PURE__*/React__default["default"].createElement("li", _rollupPluginBabelHelpers["extends"]({
-    className: cx__default["default"](classList, "".concat(blockClass, "__draggable-handleHolder"), _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__draggable-handleHolder--selected"), selected), "".concat(blockClass, "__draggable-handleHolder--sticky"), isSticky), "".concat(blockClass, "__draggable-handleHolder--dragging"), isDragging)),
+  return /*#__PURE__*/React.createElement("li", _rollupPluginBabelHelpers.extends({
+    className: cx(classList, "".concat(blockClass, "__draggable-handleHolder"), _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__draggable-handleHolder--selected"), selected), "".concat(blockClass, "__draggable-handleHolder--sticky"), isSticky), "".concat(blockClass, "__draggable-handleHolder--dragging"), isDragging)),
     id: id,
     ref: setNodeRef,
     style: style
   }, attributes, listeners, {
+    "aria-disabled": undefined,
     "aria-selected": selected,
     role: "option"
-  }), /*#__PURE__*/React__default["default"].createElement("span", {
+  }), /*#__PURE__*/React.createElement("span", {
     className: "".concat(blockClass, "__shared-ui--assistive-text")
-  }, ariaLabel), /*#__PURE__*/React__default["default"].createElement("div", {
-    className: cx__default["default"](_rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__draggable-handleStyle"), !disabled), ["".concat(blockClass, "__draggable-handleHolder-droppable")])
+  }, ariaLabel), /*#__PURE__*/React.createElement("div", {
+    className: cx(_rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__draggable-handleStyle"), !disabled), ["".concat(blockClass, "__draggable-handleHolder-droppable")])
   }, content));
 };
 DraggableElement.propTypes = {
-  ariaLabel: index["default"].string.isRequired,
-  children: index["default"].element.isRequired,
-  classList: index["default"].string,
-  disabled: index["default"].bool,
-  id: index["default"].string.isRequired,
-  isSticky: index["default"].bool,
-  selected: index["default"].bool
+  ariaLabel: index.default.string.isRequired,
+  children: index.default.element.isRequired,
+  classList: index.default.string,
+  disabled: index.default.bool,
+  id: index.default.string.isRequired,
+  isSticky: index.default.bool,
+  selected: index.default.bool
 };
 
-exports["default"] = DraggableElement;
+exports.default = DraggableElement;