@carbon/ibm-products 2.43.2-canary.32 → 2.43.2-canary.323

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,4 +1,10 @@
-import { PropsWithChildren, ReactNode } from 'react';
+/**
+ * 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 React, { PropsWithChildren, ReactNode } from 'react';
 import PropTypes from 'prop-types';
 interface DraggableElementProps extends PropsWithChildren {
     ariaLabel: string;
@@ -10,7 +16,7 @@ interface DraggableElementProps extends PropsWithChildren {
     selected?: boolean;
 }
 declare const DraggableElement: {
-    ({ id, children, classList, disabled, ariaLabel, isSticky, selected, }: DraggableElementProps): import("react/jsx-runtime").JSX.Element;
+    ({ id, children, classList, disabled, ariaLabel, isSticky, selected, }: DraggableElementProps): React.JSX.Element;
     propTypes: {
         ariaLabel: PropTypes.Validator<string>;
         children: PropTypes.Validator<PropTypes.ReactElementLike>;

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/{lib/components/Datagrid/Datagrid/addons/Slug/DatagridSlug.d.ts → es/components/Datagrid/Datagrid/addons/AiLabel/DatagridAiLabel.d.ts}

@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 import React, { ReactNode } from 'react';
-interface DatagridSlugProps {
-    slug?: ReactNode;
+interface DatagridAILabelProps {
+    aiLabel?: ReactNode;
 }
-export declare const DatagridSlug: React.ForwardRefExoticComponent<DatagridSlugProps & React.RefAttributes<HTMLDivElement>>;
+export declare const DatagridAILabel: React.ForwardRefExoticComponent<DatagridAILabelProps & React.RefAttributes<HTMLDivElement>>;
 export {};

package/es/components/Datagrid/Datagrid/addons/AiLabel/DatagridAiLabel.js

@@ -0,0 +1,29 @@
+/**
+ * Copyright IBM Corp. 2020, 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 React__default, { forwardRef, isValidElement } from 'react';
+import PropTypes from '../../../../../_virtual/index.js';
+
+var DatagridAILabel = /*#__PURE__*/forwardRef(function (_ref, ref) {
+  var aiLabel = _ref.aiLabel;
+  if (aiLabel && /*#__PURE__*/isValidElement(aiLabel)) {
+    var normalizedAILabel = /*#__PURE__*/React__default.cloneElement(aiLabel, {
+      size: 'mini',
+      ref: ref
+    });
+    return normalizedAILabel;
+  }
+  return null;
+});
+DatagridAILabel.propTypes = {
+  /**
+   * Specify the AI AILabel to be displayed
+   */
+  aiLabel: PropTypes.node
+};
+
+export { DatagridAILabel };

package/es/components/Datagrid/Datagrid/addons/CustomizeColumns/Actions.d.ts

@@ -3,7 +3,7 @@ declare function Actions({ searchText, setSearchText, findColumnPlaceholderLabel
     searchText: any;
     setSearchText: any;
     findColumnPlaceholderLabel: any;
-}): import("react/jsx-runtime").JSX.Element;
+}): React.JSX.Element;
 declare namespace Actions {
     namespace propTypes {
         let columns: PropTypes.Validator<any[]>;
@@ -15,4 +15,5 @@ declare namespace Actions {
         let setSearchText: PropTypes.Validator<(...args: any[]) => any>;
     }
 }
+import * as React from 'react';
 import PropTypes from 'prop-types';

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.d.ts

@@ -5,7 +5,7 @@ declare function ButtonWrapper({ onClick, setIsTearsheetOpen, isTearsheetOpen, i
     setIsTearsheetOpen: any;
     isTearsheetOpen: any;
     iconTooltipLabel?: string | undefined;
-}): import("react/jsx-runtime").JSX.Element;
+}): React.JSX.Element;
 declare namespace ButtonWrapper {
     namespace defaultProps {
         function onClick(): void;
@@ -18,4 +18,5 @@ declare namespace ButtonWrapper {
         export let setIsTearsheetOpen: PropTypes.Validator<(...args: any[]) => any>;
     }
 }
+import * as React from 'react';
 import PropTypes from 'prop-types';

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.d.ts

@@ -9,7 +9,7 @@ declare function Columns({ getVisibleColumnsCount, filterString, columns, setCol
     assistiveTextDisabledInstructionsLabel: any;
     selectAllLabel: any;
     customizeTearsheetHeadingLabel: any;
-}): import("react/jsx-runtime").JSX.Element;
+}): React.JSX.Element;
 declare namespace Columns {
     namespace propTypes {
         let assistiveTextDisabledInstructionsLabel: PropTypes.Requireable<string>;
@@ -26,4 +26,5 @@ declare namespace Columns {
         let setColumnsObject: PropTypes.Validator<(...args: any[]) => any>;
     }
 }
+import React from 'react';
 import PropTypes from 'prop-types';

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.d.ts

@@ -14,7 +14,7 @@ declare function CustomizeColumnsTearsheet({ isOpen, setIsTearsheetOpen, onSaveC
     assistiveTextInstructionsLabel?: string | undefined;
     assistiveTextDisabledInstructionsLabel?: string | undefined;
     selectAllLabel?: string | undefined;
-}): import("react/jsx-runtime").JSX.Element;
+}): React.JSX.Element;
 declare namespace CustomizeColumnsTearsheet {
     namespace propTypes {
         let assistiveTextDisabledInstructionsLabel: PropTypes.Requireable<string>;
@@ -33,4 +33,5 @@ declare namespace CustomizeColumnsTearsheet {
         let setIsTearsheetOpen: PropTypes.Validator<(...args: any[]) => any>;
     }
 }
+import React from 'react';
 import PropTypes from 'prop-types';

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(undefined);
   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.d.ts

@@ -5,7 +5,7 @@ export function DraggableItemsList({ columns, filterString, id, moveElement, onS
     moveElement: any;
     onSelectColumn: any;
     setAriaRegionText: any;
-}): import("react/jsx-runtime").JSX.Element;
+}): React.JSX.Element;
 export namespace DraggableItemsList {
     namespace propTypes {
         let columns: any;
@@ -16,3 +16,4 @@ export namespace DraggableItemsList {
         let setAriaRegionText: any;
     }
 }
+import React from 'react';

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.d.ts

@@ -1,10 +1,11 @@
 export default TearsheetWrapper;
 declare function TearsheetWrapper({ instance }: {
     instance: any;
-}): import("react/jsx-runtime").JSX.Element;
+}): React.JSX.Element;
 declare namespace TearsheetWrapper {
     namespace propTypes {
         let instance: PropTypes.Validator<object>;
     }
 }
+import React from 'react';
 import PropTypes from 'prop-types';

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;
@@ -13,9 +14,10 @@ declare function FilterFlyout({ updateMethod, flyoutIconDescription, filters, ti
     setAllFilters: any;
     data?: any[] | undefined;
     reactTableFiltersState?: any[] | undefined;
-}): import("react/jsx-runtime").JSX.Element;
+}): React.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>;
@@ -39,4 +41,5 @@ declare namespace FilterFlyout {
         let updateMethod: PropTypes.Validator<string>;
     }
 }
+import React from 'react';
 import PropTypes from 'prop-types';