@carbon/ibm-products 2.43.2-canary.3 → 2.43.2-canary.300

package/es/components/Datagrid/Datagrid/DatagridSelectAll.js

@@ -10,17 +10,18 @@ import React__default, { useState, useLayoutEffect } from 'react';
 import { TableSelectAll } from '@carbon/react';
 import cx from 'classnames';
 import { pkg } from '../../../settings.js';
-import { handleSelectAllRowData } from './addons/stateReducer.js';
+import { handleOnPageSelectAllRowData } from './addons/stateReducer.js';
 
 var _excluded = ["onChange"];
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var SelectAll = function SelectAll(datagridState) {
   var _columns$;
-  var _useState = useState(typeof window !== 'undefined' ? window.innerWidth : ''),
+  var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     windowSize = _useState2[0],
     setWindowSize = _useState2[1];
   useLayoutEffect(function () {
+    setWindowSize(window.innerWidth);
     /* istanbul ignore next */
     function updateSize() {
       setWindowSize(window.innerWidth);
@@ -44,11 +45,10 @@ 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.createElement("div", {
+    return /*#__PURE__*/React__default.createElement("th", {
       className: cx("".concat(blockClass, "__head-hidden-select-all"), _defineProperty({}, "".concat(blockClass, "__select-all-sticky-left"), /* istanbul ignore next */
       isFirstColumnStickyLeft && Number(windowSize) > 671))
     });
@@ -58,24 +58,8 @@ var SelectAll = function SelectAll(datagridState) {
     onChange = _ref.onChange,
     selectProps = _objectWithoutProperties(_ref, _excluded);
   var indeterminate = selectProps.indeterminate;
-  var handleSelectAllChange = function handleSelectAllChange(event) {
-    if (indeterminate) {
-      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
-        }
-      });
-    }
-    handleSelectAllRowData({
+  var handleOnPageSelectAllChange = function handleOnPageSelectAllChange(event) {
+    handleOnPageSelectAllRowData({
       dispatch: dispatch,
       rows: rows,
       getRowId: getRowId,
@@ -85,15 +69,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.createElement("div", {
+  return /*#__PURE__*/React__default.createElement(TableSelectAll, _extends({}, selectProps, {
     className: cx("".concat(blockClass, "__head-select-all"), "".concat(blockClass, "__checkbox-cell"), _defineProperty({}, "".concat(blockClass, "__checkbox-cell-sticky-left"), /* istanbul ignore next */
-    isFirstColumnStickyLeft && Number(windowSize) > 671))
-  }, /*#__PURE__*/React__default.createElement(TableSelectAll, _extends({}, selectProps, {
+    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")
-  })));
+  }));
 };
 
 export { SelectAll };

package/es/components/Datagrid/Datagrid/DatagridSelectAllWithToggle.js

@@ -7,7 +7,7 @@
 
 import { slicedToArray as _slicedToArray, objectWithoutProperties as _objectWithoutProperties, defineProperty as _defineProperty, extends as _extends } from '../../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default, { useState, useEffect, useLayoutEffect } from 'react';
-import PropTypes from '../../../node_modules/prop-types/index.js';
+import PropTypes from '../../../_virtual/index.js';
 import cx from 'classnames';
 import { Checkbox, OverflowMenu, OverflowMenuItem } from '@carbon/react';
 import { CaretDown } from '@carbon/react/icons';
@@ -43,11 +43,12 @@ var SelectAllWithToggle = function SelectAllWithToggle(_ref) {
       onSelectAllRows(isAllRowsSelected && selectAllMode === SELECT_ALL_ROWS);
     }
   }, [isAllRowsSelected, selectAllMode, onSelectAllRows]);
-  var _useState3 = useState(window.innerWidth),
+  var _useState3 = useState(),
     _useState4 = _slicedToArray(_useState3, 2),
     windowSize = _useState4[0],
     setWindowSize = _useState4[1];
   useLayoutEffect(function () {
+    setWindowSize(window.innerWidth);
     function updateSize() {
       setWindowSize(window.innerWidth);
     }
@@ -68,7 +69,7 @@ var SelectAllWithToggle = function SelectAllWithToggle(_ref) {
   var isFirstColumnStickyLeft = (columns === null || columns === void 0 || (_columns$ = columns[0]) === null || _columns$ === void 0 ? void 0 : _columns$.sticky) === 'left' && withStickyColumn;
   return /*#__PURE__*/React__default.createElement("th", {
     scope: "col",
-    className: cx("".concat(blockClass, "__select-all-toggle-on"), _defineProperty({}, "".concat(blockClass, "__select-all-sticky-left"), isFirstColumnStickyLeft && windowSize > 671))
+    className: cx("".concat(blockClass, "__select-all-toggle-on"), _defineProperty({}, "".concat(blockClass, "__select-all-sticky-left"), isFirstColumnStickyLeft && (windowSize !== null && windowSize !== void 0 ? windowSize : 0) > 671))
   }, /*#__PURE__*/React__default.createElement("span", null, /*#__PURE__*/React__default.createElement(Checkbox, _extends({}, selectProps, {
     name: "".concat(tableId, "-select-all-checkbox-name"),
     onClick: function onClick(e) {

package/es/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/es/components/Datagrid/Datagrid/DatagridToolbar.js

@@ -7,7 +7,7 @@
 
 import { objectWithoutProperties as _objectWithoutProperties, slicedToArray as _slicedToArray, defineProperty as _defineProperty } from '../../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default, { useRef, useState, useEffect } from 'react';
-import PropTypes from '../../../node_modules/prop-types/index.js';
+import PropTypes from '../../../_virtual/index.js';
 import { TableToolbar, TableBatchActions, TableBatchAction, MenuButton, MenuItem } from '@carbon/react';
 import { useResizeObserver } from '../../../global/js/hooks/useResizeObserver.js';
 import { pkg, carbon } from '../../../settings.js';
@@ -33,15 +33,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 = useState(rows.length),
+    _useState8 = _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;
+  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
@@ -80,7 +92,7 @@ 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) {
@@ -98,7 +110,10 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
       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);
       }
@@ -141,16 +156,17 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
     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) {
+    if (!toolbarBatchActionsDisplayMin && index < 2 && toolbarBatchActions.length > 3 || index < 3 && toolbarBatchActions.length <= 3 || toolbarBatchActionsDisplayMin !== undefined && index < toolbarBatchActionsDisplayMin) {
       return /*#__PURE__*/React__default.createElement(TableBatchAction, {
         key: "".concat(batchAction.label, "-").concat(index),
         renderIcon: batchAction.renderIcon,
         onClick: function onClick(event) {
           return onClickHandler(event, batchAction);
         },
+        className: cx(_defineProperty({}, "".concat(carbon.prefix, "--noLabel"), !batchAction.label || batchAction.label === '')),
         iconDescription: batchAction.label,
         tabIndex: totalSelected > 0 ? 0 : -1
       }, batchAction.label);

package/es/components/Datagrid/Datagrid/DatagridVirtualBody.js

@@ -6,12 +6,13 @@
  */
 
 import { extends as _extends, objectSpread2 as _objectSpread2 } from '../../../_virtual/_rollupPluginBabelHelpers.js';
-import React__default, { useEffect, useRef } from 'react';
+import React__default, { useRef, useEffect } from 'react';
 import { VariableSizeList } from 'react-window';
 import { TableBody } from '@carbon/react';
 import { pkg } from '../../../settings.js';
 import DatagridHead from './DatagridHead.js';
 import { useResizeObserver } from '../../../global/js/hooks/useResizeObserver.js';
+import { useIsomorphicEffect } from '../../../global/js/hooks/useIsomorphicEffect.js';
 
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var rowSizeMap = {
@@ -23,7 +24,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,
@@ -40,11 +41,15 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
     gridRef = datagridState.gridRef,
     tableId = datagridState.tableId,
     onVirtualScroll = datagridState.onVirtualScroll;
-
+  var headWrapRef = useRef(null);
+  var innerRef = 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();
     }
@@ -58,32 +63,54 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
     if (listRef && listRef.current) {
       listRef.current.resetAfterIndex(0);
     }
-  }, [listRef]);
+  }, [listRef, rowHeight]);
   var visibleRows = DatagridPagination && page || rows;
   var testRef = useRef(null);
 
   // Sync the scrollLeft position of the virtual body to the table header
   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);
     };
   });
+  useIsomorphicEffect(function () {
+    if (headWrapRef.current && headWrapRef.current.style) {
+      headWrapRef.current.style.width = "".concat(gridWidth, "px");
+      headWrapRef.current.style.overflow = "auto";
+    }
+  }, [headWrapRef, gridWidth]);
+  useIsomorphicEffect(function () {
+    if (testRef !== null && testRef !== void 0 && testRef.current && testRef.current.style) {
+      testRef.current.style.width = "".concat(gridWidth, "px");
+    }
+  }, [testRef, gridWidth]);
   return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__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'
-    }
+    ref: headWrapRef
   }, /*#__PURE__*/React__default.createElement(DatagridHead, datagridState)), /*#__PURE__*/React__default.createElement(TableBody, _extends({}, getTableBodyProps({
     role: undefined
   }), {
@@ -103,10 +130,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,
@@ -116,6 +140,7 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
     var _row$getRowProps = row.getRowProps(),
       key = _row$getRowProps.key;
     return /*#__PURE__*/React__default.createElement("div", {
+      ref: innerRef,
       style: _objectSpread2({}, style)
     }, row === null || row === void 0 || (_row$RowRenderer = row.RowRenderer) === null || _row$RowRenderer === void 0 ? void 0 : _row$RowRenderer.call(row, _objectSpread2(_objectSpread2({}, datagridState), {}, {
       row: row,

package/es/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/es/components/Datagrid/Datagrid/DraggableElement.js

@@ -7,7 +7,7 @@
 
 import { extends as _extends, defineProperty as _defineProperty } from '../../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default from 'react';
-import PropTypes from '../../../node_modules/prop-types/index.js';
+import PropTypes from '../../../_virtual/index.js';
 import { Locked, Draggable } from '@carbon/react/icons';
 import cx from 'classnames';
 import { pkg } from '../../../settings.js';
@@ -53,6 +53,7 @@ var DraggableElement = function DraggableElement(_ref) {
     ref: setNodeRef,
     style: style
   }, attributes, listeners, {
+    "aria-disabled": undefined,
     "aria-selected": selected,
     role: "option"
   }), /*#__PURE__*/React__default.createElement("span", {

package/es/components/Datagrid/Datagrid/addons/CustomizeColumns/Actions.js

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import PropTypes from '../../../../../node_modules/prop-types/index.js';
+import PropTypes from '../../../../../_virtual/index.js';
 import { Search } from '@carbon/react';
 import * as React from 'react';
 import { pkg } from '../../../../../settings.js';

package/es/components/Datagrid/Datagrid/addons/CustomizeColumns/ButtonWrapper.js

@@ -7,7 +7,7 @@
 
 import { objectWithoutProperties as _objectWithoutProperties, extends as _extends } from '../../../../../_virtual/_rollupPluginBabelHelpers.js';
 import * as React from 'react';
-import PropTypes from '../../../../../node_modules/prop-types/index.js';
+import PropTypes from '../../../../../_virtual/index.js';
 import { Column } from '@carbon/react/icons';
 import { Button } from '@carbon/react';
 import { pkg } from '../../../../../settings.js';

package/es/components/Datagrid/Datagrid/addons/CustomizeColumns/Columns.js

@@ -7,7 +7,7 @@
 
 import { slicedToArray as _slicedToArray, defineProperty as _defineProperty } from '../../../../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default, { useRef } from 'react';
-import PropTypes from '../../../../../node_modules/prop-types/index.js';
+import PropTypes from '../../../../../_virtual/index.js';
 import { Checkbox } from '@carbon/react';
 import update from 'immutability-helper';
 import { pkg } from '../../../../../settings.js';

package/es/components/Datagrid/Datagrid/addons/CustomizeColumns/CustomizeColumnsTearsheet.js

@@ -6,12 +6,13 @@
  */
 
 import { slicedToArray as _slicedToArray, objectSpread2 as _objectSpread2 } from '../../../../../_virtual/_rollupPluginBabelHelpers.js';
-import React__default, { useState, useCallback, useEffect } from 'react';
-import PropTypes from '../../../../../node_modules/prop-types/index.js';
+import React__default, { useState, useRef, useCallback, useEffect } from 'react';
+import PropTypes from '../../../../../_virtual/index.js';
+import '../../../../Tearsheet/Tearsheet.js';
+import { TearsheetNarrow } from '../../../../Tearsheet/TearsheetNarrow.js';
 import Columns from './Columns.js';
 import Actions from './Actions.js';
 import { pkg } from '../../../../../settings.js';
-import { TearsheetNarrow } from '../../../../Tearsheet/TearsheetNarrow.js';
 
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
@@ -58,6 +59,7 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
     _useState10 = _slicedToArray(_useState9, 2),
     isDirty = _useState10[0],
     setIsDirty = _useState10[1];
+  var prevColumnDefinitions = useRef();
   var onRequestClose = function onRequestClose() {
     setColumnObjects(columnDefinitions);
     setIsTearsheetOpen(false);
@@ -73,21 +75,40 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
     onSaveColumnPrefs(updatedColumns);
   };
   var onCheckboxCheck = function onCheckboxCheck(col, value) {
+    // Update the visibility of columns based on a single column or an array of columns
     var changedDefinitions = columnObjects.map(function (definition) {
-      if ((Array.isArray(col) && col.indexOf(definition) != -1 || definition.id === col.id) && definition.canFilter && !definition.disabled) {
-        return _objectSpread2(_objectSpread2({}, definition), {}, {
+      // If select all is clicked
+      if (Array.isArray(col)) {
+        return col.includes(definition) && definition.canFilter && !definition.disabled ? _objectSpread2(_objectSpread2({}, definition), {}, {
           isVisible: value
-        });
+        }) : definition;
       }
-      return definition;
+      // If a single checkbox is clicked which is written below as a default return
+      return col.id === definition.id ? _objectSpread2(_objectSpread2({}, definition), {}, {
+        isVisible: value
+      }) : definition;
     });
-    setColumnObjects(changedDefinitions);
-    setDirty();
-  };
-  var setDirty = function setDirty() {
-    if (!isDirty) {
-      setIsDirty(true);
-    }
+
+    // Count the number of visible columns excluding certain IDs after 1st mutation
+    var selectedColumnsCount = changedDefinitions.filter(function (definition) {
+      return definition.isVisible && !['datagridSelection', 'actions'].includes(definition.id);
+    }).length;
+
+    // Ensure special columns are visible if any other columns are visible
+    var finalDefinitions = changedDefinitions.map(function (definition) {
+      // If at least 1 column is visible after mutation, we add selection column and actions column (coming from various extensions)
+      if (selectedColumnsCount > 0) {
+        return ['datagridSelection', 'actions'].includes(definition.id) ? _objectSpread2(_objectSpread2({}, definition), {}, {
+          isVisible: true
+        }) : definition;
+      }
+      // Else we remove selection column and actions column
+      return ['datagridSelection', 'actions'].includes(definition.id) ? _objectSpread2(_objectSpread2({}, definition), {}, {
+        isVisible: false
+      }) : definition;
+    });
+    setColumnObjects(finalDefinitions);
+    setIsDirty(selectedColumnsCount !== 0);
   };
   var getVisibleColumnsCount = useCallback(function () {
     return columnObjects.filter(function (col) {
@@ -96,15 +117,19 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
   }, [columnObjects]);
   var string = searchText.trim().toLowerCase();
   useEffect(function () {
-    var notFilterableCount = columnObjects.filter(function (col) {
-      return !col.canFilter;
-    }).length;
+    if (prevColumnDefinitions.current !== columnDefinitions) {
+      setColumnObjects(columnDefinitions);
+    }
     var actionCount = columnObjects.filter(function (col) {
       return col.id === 'actions';
     }).length;
-    setVisibleColumnsCount(getVisibleColumnsCount() - notFilterableCount - actionCount);
-    setTotalColumns(columnObjects.length - notFilterableCount - actionCount);
-  }, [getVisibleColumnsCount, columnObjects]);
+    var datagridSelectionCount = columnObjects.filter(function (col) {
+      return col.id === 'datagridSelection';
+    }).length;
+    setVisibleColumnsCount(getVisibleColumnsCount() - actionCount - datagridSelectionCount < 0 ? 0 : getVisibleColumnsCount() - actionCount - datagridSelectionCount);
+    setTotalColumns(columnObjects.length - actionCount - datagridSelectionCount);
+    prevColumnDefinitions.current = columnDefinitions;
+  }, [getVisibleColumnsCount, columnObjects, columnDefinitions]);
   return /*#__PURE__*/React__default.createElement(TearsheetNarrow, {
     className: "".concat(blockClass, "__customize-columns-tearsheet"),
     open: isOpen,
@@ -126,7 +151,7 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
     searchText: searchText,
     setColumnsObject: function setColumnsObject(cols) {
       setColumnObjects(cols);
-      setDirty();
+      setIsDirty(true);
     },
     setSearchText: setSearchText,
     findColumnPlaceholderLabel: findColumnPlaceholderLabel,
@@ -140,7 +165,7 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
     onSelectColumn: onCheckboxCheck,
     setColumnsObject: function setColumnsObject(cols) {
       setColumnObjects(cols);
-      setDirty();
+      setIsDirty(getVisibleColumnsCount() !== 0);
     },
     selectAllLabel: selectAllLabel,
     customizeTearsheetHeadingLabel: customizeTearsheetHeadingLabel

package/es/components/Datagrid/Datagrid/addons/CustomizeColumns/DraggableItemsList.js

@@ -7,7 +7,7 @@
 
 import { objectSpread2 as _objectSpread2, toConsumableArray as _toConsumableArray } from '../../../../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default from 'react';
-import { p as propTypesExports } from '../../../../../node_modules/prop-types/index.js';
+import { p as propTypesExports } from '../../../../../_virtual/index.js';
 import { Checkbox } from '@carbon/react';
 import { isColumnVisible } from './common.js';
 import DraggableElement from '../../DraggableElement.js';
@@ -161,10 +161,10 @@ var DraggableItemsList = function DraggableItemsList(_ref) {
     strategy: verticalListSortingStrategy
   }, visibleCols.map(function (colDef) {
     var colHeaderTitle = getNodeTextContent(colDef.Header);
-    var searchString = new RegExp('(' + filterString + ')');
-    var res = filterString.length ? colHeaderTitle.toLowerCase().split(searchString) : null;
-    var firstWord = res !== null ? res[0] === '' ? res[1].charAt(0).toUpperCase() + res[1].substring(1) : res[0].charAt(0).toUpperCase() + res[0].substring(1) : null;
-    var highlightedText = res !== null ? res[0] === '' ? "<strong>".concat(firstWord, "</strong>") + res[2] : firstWord + "<strong>".concat(res[1], "</strong>") + res[2] : colHeaderTitle;
+    var parts = colHeaderTitle.split(new RegExp("(".concat(filterString, ")"), 'gi'));
+    var highlightedText = parts.map(function (part) {
+      return part.toLowerCase() === filterString.toLowerCase() ? "<strong>".concat(part, "</strong>") : part;
+    }).join('');
     var isFrozenColumn = !!colDef.sticky;
     var isDisabled = colDef.disabled;
     var listContents = /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(Checkbox, {

package/es/components/Datagrid/Datagrid/addons/CustomizeColumns/TearsheetWrapper.js

@@ -8,7 +8,7 @@
 import { objectWithoutProperties as _objectWithoutProperties, extends as _extends } from '../../../../../_virtual/_rollupPluginBabelHelpers.js';
 import '../../../../../feature-flags.js';
 import React__default, { useContext, useEffect } from 'react';
-import PropTypes from '../../../../../node_modules/prop-types/index.js';
+import PropTypes from '../../../../../_virtual/index.js';
 import CustomizeColumnsTearsheet from './CustomizeColumnsTearsheet.js';
 import { InlineEditContext } from '../InlineEdit/InlineEditContext/InlineEditContext.js';
 
@@ -36,20 +36,22 @@ var TearsheetWrapper = function TearsheetWrapper(_ref) {
     columnDefinitions: instance.allColumns,
     originalColumnDefinitions: instance.columns,
     onSaveColumnPrefs: function onSaveColumnPrefs(updatedColDefs) {
-      var hiddenIds = updatedColDefs.filter(function (colDef) {
-        return !colDef.isVisible;
-      }).map(function (colDef) {
-        return colDef.id;
-      });
-      instance.setHiddenColumns(hiddenIds);
-      if (typeof instance.setColumnOrder === 'function') {
-        instance.setColumnOrder(updatedColDefs.map(function (colDef) {
+      setTimeout(function () {
+        var hiddenIds = updatedColDefs.filter(function (colDef) {
+          return !colDef.isVisible;
+        }).map(function (colDef) {
           return colDef.id;
-        }));
-      } else {
-        // eslint-disable-next-line no-console
-        console.warn("Column order can not be updated. Did you forget to add 'useColumnOrder' in 'useDatagrid'");
-      }
+        });
+        instance.setHiddenColumns(hiddenIds);
+        if (typeof instance.setColumnOrder === 'function') {
+          instance.setColumnOrder(updatedColDefs.map(function (colDef) {
+            return colDef.id;
+          }));
+        } else {
+          // eslint-disable-next-line no-console
+          console.warn("Column order can not be updated. Did you forget to add 'useColumnOrder' in 'useDatagrid'");
+        }
+      }, 0);
       if (typeof _onSaveColumnPrefs === 'function') {
         _onSaveColumnPrefs(updatedColDefs);
       }

package/es/components/Datagrid/Datagrid/addons/Filtering/FilterFlyout.d.ts

@@ -1,7 +1,8 @@
 export default FilterFlyout;
-declare function FilterFlyout({ updateMethod, flyoutIconDescription, filters, title, primaryActionLabel, onFlyoutOpen, onFlyoutClose, onApply, onCancel, secondaryActionLabel, setAllFilters, data, reactTableFiltersState, }: {
+declare function FilterFlyout({ updateMethod, flyoutIconDescription, align, filters, title, primaryActionLabel, onFlyoutOpen, onFlyoutClose, onApply, onCancel, secondaryActionLabel, setAllFilters, data, reactTableFiltersState, }: {
     updateMethod: any;
     flyoutIconDescription?: string | undefined;
+    align?: string | undefined;
     filters?: any[] | undefined;
     title?: string | undefined;
     primaryActionLabel?: string | undefined;
@@ -16,6 +17,7 @@ declare function FilterFlyout({ updateMethod, flyoutIconDescription, filters, ti
 }): import("react/jsx-runtime").JSX.Element;
 declare namespace FilterFlyout {
     namespace propTypes {
+        let align: PropTypes.Requireable<string>;
         let data: PropTypes.Validator<any[]>;
         let filters: PropTypes.Validator<(PropTypes.InferProps<{
             type: PropTypes.Validator<string>;