@carbon/ibm-products 1.59.1 → 1.60.0

package/es/components/Datagrid/Datagrid/DatagridEmptyBody.js

@@ -9,7 +9,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { pkg } from '../../../settings';
 import { DataTable } from 'carbon-components-react';
-import { NoDataEmptyState, ErrorEmptyState, NotFoundEmptyState } from '../../EmptyStates';
+import { NoDataEmptyState, ErrorEmptyState, NotFoundEmptyState, EmptyState } from '../../EmptyStates';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var TableBody = DataTable.TableBody,
   TableRow = DataTable.TableRow,
@@ -33,13 +33,13 @@ var DatagridEmptyBody = function DatagridEmptyBody(datagridState) {
     action: emptyStateAction,
     link: emptyStateLink
   };
+  var validEmptyStates = ['error', 'noData', 'notFound'];
   return /*#__PURE__*/React.createElement(TableBody, _extends({}, getTableBodyProps({
     role: false
   }), {
     className: "".concat(blockClass, "__empty-state-body")
   }), /*#__PURE__*/React.createElement(TableRow, null, /*#__PURE__*/React.createElement(TableCell, {
-    colSpan: headers.length,
-    className: "".concat(blockClass, "__empty-state-cell")
-  }, emptyStateType === 'error' && /*#__PURE__*/React.createElement(ErrorEmptyState, emptyStateProps), emptyStateType === 'noData' && /*#__PURE__*/React.createElement(NoDataEmptyState, emptyStateProps), emptyStateType === 'notFound' && /*#__PURE__*/React.createElement(NotFoundEmptyState, emptyStateProps))));
+    colSpan: headers.length
+  }, validEmptyStates.includes(emptyStateType) ? /*#__PURE__*/React.createElement(React.Fragment, null, emptyStateType === 'error' && /*#__PURE__*/React.createElement(ErrorEmptyState, emptyStateProps), emptyStateType === 'noData' && /*#__PURE__*/React.createElement(NoDataEmptyState, emptyStateProps), emptyStateType === 'notFound' && /*#__PURE__*/React.createElement(NotFoundEmptyState, emptyStateProps)) : /*#__PURE__*/React.createElement(EmptyState, emptyStateProps))));
 };
 export default DatagridEmptyBody;

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

@@ -50,11 +50,23 @@ var SelectAll = function SelectAll(datagridState) {
   var _getProps = getProps(),
     onChange = _getProps.onChange,
     selectProps = _objectWithoutProperties(_getProps, _excluded);
+  var _ref = selectProps || {},
+    indeterminate = _ref.indeterminate;
+  var handleSelectAllChange = function handleSelectAllChange(event) {
+    if (indeterminate) {
+      return onChange === null || onChange === void 0 ? void 0 : onChange({
+        target: {
+          checked: false
+        }
+      });
+    }
+    return onChange === null || onChange === void 0 ? void 0 : onChange(event);
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: cx("".concat(blockClass, "__head-select-all"), "".concat(blockClass, "__checkbox-cell"), _defineProperty({}, "".concat(blockClass, "__checkbox-cell-sticky-left"), isFirstColumnStickyLeft && windowSize > 671))
   }, /*#__PURE__*/React.createElement(TableSelectAll, _extends({}, selectProps, {
     name: "".concat(tableId, "-select-all-checkbox-name"),
-    onSelect: onChange,
+    onSelect: handleSelectAllChange,
     disabled: isFetching || selectProps.disabled,
     id: "".concat(tableId, "-select-all-checkbox-id")
   })));

