@carbon/ibm-products 2.43.2-canary.78 → 2.43.2-canary.81

package/es/components/ConditionBuilder/ConditionGroupBuilder/ConditionGroupBuilder.d.ts

@@ -5,19 +5,17 @@ export default ConditionGroupBuilder;
  * All the inner components of group are called from here.
  * @returns
  */
-declare function ConditionGroupBuilder({ group, aria, onRemove, onChange, conditionBuilderRef, className, }: {
+declare function ConditionGroupBuilder({ group, aria, onRemove, onChange, className, }: {
     group: any;
     aria: any;
     onRemove: any;
     onChange: any;
-    conditionBuilderRef: any;
     className: any;
 }): import("react/jsx-runtime").JSX.Element;
 declare namespace ConditionGroupBuilder {
     namespace propTypes {
         let aria: PropTypes.Requireable<object>;
         let className: PropTypes.Requireable<string>;
-        let conditionBuilderRef: PropTypes.Requireable<object>;
         let group: PropTypes.Requireable<object>;
         let onChange: PropTypes.Requireable<(...args: any[]) => any>;
         let onRemove: PropTypes.Requireable<(...args: any[]) => any>;

package/es/components/ConditionBuilder/ConditionGroupBuilder/ConditionGroupBuilder.js

@@ -12,7 +12,7 @@ import PropTypes from '../../../node_modules/prop-types/index.js';
 import cx from 'classnames';
 import { blockClass, statementConfig } from '../ConditionBuilderContext/DataConfigs.js';
 import { ConditionBuilderItem } from '../ConditionBuilderItem/ConditionBuilderItem.js';
-import { focusThisField } from '../utils/util.js';
+import { focusThisField, manageTabIndexAndFocus } from '../utils/util.js';
 import ConditionConnector from '../ConditionBuilderConnector/ConditionConnector.js';
 import { ConditionBuilderContext } from '../ConditionBuilderContext/ConditionBuilderProvider.js';
 import uuidv4 from '../../../global/js/utils/uuidv4.js';
@@ -33,14 +33,15 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     aria = _ref.aria,
     onRemove = _ref.onRemove,
     onChange = _ref.onChange,
-    conditionBuilderRef = _ref.conditionBuilderRef,
     className = _ref.className;
-  var _useTranslations = useTranslations(['condition_builder_group', 'conditionText']),
-    _useTranslations2 = _slicedToArray(_useTranslations, 2),
+  var _useTranslations = useTranslations(['conditionBuilderGroupText', 'conditionText', 'conditionBuilderText']),
+    _useTranslations2 = _slicedToArray(_useTranslations, 3),
     conditionBuilderGroupText = _useTranslations2[0],
-    conditionText = _useTranslations2[1];
+    conditionText = _useTranslations2[1],
+    conditionBuilderText = _useTranslations2[2];
   var _useContext = useContext(ConditionBuilderContext),
-    variant = _useContext.variant;
+    variant = _useContext.variant,
+    conditionBuilderRef = _useContext.conditionBuilderRef;
   var _useState = useState(-1),
     _useState2 = _slicedToArray(_useState, 2),
     showConditionPreview = _useState2[0],
@@ -53,11 +54,40 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
   var onRemoveHandler = function onRemoveHandler(conditionId, evt, conditionIndex) {
     if (group.conditions.length > 1) {
       variant == 'tree' ? handleFocusOnCloseTree(evt) : handleFocusOnClose(evt, conditionIndex);
-      onChange(_objectSpread2(_objectSpread2({}, group), {}, {
-        conditions: group.conditions.filter(function (condition) {
-          return conditionId !== condition.id;
-        })
-      }));
+      if (group.conditions[1].conditions) {
+        //when we remove every plain conditions of a group without deleting  the subgroup, we need to restructure the group
+        //the inner group become outer group and same level subgroups become plain conditions
+
+        //spreading out the condition inside the subgroup
+        var allConditions = group.conditions.reduce(function (acc, item) {
+          if (item.conditions) {
+            return acc.concat(item.conditions);
+          }
+          return acc;
+        }, []);
+
+        //we always have conditions first and then subgroups, so ordering accordingly
+        var groupedItems = {
+          groups: [],
+          conditions: []
+        };
+        allConditions.forEach(function (item) {
+          if (item.conditions) {
+            groupedItems.groups.push(item);
+          } else {
+            groupedItems.conditions.push(item);
+          }
+        });
+        onChange(_objectSpread2(_objectSpread2({}, group), {}, {
+          conditions: [].concat(_toConsumableArray(groupedItems.conditions), _toConsumableArray(groupedItems.groups))
+        }));
+      } else {
+        onChange(_objectSpread2(_objectSpread2({}, group), {}, {
+          conditions: group.conditions.filter(function (condition) {
+            return conditionId !== condition.id;
+          })
+        }));
+      }
     } else {
       onRemove(evt);
     }
@@ -87,11 +117,9 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     //or focus the next one.
     var currentGroupCloseButtons = (_e$currentTarget$clos = e.currentTarget.closest(".".concat(blockClass, "__group"))) === null || _e$currentTarget$clos === void 0 ? void 0 : _e$currentTarget$clos.querySelectorAll('[data-name="closeCondition"]');
     if (conditionIndex == currentGroupCloseButtons.length - 1) {
-      var _currentGroupCloseBut;
-      (_currentGroupCloseBut = currentGroupCloseButtons[conditionIndex - 1]) === null || _currentGroupCloseBut === void 0 || _currentGroupCloseBut.focus();
+      manageTabIndexAndFocus(currentGroupCloseButtons[conditionIndex - 1], conditionBuilderRef);
     } else {
-      var _currentGroupCloseBut2;
-      (_currentGroupCloseBut2 = currentGroupCloseButtons[conditionIndex + 1]) === null || _currentGroupCloseBut2 === void 0 || _currentGroupCloseBut2.focus();
+      manageTabIndexAndFocus(currentGroupCloseButtons[conditionIndex + 1], conditionBuilderRef);
     }
   };
   var handleFocusOnCloseTree = function handleFocusOnCloseTree(evt) {
@@ -107,11 +135,9 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     //Otherwise , check the previous item is a valid condition
 
     if (nextElement !== null && nextElement !== void 0 && nextElement.classList.contains("".concat(blockClass, "__condition-block"))) {
-      var _nextElement$querySel;
-      nextElement === null || nextElement === void 0 || (_nextElement$querySel = nextElement.querySelector('[data-name="closeCondition"]')) === null || _nextElement$querySel === void 0 || _nextElement$querySel.focus();
+      manageTabIndexAndFocus(nextElement === null || nextElement === void 0 ? void 0 : nextElement.querySelector('[data-name="closeCondition"]'), conditionBuilderRef);
     } else if (prevElement !== null && prevElement !== void 0 && prevElement.classList.contains("".concat(blockClass, "__condition-block"))) {
-      var _prevElement$querySel;
-      prevElement === null || prevElement === void 0 || (_prevElement$querySel = prevElement.querySelector('[data-name="closeCondition"]')) === null || _prevElement$querySel === void 0 || _prevElement$querySel.focus();
+      manageTabIndexAndFocus(prevElement === null || prevElement === void 0 ? void 0 : prevElement.querySelector('[data-name="closeCondition"]'), conditionBuilderRef);
     }
     //If there are no valid condition in this group, focus next or previous row
     else {
@@ -119,10 +145,10 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       var prevRows = (_conditionBuilderCont3 = conditionBuilderContentRef.current) === null || _conditionBuilderCont3 === void 0 ? void 0 : _conditionBuilderCont3.querySelectorAll("[aria-level=\"".concat(Number(currentLevel) - 1, "\"][role=\"row\"]"));
       var nextRow = (_conditionBuilderCont4 = conditionBuilderContentRef.current) === null || _conditionBuilderCont4 === void 0 ? void 0 : _conditionBuilderCont4.querySelector("[aria-level=\"".concat(Number(currentLevel) + 1, "\"][role=\"row\"]"));
       if (nextRow) {
-        nextRow === null || nextRow === void 0 || nextRow.focus();
+        manageTabIndexAndFocus(nextRow, conditionBuilderRef);
       } else if ((prevRows === null || prevRows === void 0 ? void 0 : prevRows.length) > 1) {
-        var _prevRows;
-        (_prevRows = prevRows[prevRows.length - 2]) === null || _prevRows === void 0 || _prevRows.focus();
+        // prevRows[prevRows.length - 2].setAttribute('tabindex', '0');
+        manageTabIndexAndFocus(prevRows[prevRows.length - 2], conditionBuilderRef);
       }
     }
   };
@@ -179,7 +205,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     }, /*#__PURE__*/React__default.createElement("div", {
       className: "".concat(blockClass, "__condition-wrapper"),
       role: "grid",
-      "aria-label": conditionBuilderGroupText
+      "aria-label": conditionBuilderText
     }, group === null || group === void 0 || (_group$conditions = group.conditions) === null || _group$conditions === void 0 ? void 0 : _group$conditions.map(function (eachCondition, conditionIndex) {
       return /*#__PURE__*/React__default.createElement("div", {
         key: eachCondition.id,
@@ -233,7 +259,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         label: conditionText
       },
       onChange: function onChange(v, evt) {
-        focusThisField(evt);
+        focusThisField(evt, conditionBuilderRef);
         onStatementChangeHandler(v);
       },
       config: {
@@ -245,7 +271,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       }, eachCondition.conditions ? /*#__PURE__*/React__default.createElement("div", {
         className: cx("".concat(blockClass, "__condition-block subgroup  ").concat(blockClass, "__gap"), _defineProperty({}, "".concat(blockClass, "__gap-bottom"), group.conditions.length < conditionIndex + 1))
       }, /*#__PURE__*/React__default.createElement(ConditionConnector, {
-        className: "".concat(blockClass, "__gap ").concat(blockClass, "__groupConnector"),
+        className: "".concat(blockClass, "__gap ").concat(blockClass, "__gap-bottom ").concat(blockClass, "__groupConnector"),
         operator: group.groupOperator,
         "aria-hidden": true
       }), /*#__PURE__*/React__default.createElement(ConditionGroupBuilder, {
@@ -261,8 +287,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         },
         onRemove: function onRemove(e) {
           onRemoveHandler(eachCondition.id, e);
-        },
-        conditionBuilderRef: conditionBuilderRef
+        }
       })) : /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(ConditionBlock, {
         conjunction: conditionIndex > 0 ? group.groupOperator : undefined,
         aria: {
@@ -317,11 +342,6 @@ ConditionGroupBuilder.propTypes = {
    * Provide an optional class to be applied to the containing node.
    */
   className: PropTypes.string,
-  /**
-  className: PropTypes.string,
-   * ref of condition builder
-   */
-  conditionBuilderRef: PropTypes.object,
   group: PropTypes.object,
   /**
    * callback to update the current condition of the state tree

package/es/components/ConditionBuilder/utils/handleKeyboardEvents.d.ts

@@ -1 +1,2 @@
 export function handleKeyDown(evt: any, conditionBuilderRef: any, variant: any): void;
+export function handleKeyDownForPopover(evt: any, conditionBuilderRef: any, popoverRef: any): void;

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

@@ -7,25 +7,27 @@
 
 import { toConsumableArray as _toConsumableArray } from '../../../_virtual/_rollupPluginBabelHelpers.js';
 import { blockClass } from '../ConditionBuilderContext/DataConfigs.js';
-import { checkForHoldingKey, focusThisField, traverseReverse, traverseClockVise, focusThisItem } from './util.js';
+import { focusThisItem, manageTabIndexAndFocus, traverseClockVise, traverseReverse, checkForHoldingKey, focusThisField } from './util.js';
 
 var handleKeyDown = function handleKeyDown(evt, conditionBuilderRef, variant) {
+  var _activeElement$closes;
   var activeElement = document.activeElement;
+  if (!((_activeElement$closes = activeElement.closest(".".concat(blockClass, "__popover"))) !== null && _activeElement$closes !== void 0 && _activeElement$closes.querySelector('[role="dialog"]'))) {
+    handleKeyPressForMainContent(evt, conditionBuilderRef, variant);
+  }
+};
+var handleKeyDownForPopover = function handleKeyDownForPopover(evt, conditionBuilderRef, popoverRef) {
   if (excludeKeyPress(evt)) {
     return;
   }
-  if (activeElement.closest("[role=\"dialog\"]")) {
-    handleKeyPressForPopover(evt, activeElement.closest("[role=\"dialog\"]"));
-  } else {
-    handleKeyPressForMainContent(evt, conditionBuilderRef, variant);
-  }
+  handleKeyPressForPopover(evt, popoverRef === null || popoverRef === void 0 ? void 0 : popoverRef.current, conditionBuilderRef);
 };
+
 //skipping keyboard handling for date and time fields to get take carbon's
 var excludeKeyPress = function excludeKeyPress(evt) {
-  var _evt$target$closest, _evt$target$closest2;
-  return !['Escape'].includes(evt.key) && (((_evt$target$closest = evt.target.closest(".".concat(blockClass, "__item-date"))) === null || _evt$target$closest === void 0 ? void 0 : _evt$target$closest.length) || ((_evt$target$closest2 = evt.target.closest(".".concat(blockClass, "__item-time"))) === null || _evt$target$closest2 === void 0 ? void 0 : _evt$target$closest2.length));
+  return !['Escape'].includes(evt.key) && (evt.target.closest(".".concat(blockClass, "__item-date")) || evt.target.closest(".".concat(blockClass, "__item-time")));
 };
-var handleKeyPressForPopover = function handleKeyPressForPopover(evt, parentContainer) {
+var handleKeyPressForPopover = function handleKeyPressForPopover(evt, parentContainer, conditionBuilderRef) {
   var _parentContainer$quer;
   var key = evt.key;
   var isHoldingShiftKey = checkForHoldingKey(evt, 'shiftKey');
@@ -35,22 +37,22 @@ var handleKeyPressForPopover = function handleKeyPressForPopover(evt, parentCont
     case 'ArrowUp':
       //traverse through the popover options, search box, selectAll button
       parentContainer.querySelectorAll("[role=\"option\"]").forEach(function (eachElem, index, allElements) {
-        traverseReverse(eachElem, index, allElements);
+        traverseReverse(eachElem, index, allElements, null, null, conditionBuilderRef);
       });
       break;
     case 'ArrowDown':
       //traverse through the popover options, search box, selectAll button
       parentContainer.querySelectorAll("[role=\"option\"]").forEach(function (eachElem, index, allElements) {
-        traverseClockVise(eachElem, index, allElements);
+        traverseClockVise(eachElem, index, allElements, null, null, conditionBuilderRef);
       });
       break;
     case 'Tab':
       allItems = [].concat(_toConsumableArray(Array.from(parentContainer.querySelectorAll(".".concat(blockClass, "__selectAll-button,[role=\"searchbox\"]")))), [parentContainer.querySelector("[role=\"option\"]")]);
       allItems.forEach(function (eachElem, index, allElements) {
         if (isHoldingShiftKey) {
-          traverseReverse(eachElem, index, allElements, true, true);
+          traverseReverse(eachElem, index, allElements, true, true, conditionBuilderRef);
         } else {
-          traverseClockVise(eachElem, index, allElements, true, true);
+          traverseClockVise(eachElem, index, allElements, true, true, conditionBuilderRef);
         }
       });
       evt.preventDefault();
@@ -70,40 +72,41 @@ var handleKeyPressForPopover = function handleKeyPressForPopover(evt, parentCont
         if (document.activeElement.type !== 'button') {
           var _document$activeEleme2;
           //for button , enter key is click which already handled by framework, else trigger click
-          focusThisField(evt);
+          focusThisField(evt, conditionBuilderRef);
           (_document$activeEleme2 = document.activeElement) === null || _document$activeEleme2 === void 0 || _document$activeEleme2.click();
         }
       }
       break;
     case 'Escape':
-      //focus the corresponding field in which the popover is triggered
-      focusThisField(evt);
+      //focus the corresponding field in which the popover is triggered\
+      focusThisField(evt, conditionBuilderRef);
       break;
   }
 };
 var handleKeyPressForMainContent = function handleKeyPressForMainContent(evt, conditionBuilderRef, variant) {
+  var _document$activeEleme3;
   switch (evt.key) {
     case 'ArrowRight':
       evt.preventDefault();
       if (variant == 'tree') {
-        var _evt$target$closest3;
-        var allCellsInRow = Array.from((_evt$target$closest3 = evt.target.closest('[role="row"]')) === null || _evt$target$closest3 === void 0 ? void 0 : _evt$target$closest3.querySelectorAll('[role="gridcell"] button'));
-        if (evt.target.getAttribute('role') == 'row') {
+        var _evt$target$closest;
+        var allCellsInRow = Array.from((_evt$target$closest = evt.target.closest('[role="row"]')) === null || _evt$target$closest === void 0 ? void 0 : _evt$target$closest.querySelectorAll('[role="gridcell"] button'));
+        if (allCellsInRow.length === 1) {
+          evt.target = evt.target.closest('[role="row"]');
+          handleRowNavigationTree(evt, conditionBuilderRef, variant);
+          //focus next row
+        } else if (evt.target.getAttribute('role') == 'row') {
           //when current focus is on a row, then we need to enter inside and focus the first cell of that row
-          if (allCellsInRow.length === 1) {
-            handleRowNavigationTree(evt, conditionBuilderRef, variant);
-            //focus next row
-          } else {
-            var _allCellsInRow$;
-            (_allCellsInRow$ = allCellsInRow[0]) === null || _allCellsInRow$ === void 0 || _allCellsInRow$.focus();
-          }
+
+          //focus first cell
+          manageTabIndexAndFocus(allCellsInRow[0], conditionBuilderRef);
         } else {
           //finding the next cell to be focussed
           //next cell = current cell index + 1
 
           var currentItemIndex = allCellsInRow.indexOf(evt.target);
           if (currentItemIndex < allCellsInRow.length - 1) {
-            focusThisItem(allCellsInRow[currentItemIndex + 1]);
+            focusThisItem(allCellsInRow[currentItemIndex + 1], conditionBuilderRef);
           }
         }
       } else {
@@ -114,17 +117,17 @@ var handleKeyPressForMainContent = function handleKeyPressForMainContent(evt, co
       evt.preventDefault();
       if (variant == 'tree') {
         if (evt.target.getAttribute('role') !== 'row') {
-          var _evt$target$closest4;
+          var _evt$target$closest2;
           //when any cell is focussed, arrow left will select the previous cell or current row
 
-          var allItems = Array.from((_evt$target$closest4 = evt.target.closest('[role="row"]')) === null || _evt$target$closest4 === void 0 ? void 0 : _evt$target$closest4.querySelectorAll('[role="gridcell"] button'));
-          var _currentItemIndex = allItems.indexOf(evt.target);
+          var _allCellsInRow = Array.from((_evt$target$closest2 = evt.target.closest('[role="row"]')) === null || _evt$target$closest2 === void 0 ? void 0 : _evt$target$closest2.querySelectorAll('[role="gridcell"] button'));
+          var _currentItemIndex = _allCellsInRow.indexOf(evt.target);
           if (_currentItemIndex > 0) {
-            focusThisItem(allItems[_currentItemIndex - 1]);
+            focusThisItem(_allCellsInRow[_currentItemIndex - 1], conditionBuilderRef);
           } else {
             //focus the row
             var wrapper = evt.target.closest("[role=\"row\"]");
-            wrapper.focus();
+            manageTabIndexAndFocus(wrapper, conditionBuilderRef);
           }
         }
       } else {
@@ -140,6 +143,12 @@ var handleKeyPressForMainContent = function handleKeyPressForMainContent(evt, co
         handleRowNavigation(evt, conditionBuilderRef, variant);
       }
       break;
+    case 'Enter':
+      if (((_document$activeEleme3 = document.activeElement) === null || _document$activeEleme3 === void 0 || (_document$activeEleme3 = _document$activeEleme3.querySelectorAll("button")) === null || _document$activeEleme3 === void 0 ? void 0 : _document$activeEleme3.length) === 1) {
+        var _document$activeEleme4;
+        (_document$activeEleme4 = document.activeElement) === null || _document$activeEleme4 === void 0 || (_document$activeEleme4 = _document$activeEleme4.querySelectorAll("button")[0]) === null || _document$activeEleme4 === void 0 || _document$activeEleme4.click();
+      }
+      break;
   }
 };
 var getRows = function getRows(conditionBuilderRef) {
@@ -155,9 +164,9 @@ var getRowIndex = function getRowIndex(element, conditionBuilderRef) {
 var handleRowNavigation = function handleRowNavigation(evt, conditionBuilderRef, variant) {
   var rows = getRows(conditionBuilderRef);
   var currentRowIndex = getRowIndex(evt.target, conditionBuilderRef);
-  navigateToNextRowCell(evt, currentRowIndex, rows, variant);
+  navigateToNextRowCell(evt, currentRowIndex, rows, variant, conditionBuilderRef);
 };
-function handleRowNavigationTree(evt, conditionBuilderRef, variant) {
+var handleRowNavigationTree = function handleRowNavigationTree(evt, conditionBuilderRef, variant) {
   var rows = getRows(conditionBuilderRef);
   var currentRowIndex = getRowIndex(evt.target, conditionBuilderRef);
   var nextRowIndex = currentRowIndex;
@@ -175,15 +184,13 @@ function handleRowNavigationTree(evt, conditionBuilderRef, variant) {
       nextRowIndex = rows.length - 1;
     }
     if (nextRowIndex !== currentRowIndex) {
-      rows[currentRowIndex].setAttribute('tabindex', '-1');
-      rows[nextRowIndex].setAttribute('tabindex', '0');
-      rows[nextRowIndex].focus();
+      manageTabIndexAndFocus(rows[nextRowIndex], conditionBuilderRef);
     }
   } else {
-    navigateToNextRowCell(evt, currentRowIndex, rows, variant);
+    navigateToNextRowCell(evt, currentRowIndex, rows, variant, conditionBuilderRef);
   }
-}
-var navigateToNextRowCell = function navigateToNextRowCell(evt, currentRowIndex, rows, variant) {
+};
+var navigateToNextRowCell = function navigateToNextRowCell(evt, currentRowIndex, rows, variant, conditionBuilderRef) {
   //when the current focussed element is a cell of any row, arrow up/down will focus the next row same cell.
 
   var nextRowIndex = currentRowIndex;
@@ -200,17 +207,17 @@ var navigateToNextRowCell = function navigateToNextRowCell(evt, currentRowIndex,
     nextRow === null || nextRow === void 0 || (_nextRow$querySelecto = nextRow.querySelector("[data-name=\"".concat(itemName, "\"]"))) === null || _nextRow$querySelecto === void 0 || _nextRow$querySelecto.focus();
   } else if (variant === 'tree') {
     //when the next row is a if statement , then that row is focused. From any cell of last row of an group , arrow down select the next row (if)
-    nextRow === null || nextRow === void 0 || nextRow.focus();
+    manageTabIndexAndFocus(nextRow, conditionBuilderRef);
   }
 };
 var handleCellNavigation = function handleCellNavigation(evt, conditionBuilderRef) {
   conditionBuilderRef.current.querySelectorAll("[role=\"gridcell\"] button").forEach(function (eachElem, index, allElements) {
     if (evt.key === 'ArrowRight') {
-      traverseClockVise(eachElem, index, allElements);
+      traverseClockVise(eachElem, index, allElements, null, null, conditionBuilderRef);
     } else {
-      traverseReverse(eachElem, index, allElements);
+      traverseReverse(eachElem, index, allElements, null, null, conditionBuilderRef);
     }
   });
 };
 
-export { handleKeyDown };
+export { handleKeyDown, handleKeyDownForPopover };

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

@@ -1,6 +1,8 @@
-export function focusThisField(evt: any): void;
-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 focusThisField(evt: any, conditionBuilderRef: any): void;
+export function focusThisItem(currentElement: any, conditionBuilderRef: any): void;
+export function traverseClockVise(eachElem: any, index: any, allElements: any, rotate: any, trapFocus: any, conditionBuilderRef: any): void;
+export function traverseReverse(eachElem: any, index: any, allElements: any, rotate: any, trapFocus: any, conditionBuilderRef: any): void;
 export function checkForHoldingKey(evt: any, key: any): any;
 export function checkDuplicateAction(actionState: any, selectedId: any, currentActionId: any): boolean;
+export function checkIsValid(item: any): any;
+export function manageTabIndexAndFocus(currentElement: any, conditionBuilderRef: any): void;

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

@@ -5,40 +5,45 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-var focusThisField = function focusThisField(evt) {
-  setTimeout(function () {
-    var _evt$target$closest, _evt$target$closest2;
-    (_evt$target$closest = evt.target.closest('[role="gridcell"]')) === null || _evt$target$closest === void 0 || (_evt$target$closest = _evt$target$closest.querySelector('button')) === null || _evt$target$closest === void 0 || _evt$target$closest.click();
-    (_evt$target$closest2 = evt.target.closest('[role="gridcell"]')) === null || _evt$target$closest2 === void 0 || (_evt$target$closest2 = _evt$target$closest2.querySelector('button')) === null || _evt$target$closest2 === void 0 || _evt$target$closest2.focus();
-  }, 0);
+import { blockClass } from '../ConditionBuilderContext/DataConfigs.js';
+
+var focusThisField = function focusThisField(evt, conditionBuilderRef) {
+  if (evt) {
+    setTimeout(function () {
+      var _evt$target$closest, _evt$target$closest2, _evt$target$closest3;
+      manageTabIndexAndFocus((_evt$target$closest = evt.target.closest('[role="gridcell"]')) === null || _evt$target$closest === void 0 ? void 0 : _evt$target$closest.querySelector('button'), conditionBuilderRef);
+      (_evt$target$closest2 = evt.target.closest('[role="gridcell"]')) === null || _evt$target$closest2 === void 0 || (_evt$target$closest2 = _evt$target$closest2.querySelector('button')) === null || _evt$target$closest2 === void 0 || _evt$target$closest2.click();
+      (_evt$target$closest3 = evt.target.closest('[role="gridcell"]')) === null || _evt$target$closest3 === void 0 || (_evt$target$closest3 = _evt$target$closest3.querySelector('button')) === null || _evt$target$closest3 === void 0 || _evt$target$closest3.focus();
+    }, 0);
+  }
 };
-var focusThisItem = function focusThisItem(currentElement) {
+var focusThisItem = function focusThisItem(currentElement, conditionBuilderRef) {
   setTimeout(function () {
     //document.activeElement.setAttribute('tabindex', '-1');
     // currentElement.setAttribute('tabindex', '0');
-    currentElement === null || currentElement === void 0 || currentElement.focus();
+    manageTabIndexAndFocus(currentElement, conditionBuilderRef);
   }, 0);
 };
-var traverseClockVise = function traverseClockVise(eachElem, index, allElements, rotate, trapFocus) {
+var traverseClockVise = function traverseClockVise(eachElem, index, allElements, rotate, trapFocus, conditionBuilderRef) {
   if (eachElem == document.activeElement) {
     if (index !== allElements.length - 1) {
-      focusThisItem(allElements[index + 1]);
+      focusThisItem(allElements[index + 1], conditionBuilderRef);
     } else {
-      focusThisItem(allElements[rotate ? 0 : allElements.length - 1]);
+      focusThisItem(allElements[rotate ? 0 : allElements.length - 1], conditionBuilderRef);
     }
   } else if (Array.from(allElements).indexOf(document.activeElement) == -1 && trapFocus) {
-    focusThisItem(allElements[0]);
+    focusThisItem(allElements[0], conditionBuilderRef);
   }
 };
-var traverseReverse = function traverseReverse(eachElem, index, allElements, rotate, trapFocus) {
+var traverseReverse = function traverseReverse(eachElem, index, allElements, rotate, trapFocus, conditionBuilderRef) {
   if (eachElem == document.activeElement) {
     if (index !== 0) {
-      focusThisItem(allElements[index - 1]);
+      focusThisItem(allElements[index - 1], conditionBuilderRef);
     } else {
-      focusThisItem(allElements[rotate ? allElements.length - 1 : 0]);
+      focusThisItem(allElements[rotate ? allElements.length - 1 : 0], conditionBuilderRef);
     }
   } else if (Array.from(allElements).indexOf(document.activeElement) == -1 && trapFocus) {
-    focusThisItem(allElements[allElements.length - 1]);
+    focusThisItem(allElements[allElements.length - 1], conditionBuilderRef);
   }
 };
 var checkForHoldingKey = function checkForHoldingKey(evt, key) {
@@ -48,5 +53,18 @@ var checkForHoldingKey = function checkForHoldingKey(evt, key) {
   }
   return evt[key];
 };
+var checkIsValid = function checkIsValid(item) {
+  return item && item !== 'INVALID';
+};
+var manageTabIndexAndFocus = function manageTabIndexAndFocus(currentElement, conditionBuilderRef) {
+  var _currentElement$close, _conditionBuilderRef$;
+  var contentContainer = (_currentElement$close = currentElement === null || currentElement === void 0 ? void 0 : currentElement.closest(".".concat(blockClass, "__content-container"))) !== null && _currentElement$close !== void 0 ? _currentElement$close : currentElement === null || currentElement === void 0 ? void 0 : currentElement.closest(".".concat(blockClass, "__actions-container"));
+  contentContainer && Array.from(contentContainer.querySelectorAll('[tabindex="0"]')).map(function (element) {
+    return element === null || element === void 0 ? void 0 : element.setAttribute('tabindex', '-1');
+  });
+  currentElement === null || currentElement === void 0 || currentElement.setAttribute('tabindex', '0');
+  (_conditionBuilderRef$ = conditionBuilderRef.current) === null || _conditionBuilderRef$ === void 0 || (_conditionBuilderRef$ = _conditionBuilderRef$.querySelector(".".concat(blockClass, "__statement-button"))) === null || _conditionBuilderRef$ === void 0 || _conditionBuilderRef$.setAttribute('tabindex', '1');
+  currentElement === null || currentElement === void 0 || currentElement.focus();
+};
 
-export { checkForHoldingKey, focusThisField, focusThisItem, traverseClockVise, traverseReverse };
+export { checkForHoldingKey, checkIsValid, focusThisField, focusThisItem, manageTabIndexAndFocus, traverseClockVise, traverseReverse };

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

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { slicedToArray as _slicedToArray, extends as _extends, objectSpread2 as _objectSpread2, defineProperty as _defineProperty, toConsumableArray as _toConsumableArray } from '../../../../../../_virtual/_rollupPluginBabelHelpers.js';
+import { slicedToArray as _slicedToArray, toConsumableArray as _toConsumableArray, extends as _extends, objectSpread2 as _objectSpread2, defineProperty as _defineProperty } from '../../../../../../_virtual/_rollupPluginBabelHelpers.js';
 import { MULTISELECT, DROPDOWN, RADIO, CHECKBOX, NUMBER, DATE, BATCH, SAVED_FILTERS, INSTANT, PANEL } from '../constants.js';
 import { MultiSelect, Dropdown, FormGroup, RadioButtonGroup, RadioButton, NumberInput, DatePicker, DatePickerInput, Layer, Checkbox } from '@carbon/react';
 import React__default, { useContext, useState, useRef, useCallback, useEffect } from 'react';
@@ -13,6 +13,7 @@ import OverflowCheckboxes from '../OverflowCheckboxes.js';
 import { getInitialStateFromFilters } from '../utils.js';
 import { FilterContext } from '../FilterProvider.js';
 import { handleCheckboxChange } from '../handleCheckboxChange.js';
+import uuidv4 from '../../../../../../global/js/utils/uuidv4.js';
 import { usePreviousValue } from '../../../../../../global/js/hooks/usePreviousValue.js';
 
 var useFilters = function useFilters(_ref) {
@@ -47,6 +48,7 @@ var useFilters = function useFilters(_ref) {
   var previousState = usePreviousValue({
     panelOpen: panelOpen
   });
+  var filteredItemsRef = useRef();
 
   // When using batch actions we have to store the filters to then apply them later
   var prevFiltersRef = useRef(JSON.stringify(filtersState));
@@ -307,8 +309,18 @@ var useFilters = function useFilters(_ref) {
             }
             return null;
           }).filter(Boolean);
+          var isEqual = compareFilterItems(filteredItems);
+          if (!isEqual) {
+            filteredItemsRef.current = _toConsumableArray(filteredItems);
+          }
+          var getKey = function getKey() {
+            return isEqual ? {
+              key: uuidv4()
+            } : column;
+          };
           filter = /*#__PURE__*/React__default.createElement(MultiSelect, _extends({}, components.MultiSelect, {
             selectedItems: filteredItems,
+            key: getKey(),
             onChange: function onChange(_ref9) {
               var _components$MultiSele, _components$MultiSele2;
               var selectedItems = _ref9.selectedItems;
@@ -324,6 +336,7 @@ var useFilters = function useFilters(_ref) {
                 }
                 return null;
               }).filter(Boolean);
+              filteredItemsRef.current = _toConsumableArray(foundItems);
 
               // Change selected state for those items that have been selected
               allOptions.map(function (a) {
@@ -366,6 +379,25 @@ var useFilters = function useFilters(_ref) {
       key: column
     }, filter);
   };
+  var compareFilterItems = function compareFilterItems(filteredItems) {
+    var _filteredItems$map, _filteredItemsRef$cur, _filteredItemsRef$cur2;
+    var filteredItemsId = (_filteredItems$map = filteredItems.map(function (item) {
+      return item.id;
+    })) !== null && _filteredItems$map !== void 0 ? _filteredItems$map : [];
+    var previousFilteredItemsId = (_filteredItemsRef$cur = filteredItemsRef === null || filteredItemsRef === void 0 || (_filteredItemsRef$cur2 = filteredItemsRef.current) === null || _filteredItemsRef$cur2 === void 0 ? void 0 : _filteredItemsRef$cur2.map(function (item) {
+      return item.id;
+    })) !== null && _filteredItemsRef$cur !== void 0 ? _filteredItemsRef$cur : [];
+    var set1 = new Set(filteredItemsId);
+    var set2 = new Set(previousFilteredItemsId);
+    // Check if the sets have the same size (same number of unique elements)
+    if (set1.size !== set2.size) {
+      return false;
+    }
+    // Check if all elements in set1 are also present in set2 (using spread syntax)
+    return _toConsumableArray(set1).every(function (element) {
+      return set2.has(element);
+    });
+  };
 
   /** This useEffect will properly handle the previous filters when the panel closes
    * 1. If the panel closes we need to call the reset fn but also store the

package/es/components/StringFormatter/StringFormatter.js

@@ -12,14 +12,15 @@ import cx from 'classnames';
 import { getDevtoolsProps } from '../../global/js/utils/devtools.js';
 import { pkg } from '../../settings.js';
 import { DefinitionTooltip } from '@carbon/react';
-import { StringFormatterAlignment } from './utils/enums.js';
+import { StringFormatterAlignment, deprecated_StringFormatterAlignment, propMappingFunction } from './utils/enums.js';
+import { allPropTypes } from '../../global/js/utils/props-helper.js';
 
 var _excluded = ["className", "lines", "tooltipDirection", "truncate", "width", "value"];
 var blockClass = "".concat(pkg.prefix, "--string-formatter");
 var componentName = 'StringFormatter';
 var defaults = {
   lines: 1,
-  tooltipDirection: StringFormatterAlignment.BOTTOM_LEFT,
+  tooltipDirection: StringFormatterAlignment.BOTTOM_START,
   truncate: false,
   width: null
 };
@@ -59,6 +60,16 @@ var StringFormatter = /*#__PURE__*/React__default.forwardRef(function (_ref, ref
 });
 StringFormatter = pkg.checkComponentEnabled(StringFormatter, componentName);
 StringFormatter.displayName = componentName;
+StringFormatter.validateAlignment = function () {
+  return function (props, propName, componentName) {
+    var prop = props[propName];
+    var deprecatedAlignValues = Object.values(deprecated_StringFormatterAlignment);
+    if (deprecatedAlignValues.includes(prop)) {
+      var mappedNewProp = propMappingFunction(prop);
+      console.warn("\"".concat(prop, "\" is a deprecated value for the \"").concat(propName, "\" prop on the \"").concat(componentName, "\" component. Use \"").concat(mappedNewProp, "\" instead. Allowable values are: ").concat(Object.values(StringFormatterAlignment).join(', '), "."));
+    }
+  };
+};
 StringFormatter.propTypes = {
   /**
    * Provide an optional class to be applied to the containing node.
@@ -67,7 +78,7 @@ StringFormatter.propTypes = {
   /** Number of lines to clamp value. */
   lines: PropTypes.number,
   /** Specify the direction of the tooltip. Can be either top or bottom. */
-  tooltipDirection: PropTypes.oneOf(Object.values(StringFormatterAlignment)),
+  tooltipDirection: allPropTypes([StringFormatter.validateAlignment(), PropTypes.oneOf(Object.values(deprecated_StringFormatterAlignment), Object.values(StringFormatterAlignment))]),
   /** Whether or not the value should be truncated. */
   truncate: PropTypes.bool,
   /** Value to format. */