@carbon/ibm-products 2.43.2-canary.22 → 2.43.2-canary.222

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

@@ -169,10 +169,10 @@ var DraggableItemsList = function DraggableItemsList(_ref) {
     strategy: sortable.verticalListSortingStrategy
   }, visibleCols.map(function (colDef) {
     var colHeaderTitle = getNodeTextContent.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["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(react.Checkbox, {

package/lib/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>;

package/lib/components/Datagrid/Datagrid/addons/Filtering/FilterFlyout.js

@@ -14,6 +14,7 @@ var constants = require('./constants.js');
 var react = require('@carbon/react');
 var React = require('react');
 var layout = require('@carbon/layout');
+var ActionSet = require('../../../../ActionSet/ActionSet.js');
 var icons = require('@carbon/react/icons');
 var index = require('../../../../../node_modules/prop-types/index.js');
 var cx = require('classnames');
@@ -23,7 +24,6 @@ var useShouldDisableButtons = require('./hooks/useShouldDisableButtons.js');
 var useWindowResize = require('../../../../../global/js/hooks/useWindowResize.js');
 var useClickOutside = require('../../../../../global/js/hooks/useClickOutside.js');
 var useSubscribeToEventEmitter = require('./hooks/useSubscribeToEventEmitter.js');
-var ActionSet = require('../../../../ActionSet/ActionSet.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -37,14 +37,20 @@ var defaults = {
   flyoutIconDescription: 'Open filters',
   title: 'Filter',
   primaryActionLabel: 'Apply',
-  secondaryActionLabel: 'Cancel'
+  secondaryActionLabel: 'Cancel',
+  align: 'bottom'
 };
+
+// Use same empty array every time, for benefit of useEffect() etc. dependency checking.
+var emptyArray = [];
 var FilterFlyout = function FilterFlyout(_ref) {
   var updateMethod = _ref.updateMethod,
     _ref$flyoutIconDescri = _ref.flyoutIconDescription,
     flyoutIconDescription = _ref$flyoutIconDescri === void 0 ? defaults.flyoutIconDescription : _ref$flyoutIconDescri,
+    _ref$align = _ref.align,
+    align = _ref$align === void 0 ? defaults.align : _ref$align,
     _ref$filters = _ref.filters,
-    filters = _ref$filters === void 0 ? [] : _ref$filters,
+    filters = _ref$filters === void 0 ? emptyArray : _ref$filters,
     _ref$title = _ref.title,
     title = _ref$title === void 0 ? defaults.title : _ref$title,
     _ref$primaryActionLab = _ref.primaryActionLabel,
@@ -61,9 +67,9 @@ var FilterFlyout = function FilterFlyout(_ref) {
     secondaryActionLabel = _ref$secondaryActionL === void 0 ? defaults.secondaryActionLabel : _ref$secondaryActionL,
     setAllFilters = _ref.setAllFilters,
     _ref$data = _ref.data,
-    data = _ref$data === void 0 ? [] : _ref$data,
+    data = _ref$data === void 0 ? emptyArray : _ref$data,
     _ref$reactTableFilter = _ref.reactTableFiltersState,
-    reactTableFiltersState = _ref$reactTableFilter === void 0 ? [] : _ref$reactTableFilter;
+    reactTableFiltersState = _ref$reactTableFilter === void 0 ? emptyArray : _ref$reactTableFilter;
   /** State */
   var _useState = React.useState(false),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
@@ -233,7 +239,7 @@ var FilterFlyout = function FilterFlyout(_ref) {
   }, /*#__PURE__*/React__default["default"].createElement(react.IconButton, {
     label: flyoutIconDescription,
     kind: "ghost",
-    align: "bottom",
+    align: align,
     onClick: open ? closeFlyout : openFlyout,
     className: cx__default["default"]("".concat(componentClass, "__trigger"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(componentClass, "__trigger--open"), open)),
     disabled: data.length === 0
@@ -250,6 +256,10 @@ var FilterFlyout = function FilterFlyout(_ref) {
   }, renderFilters())), renderActionSet()));
 };
 FilterFlyout.propTypes = {
+  /**
+   * Tooltip alignment for the filter button
+   */
+  align: index["default"].string,
   /**
    * All data rows in the table
    */

package/lib/components/Datagrid/Datagrid/addons/Filtering/FilterPanel.js

@@ -15,16 +15,17 @@ var constants = require('./constants.js');
 var React = require('react');
 var variants = require('./motion/variants.js');
 var framerMotion = require('framer-motion');
+var ActionSet = require('../../../../ActionSet/ActionSet.js');
 var icons = require('@carbon/react/icons');
 var FilterProvider = require('./FilterProvider.js');
 var index = require('../../../../../node_modules/prop-types/index.js');
 var cx = require('classnames');
 var settings = require('../../../../../settings.js');
 var layout = require('@carbon/layout');
-var ActionSet = require('../../../../ActionSet/ActionSet.js');
 var useFilters = require('./hooks/useFilters.js');
 var useShouldDisableButtons = require('./hooks/useShouldDisableButtons.js');
 var useSubscribeToEventEmitter = require('./hooks/useSubscribeToEventEmitter.js');
+var useIsomorphicEffect = require('../../../../../global/js/hooks/useIsomorphicEffect.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -42,6 +43,9 @@ var defaults = {
   searchLabelText: 'Filter search',
   searchPlaceholder: 'Find filters'
 };
+
+// Use same empty array every time, for benefit of useEffect() etc. dependency checking.
+var emptyArray = [];
 var FilterPanel = function FilterPanel(_ref) {
   var _ref$title = _ref.title,
     title = _ref$title === void 0 ? defaults.title : _ref$title,
@@ -71,7 +75,7 @@ var FilterPanel = function FilterPanel(_ref) {
     _ref$searchPlaceholde = _ref.searchPlaceholder,
     searchPlaceholder = _ref$searchPlaceholde === void 0 ? defaults.searchPlaceholder : _ref$searchPlaceholde,
     _ref$reactTableFilter = _ref.reactTableFiltersState,
-    reactTableFiltersState = _ref$reactTableFilter === void 0 ? [] : _ref$reactTableFilter,
+    reactTableFiltersState = _ref$reactTableFilter === void 0 ? emptyArray : _ref$reactTableFilter,
     _ref$autoHideFilters = _ref.autoHideFilters,
     autoHideFilters = _ref$autoHideFilters === void 0 ? false : _ref$autoHideFilters,
     _ref$isFetching = _ref.isFetching,
@@ -111,7 +115,7 @@ var FilterPanel = function FilterPanel(_ref) {
   var filterHeadingRef = React.useRef();
   var filterSearchRef = React.useRef();
   var actionSetRef = React.useRef();
-
+  var innerContainerRef = React.useRef();
   /** State from hooks */
   var _useShouldDisableButt = useShouldDisableButtons["default"]({
       initialValue: true,
@@ -194,11 +198,11 @@ var FilterPanel = function FilterPanel(_ref) {
   }, [filterPanelMinHeight]);
 
   // tableId is passed in from the event emitter from the FilterSummary component
-  // in  DatagridContent
+  // in DatagridContent
   useSubscribeToEventEmitter["default"](constants.CLEAR_FILTERS, function (tableId) {
     reset(tableId);
   });
-  var getScrollableContainerHeight = function getScrollableContainerHeight() {
+  var getScrollableContainerHeight = React.useCallback(function () {
     var _filterHeadingRef$cur, _filterSearchRef$curr, _actionSetRef$current;
     var filterHeadingHeight = (_filterHeadingRef$cur = filterHeadingRef.current) === null || _filterHeadingRef$cur === void 0 ? void 0 : _filterHeadingRef$cur.getBoundingClientRect().height;
     var filterSearchHeight = (_filterSearchRef$curr = filterSearchRef.current) === null || _filterSearchRef$curr === void 0 ? void 0 : _filterSearchRef$curr.getBoundingClientRect().height;
@@ -206,7 +210,13 @@ var FilterPanel = function FilterPanel(_ref) {
     var height = panelOpen ? "calc(100vh - ".concat(filterHeadingHeight, "px - ").concat( /* istanbul ignore next */
     showFilterSearch ? filterSearchHeight : 0, "px - ").concat(updateMethod === constants.BATCH ? actionSetHeight : 0, "px)") : 0;
     return height;
-  };
+  }, [filterHeadingRef, filterSearchRef, actionSetRef, panelOpen, showFilterSearch, updateMethod]);
+  useIsomorphicEffect.useIsomorphicEffect(function () {
+    var height = getScrollableContainerHeight();
+    if (innerContainerRef.current && innerContainerRef.current.style) {
+      innerContainerRef.current.style.height = height;
+    }
+  }, [getScrollableContainerHeight, innerContainerRef]);
   return /*#__PURE__*/React__default["default"].createElement(framerMotion.motion.div, {
     ref: filterPanelRef,
     className: cx__default["default"](componentClass, "".concat(componentClass, "__container"), _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(componentClass, "--open"), panelOpen), "".concat(componentClass, "--batch"), showActionSet), "".concat(componentClass, "--instant"), !showActionSet)),
@@ -246,9 +256,7 @@ var FilterPanel = function FilterPanel(_ref) {
     size: "sm"
   })))), /*#__PURE__*/React__default["default"].createElement("div", {
     className: "".concat(componentClass, "__inner-container"),
-    style: {
-      height: getScrollableContainerHeight()
-    },
+    ref: innerContainerRef,
     onScroll: onInnerContainerScroll
   }, filterSections.map(function (_ref2, index) {
     var _ref2$categoryTitle = _ref2.categoryTitle,

package/lib/components/Datagrid/Datagrid/addons/Filtering/FilterProvider.d.ts

@@ -1,8 +1,9 @@
 export const FilterContext: React.Context<any>;
-export function clearSingleFilter({ key, value }: {
+export function clearSingleFilter({ key, value, tableId }: {
     key: any;
     value: any;
-}, setAllFilters: any, state: any): void;
+    tableId: any;
+}, setAllFilters: any, state: any, contextTableId: any): void;
 export function FilterProvider({ children, filters, filterProps, tableId }: {
     children: any;
     filters: any;

package/lib/components/Datagrid/Datagrid/addons/Filtering/FilterProvider.js

@@ -55,9 +55,13 @@ var updateFilterState = function updateFilterState(state, type, value) {
   });
   return removeFilterItem(state, filterTagIndex);
 };
-var clearSingleFilter = function clearSingleFilter(_ref, setAllFilters, state) {
+var clearSingleFilter = function clearSingleFilter(_ref, setAllFilters, state, contextTableId) {
   var key = _ref.key,
-    value = _ref.value;
+    value = _ref.value,
+    tableId = _ref.tableId;
+  if (tableId !== contextTableId) {
+    return;
+  }
   var tempState = _rollupPluginBabelHelpers.toConsumableArray(state.filters);
   tempState.forEach(function (f, filterIndex) {
     if (f.id === key) {
@@ -70,7 +74,7 @@ var clearSingleFilter = function clearSingleFilter(_ref, setAllFilters, state) {
           This checks if all the checkboxes are selected = false and removes it from the array
         */
         var valueIndex = filterValues.findIndex(function (val) {
-          return val.id === value;
+          return val.value === value;
         });
         filterValues[valueIndex].selected = false;
         var updatedFilterObject = _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, f), {}, {
@@ -93,10 +97,11 @@ var clearSingleFilter = function clearSingleFilter(_ref, setAllFilters, state) {
   });
   setAllFilters(tempState);
 };
-var handleSingleFilterRemoval = function handleSingleFilterRemoval(key, value) {
+var handleSingleFilterRemoval = function handleSingleFilterRemoval(key, value, tableId) {
   EventEmitter.dispatch(constants.CLEAR_SINGLE_FILTER, {
     key: key,
-    value: value
+    value: value,
+    tableId: tableId
   });
 };
 var formatDateRange = function formatDateRange(startDate, endDate) {
@@ -104,7 +109,7 @@ var formatDateRange = function formatDateRange(startDate, endDate) {
   var endDateObj = new Date(endDate);
   return "".concat(startDateObj.toLocaleDateString(), " - ").concat(endDateObj.toLocaleDateString());
 };
-var prepareFiltersForTags = function prepareFiltersForTags(filters, renderDateLabel) {
+var prepareFiltersForTags = function prepareFiltersForTags(filters, renderDateLabel, tableId) {
   var tags = [];
   filters.forEach(function (_ref2) {
     var id = _ref2.id,
@@ -113,7 +118,7 @@ var prepareFiltersForTags = function prepareFiltersForTags(filters, renderDateLa
     var sharedFilterProps = {
       filter: true,
       onClose: function onClose() {
-        return handleSingleFilterRemoval(id, value);
+        return handleSingleFilterRemoval(id, value, tableId);
       }
     };
     if (type === constants.DROPDOWN || type === constants.RADIO || type === constants.NUMBER) {
@@ -138,7 +143,7 @@ var prepareFiltersForTags = function prepareFiltersForTags(filters, renderDateLa
             value: option.value
           }, sharedFilterProps), {}, {
             onClose: function onClose() {
-              return handleSingleFilterRemoval(id, option.value);
+              return handleSingleFilterRemoval(id, option.value, tableId);
             }
           }));
         }
@@ -168,7 +173,7 @@ var FilterProvider = function FilterProvider(_ref4) {
     tableId = _ref4.tableId;
   var _ref5 = filterProps || {},
     renderDateLabel = _ref5.renderDateLabel;
-  var filterTags = prepareFiltersForTags(filters, renderDateLabel);
+  var filterTags = prepareFiltersForTags(filters, renderDateLabel, tableId);
   var _useState = React.useState(false),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     panelOpen = _useState2[0],

package/lib/components/Datagrid/Datagrid/addons/Filtering/handleCheckboxChange.js

@@ -11,6 +11,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _rollupPluginBabelHelpers = require('../../../../../_virtual/_rollupPluginBabelHelpers.js');
 
+/**
+ * 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.
+ */
+
 var handleCheckboxChange = function handleCheckboxChange(_ref) {
   var _option$onChange;
   var checked = _ref.checked,

package/lib/components/Datagrid/Datagrid/addons/Filtering/hooks/useFilters.js

@@ -17,16 +17,19 @@ var OverflowCheckboxes = require('../OverflowCheckboxes.js');
 var utils = require('../utils.js');
 var FilterProvider = require('../FilterProvider.js');
 var handleCheckboxChange = require('../handleCheckboxChange.js');
+var uuidv4 = require('../../../../../../global/js/utils/uuidv4.js');
 var usePreviousValue = require('../../../../../../global/js/hooks/usePreviousValue.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
+// Use same empty array every time, for benefit of useEffect() etc. dependency checking.
+var emptyArray = [];
 var useFilters = function useFilters(_ref) {
   var updateMethod = _ref.updateMethod,
     _ref$filters = _ref.filters,
-    filters = _ref$filters === void 0 ? [] : _ref$filters,
+    filters = _ref$filters === void 0 ? emptyArray : _ref$filters,
     setAllFilters = _ref.setAllFilters,
     variation = _ref.variation,
     reactTableFiltersState = _ref.reactTableFiltersState,
@@ -55,6 +58,7 @@ var useFilters = function useFilters(_ref) {
   var previousState = usePreviousValue.usePreviousValue({
     panelOpen: panelOpen
   });
+  var filteredItemsRef = React.useRef();
 
   // When using batch actions we have to store the filters to then apply them later
   var prevFiltersRef = React.useRef(JSON.stringify(filtersState));
@@ -315,8 +319,18 @@ var useFilters = function useFilters(_ref) {
             }
             return null;
           }).filter(Boolean);
+          var isEqual = compareFilterItems(filteredItems);
+          if (!isEqual) {
+            filteredItemsRef.current = _rollupPluginBabelHelpers.toConsumableArray(filteredItems);
+          }
+          var getKey = function getKey() {
+            return isEqual ? {
+              key: uuidv4["default"]()
+            } : column;
+          };
           filter = /*#__PURE__*/React__default["default"].createElement(react.MultiSelect, _rollupPluginBabelHelpers["extends"]({}, components.MultiSelect, {
             selectedItems: filteredItems,
+            key: getKey(),
             onChange: function onChange(_ref9) {
               var _components$MultiSele, _components$MultiSele2;
               var selectedItems = _ref9.selectedItems;
@@ -332,6 +346,7 @@ var useFilters = function useFilters(_ref) {
                 }
                 return null;
               }).filter(Boolean);
+              filteredItemsRef.current = _rollupPluginBabelHelpers.toConsumableArray(foundItems);
 
               // Change selected state for those items that have been selected
               allOptions.map(function (a) {
@@ -374,6 +389,25 @@ var useFilters = function useFilters(_ref) {
       key: column
     }, filter);
   };
+  var compareFilterItems = function compareFilterItems(filteredItems) {
+    var _filteredItems$map, _filteredItemsRef$cur, _filteredItemsRef$cur2;
+    var filteredItemsId = (_filteredItems$map = filteredItems.map(function (item) {
+      return item.id;
+    })) !== null && _filteredItems$map !== void 0 ? _filteredItems$map : [];
+    var previousFilteredItemsId = (_filteredItemsRef$cur = filteredItemsRef === null || filteredItemsRef === void 0 || (_filteredItemsRef$cur2 = filteredItemsRef.current) === null || _filteredItemsRef$cur2 === void 0 ? void 0 : _filteredItemsRef$cur2.map(function (item) {
+      return item.id;
+    })) !== null && _filteredItemsRef$cur !== void 0 ? _filteredItemsRef$cur : [];
+    var set1 = new Set(filteredItemsId);
+    var set2 = new Set(previousFilteredItemsId);
+    // Check if the sets have the same size (same number of unique elements)
+    if (set1.size !== set2.size) {
+      return false;
+    }
+    // Check if all elements in set1 are also present in set2 (using spread syntax)
+    return _rollupPluginBabelHelpers.toConsumableArray(set1).every(function (element) {
+      return set2.has(element);
+    });
+  };
 
   /** This useEffect will properly handle the previous filters when the panel closes
    * 1. If the panel closes we need to call the reset fn but also store the

package/lib/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditButton/InlineEditButton.js

@@ -36,8 +36,7 @@ var InlineEditButton = function InlineEditButton(_ref) {
     tabIndex: isActiveCell ? 0 : -1,
     "data-disabled": disabledCell,
     "aria-disabled": disabledCell,
-    role: "button",
-    title: label
+    role: "button"
   }, LabelIcon && /*#__PURE__*/React__default["default"].createElement("div", {
     className: "".concat(blockClass, "__label-icon")
   }, /*#__PURE__*/React__default["default"].createElement(LabelIcon, null)), label !== '' ? /*#__PURE__*/React__default["default"].createElement("span", {
@@ -57,7 +56,7 @@ InlineEditButton.propTypes = {
   nonEditCell: index["default"].bool,
   placeholder: index["default"].string,
   renderIcon: index["default"].oneOfType([index["default"].func, index["default"].object]),
-  type: index["default"].oneOf(['text', 'number', 'selection', 'date']),
+  type: index["default"].oneOf(['text', 'number', 'selection', 'date', 'checkbox']),
   value: index["default"].oneOfType([index["default"].string, index["default"].node])
 };
 

package/lib/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditCell/InlineEditCell.js

@@ -19,6 +19,7 @@ var cx = require('classnames');
 var propsHelper = require('../../../../../../global/js/utils/props-helper.js');
 var InlineEditContext = require('../InlineEditContext/InlineEditContext.js');
 var usePreviousValue = require('../../../../../../global/js/hooks/usePreviousValue.js');
+var useIsomorphicEffect = require('../../../../../../global/js/hooks/useIsomorphicEffect.js');
 var InlineEditButton = require('../InlineEditButton/InlineEditButton.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -75,9 +76,9 @@ var InlineEditCell = function InlineEditCell(_ref) {
   var _ref2 = config || {},
     inputProps = _ref2.inputProps;
   var textInputRef = React.useRef();
+  var checkboxRef = React.useRef();
   var numberInputRef = React.useRef();
   var dropdownRef = React.useRef();
-  var datePickerRef = React.useRef();
   var outerButtonElement = React.useRef();
   var rowSize = instance.rowSize,
     onDataUpdate = instance.onDataUpdate;
@@ -211,16 +212,42 @@ var InlineEditCell = function InlineEditCell(_ref) {
   };
   var getNewCellId = function getNewCellId(key) {
     var totalRows = instance.rows.length;
-    var newCellId = key === 'Enter' ? "column-".concat(columnIndex, "-row-").concat(cell.row.index < totalRows - 1 ? cell.row.index + 1 : cell.row.index) : "column-".concat(columnIndex < instance.columns.length - 1 ? columnIndex + 1 : columnIndex, "-row-").concat(cell.row.index);
+    var newCellId = key === 'Enter' ? "column-".concat(columnIndex, "-row-").concat(cell.row.index < totalRows - 1 && type === 'checkbox' ? cell.row.index + 1 : cell.row.index) : "column-".concat(columnIndex < instance.columns.length - 1 ? columnIndex + 1 : columnIndex, "-row-").concat(cell.row.index);
     return newCellId;
   };
   var handleKeyDown = function handleKeyDown(event) {
     var key = event.key;
     switch (key) {
+      case 'ArrowRight':
+      case 'ArrowLeft':
+      case 'ArrowUp':
+      case 'ArrowDown':
+        if (inEditMode && event.target.type === 'checkbox') {
+          var newCellId = getNewCellId(key);
+          saveCellData(cellValue);
+          setInitialValue(cellValue);
+          dispatch({
+            type: 'EXIT_EDIT_MODE',
+            payload: newCellId
+          });
+          setInEditMode(false);
+          sendFocusBackToGrid();
+        }
+        break;
       // Save cell contents to data
       case 'Tab':
       case 'Enter':
         {
+          if (type === 'checkbox') {
+            // Since checkbox doesn't need to click into it to enter `inEditMode` we don't need to check for it
+            var _newCellId = getNewCellId(key);
+            dispatch({
+              type: 'EXIT_EDIT_MODE',
+              payload: _newCellId
+            });
+            setInEditMode(false);
+            sendFocusBackToGrid();
+          }
           if (inEditMode) {
             // Dropdown saves are handled in the Dropdown's/DatePicker's onChange prop
             if (type === 'selection' || type === 'date') {
@@ -234,12 +261,12 @@ var InlineEditCell = function InlineEditCell(_ref) {
             if (isInvalid) {
               return;
             }
-            var newCellId = getNewCellId(key);
+            var _newCellId2 = getNewCellId(key);
             saveCellData(cellValue);
             setInitialValue(cellValue);
             dispatch({
               type: 'EXIT_EDIT_MODE',
-              payload: newCellId
+              payload: _newCellId2
             });
             setInEditMode(false);
             sendFocusBackToGrid();
@@ -281,6 +308,13 @@ var InlineEditCell = function InlineEditCell(_ref) {
       return renderDropdownItem(item);
     } : null;
   };
+  useIsomorphicEffect.useIsomorphicEffect(function () {
+    if (dropdownRef.current && dropdownRef.current.style) {
+      var closestElement = dropdownRef.current.closest(".".concat(blockClass, "__inline-edit--select"));
+      closestElement.style.width = "".concat(cell.column.totalWidth, "px");
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [dropdownRef.current, cell.column.totalWidth]);
   var renderSelectCell = function renderSelectCell() {
     var _ref6 = config || {},
       inputProps = _ref6.inputProps;
@@ -290,9 +324,6 @@ var InlineEditCell = function InlineEditCell(_ref) {
       ariaLabel: cellLabel || 'Dropdown menu options'
     }, inputProps, {
       hideLabel: true,
-      style: {
-        width: cell.column.totalWidth
-      },
       className: cx__default["default"]("".concat(blockClass, "__inline-edit--select"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__inline-edit--select-").concat(rowSize), rowSize)),
       items: (inputProps === null || inputProps === void 0 ? void 0 : inputProps.items) || [],
       initialSelectedItem: cell.value,
@@ -327,7 +358,8 @@ var InlineEditCell = function InlineEditCell(_ref) {
           }
         }
       },
-      ref: dropdownRef
+      ref: dropdownRef,
+      autoAlign: true
     }));
   };
   var setRenderIcon = function setRenderIcon() {
@@ -344,20 +376,21 @@ var InlineEditCell = function InlineEditCell(_ref) {
       return icons.Calendar;
     }
   };
-  var renderRegularCell = function renderRegularCell() {
-    return /*#__PURE__*/React__default["default"].createElement("span", _rollupPluginBabelHelpers["extends"]({}, inputProps, {
-      id: cellId
-    }));
-  };
   var renderDateCell = function renderDateCell() {
     var _config$inputProps, _outerButtonElement$c;
     var datePickerPreparedProps = propsHelper.prepareProps(config.inputProps, ['datePickerInputProps']);
     var datePickerInputProps = config === null || config === void 0 || (_config$inputProps = config.inputProps) === null || _config$inputProps === void 0 ? void 0 : _config$inputProps.datePickerInputProps;
     return /*#__PURE__*/React__default["default"].createElement(react.DatePicker, _rollupPluginBabelHelpers["extends"]({}, datePickerPreparedProps, {
       appendTo: outerButtonElement === null || outerButtonElement === void 0 || (_outerButtonElement$c = outerButtonElement.current) === null || _outerButtonElement$c === void 0 ? void 0 : _outerButtonElement$c.parentElement,
-      ref: datePickerRef,
-      style: {
-        width: cell.column.totalWidth
+      ref: function ref(el) {
+        if (el && el.style) {
+          el.style.width = "".concat(cell.column.totalWidth, "px");
+          var elementId = "".concat(blockClass, "__inline-edit--date-picker--").concat(cell.row.index);
+          var element = el.querySelector("input#".concat(elementId));
+          if (element) {
+            element.style.position = 'static';
+          }
+        }
       },
       datePickerType: "single",
       className: cx__default["default"]("".concat(blockClass, "__inline-edit--date"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__inline-edit--date-").concat(rowSize), rowSize)),
@@ -380,9 +413,6 @@ var InlineEditCell = function InlineEditCell(_ref) {
       },
       value: cell.value
     }), /*#__PURE__*/React__default["default"].createElement(react.DatePickerInput, _rollupPluginBabelHelpers["extends"]({}, datePickerInputProps, {
-      style: {
-        position: 'static'
-      },
       placeholder: (datePickerInputProps === null || datePickerInputProps === void 0 ? void 0 : datePickerInputProps.placeholder) || 'mm/dd/yyyy',
       labelText: (datePickerInputProps === null || datePickerInputProps === void 0 ? void 0 : datePickerInputProps.labelText) || cellLabel || 'Set date',
       id: "".concat(blockClass, "__inline-edit--date-picker--").concat(cell.row.index),
@@ -434,9 +464,27 @@ var InlineEditCell = function InlineEditCell(_ref) {
       ref: numberInputRef
     }));
   };
+  var renderCheckBoxCell = function renderCheckBoxCell() {
+    return /*#__PURE__*/React__default["default"].createElement(react.Checkbox, _rollupPluginBabelHelpers["extends"]({
+      labelText: cellLabel || 'Checkbox'
+    }, inputProps, {
+      className: cx__default["default"]("".concat(blockClass, "__inline-edit--outer-cell-checkbox"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__inline-edit--outer-cell-checkbox-focus"), activeCellId === cellId)),
+      id: cellId,
+      hideLabel: true,
+      checked: cellValue,
+      onChange: function onChange(event, _ref10) {
+        var checked = _ref10.checked;
+        setCellValue(checked);
+        if (inputProps.onChange) {
+          inputProps.onChange(checked);
+        }
+      },
+      ref: checkboxRef
+    }));
+  };
   var renderTextInput = function renderTextInput() {
-    var _ref10 = config || {},
-      validator = _ref10.validator;
+    var _ref11 = config || {},
+      validator = _ref11.validator;
     var isInvalid = validator === null || validator === void 0 ? void 0 : validator(cellValue);
     return /*#__PURE__*/React__default["default"].createElement(react.TextInput, _rollupPluginBabelHelpers["extends"]({
       labelText: cellLabel,
@@ -487,7 +535,7 @@ var InlineEditCell = function InlineEditCell(_ref) {
       onClick: !nonEditCell ? handleInlineCellClick : addActiveState,
       onKeyDown: !nonEditCell ? handleKeyDown : null,
       className: cx__default["default"]("".concat(blockClass, "__inline-edit--outer-cell-button"), _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__inline-edit--outer-cell-button--").concat(rowSize), rowSize), "".concat(blockClass, "__inline-edit--outer-cell-button--lg"), !rowSize), "".concat(blockClass, "__inline-edit--outer-cell-button--invalid"), inEditMode && (config === null || config === void 0 || (_config$validator = config.validator) === null || _config$validator === void 0 ? void 0 : _config$validator.call(config, cellValue))), "".concat(blockClass, "__static--outer-cell"), !disabledCell))
-    }, !nonEditCell && !disabledCell && renderRegularCell(), (!inEditMode || disabledCell) && /*#__PURE__*/React__default["default"].createElement(InlineEditButton.InlineEditButton, {
+    }, (!inEditMode || disabledCell) && type !== 'checkbox' && /*#__PURE__*/React__default["default"].createElement(InlineEditButton.InlineEditButton, {
       isActiveCell: cellId === activeCellId,
       renderIcon: setRenderIcon(),
       label: getLabel(),
@@ -498,7 +546,7 @@ var InlineEditCell = function InlineEditCell(_ref) {
       nonEditCell: nonEditCell,
       columnConfig: cell.column,
       type: type
-    }), !nonEditCell && inEditMode && cellId === activeCellId && /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, type === 'text' && renderTextInput(), type === 'number' && renderNumberInput(), type === 'selection' && renderSelectCell(), type === 'date' && renderDateCell()))
+    }), type === 'checkbox' && renderCheckBoxCell(), !nonEditCell && inEditMode && cellId === activeCellId && /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, type === 'text' && renderTextInput(), type === 'number' && renderNumberInput(), type === 'selection' && renderSelectCell(), type === 'date' && renderDateCell()))
   );
 };
 InlineEditCell.propTypes = {
@@ -516,7 +564,7 @@ InlineEditCell.propTypes = {
   nonEditCell: index["default"].bool,
   placeholder: index["default"].string,
   tabIndex: index["default"].number,
-  type: index["default"].oneOf(['text', 'number', 'selection', 'date']),
+  type: index["default"].oneOf(['text', 'number', 'selection', 'date', 'checkbox']),
   value: index["default"].oneOfType([index["default"].string, index["default"].node, index["default"].object])
 };
 

package/lib/components/Datagrid/Datagrid/addons/InlineEdit/handleGridKeyPress.js

@@ -78,7 +78,7 @@ var handleGridKeyPress = function handleGridKeyPress(_ref) {
   };
 
   // Stop grid key listener when in edit mode
-  var isEditing = document.activeElement.id === activeCellId && document.activeElement.id === editId || dropdownIsActive() || datePickerIsActive();
+  var isEditing = focusedCell.getAttribute('data-inline-type') !== 'checkbox' && document.activeElement.id === activeCellId && document.activeElement.id === editId || dropdownIsActive() || datePickerIsActive();
   if (isEditing || !gridActive) {
     return;
   }
@@ -91,6 +91,7 @@ var handleGridKeyPress = function handleGridKeyPress(_ref) {
     event.preventDefault();
   }
   var isDisabledCell = focusedCell.getAttribute('data-disabled') === 'false' ? false : true;
+  var isEditableCell = !event.target.classList.contains("".concat(blockClass, "__inline-edit-button--non-edit"));
   var sharedUpdateParams = {
     oldId: activeCellId,
     instance: instance
@@ -198,7 +199,7 @@ var handleGridKeyPress = function handleGridKeyPress(_ref) {
       case 'Enter':
         {
           // Disabled cells are not allowed to go into edit mode
-          if (isDisabledCell) {
+          if (isDisabledCell || !isEditableCell) {
             return;
           }
           // Only go into edit mode if there is no editId, meaning that we're not already in edit mode
@@ -211,6 +212,13 @@ var handleGridKeyPress = function handleGridKeyPress(_ref) {
                 dropdownTrigger === null || dropdownTrigger === void 0 || dropdownTrigger.click();
               }, 1);
             }
+            if (focusedType === 'checkbox') {
+              setTimeout(function () {
+                var checkboxTrigger = focusedCell.querySelector('input');
+                checkboxTrigger === null || checkboxTrigger === void 0 || checkboxTrigger.click();
+                checkboxTrigger === null || checkboxTrigger === void 0 || checkboxTrigger.focus();
+              }, 1);
+            }
             if (focusedType === 'date') {
               setTimeout(function () {
                 var dateInputTrigger = focusedCell.querySelector('input');

package/lib/components/Datagrid/Datagrid/addons/RowSize/RowSizeRadioGroup.js

@@ -41,7 +41,7 @@ var RowSizeRadioGroup = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     ref: ref
   }, /*#__PURE__*/React__default["default"].createElement(react.RadioButtonGroup, {
     legendText: legendText,
-    name: "row-height-group",
+    name: "".concat(tableId, "--row-height-group"),
     orientation: "vertical",
     defaultSelected: getBackwardCompatibleRowSize(selectedOption),
     onChange: onChange