package/es/components/Datagrid/Datagrid/DatagridToolbar.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 /**
- * Copyright IBM Corp. 2022, 2022
+ * Copyright IBM Corp. 2022, 2023
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
@@ -70,20 +70,8 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
       menuOptionsClass: "".concat(blockClass, "__button-menu-options"),
       flipped: true
     }, toolbarBatchActions && toolbarBatchActions.map(function (batchAction, index) {
-      if (index < 2) {
-        if (displayAllInMenu) {
-          return /*#__PURE__*/React.createElement(ButtonMenuItem, {
-            key: "".concat(batchAction.label, "-").concat(index),
-            itemText: batchAction.label,
-            onClick: function onClick() {
-              batchAction.onClick();
-              if (batchAction.type === 'select_all') {
-                toggleAllRowsSelected(true);
-              }
-            }
-          });
-        }
-        return null;
+      if (index < 2 && !displayAllInMenu) {
+        return;
       }
       return /*#__PURE__*/React.createElement(ButtonMenuItem, {
         key: "".concat(batchAction.label, "-").concat(index),

package/es/components/Datagrid/Datagrid/DraggableElement.js

@@ -1,5 +1,5 @@
+import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 // @flow
 /*
  * Licensed Materials - Property of IBM
@@ -8,166 +8,63 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
  * US Government Users Restricted Rights - Use, duplication or disclosure
  * restricted by GSA ADP Schedule Contract with IBM Corp.
  */
-import * as React from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import { Draggable16, Locked16 } from '@carbon/icons-react';
-import { useDrag, useDrop } from 'react-dnd';
 import cx from 'classnames';
 import { pkg } from '../../../settings';
-var useEffect = React.useEffect,
-  useRef = React.useRef,
-  useState = React.useState;
+import { CSS } from '@dnd-kit/utilities';
+import { useSortable } from '@dnd-kit/sortable';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
-var DRAG_TYPE = "".concat(blockClass, "__shared-ui-draggable-element");
 var DraggableElement = function DraggableElement(_ref) {
   var _cx;
   var id = _ref.id,
-    index = _ref.index,
-    listData = _ref.listData,
     children = _ref.children,
-    type = _ref.type,
+    classList = _ref.classList,
     disabled = _ref.disabled,
     ariaLabel = _ref.ariaLabel,
-    onGrab = _ref.onGrab,
-    onArrowKeyDown = _ref.onArrowKeyDown,
-    isFocused = _ref.isFocused,
     isSticky = _ref.isSticky,
-    moveElement = _ref.moveElement,
-    selected = _ref.selected,
-    _ref$positionLabel = _ref.positionLabel,
-    positionLabel = _ref$positionLabel === void 0 ? 'Current position {index} of {total}' : _ref$positionLabel,
-    _ref$grabbedLabel = _ref.grabbedLabel,
-    grabbedLabel = _ref$grabbedLabel === void 0 ? '{itemName} grabbed.' : _ref$grabbedLabel,
-    _ref$droppedLabel = _ref.droppedLabel,
-    droppedLabel = _ref$droppedLabel === void 0 ? '{itemName} dropped.' : _ref$droppedLabel;
-  var ref = useRef();
-  var _useDrop = useDrop({
-      accept: DRAG_TYPE + type,
-      collect: function collect(monitor) {
-        return {
-          isOver: !!monitor.isOver()
-        };
-      },
-      drop: function drop(item) {
-        moveElement(item.index, index);
-      },
-      canDrop: function canDrop() {
-        return !disabled;
-      },
-      hover: function hover(item) {
-        var dragIndex = item.index;
-        var hoverIndex = index;
-        // Don't replace items with themselves
-        if (dragIndex === hoverIndex || disabled) {
-          return;
-        }
-        moveElement(dragIndex, hoverIndex);
-        // Time to actually perform the action
-        // Note: we're mutating the monitor item here!
-        // Generally it's better to avoid mutations,
-        // but it's good here for the sake of performance
-        // to avoid expensive index searches.
-        // eslint-disable-next-line no-param-reassign
-        item.index = hoverIndex;
-      }
+    selected = _ref.selected;
+  var _useSortable = useSortable({
+      id: id
     }),
-    _useDrop2 = _slicedToArray(_useDrop, 2),
-    isOver = _useDrop2[0].isOver,
-    drop = _useDrop2[1];
-  var _useDrag = useDrag({
-      type: DRAG_TYPE + type,
-      item: {
-        id: id,
-        index: index
-      },
-      canDrag: function canDrag() {
-        return !disabled;
-      },
-      collect: function collect(monitor) {
-        return {
-          isDragging: monitor.isDragging()
-        };
-      }
-    }),
-    _useDrag2 = _slicedToArray(_useDrag, 3),
-    isDragging = _useDrag2[0].isDragging,
-    drag = _useDrag2[1],
-    preview = _useDrag2[2];
-  useEffect(function () {
-    if (isFocused && ref && ref.current) {
-      ref.current.focus();
-    }
-  }, [isFocused]);
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    isGrabbed = _useState2[0],
-    setIsGrabbed = _useState2[1];
-  var _useState3 = useState(isFocused),
-    _useState4 = _slicedToArray(_useState3, 2),
-    isFocusedOnItem = _useState4[0],
-    setIsFocusedOnItem = _useState4[1];
-  drop(ref);
+    attributes = _useSortable.attributes,
+    isDragging = _useSortable.isDragging,
+    listeners = _useSortable.listeners,
+    setNodeRef = _useSortable.setNodeRef,
+    transform = _useSortable.transform,
+    transition = _useSortable.transition;
   var content = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: cx({
       disabled: disabled
     }, "".concat(blockClass, "__draggable-handleStyle"))
   }, isSticky ? /*#__PURE__*/React.createElement(Locked16, null) : /*#__PURE__*/React.createElement(Draggable16, null)), children);
-  return /*#__PURE__*/React.createElement("li", {
-    className: cx((_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__draggable-handleHolder-isOver"), isOver && !disabled), _defineProperty(_cx, "".concat(blockClass, "__draggable-handleHolder-grabbed"), isGrabbed), _defineProperty(_cx, "".concat(blockClass, "__draggable-handleHolder-selected"), selected), _defineProperty(_cx, "".concat(blockClass, "__draggable-handleHolder--sticky"), isSticky), _defineProperty(_cx, "".concat(blockClass, "__draggable-handleHolder"), !selected), _cx)),
-    ref: ref,
-    "aria-selected": isFocused,
-    role: "option",
-    tabIndex: isFocused ? 0 : -1,
-    onKeyPress: function onKeyPress(e) {
-      if (e.key === ' ' && e.target === e.currentTarget && !disabled) {
-        var positionText = positionLabel.replace('{index}', index + 1).replace('{total}', listData.length);
-        var grabAriaText = (isGrabbed ? droppedLabel : grabbedLabel).replace('{itemName}', ariaLabel);
-        onGrab(grabAriaText + positionText);
-        setIsGrabbed(!isGrabbed);
-        e.preventDefault();
-      }
-    },
-    onKeyDown: function onKeyDown(e) {
-      if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
-        onArrowKeyDown(e, isGrabbed, index);
-      }
-    },
-    onBlur: function onBlur(e) {
-      // handle when focus move to inner elements
-      setIsFocusedOnItem(e.currentTarget === e.target);
-    },
-    onFocus: function onFocus(e) {
-      // handle when focus move to li element
-      setIsFocusedOnItem(e.currentTarget === e.target);
-    }
-  }, /*#__PURE__*/React.createElement("span", {
+  var style = {
+    transform: CSS.Transform.toString(transform),
+    transition: transition
+  };
+  return /*#__PURE__*/React.createElement("li", _extends({
+    className: cx(classList, "".concat(blockClass, "__draggable-handleHolder"), (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__draggable-handleHolder--selected"), selected), _defineProperty(_cx, "".concat(blockClass, "__draggable-handleHolder--sticky"), isSticky), _defineProperty(_cx, "".concat(blockClass, "__draggable-handleHolder--dragging"), isDragging), _cx)),
+    id: id,
+    ref: setNodeRef,
+    style: style
+  }, attributes, listeners, {
+    disabled: disabled,
+    "aria-selected": selected,
+    role: "option"
+  }), /*#__PURE__*/React.createElement("span", {
     className: "".concat(blockClass, "__shared-ui--assistive-text")
-  }, ariaLabel), isDragging && !isOver ? /*#__PURE__*/React.createElement("div", {
-    ref: preview,
-    className: "".concat(blockClass, "__draggable-handleHolder-droppable ").concat(blockClass, "__draggable-handleHolder-droppable--origin")
-  }, content) : /*#__PURE__*/React.createElement("div", {
-    ref: drag,
-    "aria-hidden": isFocused && isFocusedOnItem // if focus on li, hide the children from aria
-    ,
+  }, ariaLabel), /*#__PURE__*/React.createElement("div", {
     className: cx(_defineProperty({}, "".concat(blockClass, "__draggable-handleStyle"), !disabled), ["".concat(blockClass, "__draggable-handleHolder-droppable")])
-  }, (!isOver || disabled) && content));
+  }, content));
 };
 DraggableElement.propTypes = {
   ariaLabel: PropTypes.string.isRequired,
   children: PropTypes.element.isRequired,
+  classList: PropTypes.string,
   disabled: PropTypes.bool,
-  droppedLabel: PropTypes.string,
-  grabbedLabel: PropTypes.string,
   id: PropTypes.string.isRequired,
-  index: PropTypes.number.isRequired,
-  isFocused: PropTypes.bool.isRequired,
   isSticky: PropTypes.bool,
-  listData: PropTypes.array.isRequired,
-  moveElement: PropTypes.func.isRequired,
-  onArrowKeyDown: PropTypes.func.isRequired,
-  onGrab: PropTypes.func.isRequired,
-  positionLabel: PropTypes.string,
-  selected: PropTypes.bool,
-  type: PropTypes.string.isRequired
+  selected: PropTypes.bool
 };
 export default DraggableElement;

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

@@ -1,32 +1,21 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 /**
- * Copyright IBM Corp. 2022, 2022
+ * Copyright IBM Corp. 2022, 2023
  *
  * 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 from 'react';
+import React, { useRef } from 'react';
 import PropTypes from 'prop-types';
-import { DndProvider } from 'react-dnd';
-import { HTML5Backend } from 'react-dnd-html5-backend';
 import { Checkbox } from 'carbon-components-react';
 import update from 'immutability-helper';
 import { pkg } from '../../../../../settings';
 import classNames from 'classnames';
 import { DraggableItemsList } from './DraggableItemsList';
+import uuidv4 from '../../../../../global/js/utils/uuidv4';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
-var getNextIndex = function getNextIndex(array, currentIndex, key) {
-  var newIndex = -1;
-  if (key === 'ArrowUp') {
-    newIndex = currentIndex - 1 >= 0 ? currentIndex - 1 : array.length - 1;
-  }
-  if (key === 'ArrowDown') {
-    newIndex = currentIndex + 1 < array.length ? currentIndex + 1 : 0;
-  }
-  return newIndex;
-};
 var Columns = function Columns(_ref) {
   var getVisibleColumnsCount = _ref.getVisibleColumnsCount,
     filterString = _ref.filterString,
@@ -36,36 +25,26 @@ var Columns = function Columns(_ref) {
     assistiveTextInstructionsLabel = _ref.assistiveTextInstructionsLabel,
     assistiveTextDisabledInstructionsLabel = _ref.assistiveTextDisabledInstructionsLabel,
     selectAllLabel = _ref.selectAllLabel;
+  var listId = useRef(uuidv4()); // keep id between renders
+  var listRef = useRef(null);
   var _React$useState = React.useState(''),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     ariaRegionText = _React$useState2[0],
     setAriaRegionText = _React$useState2[1];
-  var _React$useState3 = React.useState(-1),
-    _React$useState4 = _slicedToArray(_React$useState3, 2),
-    focusIndex = _React$useState4[0],
-    setFocusIndex = _React$useState4[1];
-  var moveElement = React.useCallback(function (dragIndex, hoverIndex) {
-    var dragCard = columns[dragIndex];
+  // after a drag/drop action set the columns
+  var moveElement = React.useCallback(function (from, to) {
+    var fromCol = columns[from];
     setColumnsObject(update(columns, {
-      $splice: [[dragIndex, 1], [hoverIndex, 0, dragCard]]
+      $splice: [[from, 1], [to, 0, fromCol]]
     }));
   }, [columns, setColumnsObject]);
   return /*#__PURE__*/React.createElement("div", {
-    className: "".concat(blockClass, "__customize-columns-column-list")
-  }, /*#__PURE__*/React.createElement(DndProvider, {
-    backend: HTML5Backend
+    className: "".concat(blockClass, "__customize-columns-column-list"),
+    ref: listRef
   }, /*#__PURE__*/React.createElement("ol", {
     className: "".concat(blockClass, "__customize-columns-column-list--focus"),
     role: "listbox",
     "aria-describedby": "".concat(blockClass, "__customize-columns--instructions"),
-    onKeyDown: function onKeyDown(e) {
-      var nextIndex = getNextIndex(columns, focusIndex, e.key);
-      if (nextIndex >= 0) {
-        setFocusIndex(nextIndex);
-        e.preventDefault();
-        e.stopPropagation();
-      }
-    },
     tabIndex: 0
   }, /*#__PURE__*/React.createElement("span", {
     "aria-live": "assertive",
@@ -87,16 +66,13 @@ var Columns = function Columns(_ref) {
     id: "".concat(blockClass, "__customization-column-select-all"),
     labelText: selectAllLabel
   })), /*#__PURE__*/React.createElement(DraggableItemsList, {
+    id: listId.current,
     columns: columns,
     filterString: filterString,
-    focusIndex: focusIndex,
-    getNextIndex: getNextIndex,
     moveElement: moveElement,
-    onSelectColumn: onSelectColumn,
     setAriaRegionText: setAriaRegionText,
-    setColumnsObject: setColumnsObject,
-    setFocusIndex: setFocusIndex
-  }))));
+    onSelectColumn: onSelectColumn
+  })));
 };
 Columns.propTypes = {
   assistiveTextDisabledInstructionsLabel: PropTypes.string,

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

@@ -75,6 +75,7 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
     isDirty = _useState10[0],
     setIsDirty = _useState10[1];
   var onRequestClose = function onRequestClose() {
+    setColumnObjects(columnDefinitions);
     setIsTearsheetOpen(false);
   };
   var onRequestSubmit = function onRequestSubmit() {

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

@@ -1,3 +1,6 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 /**
  * Copyright IBM Corp. 2023, 2023
  *
@@ -12,18 +15,21 @@ import { isColumnVisible } from './common';
 import DraggableElement from '../../DraggableElement';
 import { pkg } from '../../../../../settings';
 import getColTitle from '../../../utils/getColTitle';
+import { DndContext, KeyboardSensor, PointerSensor, closestCenter, useSensor, useSensors } from '@dnd-kit/core';
+import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
+var matchedColsById = function matchedColsById(col1, col2) {
+  return col1 && col2 && col1.id === col2.id;
+};
 export var DraggableItemsList = function DraggableItemsList(_ref) {
   var columns = _ref.columns,
     filterString = _ref.filterString,
-    focusIndex = _ref.focusIndex,
-    getNextIndex = _ref.getNextIndex,
+    id = _ref.id,
     moveElement = _ref.moveElement,
     onSelectColumn = _ref.onSelectColumn,
-    setAriaRegionText = _ref.setAriaRegionText,
-    setColumnsObject = _ref.setColumnsObject,
-    setFocusIndex = _ref.setFocusIndex;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, columns
+    setAriaRegionText = _ref.setAriaRegionText;
+  var draggableClass = "".concat(blockClass, "__draggable-item");
+  var visibleCols = columns
   // hide the columns without Header, e.g the sticky actions, spacer
   .filter(function (colDef) {
     return !!getColTitle(colDef);
@@ -32,7 +38,108 @@ export var DraggableItemsList = function DraggableItemsList(_ref) {
   }).filter(function (colDef) {
     var _getColTitle;
     return filterString.length === 0 || ((_getColTitle = getColTitle(colDef)) === null || _getColTitle === void 0 ? void 0 : _getColTitle.toLowerCase().includes(filterString)) && colDef.id !== 'spacer';
-  }).map(function (colDef, i) {
+  });
+
+  // let localRefCopy;
+  var handleDragEnd = function handleDragEnd(event) {
+    var active = event.active,
+      over = event.over;
+    var fromVisibleIndex = columns.findIndex(function (col) {
+      return matchedColsById(col, active);
+    });
+    var toVisibleIndex = columns.findIndex(function (col) {
+      return matchedColsById(col, over);
+    });
+    var colTitle = getColTitle(visibleCols[fromVisibleIndex]);
+    setAriaRegionText("".concat(colTitle, " dropped. New position ").concat(toVisibleIndex + 1, " of ").concat(visibleCols.length, "."));
+    var fromIndex = columns.findIndex(function (col) {
+      return matchedColsById(col, active);
+    });
+    var toIndex = columns.findIndex(function (col) {
+      return matchedColsById(col, over);
+    });
+    moveElement(fromIndex, toIndex);
+  };
+  var handleDragStart = function handleDragStart(event) {
+    var active = event.active;
+    var fromIndex = visibleCols.findIndex(function (col) {
+      return matchedColsById(col, active);
+    });
+    var colTitle = getColTitle(visibleCols[fromIndex]);
+    setAriaRegionText("".concat(colTitle, " grabbed. Current position ").concat(fromIndex + 1, " of ").concat(visibleCols.length, "."));
+  };
+  var handleDragUpdate = function handleDragUpdate(event) {
+    var active = event.active,
+      over = event.over;
+    var fromIndex = visibleCols.findIndex(function (col) {
+      return matchedColsById(col, active);
+    });
+    var toIndex = visibleCols.findIndex(function (col) {
+      return matchedColsById(col, over);
+    });
+    var colTitle = getColTitle(visibleCols[fromIndex]);
+    setAriaRegionText("".concat(colTitle, " grabbed. Original position ").concat(fromIndex + 1, ", new position ").concat(toIndex + 1, " of ").concat(visibleCols.length, "."));
+  };
+  var pointerSensor = useSensor(PointerSensor, {
+    // Require the mouse to move by 10 pixels before activating
+    activationConstraint: {
+      distance: 4
+    }
+  });
+  var keyboardSensor = useSensor(KeyboardSensor, {
+    coordinateGetter: function coordinateGetter(event, args) {
+      var currentCoordinates = args.currentCoordinates;
+      var target = event.target;
+      while (target && !target.classList.contains(draggableClass)) {
+        target = target.parentNode;
+      }
+      var delta = target.offsetHeight;
+      switch (event.code) {
+        case 'ArrowRight':
+        case 'ArrowLeft':
+          // ignore right and left
+          return currentCoordinates;
+        case 'ArrowUp':
+          return _objectSpread(_objectSpread({}, currentCoordinates), {}, {
+            y: currentCoordinates.y - delta
+          });
+        case 'ArrowDown':
+          return _objectSpread(_objectSpread({}, currentCoordinates), {}, {
+            y: currentCoordinates.y + delta
+          });
+        case 'Space':
+          break;
+      }
+    }
+  });
+  var sensors = useSensors(pointerSensor, keyboardSensor);
+  var handleCheckboxKeydown = function handleCheckboxKeydown(event, colDef) {
+    if (event.code === 'Space') {
+      onSelectColumn(colDef, !isColumnVisible(colDef));
+      event.preventDefault();
+      event.stopPropagation();
+      return false;
+    }
+  };
+  return /*#__PURE__*/React.createElement(DndContext, {
+    collisionDetection: closestCenter,
+    onDragEnd: handleDragEnd,
+    onDragStart: handleDragStart,
+    onDragMove: handleDragUpdate,
+    sensors: sensors
+  }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(blockClass, "__draggable-underlay"),
+    "aria-hidden": "true",
+    key: "draggable-underlay-".concat(id)
+  }, visibleCols.map(function (colDef) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: "".concat(blockClass, "__draggable-underlay-item"),
+      key: colDef.id
+    });
+  })), /*#__PURE__*/React.createElement(SortableContext, {
+    items: visibleCols,
+    strategy: verticalListSortingStrategy
+  }, visibleCols.map(function (colDef) {
     var colHeaderTitle = getColTitle(colDef);
     var searchString = new RegExp('(' + filterString + ')');
     var res = filterString.length ? colHeaderTitle.toLowerCase().split(searchString) : null;
@@ -40,60 +147,41 @@ export var DraggableItemsList = function DraggableItemsList(_ref) {
     var highlightedText = res !== null ? res[0] === '' ? "<strong>".concat(firstWord, "</strong>") + res[2] : firstWord + "<strong>".concat(res[1], "</strong>") + res[2] : colHeaderTitle;
     var isFrozenColumn = !!colDef.sticky;
     var listContents = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Checkbox, {
-      wrapperClassName: "".concat(blockClass, "__customize-columns-checkbox-wrapper"),
       checked: isColumnVisible(colDef),
       disabled: isFrozenColumn,
-      onChange: onSelectColumn.bind(null, colDef),
+      onChange: function onChange(checked) {
+        return onSelectColumn(colDef, checked);
+      },
       id: "".concat(blockClass, "__customization-column-").concat(colDef.id),
       labelText: colHeaderTitle,
       title: colHeaderTitle,
       className: "".concat(blockClass, "__customize-columns-checkbox"),
-      hideLabel: true
+      hideLabel: true,
+      onKeyDown: function onKeyDown(event) {
+        return handleCheckboxKeydown(event, colDef);
+      }
     }), /*#__PURE__*/React.createElement("div", {
       dangerouslySetInnerHTML: {
         __html: highlightedText
-      }
+      },
+      className: "".concat(blockClass, "__customize-columns-checkbox-visible-label")
     }));
     return /*#__PURE__*/React.createElement(DraggableElement, {
+      classList: draggableClass,
       key: colDef.id,
-      index: i,
-      listData: columns,
-      setListData: setColumnsObject,
-      id: "dnd-datagrid-columns-".concat(colDef.id),
-      type: "column-customization",
+      id: colDef.id,
       disabled: filterString.length > 0 || isFrozenColumn,
       ariaLabel: colHeaderTitle,
-      onGrab: setAriaRegionText,
-      isFocused: focusIndex === i,
-      moveElement: moveElement,
-      onArrowKeyDown: function onArrowKeyDown(e, isGrabbed, currentIndex) {
-        if (isGrabbed) {
-          var _columns$nextIndex;
-          var nextIndex = getNextIndex(columns, currentIndex, e.key);
-          e.preventDefault();
-          e.stopPropagation();
-          if (nextIndex >= 0 && !((_columns$nextIndex = columns[nextIndex]) !== null && _columns$nextIndex !== void 0 && _columns$nextIndex.sticky)) {
-            setFocusIndex(nextIndex);
-            moveElement(currentIndex, nextIndex);
-            e.target.scrollIntoView({
-              block: 'center'
-            });
-          }
-        }
-      },
       isSticky: isFrozenColumn,
       selected: isColumnVisible(colDef)
     }, listContents);
-  }));
+  }))));
 };
 DraggableItemsList.propTypes = {
   columns: PropTypes.array.isRequired,
   filterString: PropTypes.string.isRequired,
-  focusIndex: PropTypes.number.isRequired,
-  getNextIndex: PropTypes.func.isRequired,
+  id: PropTypes.string.isRequired,
   moveElement: PropTypes.func.isRequired,
   onSelectColumn: PropTypes.func.isRequired,
-  setAriaRegionText: PropTypes.func.isRequired,
-  setColumnsObject: PropTypes.func.isRequired,
-  setFocusIndex: PropTypes.func.isRequired
+  setAriaRegionText: PropTypes.func.isRequired
 };

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

@@ -61,13 +61,19 @@ var FilterPanel = function FilterPanel(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     showDividerLine = _useState2[0],
     setShowDividerLine = _useState2[1];
+
+  /** Context */
+  var _useContext = useContext(FilterContext),
+    panelOpen = _useContext.panelOpen,
+    setPanelOpen = _useContext.setPanelOpen;
   var _useFilters = useFilters({
       updateMethod: updateMethod,
       filters: filterSections,
       setAllFilters: setAllFilters,
       variation: PANEL,
       reactTableFiltersState: reactTableFiltersState,
-      onCancel: onCancel
+      onCancel: onCancel,
+      panelOpen: panelOpen
     }),
     filtersState = _useFilters.filtersState,
     prevFiltersObjectArrayRef = _useFilters.prevFiltersObjectArrayRef,
@@ -99,11 +105,6 @@ var FilterPanel = function FilterPanel(_ref) {
     return updateMethod === BATCH;
   }, [updateMethod]);
 
-  /** Context */
-  var _useContext = useContext(FilterContext),
-    panelOpen = _useContext.panelOpen,
-    setPanelOpen = _useContext.setPanelOpen;
-
   /** Methods */
   var closePanel = function closePanel() {
     cancel();