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

package/lib/components/ConditionBuilder/ConditionPreview/ConditionPreview.js

@@ -9,7 +9,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
+var cx = require('classnames');
 var index = require('../../../node_modules/prop-types/index.js');
 var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
 var ConditionBuilderItem = require('../ConditionBuilderItem/ConditionBuilderItem.js');
@@ -18,9 +20,17 @@ var ConditionConnector = require('../ConditionBuilderConnector/ConditionConnecto
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 
 var ConditionPreview = function ConditionPreview(_ref) {
   var previewType = _ref.previewType;
+  var _useState = React.useState(false),
+    _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
+    animate = _useState2[0],
+    setAnimate = _useState2[1];
+  React.useEffect(function () {
+    setAnimate(true);
+  }, []);
   var getConditionSection = function getConditionSection() {
     return /*#__PURE__*/React__default["default"].createElement("div", null, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
       label: DataConfigs.translateWithId('property')
@@ -31,20 +41,20 @@ var ConditionPreview = function ConditionPreview(_ref) {
     }));
   };
   return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, previewType == 'newGroup' && /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "".concat(DataConfigs.blockClass, "__group__row ").concat(DataConfigs.blockClass, "__group-preview  ")
+    className: cx__default["default"](["".concat(DataConfigs.blockClass, "__group__row ").concat(DataConfigs.blockClass, "__group-preview "), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__group-preview-animate"), animate)])
   }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
     className: "".concat(DataConfigs.blockClass, "__statement-button"),
     label: DataConfigs.translateWithId('and')
   })), /*#__PURE__*/React__default["default"].createElement("div", {
     "aria-hidden": true,
-    className: "".concat(DataConfigs.blockClass, "__group ").concat(DataConfigs.blockClass, "__condition-wrapper ").concat(DataConfigs.blockClass, "__group-preview ").concat(DataConfigs.blockClass, "__group-wrapper")
+    className: cx__default["default"](["".concat(DataConfigs.blockClass, "__group ").concat(DataConfigs.blockClass, "__condition-wrapper ").concat(DataConfigs.blockClass, "__group-preview ").concat(DataConfigs.blockClass, "__group-wrapper "), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__group-preview-animate"), animate)])
   }, /*#__PURE__*/React__default["default"].createElement("div", {
     className: "".concat(DataConfigs.blockClass, "__gap")
   }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
     className: "".concat(DataConfigs.blockClass, "__statement-button"),
     label: DataConfigs.translateWithId('if')
   })), getConditionSection())), previewType == 'subGroup' && /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "".concat(DataConfigs.blockClass, "__group-preview")
+    className: cx__default["default"](["".concat(DataConfigs.blockClass, "__group__row ").concat(DataConfigs.blockClass, "__group-preview "), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__group-preview-animate"), animate)])
   }, /*#__PURE__*/React__default["default"].createElement("div", {
     className: "".concat(DataConfigs.blockClass, "__condition-block  ").concat(DataConfigs.blockClass, "__gap")
   }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
@@ -57,7 +67,7 @@ var ConditionPreview = function ConditionPreview(_ref) {
     className: "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__groupConnector"),
     operator: DataConfigs.translateWithId('if')
   }), getConditionSection()))), previewType == 'condition' && /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "".concat(DataConfigs.blockClass, "__group-preview")
