@carbon/ibm-products 1.59.0 → 1.60.0

package/lib/components/Datagrid/Datagrid/DatagridRow.js

@@ -15,6 +15,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _commonColumnIds = require("../common-column-ids");
 var _settings = require("../../../settings");
 var _excluded = ["children"];
+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) { (0, _defineProperty2.default)(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; }
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var TableRow = _carbonComponentsReact.DataTable.TableRow,
   TableCell = _carbonComponentsReact.DataTable.TableCell;
@@ -31,7 +33,8 @@ var DatagridRow = function DatagridRow(datagridState) {
   var _cx;
   var row = datagridState.row,
     rowSize = datagridState.rowSize,
-    withNestedRows = datagridState.withNestedRows;
+    withNestedRows = datagridState.withNestedRows,
+    prepareRow = datagridState.prepareRow;
   var getVisibleNestedRowCount = function getVisibleNestedRowCount(_ref) {
     var isExpanded = _ref.isExpanded,
       subRows = _ref.subRows;
@@ -46,6 +49,9 @@ var DatagridRow = function DatagridRow(datagridState) {
   };
   var hoverHandler = function hoverHandler(event) {
     var _hoverRow$style, _hoverRow$style2, _hoverRow$style3;
+    if (!withNestedRows) {
+      return;
+    }
     var subRowCount = getVisibleNestedRowCount(row);
     var totalNestedRowIndicatorHeight = (0, _layout.px)(subRowCount * rowHeights[rowSize]);
     var hoverRow = event.target.closest(".".concat(blockClass, "__carbon-row-expanded"));
@@ -62,48 +68,50 @@ var DatagridRow = function DatagridRow(datagridState) {
       el.classList.remove("".concat(blockClass, "__carbon-row-expanded-hover-active"));
     });
   };
-  return /*#__PURE__*/_react.default.createElement(TableRow, (0, _extends2.default)({
-    className: (0, _classnames.default)("".concat(blockClass, "__carbon-row"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expandable"), row.canExpand), (0, _defineProperty2.default)(_cx, "".concat(_settings.carbon.prefix, "--data-table--selected"), row.isSelected), _cx))
+  var renderExpandedRow = function renderExpandedRow() {
+    if (row.isExpanded) {
+      var _row$RowExpansionRend;
+      prepareRow(row);
+      return row === null || row === void 0 ? void 0 : (_row$RowExpansionRend = row.RowExpansionRenderer) === null || _row$RowExpansionRend === void 0 ? void 0 : _row$RowExpansionRend.call(row, _objectSpread(_objectSpread({}, datagridState), {}, {
+        row: row
+      }));
+    }
+    return null;
+  };
+  var handleMouseLeave = function handleMouseLeave(event) {
+    var hoverRow = event.target.closest(".".concat(blockClass, "__carbon-row-expanded"));
+    hoverRow === null || hoverRow === void 0 ? void 0 : hoverRow.classList.remove("".concat(blockClass, "__carbon-row-expanded-hover-active"));
+  };
+  var handleOnKeyUp = function handleOnKeyUp(event) {
+    if (!withNestedRows) {
+      return;
+    }
+    if (event.key === 'Enter' || event.key === 'Space') {
+      focusRemover();
+      hoverHandler(event);
+    }
+  };
+  var rowClassNames = (0, _classnames.default)("".concat(blockClass, "__carbon-row"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expandable"), row.canExpand), (0, _defineProperty2.default)(_cx, "".concat(_settings.carbon.prefix, "--data-table--selected"), row.isSelected), _cx));
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(TableRow, (0, _extends2.default)({
+    className: rowClassNames
   }, row.getRowProps({
     role: false
   }), {
     key: row.id,
-    onMouseEnter: function onMouseEnter(event) {
-      if (!withNestedRows) {
-        return;
-      }
-      hoverHandler(event);
-    },
-    onMouseLeave: function onMouseLeave(event) {
-      var hoverRow = event.target.closest(".".concat(blockClass, "__carbon-row-expanded"));
-      hoverRow === null || hoverRow === void 0 ? void 0 : hoverRow.classList.remove("".concat(blockClass, "__carbon-row-expanded-hover-active"));
-    },
-    onFocus: function onFocus(event) {
-      if (!withNestedRows) {
-        return;
-      }
-      hoverHandler(event);
-    },
-    onBlur: function onBlur() {
-      focusRemover();
-    },
-    onKeyUp: function onKeyUp(event) {
-      if (!withNestedRows) {
-        return;
-      }
-      if (event.key === 'Enter' || event.key === 'Space') {
-        focusRemover();
-        hoverHandler(event);
-      }
-    }
+    onMouseEnter: hoverHandler,
+    onMouseLeave: handleMouseLeave,
+    onFocus: hoverHandler,
+    onBlur: focusRemover,
+    onKeyUp: handleOnKeyUp
   }), row.cells.map(function (cell, index) {
+    var _cell$column;
     var cellProps = cell.getCellProps({
       role: false
     });
     var children = cellProps.children,
       restProps = (0, _objectWithoutProperties2.default)(cellProps, _excluded);
     var content = children || /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !row.isSkeleton && cell.render('Cell'), row.isSkeleton && /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.SkeletonText, null));
-    if (cell && cell.column && cell.column.id === _commonColumnIds.selectionColumnId) {
+    if ((cell === null || cell === void 0 ? void 0 : (_cell$column = cell.column) === null || _cell$column === void 0 ? void 0 : _cell$column.id) === _commonColumnIds.selectionColumnId) {
       // directly render component without the wrapping TableCell
       return cell.render('Cell', {
         key: cell.column.id
@@ -114,7 +122,7 @@ var DatagridRow = function DatagridRow(datagridState) {
     }, restProps, {
       key: cell.column.id
     }), content);
-  }));
+  })), renderExpandedRow());
 };
 var _default = DatagridRow;
 exports.default = _default;

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

@@ -52,11 +52,23 @@ var SelectAll = function SelectAll(datagridState) {
   var _getProps = getProps(),
     onChange = _getProps.onChange,
     selectProps = (0, _objectWithoutProperties2.default)(_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.default.createElement("div", {
     className: (0, _classnames.default)("".concat(blockClass, "__head-select-all"), "".concat(blockClass, "__checkbox-cell"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__checkbox-cell-sticky-left"), isFirstColumnStickyLeft && windowSize > 671))
   }, /*#__PURE__*/_react.default.createElement(TableSelectAll, (0, _extends2.default)({}, selectProps, {
     name: "".concat(tableId, "-select-all-checkbox-name"),
-    onSelect: onChange,
+    onSelect: handleSelectAllChange,
     disabled: isFetching || selectProps.disabled,
     id: "".concat(tableId, "-select-all-checkbox-id")
   })));

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

@@ -18,7 +18,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /**
- * 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.
@@ -80,20 +80,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.default.createElement(_ButtonMenu.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.default.createElement(_ButtonMenu.ButtonMenuItem, {
         key: "".concat(batchAction.label, "-").concat(index),

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

@@ -1,21 +1,19 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var React = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _iconsReact = require("@carbon/icons-react");
-var _reactDnd = require("react-dnd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _settings = require("../../../settings");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var _utilities = require("@dnd-kit/utilities");
+var _sortable = require("@dnd-kit/sortable");
 // @flow
 /*
  * Licensed Materials - Property of IBM
@@ -25,161 +23,57 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * restricted by GSA ADP Schedule Contract with IBM Corp.
  */
 
-var useEffect = React.useEffect,
-  useRef = React.useRef,
-  useState = React.useState;
 var blockClass = "".concat(_settings.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 = (0, _reactDnd.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 = (0, _sortable.useSortable)({
+      id: id
     }),
-    _useDrop2 = (0, _slicedToArray2.default)(_useDrop, 2),
-    isOver = _useDrop2[0].isOver,
-    drop = _useDrop2[1];
-  var _useDrag = (0, _reactDnd.useDrag)({
-      type: DRAG_TYPE + type,
-      item: {
-        id: id,
-        index: index
-      },
-      canDrag: function canDrag() {
-        return !disabled;
-      },
-      collect: function collect(monitor) {
-        return {
-          isDragging: monitor.isDragging()
-        };
-      }
-    }),
-    _useDrag2 = (0, _slicedToArray2.default)(_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 = (0, _slicedToArray2.default)(_useState, 2),
-    isGrabbed = _useState2[0],
-    setIsGrabbed = _useState2[1];
-  var _useState3 = useState(isFocused),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    isFocusedOnItem = _useState4[0],
-    setIsFocusedOnItem = _useState4[1];
-  drop(ref);
-  var content = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    attributes = _useSortable.attributes,
+    isDragging = _useSortable.isDragging,
+    listeners = _useSortable.listeners,
+    setNodeRef = _useSortable.setNodeRef,
+    transform = _useSortable.transform,
+    transition = _useSortable.transition;
+  var content = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)({
       disabled: disabled
     }, "".concat(blockClass, "__draggable-handleStyle"))
-  }, isSticky ? /*#__PURE__*/React.createElement(_iconsReact.Locked16, null) : /*#__PURE__*/React.createElement(_iconsReact.Draggable16, null)), children);
-  return /*#__PURE__*/React.createElement("li", {
-    className: (0, _classnames.default)((_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__draggable-handleHolder-isOver"), isOver && !disabled), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__draggable-handleHolder-grabbed"), isGrabbed), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__draggable-handleHolder-selected"), selected), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__draggable-handleHolder--sticky"), isSticky), (0, _defineProperty2.default)(_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", {
+  }, isSticky ? /*#__PURE__*/_react.default.createElement(_iconsReact.Locked16, null) : /*#__PURE__*/_react.default.createElement(_iconsReact.Draggable16, null)), children);
+  var style = {
+    transform: _utilities.CSS.Transform.toString(transform),
+    transition: transition
+  };
+  return /*#__PURE__*/_react.default.createElement("li", (0, _extends2.default)({
+    className: (0, _classnames.default)(classList, "".concat(blockClass, "__draggable-handleHolder"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__draggable-handleHolder--selected"), selected), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__draggable-handleHolder--sticky"), isSticky), (0, _defineProperty2.default)(_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.default.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.default.createElement("div", {
     className: (0, _classnames.default)((0, _defineProperty2.default)({}, "".concat(blockClass, "__draggable-handleStyle"), !disabled), ["".concat(blockClass, "__draggable-handleHolder-droppable")])
-  }, (!isOver || disabled) && content));
+  }, content));
 };
 DraggableElement.propTypes = {
   ariaLabel: _propTypes.default.string.isRequired,
   children: _propTypes.default.element.isRequired,
+  classList: _propTypes.default.string,
   disabled: _propTypes.default.bool,
-  droppedLabel: _propTypes.default.string,
-  grabbedLabel: _propTypes.default.string,
   id: _propTypes.default.string.isRequired,
-  index: _propTypes.default.number.isRequired,
-  isFocused: _propTypes.default.bool.isRequired,
   isSticky: _propTypes.default.bool,
-  listData: _propTypes.default.array.isRequired,
-  moveElement: _propTypes.default.func.isRequired,
-  onArrowKeyDown: _propTypes.default.func.isRequired,
-  onGrab: _propTypes.default.func.isRequired,
-  positionLabel: _propTypes.default.string,
-  selected: _propTypes.default.bool,
-  type: _propTypes.default.string.isRequired
+  selected: _propTypes.default.bool
 };
 var _default = DraggableElement;
 exports.default = _default;

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

@@ -1,39 +1,31 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _reactDnd = require("react-dnd");
-var _reactDndHtml5Backend = require("react-dnd-html5-backend");
 var _carbonComponentsReact = require("carbon-components-react");
 var _immutabilityHelper = _interopRequireDefault(require("immutability-helper"));
 var _settings = require("../../../../../settings");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _DraggableItemsList = require("./DraggableItemsList");
+var _uuidv = _interopRequireDefault(require("../../../../../global/js/utils/uuidv4"));
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /**
- * 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.
  */
 
 var blockClass = "".concat(_settings.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,
@@ -43,36 +35,26 @@ var Columns = function Columns(_ref) {
     assistiveTextInstructionsLabel = _ref.assistiveTextInstructionsLabel,
     assistiveTextDisabledInstructionsLabel = _ref.assistiveTextDisabledInstructionsLabel,
     selectAllLabel = _ref.selectAllLabel;
+  var listId = (0, _react.useRef)((0, _uuidv.default)()); // keep id between renders
+  var listRef = (0, _react.useRef)(null);
   var _React$useState = _react.default.useState(''),
     _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
     ariaRegionText = _React$useState2[0],
     setAriaRegionText = _React$useState2[1];
-  var _React$useState3 = _react.default.useState(-1),
-    _React$useState4 = (0, _slicedToArray2.default)(_React$useState3, 2),
-    focusIndex = _React$useState4[0],
-    setFocusIndex = _React$useState4[1];
-  var moveElement = _react.default.useCallback(function (dragIndex, hoverIndex) {
-    var dragCard = columns[dragIndex];
+  // after a drag/drop action set the columns
+  var moveElement = _react.default.useCallback(function (from, to) {
+    var fromCol = columns[from];
     setColumnsObject((0, _immutabilityHelper.default)(columns, {
-      $splice: [[dragIndex, 1], [hoverIndex, 0, dragCard]]
+      $splice: [[from, 1], [to, 0, fromCol]]
     }));
   }, [columns, setColumnsObject]);
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(blockClass, "__customize-columns-column-list")
-  }, /*#__PURE__*/_react.default.createElement(_reactDnd.DndProvider, {
-    backend: _reactDndHtml5Backend.HTML5Backend
+    className: "".concat(blockClass, "__customize-columns-column-list"),
+    ref: listRef
   }, /*#__PURE__*/_react.default.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.default.createElement("span", {
     "aria-live": "assertive",
@@ -94,16 +76,13 @@ var Columns = function Columns(_ref) {
     id: "".concat(blockClass, "__customization-column-select-all"),
     labelText: selectAllLabel
   })), /*#__PURE__*/_react.default.createElement(_DraggableItemsList.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.default.string,

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

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