+    className: cx__default["default"](["".concat(DataConfigs.blockClass, "__group__row ").concat(DataConfigs.blockClass, "__group-preview "), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__group-preview-animate"), animate)])
   }, /*#__PURE__*/React__default["default"].createElement("div", {
     className: "".concat(DataConfigs.blockClass, "__condition-block  ").concat(DataConfigs.blockClass, "__gap")
   }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {

package/lib/components/ConditionBuilder/utils/handleKeyboardEvents.js

@@ -11,7 +11,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
 var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
-var checkForHoldingKey = require('./checkForHoldingKey.js');
 var util = require('./util.js');
 
 var handleKeyDown = function handleKeyDown(evt, conditionBuilderRef) {
@@ -25,7 +24,7 @@ var handleKeyDown = function handleKeyDown(evt, conditionBuilderRef) {
 var handleKeyPressForPopover = function handleKeyPressForPopover(evt, parentContainer) {
   var _parentContainer$quer;
   var key = evt.key;
-  var isHoldingShiftKey = checkForHoldingKey.checkForHoldingKey(evt, 'shiftKey');
+  var isHoldingShiftKey = util.checkForHoldingKey(evt, 'shiftKey');
   var isMultiSelect = (_parentContainer$quer = parentContainer.querySelector('ul')) === null || _parentContainer$quer === void 0 ? void 0 : _parentContainer$quer.dataset.multiSelect;
   var allItems = [];
   switch (key) {

package/lib/components/ConditionBuilder/utils/util.d.ts

@@ -3,3 +3,4 @@ export function focusThisItem(currentElement: any): void;
 export function traverseClockVise(eachElem: any, index: any, allElements: any, rotate: any, trapFocus: any): void;
 export function traverseReverse(eachElem: any, index: any, allElements: any, rotate: any, trapFocus: any): void;
 export function checkForHoldingKey(evt: any, key: any): any;
+export function checkDuplicateAction(actionState: any, selectedId: any, currentActionId: any): boolean;

package/lib/components/ConditionBuilder/utils/util.js

@@ -45,7 +45,24 @@ var traverseReverse = function traverseReverse(eachElem, index, allElements, rot
     focusThisItem(allElements[allElements.length - 1]);
   }
 };
+var checkForHoldingKey = function checkForHoldingKey(evt, key) {
+  // possible key inputs: altKey,ctrlKey,metaKey,shiftKey
+  if (key === 'cmd') {
+    return evt.metaKey || evt.ctrlKey;
+  }
+  return evt[key];
+};
+var checkDuplicateAction = function checkDuplicateAction(actionState, selectedId, currentActionId) {
+  if (selectedId !== currentActionId && actionState.find(function (eachAction) {
+    return eachAction.id === selectedId;
+  })) {
+    return true;
+  }
+  return false;
+};
 
+exports.checkDuplicateAction = checkDuplicateAction;
+exports.checkForHoldingKey = checkForHoldingKey;
 exports.focusThisField = focusThisField;
 exports.focusThisItem = focusThisItem;
 exports.traverseClockVise = traverseClockVise;

package/lib/components/DataSpreadsheet/DataSpreadsheet.js

@@ -121,15 +121,19 @@ exports.DataSpreadsheet = /*#__PURE__*/React__default["default"].forwardRef(func
     _useState18 = _rollupPluginBabelHelpers.slicedToArray(_useState17, 2),
     headerCellHoldActive = _useState18[0],
     setHeaderCellHoldActive = _useState18[1];
-  var isBlurSpreadsheet = React.useRef(false);
   var _useState19 = React.useState(false),
     _useState20 = _rollupPluginBabelHelpers.slicedToArray(_useState19, 2),
-    isActiveHeaderCellChanged = _useState20[0],
-    setIsActiveHeaderCellChanged = _useState20[1];
+    selectedHeaderReorderActive = _useState20[0],
+    setSelectedHeaderReorderActive = _useState20[1];
+  var isBlurSpreadsheet = React.useRef(false);
   var _useState21 = React.useState(false),
     _useState22 = _rollupPluginBabelHelpers.slicedToArray(_useState21, 2),
-    activeCellInsideSelectionArea = _useState22[0],
-    setActiveCellInsideSelectionArea = _useState22[1];
+    isActiveHeaderCellChanged = _useState22[0],
+    setIsActiveHeaderCellChanged = _useState22[1];
+  var _useState23 = React.useState(false),
+    _useState24 = _rollupPluginBabelHelpers.slicedToArray(_useState23, 2),
+    activeCellInsideSelectionArea = _useState24[0],
+    setActiveCellInsideSelectionArea = _useState24[1];
   var previousState = usePreviousValue.usePreviousValue({
     activeCellCoordinates: activeCellCoordinates,
     isEditing: isEditing,
@@ -137,10 +141,10 @@ exports.DataSpreadsheet = /*#__PURE__*/React__default["default"].forwardRef(func
   }) || {};
   var cellSizeValue = getCellSize.getCellSize(cellSize);
   var cellEditorRef = React.useRef();
-  var _useState23 = React.useState(),
-    _useState24 = _rollupPluginBabelHelpers.slicedToArray(_useState23, 2),
-    activeCellContent = _useState24[0],
-    setActiveCellContent = _useState24[1];
+  var _useState25 = React.useState(),
+    _useState26 = _rollupPluginBabelHelpers.slicedToArray(_useState25, 2),
+    activeCellContent = _useState26[0],
+    setActiveCellContent = _useState26[1];
   var activeCellRef = React.useRef();
   var cellEditorRulerRef = React.useRef();
   var defaultColumn = React.useMemo(function () {
@@ -216,9 +220,12 @@ exports.DataSpreadsheet = /*#__PURE__*/React__default["default"].forwardRef(func
     }
     if ((prevCoords === null || prevCoords === void 0 ? void 0 : prevCoords.row) !== (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) || (prevCoords === null || prevCoords === void 0 ? void 0 : prevCoords.column) !== (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column)) {
       if (activeCellCoordinates && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) !== 'header' && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) !== 'header') {
-        var _activeCellFullData$r;
         var activeCellFullData = typeof (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'number' && typeof (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'number' ? rows[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row].cells[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column] : null;
-        setActiveCellContent((_activeCellFullData$r = activeCellFullData === null || activeCellFullData === void 0 ? void 0 : activeCellFullData.render('Cell')) !== null && _activeCellFullData$r !== void 0 ? _activeCellFullData$r : null);
+        if (activeCellFullData) {
+          setActiveCellContent(activeCellFullData.render('Cell'));
+        } else {
+          setActiveCellContent(null);
+        }
       }
       if (activeCellCoordinates && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header' || (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header') {
         setActiveCellContent(null);
@@ -433,8 +440,8 @@ exports.DataSpreadsheet = /*#__PURE__*/React__default["default"].forwardRef(func
     var activeCellFullData = typeof (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'number' && typeof (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'number' ? rows[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row].cells[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column] : null;
     var activeCellValue;
     if (activeCellFullData && activeCellCoordinates !== null && activeCellCoordinates !== void 0 && activeCellCoordinates.column) {
-      var _activeCellFullData$r2;
-      activeCellValue = activeCellFullData ? (_activeCellFullData$r2 = activeCellFullData.row.cells) === null || _activeCellFullData$r2 === void 0 || (_activeCellFullData$r2 = _activeCellFullData$r2[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column]) === null || _activeCellFullData$r2 === void 0 ? void 0 : _activeCellFullData$r2.value : null;
+      var _activeCellFullData$r;
+      activeCellValue = activeCellFullData ? (_activeCellFullData$r = activeCellFullData.row.cells) === null || _activeCellFullData$r === void 0 || (_activeCellFullData$r = _activeCellFullData$r[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column]) === null || _activeCellFullData$r === void 0 ? void 0 : _activeCellFullData$r.value : null;
     }
     setCellEditorValue(activeCellValue || '');
     if (cellEditorRulerRef !== null && cellEditorRulerRef !== void 0 && cellEditorRulerRef.current) {
@@ -624,6 +631,8 @@ exports.DataSpreadsheet = /*#__PURE__*/React__default["default"].forwardRef(func
     columns: columns,
     currentMatcher: currentMatcher,
     defaultColumn: defaultColumn,
+    selectedHeaderReorderActive: selectedHeaderReorderActive,
+    setSelectedHeaderReorderActive: setSelectedHeaderReorderActive,
     headerGroups: headerGroups,
     rows: rows,
     scrollBarSize: scrollBarSize,
@@ -647,6 +656,8 @@ exports.DataSpreadsheet = /*#__PURE__*/React__default["default"].forwardRef(func
     currentMatcher: currentMatcher,
     setCurrentMatcher: setCurrentMatcher,
     setContainerHasFocus: setContainerHasFocus,
+    selectedHeaderReorderActive: selectedHeaderReorderActive,
+    setSelectedHeaderReorderActive: setSelectedHeaderReorderActive,
     selectionAreas: selectionAreas,
     setSelectionAreas: setSelectionAreas,
     headerGroups: headerGroups,
@@ -697,9 +708,11 @@ exports.DataSpreadsheet = /*#__PURE__*/React__default["default"].forwardRef(func
       updateData: updateData
     }),
     onChange: function onChange(event) {
-      setCellEditorValue(event.target.value);
-      if (cellEditorRulerRef !== null && cellEditorRulerRef !== void 0 && cellEditorRulerRef.current) {
-        cellEditorRulerRef.current.textContent = event.target.value;
+      if (previousState.isEditing) {
+        setCellEditorValue(event.target.value);
+        if (cellEditorRulerRef !== null && cellEditorRulerRef !== void 0 && cellEditorRulerRef.current) {
+          cellEditorRulerRef.current.textContent = event.target.value;
+        }
       }
     },
     ref: cellEditorRef,

package/lib/components/DataSpreadsheet/DataSpreadsheetBody.d.ts

@@ -79,7 +79,15 @@ interface DataSpreadsheetBodyProps {
     /**
      * Array of selection area data
      */
-    selectionAreaData?: object[];
+    selectionAreaData?: any[];
+    /**
+     * Header reordering is active
+     */
+    selectedHeaderReorderActive?: boolean;
+    /**
+     * Set header reordering active or not
+     */
+    setSelectedHeaderReorderActive?: Dispatch<SetStateAction<boolean>>;
     /**
      * Array of selection areas
      */

package/lib/components/DataSpreadsheet/DataSpreadsheetBody.js

@@ -49,6 +49,8 @@ var DataSpreadsheetBody = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     selectionAreaData = _ref.selectionAreaData,
     setSelectionAreaData = _ref.setSelectionAreaData,
     setActiveCellCoordinates = _ref.setActiveCellCoordinates,
+    selectedHeaderReorderActive = _ref.selectedHeaderReorderActive,
+    setSelectedHeaderReorderActive = _ref.setSelectedHeaderReorderActive,
     selectionAreas = _ref.selectionAreas,
     setContainerHasFocus = _ref.setContainerHasFocus,
     setSelectionAreas = _ref.setSelectionAreas,
@@ -84,8 +86,12 @@ var DataSpreadsheetBody = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   // back to the consumer
   React.useEffect(function () {
     if (selectionAreaData !== null && selectionAreaData !== void 0 && selectionAreaData.length) {
-      var _previousState$select;
-      if (!clickAndHoldActive && previousState !== null && previousState !== void 0 && previousState.clickAndHoldActive || (previousState === null || previousState === void 0 || (_previousState$select = previousState.selectionAreaData) === null || _previousState$select === void 0 ? void 0 : _previousState$select.length) !== (selectionAreaData === null || selectionAreaData === void 0 ? void 0 : selectionAreaData.length)) {
+      var _previousState$select, _selectionAreaData$, _previousState$select2;
+      var selectionChanged = false;
+      if ((previousState === null || previousState === void 0 || (_previousState$select = previousState.selectionAreaData) === null || _previousState$select === void 0 ? void 0 : _previousState$select.length) !== (selectionAreaData === null || selectionAreaData === void 0 ? void 0 : selectionAreaData.length) || (selectionAreaData === null || selectionAreaData === void 0 || (_selectionAreaData$ = selectionAreaData[0]) === null || _selectionAreaData$ === void 0 ? void 0 : _selectionAreaData$.cells.length) !== (previousState === null || previousState === void 0 || (_previousState$select2 = previousState.selectionAreaData) === null || _previousState$select2 === void 0 || (_previousState$select2 = _previousState$select2[0]) === null || _previousState$select2 === void 0 ? void 0 : _previousState$select2.cells.length)) {
+        selectionChanged = true;
+      }
+      if (!clickAndHoldActive && previousState !== null && previousState !== void 0 && previousState.clickAndHoldActive || selectionChanged) {
         onSelectionAreaChange === null || onSelectionAreaChange === void 0 || onSelectionAreaChange(selectionAreaData);
       }
     }
@@ -160,6 +166,8 @@ var DataSpreadsheetBody = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     setClickAndHoldActive: setClickAndHoldActive,
     setSelectionAreas: setSelectionAreas,
     setValidStartingPoint: setValidStartingPoint,
+    selectedHeaderReorderActive: selectedHeaderReorderActive,
+    setSelectedHeaderReorderActive: setSelectedHeaderReorderActive,
     validStartingPoint: validStartingPoint,
     ref: ref,
     setHeaderCellHoldActive: setHeaderCellHoldActive,
@@ -466,6 +474,10 @@ DataSpreadsheetBody.propTypes = {
    * The scrollbar width
    */
   scrollBarSize: index["default"].number,
+  /**
+   * Header reordering is active
+   */
+  selectedHeaderReorderActive: index["default"].bool,
   /**
    * Array of selection area data
    */
@@ -502,6 +514,10 @@ DataSpreadsheetBody.propTypes = {
    * Setter fn for header cell hold active value
    */
   setHeaderCellHoldActive: index["default"].func,
+  /**
+   * Set header reordering active or not
+   */
+  setSelectedHeaderReorderActive: index["default"].func,
   /**
    * Setter fn for selectionAreaData state value
    */

package/lib/components/DataSpreadsheet/DataSpreadsheetHeader.d.ts

@@ -56,6 +56,14 @@ interface DataSpreadsheetHeaderProps {
      * Setter fn for activeCellCoordinates value
      */
     setActiveCellCoordinates?: Dispatch<SetStateAction<ActiveCellCoordinates | null>>;
+    /**
+     * Header reordering is active
+     */
+    selectedHeaderReorderActive?: boolean;
+    /**
+     * Set header reordering active or not
+     */
+    setSelectedHeaderReorderActive?: Dispatch<SetStateAction<boolean>>;
     /**
      * Setter fn for currentMatcher value
      */

package/lib/components/DataSpreadsheet/DataSpreadsheetHeader.js

@@ -40,6 +40,8 @@ var DataSpreadsheetHeader = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     headerGroups = _ref.headerGroups,
     scrollBarSize = _ref.scrollBarSize,
     selectionAreas = _ref.selectionAreas,
+    selectedHeaderReorderActive = _ref.selectedHeaderReorderActive,
+    setSelectedHeaderReorderActive = _ref.setSelectedHeaderReorderActive,
     setActiveCellCoordinates = _ref.setActiveCellCoordinates,
     setCurrentMatcher = _ref.setCurrentMatcher,
     setSelectionAreas = _ref.setSelectionAreas,
@@ -55,10 +57,6 @@ var DataSpreadsheetHeader = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     scrollBarSizeValue = _useState2[0],
     setScrollBarSizeValue = _useState2[1];
-  var _useState3 = React.useState(false),
-    _useState4 = _rollupPluginBabelHelpers.slicedToArray(_useState3, 2),
-    selectedHeaderReorderActive = _useState4[0],
-    setSelectedHeaderReorderActive = _useState4[1];
   var previousState = usePreviousValue.usePreviousValue({
     cellSize: cellSize
   }) || {};
@@ -116,11 +114,16 @@ var DataSpreadsheetHeader = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
         // Remove columns, need to call handleHeaderCellSelection
         return;
       }
-      setSelectedHeaderReorderActive(true);
       var selectionAreaToClone = selectionAreas === null || selectionAreas === void 0 ? void 0 : selectionAreas.filter(function (item) {
         return (item === null || item === void 0 ? void 0 : item.matcher) === currentMatcher;
       });
       var selectionAreaElement = ref.current.querySelector("[data-matcher-id=\"".concat(selectionAreaToClone === null || selectionAreaToClone === void 0 || (_selectionAreaToClone = selectionAreaToClone[0]) === null || _selectionAreaToClone === void 0 ? void 0 : _selectionAreaToClone.matcher, "\"]"));
+      if (selectionAreaElement) {
+        selectionAreaElement.classList.add("".concat(blockClass, "__selection-area--element"));
+      }
+      if (typeof setSelectedHeaderReorderActive === 'function') {
+        setSelectedHeaderReorderActive(true);
+      }
       var clickXPosition = event.clientX;
       var headerButtonCoords = event.target.getBoundingClientRect();
       var headerIndex = event.target.getAttribute('data-column-index');
@@ -198,7 +201,7 @@ var DataSpreadsheetHeader = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
         "data-column-index": index,
         tabIndex: -1,
         onMouseDown: selectedHeader ? handleHeaderMouseDown(index) : undefined,
-        onMouseUp: selectedHeader ? function () {
+        onMouseUp: selectedHeader && typeof setSelectedHeaderReorderActive === 'function' ? function () {
           return setSelectedHeaderReorderActive(false);
         } : undefined,
         onClick: !selectedHeader ? handleColumnHeaderClick(index) : undefined,
@@ -263,6 +266,10 @@ DataSpreadsheetHeader.propTypes = {
    * The aria label applied to the Select all button
    */
   selectAllAriaLabel: index["default"].string.isRequired,
+  /**
+   * Header reordering is active
+   */
+  selectedHeaderReorderActive: index["default"].bool,
   /**
    * All of the cell selection area items
    */
@@ -280,6 +287,10 @@ DataSpreadsheetHeader.propTypes = {
    * Setter fn for header cell hold active value
    */
   setHeaderCellHoldActive: index["default"].func,
+  /**
+   * Set header reordering active or not
+   */
+  setSelectedHeaderReorderActive: index["default"].func,
   /**
    * Setter fn for selectionAreaData state value
    */

package/lib/components/DataSpreadsheet/hooks/useSpreadsheetMouseMove.js

@@ -44,9 +44,12 @@ var useSpreadsheetMouseMove = function useSpreadsheetMouseMove(_ref) {
       var totalSpreadsheetScrollingWidth = listContainer.scrollWidth;
       var clonedSelectionWidth = clonedSelectionElement.offsetWidth;
       var clonePlacement = Math.max(xPositionRelativeToSpreadsheet - offsetXValue, defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth);
+      var leftPosition = totalSpreadsheetScrollingWidth - clonedSelectionWidth >= clonePlacement ? clonePlacement + scrollAmount : totalSpreadsheetScrollingWidth - clonedSelectionWidth;
       // Moves the position of the cloned selection area to follow mouse, and
       // add the amount horizontally scrolled
-      clonedSelectionElement.style.left = layout.px(totalSpreadsheetScrollingWidth - clonedSelectionWidth >= clonePlacement ? clonePlacement + scrollAmount : totalSpreadsheetScrollingWidth - clonedSelectionWidth);
+      if (leftPosition < spreadsheetCoords.right - 40) {
+        clonedSelectionElement.style.left = layout.px(leftPosition);
+      }
     };
     if (headerCellHoldActive) {
       ref.current.addEventListener('mousemove', handleMouseMove);

package/lib/components/DataSpreadsheet/hooks/useSpreadsheetMouseUp.d.ts

@@ -1,6 +1,8 @@
-export function useSpreadsheetMouseUp({ currentMatcher, setSelectionAreas, setClickAndHoldActive, setValidStartingPoint, validStartingPoint, blockClass, ref, setHeaderCellHoldActive, setColumnOrder, visibleColumns, setActiveCellCoordinates, activeCellCoordinates, rows, defaultColumn, selectionAreas, }: {
+export function useSpreadsheetMouseUp({ currentMatcher, setSelectionAreas, selectedHeaderReorderActive, setSelectedHeaderReorderActive, setClickAndHoldActive, setValidStartingPoint, validStartingPoint, blockClass, ref, setHeaderCellHoldActive, setColumnOrder, visibleColumns, setActiveCellCoordinates, activeCellCoordinates, rows, defaultColumn, selectionAreas, }: {
     currentMatcher: any;
     setSelectionAreas: any;
+    selectedHeaderReorderActive: any;
+    setSelectedHeaderReorderActive: any;
     setClickAndHoldActive: any;
     setValidStartingPoint: any;
     validStartingPoint: any;

package/lib/components/DataSpreadsheet/hooks/useSpreadsheetMouseUp.js

@@ -18,6 +18,8 @@ var deepCloneObject = require('../../../global/js/utils/deepCloneObject.js');
 var useSpreadsheetMouseUp = function useSpreadsheetMouseUp(_ref) {
   var currentMatcher = _ref.currentMatcher,
     setSelectionAreas = _ref.setSelectionAreas,
+    selectedHeaderReorderActive = _ref.selectedHeaderReorderActive,
+    setSelectedHeaderReorderActive = _ref.setSelectedHeaderReorderActive,
     setClickAndHoldActive = _ref.setClickAndHoldActive,
     setValidStartingPoint = _ref.setValidStartingPoint,
     validStartingPoint = _ref.validStartingPoint,
@@ -34,15 +36,22 @@ var useSpreadsheetMouseUp = function useSpreadsheetMouseUp(_ref) {
     selectionAreas = _ref.selectionAreas;
   React.useEffect(function () {
     var handleMouseUp = function handleMouseUp(event) {
+      var _selectionAreas$;
+      var isHoldingColumn = false;
+      if (selectionAreas !== null && selectionAreas !== void 0 && (_selectionAreas$ = selectionAreas[0]) !== null && _selectionAreas$ !== void 0 && _selectionAreas$.header && selectionAreas[0].header.type === 'column') {
+        isHoldingColumn = true;
+      }
       // Remove the cloned selection area on mouse up
-      if (!validStartingPoint) {
+      if (!validStartingPoint && isHoldingColumn) {
         setHeaderCellHoldActive(false);
+        var selectionAreaElement = ref.current.querySelector(".".concat(blockClass, "__selection-area--element"));
         var selectionAreaCloneElement = ref.current.querySelector(".".concat(blockClass, "__selection-area--element-cloned"));
         if (!selectionAreaCloneElement) {
           return;
         }
         // Mouse up while a cloned selection area exists/a column is being reordered
         if (selectionAreaCloneElement) {
+          var _selectionAreaElement;
           var closestCell = event.target.closest(".".concat(blockClass, "--interactive-cell-element"));
           var newColumnIndex = parseInt === null || parseInt === void 0 ? void 0 : parseInt(closestCell === null || closestCell === void 0 ? void 0 : closestCell.getAttribute('data-column-index'));
           var originalColumnIndex = parseInt === null || parseInt === void 0 ? void 0 : parseInt(selectionAreaCloneElement === null || selectionAreaCloneElement === void 0 ? void 0 : selectionAreaCloneElement.getAttribute('data-column-index-original'));
@@ -85,6 +94,7 @@ var useSpreadsheetMouseUp = function useSpreadsheetMouseUp(_ref) {
               selectionAreaClone[indexOfItemToUpdate].point1.column = Math.min.apply(Math, _rollupPluginBabelHelpers.toConsumableArray(newIndexArray));
               selectionAreaClone[indexOfItemToUpdate].point2.column = Math.max.apply(Math, _rollupPluginBabelHelpers.toConsumableArray(newIndexArray));
             }
+            selectionAreaClone[indexOfItemToUpdate].areaCreated = false;
             return selectionAreaClone;
           });
           // Only reorder columns if the new index is _not_ part of the
@@ -129,11 +139,13 @@ var useSpreadsheetMouseUp = function useSpreadsheetMouseUp(_ref) {
           var indicatorLineElement = ref.current.querySelector(".".concat(blockClass, "__reorder-indicator-line"));
           indicatorLineElement === null || indicatorLineElement === void 0 || indicatorLineElement.remove();
           selectionAreaCloneElement === null || selectionAreaCloneElement === void 0 || selectionAreaCloneElement.remove();
+          selectionAreaElement === null || selectionAreaElement === void 0 || (_selectionAreaElement = selectionAreaElement.classList) === null || _selectionAreaElement === void 0 || _selectionAreaElement.remove("".concat(blockClass, "__selection-area--element"));
+          setSelectedHeaderReorderActive(false);
         }
       }
       // Mouse up was on a spreadsheet body cell which is a valid
       // start/end point for creating a selection area
-      if (validStartingPoint) {
+      if (validStartingPoint || event.type === 'mouseup') {
         setClickAndHoldActive(false);
         setValidStartingPoint(false);
         var cellButton = event.target.closest(".".concat(blockClass, "__body--td"));
@@ -162,7 +174,7 @@ var useSpreadsheetMouseUp = function useSpreadsheetMouseUp(_ref) {
     return function () {
       document.removeEventListener('mouseup', handleMouseUp);
     };
-  }, [blockClass, currentMatcher, setSelectionAreas, setClickAndHoldActive, setValidStartingPoint, validStartingPoint, ref, setHeaderCellHoldActive, setColumnOrder, visibleColumns, setActiveCellCoordinates, activeCellCoordinates, rows, defaultColumn, selectionAreas]);
+  }, [blockClass, currentMatcher, setSelectionAreas, setClickAndHoldActive, setValidStartingPoint, validStartingPoint, selectedHeaderReorderActive, setSelectedHeaderReorderActive, ref, setHeaderCellHoldActive, setColumnOrder, visibleColumns, setActiveCellCoordinates, activeCellCoordinates, rows, defaultColumn, selectionAreas]);
 };
 
 exports.useSpreadsheetMouseUp = useSpreadsheetMouseUp;

package/lib/components/DataSpreadsheet/types/index.d.ts

@@ -13,7 +13,7 @@ export interface PrevState {
     cellEditorValue?: string;
     activeCellCoordinates?: ActiveCellCoordinates;
     isEditing?: boolean;
-    selectionAreaData?: object[];
+    selectionAreaData?: any[];
     clickAndHoldActive?: boolean;
     rowHeight?: number;
     cellSize?: Size;

package/lib/components/DataSpreadsheet/utils/moveColumnIndicatorLine.js

@@ -26,11 +26,43 @@ var moveColumnIndicatorLine = function moveColumnIndicatorLine(_ref) {
   var indicatorLineElement = ref.current.querySelector(".".concat(blockClass, "__reorder-indicator-line"));
   var matcherId = clonedSelectionElement === null || clonedSelectionElement === void 0 ? void 0 : clonedSelectionElement.getAttribute('data-matcher-id');
   var selectionAreaOrigin = ref.current.querySelector("[data-matcher-id=\"".concat(matcherId, "\"]"));
+  var listContainer = ref.current.querySelector(".".concat(blockClass, "__list--container"));
+  var scrollSpeed = 10; // Scrolling speed
+  var leftEdgeThreshold = 120; // Distance from the left edge to start scrolling
+  var rightEdgeThreshold = 100; // Distance from the right edge to start scrolling
+
+  var _event = event,
+    clientX = _event.clientX;
+  var _listContainer$getBou = listContainer.getBoundingClientRect(),
+    left = _listContainer$getBou.left,
+    right = _listContainer$getBou.right;
+
+  // Is near left side of viewport
+  if (clientX < leftEdgeThreshold) {
+    window.scrollBy(-scrollSpeed, 0);
+  }
+
+  // Is near right side of viewport
+  if (clientX > window.innerWidth - rightEdgeThreshold) {
+    window.scrollBy(scrollSpeed, 0);
+  }
+
+  // Is near left edge of table
+  if (clientX > left && clientX < left + leftEdgeThreshold) {
+    listContainer.scrollBy(-scrollSpeed, 0);
+  }
+
+  // Is near right edge of table
+  if (clientX < right && clientX > right - rightEdgeThreshold) {
+    listContainer.scrollBy(scrollSpeed, 0);
+  }
   if (Number(newColumnIndex) > Number(originalColumnIndex)) {
-    indicatorLineElement.style.left = layout.px(closestCellCoords.left - spreadsheetCoords.left + closestCell.offsetWidth - 2 + leftScrollAmount);
+    var leftPosition = closestCellCoords.left - spreadsheetCoords.left + closestCell.offsetWidth - 2 + leftScrollAmount;
+    indicatorLineElement.style.left = layout.px(leftPosition);
   }
   if (Number(newColumnIndex) < Number(originalColumnIndex)) {
-    indicatorLineElement.style.left = layout.px(closestCellCoords.left - spreadsheetCoords.left + leftScrollAmount);
+    var _leftPosition = closestCellCoords.left - spreadsheetCoords.left + leftScrollAmount;
+    indicatorLineElement.style.left = layout.px(_leftPosition);
   }
   if (Number(newColumnIndex) === Number(originalColumnIndex)) {
     indicatorLineElement.style.left = selectionAreaOrigin.style.left;

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

@@ -55,7 +55,8 @@ exports.Datagrid = /*#__PURE__*/React__default["default"].forwardRef(function (_
   };
   return /*#__PURE__*/React__default["default"].createElement(FilterProvider.FilterProvider, {
     filters: state === null || state === void 0 ? void 0 : state.filters,
-    filterProps: filterProps
+    filterProps: filterProps,
+    tableId: tableId
   }, /*#__PURE__*/React__default["default"].createElement(InlineEditContext.InlineEditProvider, null, /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({}, rest, {
     id: tableId,
     ref: ref,

package/lib/components/Datagrid/Datagrid/DatagridContent.js

@@ -167,7 +167,7 @@ var DatagridContent = function DatagridContent(_ref) {
       className: "".concat(blockClass, "__filter-summary"),
       filters: filterTags,
       clearFilters: function clearFilters() {
-        return EventEmitter.dispatch(constants.CLEAR_FILTERS);
+        return EventEmitter.dispatch(constants.CLEAR_FILTERS, tableId);
       },
       renderLabel: filterProps === null || filterProps === void 0 ? void 0 : filterProps.renderLabel,
       overflowType: "tag"

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

@@ -218,7 +218,12 @@ var FilterFlyout = function FilterFlyout(_ref) {
     closeFlyout();
     cancel();
   });
-  useSubscribeToEventEmitter["default"](constants.CLEAR_FILTERS, reset);
+
+  // tableId is passed in from the event emitter from the FilterSummary component
+  // in  DatagridContent
+  useSubscribeToEventEmitter["default"](constants.CLEAR_FILTERS, function (tableId) {
+    reset(tableId);
+  });
   React.useEffect(function reflectLastAppliedFiltersWhenReactTableUpdates() {
     lastAppliedFilters.current = JSON.stringify(reactTableFiltersState);
   }, [reactTableFiltersState, lastAppliedFilters]);

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

@@ -192,7 +192,12 @@ var FilterPanel = function FilterPanel(_ref) {
     var _filterPanelRef$curre;
     (_filterPanelRef$curre = filterPanelRef.current) === null || _filterPanelRef$curre === void 0 || _filterPanelRef$curre.style.setProperty('--filter-panel-min-height', layout.rem(filterPanelMinHeight));
   }, [filterPanelMinHeight]);
-  useSubscribeToEventEmitter["default"](constants.CLEAR_FILTERS, reset);
+
+  // tableId is passed in from the event emitter from the FilterSummary component
+  // in  DatagridContent
+  useSubscribeToEventEmitter["default"](constants.CLEAR_FILTERS, function (tableId) {
+    reset(tableId);
+  });
   var getScrollableContainerHeight = function getScrollableContainerHeight() {
     var _filterHeadingRef$cur, _filterSearchRef$curr, _actionSetRef$current;
     var filterHeadingHeight = (_filterHeadingRef$cur = filterHeadingRef.current) === null || _filterHeadingRef$cur === void 0 ? void 0 : _filterHeadingRef$cur.getBoundingClientRect().height;

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

@@ -3,16 +3,18 @@ export function clearSingleFilter({ key, value }: {
     key: any;
     value: any;
 }, setAllFilters: any, state: any): void;
-export function FilterProvider({ children, filters, filterProps }: {
+export function FilterProvider({ children, filters, filterProps, tableId }: {
     children: any;
     filters: any;
     filterProps: any;
+    tableId: any;
 }): import("react/jsx-runtime").JSX.Element;
 export namespace FilterProvider {
     namespace propTypes {
         let children: PropTypes.Validator<NonNullable<NonNullable<PropTypes.ReactNodeLike>>>;
         let filterProps: PropTypes.Requireable<object>;
         let filters: PropTypes.Validator<(object | null | undefined)[]>;
+        let tableId: PropTypes.Requireable<string>;
     }
 }
 import React from 'react';

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

@@ -164,7 +164,8 @@ var filteringReducer = function filteringReducer(state, action) {
 var FilterProvider = function FilterProvider(_ref4) {
   var children = _ref4.children,
     filters = _ref4.filters,
-    filterProps = _ref4.filterProps;
+    filterProps = _ref4.filterProps,
+    tableId = _ref4.tableId;
   var _ref5 = filterProps || {},
     renderDateLabel = _ref5.renderDateLabel;
   var filterTags = prepareFiltersForTags(filters, renderDateLabel);
@@ -185,7 +186,8 @@ var FilterProvider = function FilterProvider(_ref4) {
     panelOpen: panelOpen,
     setPanelOpen: setPanelOpen,
     state: state,
-    dispatch: dispatch
+    dispatch: dispatch,
+    tableId: tableId
   };
   return /*#__PURE__*/React__default["default"].createElement(FilterContext.Provider, {
     value: value
@@ -194,7 +196,8 @@ var FilterProvider = function FilterProvider(_ref4) {
 FilterProvider.propTypes = {
   children: index["default"].oneOfType([index["default"].arrayOf(index["default"].node), index["default"].node]).isRequired,
   filterProps: index["default"].object,
-  filters: index["default"].arrayOf(index["default"].object).isRequired
+  filters: index["default"].arrayOf(index["default"].object).isRequired,
+  tableId: index["default"].string
 };
 
 exports.FilterContext = FilterContext;

package/lib/components/Datagrid/Datagrid/addons/Filtering/hooks/useFilters.d.ts

@@ -15,7 +15,7 @@ declare function useFilters({ updateMethod, filters, setAllFilters, variation, r
     prevFiltersObjectArrayRef: React.MutableRefObject<string>;
     prevFiltersRef: React.MutableRefObject<string>;
     revertToPreviousFilters: () => void;
-    reset: () => void;
+    reset: (tableId: any) => void;
     renderFilter: ({ type, column, props: components }: {
         type: any;
         column: any;